Merge pull request #73 from hotstreams/detached6

fix instance transformation
hotstreams · Aug 28, 2024 · 53c0eeb · 53c0eeb
2 parents 6c0adac + 3da6ba2
commit 53c0eeb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/include/limitless/models/mesh.hpp b/include/limitless/models/mesh.hpp
@@ -12,9 +12,13 @@ namespace Limitless {
         Box bounding_box {};
 
         void calculateBoundingBox() {
+            //TODO: dispatch?
             if (auto vnt = dynamic_cast<VertexStream<VertexNormalTangent>*>(stream.get()); vnt) {
                 bounding_box = Limitless::calculateBoundingBox(vnt->getVertices());
             }
+            if (auto vnt = dynamic_cast<VertexStream<VertexTerrain>*>(stream.get()); vnt) {
+                bounding_box = Limitless::calculateBoundingBox(vnt->getVertices());
+            }
         }
     public:
 //        Mesh(std::vector<Vertex>&& vertices, VertexStreamUsage usage, VertexStreamDraw draw, std::string _name)

diff --git a/include/limitless/renderer/renderer_settings.hpp b/include/limitless/renderer/renderer_settings.hpp
@@ -83,12 +83,12 @@ namespace Limitless {
         /**
          * Render System Axes
          */
-        bool coordinate_system_axes = true;
+        bool coordinate_system_axes = false;
 
         /**
          * Render bounding boxes
          */
-        bool bounding_box = true;
+        bool bounding_box = false;
 
         class Builder {
         private:

diff --git a/src/limitless/instances/instance_builder.cpp b/src/limitless/instances/instance_builder.cpp
@@ -88,6 +88,7 @@ Instance::Builder& Instance::Builder::bounding_box(const Box& box) {
 std::shared_ptr<ModelInstance> Instance::Builder::asModel() {
     if (dynamic_cast<Model*>(model_.get())) {
         auto instance = std::make_shared<ModelInstance>(model_, position_);
+        initialize(*instance);
         initialize(instance);
         return instance;
     }

diff --git a/src/limitless/scene.cpp b/src/limitless/scene.cpp
@@ -140,7 +140,6 @@ Instances Scene::getInstances() const noexcept {
     };
 
 	for (const auto& [_, instance] : instances) {
-		visitor(instance);
         if (instance->isHidden()) {
             continue;
         }