Removed SceneRenderer2D

tomheeleynz · Jul 20, 2023 · bc34845 · bc34845
1 parent 1835761
commit bc34845
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 358 deletions.
diff --git a/Arcane/src/Arcane.h b/Arcane/src/Arcane.h
@@ -20,7 +20,6 @@
 #include "Arcane/Renderer/Texture.h"
 #include "Arcane/Renderer/Framebuffer.h"
 #include "Arcane/Renderer/SceneRenderer.h"
-#include "Arcane/Renderer/SceneRenderer2D.h"
 #include "Arcane/Renderer/Camera.h"
 #include "Arcane/Renderer/DescriptorSet.h"
 #include "Arcane/Renderer/MeshFactory.h"

diff --git a/Arcane/src/Arcane/Renderer/SceneRenderer.cpp b/Arcane/src/Arcane/Renderer/SceneRenderer.cpp
@@ -297,6 +297,7 @@ namespace Arcane
 
 				for (int j = 0; j < currentMesh->GetSubMeshes().size(); j++) {
 					SubMesh* currentSubMesh = currentMesh->GetSubMeshes()[j];
+
 					Renderer::RenderMesh(currentSubMesh->GetVertexBuffer(), material->GetPipeline(), {
 						s_Data.GlobalDescriptorSet,
 						s_Data.GeometryPassDescriptorSet,

diff --git a/Arcane/src/Arcane/Renderer/SceneRenderer2D.cpp b/Arcane/src/Arcane/Renderer/SceneRenderer2D.cpp
diff --git a/Arcane/src/Arcane/Renderer/SceneRenderer2D.h b/Arcane/src/Arcane/Renderer/SceneRenderer2D.h
diff --git a/Arcane/src/Arcane/Scene/Scene.cpp b/Arcane/src/Arcane/Scene/Scene.cpp
@@ -138,16 +138,6 @@ namespace Arcane
 	{
 		if (Application::Get().GetProject()->GetDimensionType() == DimensionType::TwoD)
 		{
-			auto view = m_Registry.view<TransformComponent, SpriteRendererComponent>();
-			for (auto& entity : view)
-			{
-				auto& spriteRenderer = view.get<SpriteRendererComponent>(entity);
-				auto& transform = view.get<TransformComponent>(entity);
-
-				if (spriteRenderer.material != nullptr && spriteRenderer.material->GetShader() != nullptr)
-					m_SceneRenderer2D->SubmitQuad(spriteRenderer.quad, transform, {1.0f, 1.0f, 1.0f}, spriteRenderer.material);
-			}
-			m_SceneRenderer2D->RenderScene();
 		}
 		else {
 			// Add Lights to scene
@@ -317,10 +307,7 @@ namespace Arcane
 
 	void Scene::SetSceneCamera(Camera* sceneCamera)
 	{
-		if (Application::Get().GetProject()->GetDimensionType() == DimensionType::TwoD)
-			m_SceneRenderer2D->SetCamera(sceneCamera);
-		else 
-			m_SceneRenderer->SetCamera(sceneCamera);
+		m_SceneRenderer->SetCamera(sceneCamera);
 	}
 
 	Kinetics::DynamicBody* Scene::AddDynamicBodyToPhysicsWorld(Kinetics::BodyDef bodyDef)

diff --git a/Arcane/src/Arcane/Scene/Scene.h b/Arcane/src/Arcane/Scene/Scene.h
@@ -8,7 +8,6 @@
 
 #include "Arcane/ECS/Component.h"
 #include "Arcane/Renderer/SceneRenderer.h"
-#include "Arcane/Renderer/SceneRenderer2D.h"
 #include "Arcane/Assets/Asset.h"
 
 namespace Arcane
@@ -42,15 +41,13 @@ namespace Arcane
 		entt::registry m_Registry;
 
 		void SetSceneRenderer(SceneRenderer* sceneRenderer) { m_SceneRenderer = sceneRenderer; }
-		void SetSceneRenderer2D(SceneRenderer2D* sceneRenderer) { m_SceneRenderer2D = sceneRenderer; }
 		void SetSceneCamera(Camera* sceneCamera);
 
 		Kinetics::DynamicBody* AddDynamicBodyToPhysicsWorld(Kinetics::BodyDef bodyDef);
 		void CopyDynamicBodyToPhysicsWorld(Kinetics::DynamicBody* body);
 	private:
 		std::string m_Name;
 		SceneRenderer* m_SceneRenderer;
-		SceneRenderer2D* m_SceneRenderer2D;
 		Kinetics::World* m_PhysicsWorld;
 
 		std::unordered_map<Core::UUID, entt::entity> m_EntityMap;

diff --git a/Arcane/src/Arcane/Scripting/ScriptingEngine.cpp b/Arcane/src/Arcane/Scripting/ScriptingEngine.cpp
@@ -81,7 +81,6 @@ namespace Arcane
 			luaL_getmetatable(L, "TransformComponentMetatable");
 			lua_setmetatable(L, -2);
 		}
-
 		return 1;
 	}