setup dockspace

Sandbox/src/Sandbox2D.cpp

@@ -14,9 +14,9 @@ static const char* s_MapTiles =
 	"WWWWWDDDWWWWWWW"
 	"WWWDDDDDDDWWWWW"
 	"WWDDDDDDDDDWWWW"
-	"WWDDDWWDDDDWWWW"
 	"WWWDDWWDDDWWWWW"
 	"WWDDDWWDDDDWWWW"
+	"WWDDDWWDDDDWWWW"
 	"WWWDDDWDDDDWWWW"
 	"WWWDDDDDDDWWWWW"
 	"WWDDDDDDDDWWWWW"
@@ -77,33 +77,10 @@ void Sandbox2D::OnUpdate(StarEngine::Timestep ts)
 		StarEngine::RenderCommand::SetClearColor({ 0.1f, 0.1f, 0.1f, 1 });
 		StarEngine::RenderCommand::Clear();
 	}
-	/*
-	{
-		static float rotation = 0.0f;
-		rotation += ts * 50.0f;
-
-		SE_PROFILE_SCOPE("Renderer Draw");
-		StarEngine::Renderer2D::BeginScene(m_CameraController.GetCamera());
-		StarEngine::Renderer2D::DrawRotatedQuad({ 1.0f, 0.0f }, { 0.8f, 0.8f }, glm::radians(-45.0f), { 0.8f, 0.2f, 0.3f, 1.0f });
-		StarEngine::Renderer2D::DrawQuad({ -1.0f, 0.0f }, { 0.8f, 0.8f }, { 0.8f, 0.2f, 0.3f, 1.0f });
-		StarEngine::Renderer2D::DrawQuad({ 0.5f, -0.5f }, { 0.5f, 0.75f }, m_SquareColor);
-		StarEngine::Renderer2D::DrawQuad({ 0.0f, 0.0f, -0.1f }, { 20.0f, 20.0f }, m_CheckerboardTexture, 10.0f);
-		StarEngine::Renderer2D::DrawRotatedQuad({ -2.0f, 0.0f, 0.0f }, { 1.0f, 1.0f }, glm::radians(rotation), m_CheckerboardTexture, 20.0f);
-		StarEngine::Renderer2D::EndScene();
-
-
-		StarEngine::Renderer2D::BeginScene(m_CameraController.GetCamera());
-		for (float y = -5.0f; y < 5.0f; y += 0.5f)
-		{
-			for (float x = -5.0f; x < 5.0f; x += 0.5f)
-			{
-				glm::vec4 color = { (x + 5.0f) / 10.0f, 0.4f, (y + 5.0f) / 10.0f, 0.7f };
-				StarEngine::Renderer2D::DrawQuad({ x, y }, { 0.45f, 0.45f }, color);
-			}
-		}
-		StarEngine::Renderer2D::EndScene();
-	}
-	*/
+
+	{ 
+		SE_PROFILE_SCOPE("Renderer Draw"); 
+
 	if (StarEngine::Input::IsMouseButtonPressed(SE_MOUSE_BUTTON_LEFT))
 	{
 		auto [x, y] = StarEngine::Input::GetMousePosition();
@@ -119,29 +96,9 @@ void Sandbox2D::OnUpdate(StarEngine::Timestep ts)
 			m_ParticleSystem.Emit(m_Particle);
 	}
 
-	StarEngine::Renderer2D::BeginScene(m_CameraController.GetCamera());
-
-	for (uint32_t y = 0; y < s_MapWidth; y++)
-	{
-		for (uint32_t x = 0; x < s_MapWidth; x++)
-		{
-			char tileType = s_MapTiles[x + y * s_MapWidth];
-			StarEngine::Ref<StarEngine::SubTexture2D> texture;
-			if (s_TextureMap.find(tileType) != s_TextureMap.end())
-				texture = s_TextureMap[tileType];
-			else
-				texture = m_TextureStairs;
-			StarEngine::Renderer2D::DrawQuad({ x - s_MapWidth / 2.0f, s_MapWidth / 2.0f - y }, { 1.0f, 1.0f }, texture);
-		}
-	}
-
-	StarEngine::Renderer2D::DrawQuad({ 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f }, m_TextureBarrel);
-	StarEngine::Renderer2D::DrawQuad({ -1.0f, 0.0f, 0.0f }, { 1.0f, 1.0f }, m_TextureStairs);
-	StarEngine::Renderer2D::DrawQuad({ 1.0f, 0.0f, 0.0f }, { 1.0f, 2.0f }, m_TextureTree);
-	StarEngine::Renderer2D::EndScene();
-
 	m_ParticleSystem.OnUpdate(ts);
 	m_ParticleSystem.OnRender(m_CameraController.GetCamera());
+	}
 }
 
 void Sandbox2D::OnImGuiRender()
