Cleanup and refactor

Author: htmlboss

MP-APS/.vs/MP-APS/v15/.suo

@@ -339,15 +339,15 @@ nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int m
 }
 
 NK_INTERN void
-nk_glfw3_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
+nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
 {
     const char *text = glfwGetClipboardString(glfw.win);
     if (text) nk_textedit_paste(edit, text, nk_strlen(text));
     (void)usr;
 }
 
 NK_INTERN void
-nk_glfw3_clipbard_copy(nk_handle usr, const char *text, int len)
+nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
 {
     char *str = 0;
     (void)usr;
@@ -370,8 +370,8 @@ nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state)
         glfwSetMouseButtonCallback(win, nk_glfw3_mouse_button_callback);
     }
     nk_init_default(&glfw.ctx, 0);
-    glfw.ctx.clip.copy = nk_glfw3_clipbard_copy;
-    glfw.ctx.clip.paste = nk_glfw3_clipbard_paste;
+    glfw.ctx.clip.copy = nk_glfw3_clipboard_copy;
+    glfw.ctx.clip.paste = nk_glfw3_clipboard_paste;
     glfw.ctx.clip.userdata = nk_handle_ptr(0);
     glfw.last_button_click = 0;
     nk_glfw3_device_create();

MP-APS/.vs/MP-APS/v15/Browse.VC.db

@@ -4,17 +4,7 @@
 #include <GLFW/glfw3.h>
 
 /***********************************************************************************/
-Camera::Camera(const glm::vec3& position, const glm::vec3& up, const float yaw, const float pitch, const float FOV) noexcept :
-	m_position(position),
-	m_front(glm::vec3(0.0f, 0.0f, -1.0f)),
-	m_up(up),
-	m_yaw(yaw),
-	m_pitch(pitch),
-	m_FOV(FOV),
-	m_firstMouse(true),
-	m_prevX(0.0),
-	m_prevY(0.0) 
-{
+Camera::Camera() noexcept {
 	updateVectors();
 }
 
@@ -29,18 +19,18 @@ void Camera::SetFar(const float far) {
 }
 
 /***********************************************************************************/
-void Camera::SetSpeed(const double speed) {
+void Camera::SetSpeed(const float speed) {
 	m_speed = speed;
 }
 
 /***********************************************************************************/
 void Camera::Update(const double deltaTime) {
 
 	if (Input::GetInstance().IsKeyPressed(GLFW_KEY_TAB)) {
-		m_shouldUpdate = !m_shouldUpdate;
+		m_dirty = !m_dirty;
 	}
 
-	if (m_shouldUpdate) {
+	if (m_dirty) {
 		// Update view from mouse movement
 		updateView();
 

MP-APS/3rdParty/nuklear/include/nuklear/nuklear.h

@@ -5,15 +5,16 @@
 class Camera {
 
 public:
-	Camera(const glm::vec3& position = { 0.0f, 0.0f, 0.0f }, const glm::vec3& up = { 0.0f, 1.0f, 0.0f }, const float yaw = -90.0f, const float pitch = 0.0f, const float FOV = 70.0f) noexcept;
+	Camera() noexcept;
 
 	void SetNear(const float near);
 	void SetFar(const float far);
-	void SetSpeed(const double speed);
+	void SetSpeed(const float speed);
 
 	void Update(const double deltaTime);
 
 	auto GetViewMatrix() const { return lookAt(m_position, m_position + m_front, m_up); }
+	// TODO: optimize projection matrix calculation
 	auto GetProjMatrix(const float width, const float height) const { return glm::perspective(m_FOV, width / height, m_near, m_far); }
 	auto GetPosition() const noexcept { return m_position; }
 
@@ -37,24 +38,26 @@ class Camera {
 	void updateVectors();
 
 	// Camera Attributes
-	glm::vec3 m_position;
-	glm::vec3 m_front;
-	glm::vec3 m_up;
+	glm::vec3 m_position{ 0.0f, 0.0f, 0.0f };
+	glm::vec3 m_front{ 0.0f, 0.0f, -1.0f };
+	glm::vec3 m_up{ 0.0f, 1.0f, 0.0f };
 	glm::vec3 m_right;
-	const glm::vec3 m_worldUp = glm::vec3(0.0f, 1.0f, 0.0f);
+	const glm::vec3 m_worldUp{ 0.0f, 1.0f, 0.0f };
 
 	float m_near = 1.0f, m_far = 100.0f;
 
 	// Eular Angles
-	double m_yaw, m_pitch;
+	float m_yaw{ -90.0f };
+	float m_pitch{ 0.0f };
 
-	double m_speed = 5.0;
-	const double m_sensitivity = 0.3;
-	const float m_FOV;
+	float m_speed{ 5.0f };
+	const float m_sensitivity{ 0.3f };
+	const float m_FOV{ 70.0f };
 
 	// Mouse positions
-	bool m_firstMouse;
-	double m_prevX, m_prevY;
+	bool m_firstMouse{ true };
+	double m_prevX{ 0.0 }, m_prevY{0.0};
 
-	bool m_shouldUpdate = true;
+	// Should we update the camera attributes?
+	bool m_dirty{ true };
 };

MP-APS/3rdParty/nuklear/include/nuklear/nuklear_glfw_gl3.h

@@ -1,5 +1,7 @@
 #include "GUISystem.h"
 
+#include <cstddef>
+
 #include <glad/glad.h>
 
 #define NK_INCLUDE_FIXED_TYPES
@@ -16,6 +18,9 @@
 
 //https://github.com/vurtun/nuklear/blob/master/demo/glfw_opengl3/main.c
 
+const constexpr std::size_t MaxVertexBuffer{ 512 * 1024 };
+const constexpr std::size_t MaxElementBuffer{ 128 * 1024 };
+
 /***********************************************************************************/
 void GUISystem::Init(GLFWwindow* windowPtr) {
 	m_nuklearContext = nk_glfw3_init(windowPtr, NK_GLFW3_INSTALL_CALLBACKS);
@@ -78,7 +83,7 @@ void GUISystem::Render() {
 	nk_end(m_nuklearContext);
 
 
-	nk_glfw3_render(NK_ANTI_ALIASING_ON, m_maxVertexBuffer, m_maxElementBuffer);
+	nk_glfw3_render(NK_ANTI_ALIASING_ON, MaxVertexBuffer, MaxElementBuffer);
 }
 
 /***********************************************************************************/

MP-APS/AI/AISystem.cpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <cstddef>
-
 /***********************************************************************************/
 // Forward Declarations
 struct nk_context;
@@ -23,8 +21,5 @@ class GUISystem {
 	void Shutdown() const;
 
 private:
-	nk_context* m_nuklearContext;
-
-	std::size_t m_maxVertexBuffer = 512 * 1024;
-	std::size_t m_maxElementBuffer = 128 * 1024;
+	nk_context* m_nuklearContext{ nullptr };
 };