Added shouldUpdate logic to camera.

htmlboss · htmlboss · commit 6c27c07bfba3 · 2018-02-16T13:18:36.000-03:30
* No need to render gui to separate framebuffer.
diff --git a/MP-APS/.vs/MP-APS/v15/.suo b/MP-APS/.vs/MP-APS/v15/.suo
diff --git a/MP-APS/.vs/MP-APS/v15/Browse.VC.db b/MP-APS/.vs/MP-APS/v15/Browse.VC.db
diff --git a/MP-APS/Camera.cpp b/MP-APS/Camera.cpp
@@ -20,16 +20,23 @@ Camera::Camera(const glm::vec3& position, const glm::vec3& up, const float yaw,
 
 /***********************************************************************************/
 void Camera::Update(const double deltaTime) {
-	// Update view from mouse movement
-	updateView();
-
-	// Update Keyboard
-	if (Input::GetInstance().IsKeyHeld(GLFW_KEY_W)) { processKeyboard(Direction::FORWARD, deltaTime); }
-	if (Input::GetInstance().IsKeyHeld(GLFW_KEY_S)) { processKeyboard(Direction::BACKWARD, deltaTime); }
-	if (Input::GetInstance().IsKeyHeld(GLFW_KEY_A)) { processKeyboard(Direction::LEFT, deltaTime); }
-	if (Input::GetInstance().IsKeyHeld(GLFW_KEY_D)) { processKeyboard(Direction::RIGHT, deltaTime); }
-	if (Input::GetInstance().IsKeyHeld(GLFW_KEY_SPACE)) { processKeyboard(Direction::UP, deltaTime); }
-	if (Input::GetInstance().IsKeyHeld(GLFW_KEY_LEFT_CONTROL)) { processKeyboard(Direction::DOWN, deltaTime); }
+
+	if (Input::GetInstance().IsKeyPressed(GLFW_KEY_TAB)) {
+		m_shouldUpdate = !m_shouldUpdate;
+	}
+
+	if (m_shouldUpdate) {
+		// Update view from mouse movement
+		updateView();
+
+		// Update Keyboard
+		if (Input::GetInstance().IsKeyHeld(GLFW_KEY_W)) { processKeyboard(Direction::FORWARD, deltaTime); }
+		if (Input::GetInstance().IsKeyHeld(GLFW_KEY_S)) { processKeyboard(Direction::BACKWARD, deltaTime); }
+		if (Input::GetInstance().IsKeyHeld(GLFW_KEY_A)) { processKeyboard(Direction::LEFT, deltaTime); }
+		if (Input::GetInstance().IsKeyHeld(GLFW_KEY_D)) { processKeyboard(Direction::RIGHT, deltaTime); }
+		if (Input::GetInstance().IsKeyHeld(GLFW_KEY_SPACE)) { processKeyboard(Direction::UP, deltaTime); }
+		if (Input::GetInstance().IsKeyHeld(GLFW_KEY_LEFT_CONTROL)) { processKeyboard(Direction::DOWN, deltaTime); }
+	}
 }
 
 /***********************************************************************************/
diff --git a/MP-APS/Camera.h b/MP-APS/Camera.h
@@ -49,4 +49,6 @@ class Camera {
 	// Mouse positions
 	bool m_firstMouse;
 	double m_prevX, m_prevY;
+
+	bool m_shouldUpdate = true;
 };
diff --git a/MP-APS/Core/GUISystem.cpp b/MP-APS/Core/GUISystem.cpp
@@ -27,11 +27,6 @@ void GUISystem::Init(GLFWwindow* windowPtr) {
 		nk_glfw3_font_stash_begin(&atlas);
 		nk_glfw3_font_stash_end();
 	}
-
-	int width, height;
-	glfwGetWindowSize(windowPtr, &width, &height);
-
-	m_guiFBO.Init("GUI FBO", width, height);
 }
 
 /***********************************************************************************/
@@ -83,13 +78,10 @@ void GUISystem::Render() {
 	nk_end(m_nuklearContext);
 
 
-	// Todo: render to different framebuffer and blit onto default
-	//glClear(GL_COLOR_BUFFER_BIT);
 	nk_glfw3_render(NK_ANTI_ALIASING_ON, m_maxVertexBuffer, m_maxElementBuffer);
 }
 
 /***********************************************************************************/
-void GUISystem::Shutdown() {
-	m_guiFBO.Delete();
+void GUISystem::Shutdown() const {
 	nk_glfw3_shutdown();
 }
diff --git a/MP-APS/Core/GUISystem.h b/MP-APS/Core/GUISystem.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../Graphics/GLFramebuffer.h"
-
 #include <cstddef>
 
 /***********************************************************************************/
@@ -19,13 +17,11 @@ class GUISystem {
 	void Init(GLFWwindow* windowPtr);
 	void Update();
 	void Render();
-	void Shutdown();
+	void Shutdown() const;
 
 private:
 	nk_context* m_nuklearContext;
 
 	std::size_t m_maxVertexBuffer = 512 * 1024;
 	std::size_t m_maxElementBuffer = 128 * 1024;
-
-	GLFramebuffer m_guiFBO;
 };
diff --git a/MP-APS/Engine.cpp b/MP-APS/Engine.cpp
@@ -76,10 +76,7 @@ void Engine::Execute() {
 	while (!m_mainWindow.ShouldClose()) {
 		update();
 
-		// No need to render when the cursor is enabled
-		if (!m_mainWindow.IsCursorVisible()) {
-			m_renderer.Render(*m_activeScene, false);
-		}
+		m_renderer.Render(*m_activeScene, false);
 
 		m_guiSystem.Render();
 
@@ -100,7 +97,7 @@ void Engine::update() {
 }
 
 /***********************************************************************************/
-void Engine::shutdown() {
+void Engine::shutdown() const {
 	m_guiSystem.Shutdown();
 	m_renderer.Shutdown();
 	ResourceManager::GetInstance().ReleaseAllResources();
diff --git a/MP-APS/Engine.h b/MP-APS/Engine.h
@@ -24,7 +24,7 @@ class Engine {
 
 private:
 	void update();
-	void shutdown();
+	void shutdown() const;
 
 	Timer m_timer;
 

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,6 @@ void GUISystem::Init(GLFWwindow* windowPtr) {`
`27`	`27`	`nk_glfw3_font_stash_begin(&atlas);`
`28`	`28`	`nk_glfw3_font_stash_end();`
`29`	`29`	`}`
`30`		`-`
`31`		`- int width, height;`
`32`		`- glfwGetWindowSize(windowPtr, &width, &height);`
`33`		`-`
`34`		`- m_guiFBO.Init("GUI FBO", width, height);`
`35`	`30`	`}`
`36`	`31`
`37`	`32`	`/***********************************************************************************/`
`@@ -83,13 +78,10 @@ void GUISystem::Render() {`
`83`	`78`	`nk_end(m_nuklearContext);`
`84`	`79`
`85`	`80`
`86`		`- // Todo: render to different framebuffer and blit onto default`
`87`		`- //glClear(GL_COLOR_BUFFER_BIT);`
`88`	`81`	`nk_glfw3_render(NK_ANTI_ALIASING_ON, m_maxVertexBuffer, m_maxElementBuffer);`
`89`	`82`	`}`
`90`	`83`
`91`	`84`	`/***********************************************************************************/`
`92`		`-void GUISystem::Shutdown() {`
`93`		`- m_guiFBO.Delete();`
	`85`	`+void GUISystem::Shutdown() const {`
`94`	`86`	`nk_glfw3_shutdown();`
`95`	`87`	`}`