@@ -151,32 +108,68 @@ void Sandbox2D::OnImGuiRender()
 	ImGuiContext& g = *GImGui;
 	ImGuiIO& io = g.IO;
 
-#ifdef SE_DIST
-	SE_CORE_INFO("FPS : {0}", io.Framerate);
-#endif
+	static bool dockspaceOpen = true;
+	static bool opt_fullscreen = true;
+	static bool opt_padding = false;
+	static ImGuiDockNodeFlags dockspace_flags = ImGuiDockNodeFlags_None;
 
+	ImGuiWindowFlags window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking;
+	if (opt_fullscreen)
+	{
+		const ImGuiViewport* viewport = ImGui::GetMainViewport();
+		ImGui::SetNextWindowPos(viewport->WorkPos);
+		ImGui::SetNextWindowSize(viewport->WorkSize);
+		ImGui::SetNextWindowViewport(viewport->ID);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+		window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
+		window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
+	}
+	else
+	{
+		dockspace_flags &= ~ImGuiDockNodeFlags_PassthruCentralNode;
+	}
 
-#ifdef SE_DEBUG
+	if (dockspace_flags & ImGuiDockNodeFlags_PassthruCentralNode)
+		window_flags |= ImGuiWindowFlags_NoBackground;
 
-	//Camera Info
-	ImGui::Begin("Camera Info");
+	if (!opt_padding)
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
+	ImGui::Begin("DockSpace Demo", &dockspaceOpen, window_flags);
+	if (!opt_padding)
+		ImGui::PopStyleVar();
 
-	ImGui::Text("Camera Position");
-	ImGui::Text("X: %.2f", m_CameraController.GetCamera().GetPosition().x);
-	ImGui::Text("Y: %.2f", m_CameraController.GetCamera().GetPosition().y);
-	ImGui::Text("Z: %.2f", m_CameraController.GetCamera().GetPosition().z);
+	if (opt_fullscreen)
+		ImGui::PopStyleVar(2);
 
-	ImGui::Text("Camera Rotation: %.2f", m_CameraController.GetCamera().GetRotation());
+	// Submit the DockSpace
+	if (io.ConfigFlags & ImGuiConfigFlags_DockingEnable)
+	{
+		ImGuiID dockspace_id = ImGui::GetID("MyDockSpace");
+		ImGui::DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), dockspace_flags);
+	}
 
