Pull from main

JoshuaMKW · Nov 18, 2023 · e52863a · e52863a
2 parents 7e06f82 + 108f9e7
commit e52863a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/include/gui/scene/window.hpp b/include/gui/scene/window.hpp
@@ -17,9 +17,11 @@
 
 #include "gui/clipboard.hpp"
 #include "gui/property/property.hpp"
+#include "gui/scene/billboard.hpp"
 #include "gui/scene/camera.hpp"
 #include "gui/scene/nodeinfo.hpp"
 #include "gui/scene/objdialog.hpp"
+#include "gui/scene/path.hpp"
 #include "gui/window.hpp"
 
 #include <gui/context_menu.hpp>

diff --git a/src/gui/camera.cpp b/src/gui/camera.cpp
@@ -45,10 +45,12 @@ namespace Toolbox {
         this->vPos = inPos;
     };
 
-    // The projection matrix
-    void Camera::privUpdateProjectionMatrix(void) {
-        this->projMatrix = glm::perspective(fovy, aspectRatio, nearDist, farDist);
-    };
+// The projection matrix
+void Camera::privUpdateProjectionMatrix(void) {
+    if (aspectRatio < 1)
+        return;
+    this->projMatrix = glm::perspective(fovy, aspectRatio, nearDist, farDist);
+};
 
     void Camera::privUpdateViewMatrix(void) {
         this->viewMatrix = glm::lookAt(vPos, vPos + vDir, vUp);

diff --git a/src/gui/scene/window.cpp b/src/gui/scene/window.cpp
@@ -108,7 +108,15 @@ namespace Toolbox::UI {
 
         buildCreateObjDialog();
         buildRenameObjDialog();
-    }
+
+        if (!m_path_renderer.initPathRenderer()) {
+            // show some error
+        }
+
+        // 128x128 billboards, 10 unique images
+        if (!m_billboard_renderer.initBillboardRenderer(128, 10)) {
+            // show some error
+        }
 
         m_billboard_renderer.loadBillboardTexture("res/question.png", 0);
     }