Thicken rail lines, adjust near/far

JoshuaMKW · Nov 18, 2023 · b46ea54 · b46ea54
1 parent e52863a
commit b46ea54
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/include/gui/modelcache.hpp b/include/gui/modelcache.hpp
@@ -2,10 +2,10 @@
 #include <string>
 
 #include <J3D/J3DModelLoader.hpp>
-#include <J3D/J3DModelData.hpp>
-#include <J3D/J3DUniformBufferObject.hpp>
-#include <J3D/J3DLight.hpp>
-#include <J3D/J3DModelInstance.hpp>
-#include <J3D/J3DRendering.hpp>
+#include <J3D/Data/J3DModelData.hpp>
+#include <J3D/Material/J3DUniformBufferObject.hpp>
+#include <J3D/Rendering/J3DLight.hpp>
+#include <J3D/Data/J3DModelInstance.hpp>
+#include <J3D/Rendering/J3DRendering.hpp>
 
 extern std::map<std::string, std::shared_ptr<J3DModelData>> ModelCache;
diff --git a/include/objlib/object.hpp b/include/objlib/object.hpp
@@ -6,8 +6,8 @@
 #include "transform.hpp"
 #include "types.hpp"
 #include <J3D/Animation/J3DAnimationInstance.hpp>
-#include <J3D/J3DLight.hpp>
-#include <J3D/J3DModelInstance.hpp>
+#include <J3D/Rendering/J3DLight.hpp>
+#include <J3D/Data/J3DModelInstance.hpp>
 #include <expected>
 #include <filesystem>
 #include <stacktrace>

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -6,7 +6,7 @@
 #include "gui/themes.hpp"
 #include "gui/util.hpp"
 
-#include <J3D/J3DUniformBufferObject.hpp>
+#include <J3D/Material/J3DUniformBufferObject.hpp>
 
 #include <iostream>
 #include <string>

diff --git a/src/gui/scene/path.cpp b/src/gui/scene/path.cpp
@@ -102,7 +102,7 @@ namespace Toolbox::UI {
 
         glEnable(GL_PROGRAM_POINT_SIZE);
 
-        glLineWidth(2.0f);
+        glLineWidth(5.0f);
 
         glm::mat4 mvp = camera->getProjMatrix() * camera->getViewMatrix() * glm::mat4(1.0);
 

diff --git a/src/gui/scene/window.cpp b/src/gui/scene/window.cpp
@@ -31,6 +31,8 @@
 #endif
 #include <gui/context_menu.hpp>
 
+#include <J3D/Material/J3DUniformBufferObject.hpp>
+
 namespace Toolbox::UI {
 
     void PacketSort(J3DRendering::SortFunctionArgs packets) {
@@ -92,7 +94,7 @@ namespace Toolbox::UI {
     }
 
     SceneWindow::SceneWindow() : DockWindow() {
-        m_camera.setPerspective(150, 16 / 9, 100, 300000);
+        m_camera.setPerspective(150, 16 / 9, 100, 250000);
         m_camera.setOrientAndPosition({0, 1, 0}, {0, 0, 1}, {0, 0, 0});
         m_camera.updateCamera();
         J3DRendering::SetSortFunction(PacketSort);
@@ -552,7 +554,7 @@ namespace Toolbox::UI {
                 projection = m_camera.getProjMatrix();
                 view       = m_camera.getViewMatrix();
 
-                J3DUniformBufferObject::SetProjAndViewMatrices(&projection, &view);
+                J3DUniformBufferObject::SetProjAndViewMatrices(projection, view);
 
                 glm::vec3 position;
                 m_camera.getPos(position);