-	if (ImGui::Button("Reset")) {
-		m_CameraController.GetCamera().SetPosition(glm::vec3(0.0f));
-		m_CameraController.GetCamera().SetRotation(0.0f);
+	if (ImGui::BeginMenuBar())
+	{
+		if (ImGui::BeginMenu("File"))
+		{
+			if (ImGui::MenuItem("Exit")) StarEngine::Application::Get().Close();
+			ImGui::EndMenu();
+		}
+		ImGui::EndMenuBar();
 	}
 
-	//Color Picker
-	ImGui::Text("Color Picker");
+	//Camera Info
+	ImGui::Begin("Camera Info");
+
+	auto stats = StarEngine::Renderer2D::GetStats();
+	ImGui::Text("Renderer2D Stats:");
+	ImGui::Text("Draw Calls: %d", stats.DrawCalls);
+	ImGui::Text("Quads: %d", stats.QuadCount);
+	ImGui::Text("Vertices: %d", stats.GetTotalVertexCount());
+	ImGui::Text("Indices: %d", stats.GetTotalIndexCount());
 
-	ImGui::ColorEdit3("Square Color", glm::value_ptr(m_SquareColor));
+	ImGui::Separator();
 
 	ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
 
@@ -185,24 +178,18 @@ void Sandbox2D::OnImGuiRender()
 		StarEngine::Application::Get().GetWindow().SetVSync(m_VSync);
 	}
 
-	ImGui::Text("Settings");
-
-	auto stats = StarEngine::Renderer2D::GetStats();
-	ImGui::Text("Renderer2D Stats:");
-	ImGui::Text("Draw Calls: %d", stats.DrawCalls);
-	ImGui::Text("Quads: %d", stats.QuadCount);
-	ImGui::Text("Vertices: %d", stats.GetTotalVertexCount());
-	ImGui::Text("Indices: %d", stats.GetTotalIndexCount());
+	ImGui::Image(m_CheckerboardTexture->GetRendererID(), ImVec2{ 256.0f, 256.0f });
 
 	ImGui::End();
 
-#endif
-
 	ImGui::Begin("Settings");
 	ImGui::ColorEdit4("Birth Color", glm::value_ptr(m_Particle.ColorBegin));
 	ImGui::ColorEdit4("Death Color", glm::value_ptr(m_Particle.ColorEnd));
 	ImGui::DragFloat("Life Time", &m_Particle.LifeTime, 0.1f, 0.0f, 1000.0f);
 	ImGui::End();
+
+
+	ImGui::End();
 }
 
 void Sandbox2D::OnEvent(StarEngine::Event& e)

StarEngine/src/Platform/OpenGL/OpenGLTexture.h

@@ -17,6 +17,7 @@ namespace StarEngine {
 
 		virtual uint32_t GetWidth() const override { return m_Width; }
 		virtual uint32_t GetHeight() const override { return m_Height; }
+		virtual uint32_t GetRendererID() const override { return m_RendererID; }
 
 		virtual void SetData(void* data, uint32_t size) override;
 

StarEngine/src/StarEngine/Core/Application.cpp

@@ -50,6 +50,11 @@ namespace StarEngine
 		layer->OnAttach();
 	}
 
+	void Application::Close()
+	{
+		m_Running = false;
+	}
+
 	void Application::OnEvent(Event& e)
 	{
 		SE_PROFILE_FUNCTION();

StarEngine/src/StarEngine/Core/Application.h

@@ -25,7 +25,11 @@ namespace StarEngine
 
 			void PushLayer(Layer* layer);
 			void PushOverlay(Layer* layer);
+
 			Window& GetWindow() { return *m_Window; }
+
+			void Close();
+
 			static Application& Get() { return *s_Instance; }
 		private:
 			void Run();

StarEngine/src/StarEngine/Core/Window.h

@@ -13,7 +13,7 @@ namespace StarEngine {
 		unsigned int Width;
 		unsigned int Height;
 
-		WindowProps(const std::string& title = "StarEngine Engine",
+		WindowProps(const std::string& title = "StarEngine",
 			unsigned int width = 1280,
 			unsigned int height = 720)
 			: Title(title), Width(width), Height(height)

StarEngine/src/StarEngine/Renderer/Texture.h

@@ -13,6 +13,7 @@ namespace StarEngine {
 
 		virtual uint32_t GetWidth() const = 0;
 		virtual uint32_t GetHeight() const = 0;
+		virtual uint32_t GetRendererID() const = 0;
 
 		virtual void SetData(void* data, uint32_t size) = 0;