Make range-based bounding_aabb_of return std::optional<AABB> when it makes sense (#1132)

adamkewley · adamkewley · commit a163dfa5031f · 2025-11-10T19:37:32.000+01:00
diff --git a/libopensimcreator/Documents/MeshImporter/Body.h b/libopensimcreator/Documents/MeshImporter/Body.h
@@ -78,7 +78,7 @@ namespace osc::mi
             m_Xform.scale = {1.0f, 1.0f, 1.0f};
         }
 
-        AABB implCalcBounds(const IObjectFinder&) const final
+        std::optional<AABB> implCalcBounds(const IObjectFinder&) const final
         {
             return bounding_aabb_of(m_Xform.translation);
         }
diff --git a/libopensimcreator/Documents/MeshImporter/Ground.h b/libopensimcreator/Documents/MeshImporter/Ground.h
@@ -34,9 +34,9 @@ namespace osc::mi
             return identity<Transform>();
         }
 
-        AABB implCalcBounds(const IObjectFinder&) const final
+        std::optional<AABB> implCalcBounds(const IObjectFinder&) const final
         {
-            return AABB{};
+            return std::nullopt;
         }
     };
 }
diff --git a/libopensimcreator/Documents/MeshImporter/Joint.h b/libopensimcreator/Documents/MeshImporter/Joint.h
@@ -116,7 +116,7 @@ namespace osc::mi
             m_Xform.scale = {1.0f, 1.0f, 1.0f};
         }
 
-        AABB implCalcBounds(const IObjectFinder&) const final
+        std::optional<AABB> implCalcBounds(const IObjectFinder&) const final
         {
             return bounding_aabb_of(m_Xform.translation);
         }
diff --git a/libopensimcreator/Documents/MeshImporter/MIObject.h b/libopensimcreator/Documents/MeshImporter/MIObject.h
@@ -137,7 +137,7 @@ namespace osc::mi
             setXform(lookup, getXForm(lookup).with_rotation(newRotation));
         }
 
-        AABB calcBounds(const IObjectFinder& lookup) const
+        std::optional<AABB> calcBounds(const IObjectFinder& lookup) const
         {
             return implCalcBounds(lookup);
         }
@@ -218,6 +218,6 @@ namespace osc::mi
         virtual Transform implGetXform(const IObjectFinder&) const = 0;
         virtual void implSetXform(const IObjectFinder&, const Transform&) {}
 
-        virtual AABB implCalcBounds(const IObjectFinder&) const = 0;
+        virtual std::optional<AABB> implCalcBounds(const IObjectFinder&) const = 0;
     };
 }
diff --git a/libopensimcreator/Documents/MeshImporter/Mesh.cpp b/libopensimcreator/Documents/MeshImporter/Mesh.cpp
@@ -34,9 +34,12 @@ osc::mi::Mesh::Mesh(
     m_Name{SanitizeToOpenSimComponentName(m_Path.filename().replace_extension().string())}
 {}
 
-AABB osc::mi::Mesh::calcBounds() const
+std::optional<AABB> osc::mi::Mesh::calcBounds() const
 {
-    return transform_aabb(m_Transform, m_MeshData.bounds());
+    return m_MeshData.bounds().transform([this](const AABB& localBounds)
+    {
+        return transform_aabb(m_Transform, localBounds);
+    });
 }
 
 void osc::mi::Mesh::reloadMeshDataFromDisk()
diff --git a/libopensimcreator/Documents/MeshImporter/Mesh.h b/libopensimcreator/Documents/MeshImporter/Mesh.h
@@ -58,7 +58,7 @@ namespace osc::mi
             m_Transform = t;
         }
 
-        AABB calcBounds() const;
+        std::optional<AABB> calcBounds() const;
 
         void reloadMeshDataFromDisk();
 
@@ -113,7 +113,7 @@ namespace osc::mi
             setXform(t);
         }
 
-        AABB implCalcBounds(const IObjectFinder&) const final
+        std::optional<AABB> implCalcBounds(const IObjectFinder&) const final
         {
             return calcBounds();
         }
diff --git a/libopensimcreator/Documents/MeshImporter/Station.h b/libopensimcreator/Documents/MeshImporter/Station.h
@@ -91,7 +91,7 @@ namespace osc::mi
             m_Position = t.translation;
         }
 
-        AABB implCalcBounds(const IObjectFinder&) const final
+        std::optional<AABB> implCalcBounds(const IObjectFinder&) const final
         {
             return bounding_aabb_of(m_Position);
         }
diff --git a/libopensimcreator/Documents/MeshImporter/UndoableActions.cpp b/libopensimcreator/Documents/MeshImporter/UndoableActions.cpp
@@ -258,7 +258,13 @@ bool osc::mi::TryTranslateToMeshBoundsCenter(
         return false;
     }
 
-    const Vector3 boundsMidpoint = centroid_of(mesh->calcBounds());
+    const std::optional<AABB> bounds = mesh->calcBounds();
+    if (!bounds)
+    {
+        return false;
+    }
+
+    const Vector3 boundsMidpoint = centroid_of(*bounds);
 
     obj->setPos(doc, boundsMidpoint);
     udoc.commit_scratch("moved " + obj->getLabel());
diff --git a/libopensimcreator/Graphics/OpenSimDecorationGenerator.tests.cpp b/libopensimcreator/Graphics/OpenSimDecorationGenerator.tests.cpp
@@ -577,7 +577,7 @@ TEST(GenerateModelDecorations, RadiusOfContactSphereIsCorrectlyUpdated)
     // Before changing radius: it should be as-set
     {
         const auto decorations = GenerateModelDecorations(cache, model, state);
-        const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds));
+        const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds).value());
         ASSERT_NEAR(volume, 0.2f*0.2f*0.2f, 0.001f);
     }
 
@@ -588,7 +588,7 @@ TEST(GenerateModelDecorations, RadiusOfContactSphereIsCorrectlyUpdated)
     // After changing radius: should update it
     {
         const auto decorations = GenerateModelDecorations(cache, model, state);
-        const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds));
+        const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds).value());
         ASSERT_NEAR(volume, 1.0f*1.0f*1.0f, 0.001f);
     }
 }
diff --git a/libopensimcreator/UI/MeshImporter/DrawableThing.h b/libopensimcreator/UI/MeshImporter/DrawableThing.h
@@ -23,8 +23,11 @@ namespace osc::mi
         SceneDecorationFlags flags = SceneDecorationFlag::Default;
     };
 
-    inline AABB calcBounds(const DrawableThing& dt)
+    inline std::optional<AABB> calcBounds(const DrawableThing& dt)
     {
-        return transform_aabb(dt.transform, dt.mesh.bounds());
+        return dt.mesh.bounds().transform([&dt](const AABB& localBounds)
+        {
+            return transform_aabb(dt.transform, localBounds);
+        });
     }
 }
diff --git a/libopensimcreator/UI/MeshImporter/MeshImporterTab.cpp b/libopensimcreator/UI/MeshImporter/MeshImporterTab.cpp
@@ -983,7 +983,8 @@ class osc::mi::MeshImporterTab::Impl final :
                 {
                     if (ui::draw_menu_item(OSC_ICON_BORDER_ALL " at bounds center"))
                     {
-                        const Vector3 location = centroid_of(mesh->calcBounds());
+                        const AABB bounds = mesh->calcBounds().value_or(AABB{});
+                        const Vector3 location = centroid_of(bounds);
                         AddBody(m_Shared->updCommittableModelGraph(), location, mesh->getID());
                     }
                     ui::draw_tooltip_if_item_hovered("Add Body", MIStrings::c_BodyDescription);
@@ -1056,7 +1057,7 @@ class osc::mi::MeshImporterTab::Impl final :
                     {
                         if (ui::draw_menu_item(OSC_ICON_BORDER_ALL " at bounds center"))
                         {
-                            AddStationAtLocation(m_Shared->updCommittableModelGraph(), el, centroid_of(el.calcBounds(m_Shared->getModelGraph())));
+                            AddStationAtLocation(m_Shared->updCommittableModelGraph(), el, centroid_of(el.calcBounds(m_Shared->getModelGraph()).value_or(AABB{})));
                         }
                         ui::draw_tooltip_if_item_hovered("Add Station", MIStrings::c_StationDescription);
                     }
@@ -1096,7 +1097,7 @@ class osc::mi::MeshImporterTab::Impl final :
     {
         if (ui::draw_menu_item(OSC_ICON_CAMERA " Focus camera on this"))
         {
-            m_Shared->focusCameraOn(centroid_of(el.calcBounds(m_Shared->getModelGraph())));
+            m_Shared->focusCameraOn(centroid_of(el.calcBounds(m_Shared->getModelGraph()).value_or(AABB{})));
         }
         ui::draw_tooltip_if_item_hovered("Focus camera on this scene element", "Focuses the scene camera on this element. This is useful for tracking the camera around that particular object in the scene");
 
@@ -1839,7 +1840,7 @@ class osc::mi::MeshImporterTab::Impl final :
 
     std::optional<AABB> calcSceneAABB() const
     {
-        return maybe_bounding_aabb_of(m_DrawablesBuffer, [](const DrawableThing& drawable) -> std::optional<AABB>
+        return bounding_aabb_of(m_DrawablesBuffer, [](const DrawableThing& drawable) -> std::optional<AABB>
         {
             if (drawable.id != MIIDs::Empty()) {
                 return calcBounds(drawable);
diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTabInputMeshPanel.h b/libopensimcreator/UI/MeshWarper/MeshWarpingTabInputMeshPanel.h
@@ -610,8 +610,10 @@ namespace osc
         {
             if (ui::draw_button(OSC_ICON_EXPAND_ARROWS_ALT))
             {
-                auto_focus(m_Camera, m_State->getScratchMesh(m_DocumentIdentifier).bounds(), aspect_ratio_of(m_LastTextureHittestResult.item_ui_rect));
-                m_State->setLinkedBaseCamera(m_Camera);
+                if (const auto bounds = m_State->getScratchMesh(m_DocumentIdentifier).bounds()) {
+                    auto_focus(m_Camera, *bounds, aspect_ratio_of(m_LastTextureHittestResult.item_ui_rect));
+                    m_State->setLinkedBaseCamera(m_Camera);
+                }
             }
             ui::draw_tooltip_if_item_hovered("Autoscale Scene", "Zooms camera to try and fit everything in the scene into the viewer");
         }
@@ -638,7 +640,7 @@ namespace osc
 
         std::shared_ptr<MeshWarpingTabSharedState> m_State;
         TPSDocumentInputIdentifier m_DocumentIdentifier;
-        PolarPerspectiveCamera m_Camera = create_camera_focused_on(m_State->getScratchMesh(m_DocumentIdentifier).bounds());
+        PolarPerspectiveCamera m_Camera = create_camera_focused_on(m_State->getScratchMesh(m_DocumentIdentifier).bounds().value_or(AABB{}));
         CachedSceneRenderer m_CachedRenderer{
             *App::singleton<SceneCache>(App::resource_loader()),
         };
diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTabResultMeshPanel.h b/libopensimcreator/UI/MeshWarper/MeshWarpingTabResultMeshPanel.h
@@ -183,7 +183,7 @@ namespace osc
             {
                 auto_focus(
                     m_Camera,
-                    m_State->getResultMesh().bounds(),
+                    m_State->getResultMesh().bounds().value_or(AABB{}),
                     aspect_ratio_of(m_LastTextureHittestResult.item_ui_rect)
                 );
                 m_State->setLinkedBaseCamera(m_Camera);
@@ -318,7 +318,7 @@ namespace osc
         }
 
         std::shared_ptr<MeshWarpingTabSharedState> m_State;
-        PolarPerspectiveCamera m_Camera = create_camera_focused_on(m_State->getResultMesh().bounds());
+        PolarPerspectiveCamera m_Camera = create_camera_focused_on(m_State->getResultMesh().bounds().value_or(AABB{}));
         CachedSceneRenderer m_CachedRenderer{
             *App::singleton<SceneCache>(App::resource_loader()),
         };
diff --git a/libopensimcreator/UI/MeshWarper/MeshWarpingTabSharedState.h b/libopensimcreator/UI/MeshWarper/MeshWarpingTabSharedState.h
@@ -14,6 +14,7 @@
 #include <liboscar/Graphics/Material.h>
 #include <liboscar/Graphics/Materials/MeshBasicMaterial.h>
 #include <liboscar/Graphics/Scene/SceneCache.h>
+#include <liboscar/Maths/AABB.h>
 #include <liboscar/Maths/PolarPerspectiveCamera.h>
 #include <liboscar/Maths/Vector2.h>
 #include <liboscar/Maths/Vector3.h>
@@ -297,7 +298,7 @@ namespace osc
         bool m_OnlyLinkRotation = false;
 
         // shared linked camera
-        PolarPerspectiveCamera m_LinkedCameraBase = create_camera_focused_on(m_UndoableTPSDocument->scratch().sourceMesh.bounds());
+        PolarPerspectiveCamera m_LinkedCameraBase = create_camera_focused_on(m_UndoableTPSDocument->scratch().sourceMesh.bounds().value_or(AABB{}));
 
         // shared scene cache, to minimize rendering effort when redrawing
         std::shared_ptr<SceneCache> m_SceneCache;
diff --git a/libopensimcreator/UI/RendererPerfTestingTab.cpp b/libopensimcreator/UI/RendererPerfTestingTab.cpp
@@ -85,8 +85,9 @@ class osc::RendererPerfTestingTab::Impl final : public TabPrivate {
             generateDecorations();
         }
         if (std::exchange(m_FirstFrame, false)) {
-            const AABB sceneAABB = bounding_aabb_of(m_Decorations, &SceneDecoration::world_space_bounds);
-            auto_focus(m_ModelRendererParams.camera, sceneAABB);
+            if (const std::optional<AABB> sceneAABB = bounding_aabb_of(m_Decorations, &SceneDecoration::world_space_bounds)) {
+                auto_focus(m_ModelRendererParams.camera, *sceneAABB);
+            }
         }
 
         const Rect workspaceScreenRect = ui::get_main_window_workspace_screen_space_rect();
diff --git a/liboscar-demos/FrustumCullingTab.cpp b/liboscar-demos/FrustumCullingTab.cpp
@@ -33,6 +33,14 @@ namespace
     struct TransformedMesh {
         Mesh mesh;
         Transform transform;
+
+        std::optional<AABB> world_space_bounds() const
+        {
+            return mesh.bounds().transform([this](const AABB& local_aabb)
+            {
+                return transform_aabb(transform, local_aabb);
+            });
+        }
     };
 
     std::vector<TransformedMesh> generateDecorations()
@@ -126,8 +134,8 @@ class osc::FrustumCullingTab::Impl final : public TabPrivate {
 
         // render from user's perspective on left-hand side
         for (const auto& decoration : decorations_) {
-            const AABB decoration_world_aabb = transform_aabb(decoration.transform, decoration.mesh.bounds());
-            if (is_intersecting(frustum, decoration_world_aabb)) {
+            const std::optional<AABB> decoration_world_aabb = decoration.world_space_bounds();
+            if (decoration_world_aabb and is_intersecting(frustum, *decoration_world_aabb)) {
                 graphics::draw(decoration.mesh, decoration.transform, material_, user_camera_, blue_material_props_);
             }
         }
@@ -136,8 +144,8 @@ class osc::FrustumCullingTab::Impl final : public TabPrivate {
 
         // render from top-down perspective on right-hand side
         for (const auto& decoration : decorations_) {
-            const AABB decoration_world_aabb = transform_aabb(decoration.transform, decoration.mesh.bounds());
-            const auto & props = is_intersecting(frustum, decoration_world_aabb) ? blue_material_props_ : red_material_props_;
+            const std::optional<AABB> decoration_world_aabb = decoration.world_space_bounds();
+            const auto & props = (decoration_world_aabb and is_intersecting(frustum, *decoration_world_aabb)) ? blue_material_props_ : red_material_props_;
             graphics::draw(decoration.mesh, decoration.transform, material_, top_down_camera_, props);
         }
         graphics::draw(
diff --git a/liboscar-demos/HittestTab.cpp b/liboscar-demos/HittestTab.cpp
@@ -261,8 +261,8 @@ class osc::HittestTab::Impl final : public TabPrivate {
 
     // scene state
     std::vector<SceneSphere> scene_spheres_ = generate_scene_spheres();
-    AABB scene_sphere_aabb_ = sphere_mesh_.bounds();
-    Sphere sphere_bounding_sphere_ = bounding_sphere_of(sphere_mesh_);
+    AABB scene_sphere_aabb_ = sphere_mesh_.bounds().value();
+    Sphere sphere_bounding_sphere_ = bounding_sphere_of(sphere_mesh_).value();
     EulerAngles camera_eulers;
     bool showing_aabbs_ = true;
 };
diff --git a/liboscar/Concepts/StaticallySizedNonEmptyInputRange.h b/liboscar/Concepts/StaticallySizedNonEmptyInputRange.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <ranges>
+
+namespace osc
+{
+    // Satisfied if `T` is a `std::ranges::input_range<T>` AND has a size that's
+    // known at compile-time to be non-zero.
+    template<typename T>
+    concept StaticallySizedNonEmptyInputRange = std::ranges::input_range<T> and requires (const T& v) { std::ranges::size(v) > 0; };
+}
diff --git a/liboscar/Graphics/Detail/RenderQueue.h b/liboscar/Graphics/Detail/RenderQueue.h
@@ -64,7 +64,14 @@ namespace osc::detail
             auto& mesh() const { return render_queue_pointer_->meshes_[*handle_pointer_]; }
             auto& maybe_submesh_index() const { return render_queue_pointer_->maybe_submesh_indices_[*handle_pointer_]; }
             auto& model_matrix() const { return render_queue_pointer_->model_matrices_[*handle_pointer_]; }
-            Vector3 world_space_centroid() const { return transform_point(model_matrix(), mesh().centroid()); }
+            Vector3 world_space_centroid() const
+            {
+                if (const auto local_centroid = mesh().centroid()) {
+                    return transform_point(model_matrix(), *local_centroid);
+                } else {
+                    return Vector3{0.0f};  // Just something for scene sorting
+                }
+            }
 
             bool is_opaque() const { return not material().is_transparent(); }
             bool is_depth_tested() const { return material().is_depth_tested(); }
diff --git a/liboscar/Graphics/GraphicsImplementation.cpp b/liboscar/Graphics/GraphicsImplementation.cpp
@@ -4637,8 +4637,8 @@ class osc::Mesh::Impl final {
         return rv;
     }
 
-    const AABB& bounds() const { return aabb_; }
-    Vector3 centroid() const { return centroid_of(bounds()); }
+    const std::optional<AABB>& bounds() const { return aabb_; }
+    std::optional<Vector3> centroid() const { return bounds().transform([](const AABB& aabb) { return centroid_of(aabb); }); }
 
     void clear()
     {
@@ -5023,7 +5023,7 @@ class osc::Mesh::Impl final {
     size_t num_indices_ = 0;
     std::vector<PackedIndex> indices_data_;
 
-    AABB aabb_ = {};
+    std::optional<AABB> aabb_;
 
     std::vector<SubMeshDescriptor> submesh_descriptors_;
 
@@ -5179,12 +5179,12 @@ std::vector<Vector3> osc::Mesh::indexed_vertices() const
     return impl_->indexed_vertices();
 }
 
-const AABB& osc::Mesh::bounds() const
+const std::optional<AABB>& osc::Mesh::bounds() const
 {
     return impl_->bounds();
 }
 
-Vector3 osc::Mesh::centroid() const
+std::optional<Vector3> osc::Mesh::centroid() const
 {
     return impl_->centroid();
 }
diff --git a/liboscar/Graphics/Mesh.h b/liboscar/Graphics/Mesh.h
@@ -111,16 +111,21 @@ namespace osc
         Triangle get_triangle_at(size_t first_index_offset) const;
         std::vector<Vector3> indexed_vertices() const;
 
-        // local-space bounds of the mesh
+        // Returns the local-space bounds of this mesh, if it contains at least
+        // one primitive. Automatically recalculated from the indexed data
+        // whenever `set_vertices`, `set_indices`, or `set_vertex_buffer_data`
+        // is called.
         //
-        // automatically recalculated from the indexed data whenever `set_vertices`,
-        // `set_indices`, or `set_vertex_buffer_data` is called
-        const AABB& bounds() const;
+        // Returns `std::nullopt` if the mesh contains no primitives (e.g. when
+        // it's empty).
+        const std::optional<AABB>& bounds() const;
 
-        // Returns the local-space centroid of the bounds of this mesh.
+        // Returns the local-space centroid of the bounds of this mesh, if it
+        // contains at least one primitive.
         //
-        // Equivalent to `centroid_of(mesh.bounds())`
-        Vector3 centroid() const;
+        // Returns `std::nullopt` if the mesh contains no primitives (e.g. when
+        // it's empty).
+        std::optional<Vector3> centroid() const;
 
         // clear all data in the mesh, such that the mesh then behaves as-if it were
         // just default-initialized
diff --git a/liboscar/Graphics/Mesh.tests.cpp b/liboscar/Graphics/Mesh.tests.cpp
diff --git a/liboscar/Graphics/MeshFunctions.cpp b/liboscar/Graphics/MeshFunctions.cpp
diff --git a/liboscar/Graphics/MeshFunctions.h b/liboscar/Graphics/MeshFunctions.h
diff --git a/liboscar/Graphics/Scene/SceneDecoration.cpp b/liboscar/Graphics/Scene/SceneDecoration.cpp
diff --git a/liboscar/Graphics/Scene/SceneDecoration.h b/liboscar/Graphics/Scene/SceneDecoration.h
diff --git a/liboscar/Graphics/Scene/SceneHelpers.cpp b/liboscar/Graphics/Scene/SceneHelpers.cpp
diff --git a/liboscar/Graphics/Scene/SceneRenderer.cpp b/liboscar/Graphics/Scene/SceneRenderer.cpp
diff --git a/liboscar/Maths/AABBFunctions.h b/liboscar/Maths/AABBFunctions.h
diff --git a/liboscar/Maths/MathHelpers.h b/liboscar/Maths/MathHelpers.h
diff --git a/liboscar/Maths/MathsImplementation.cpp b/liboscar/Maths/MathsImplementation.cpp

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ namespace osc::mi`
`78`	`78`	`m_Xform.scale = {1.0f, 1.0f, 1.0f};`
`79`	`79`	`}`
`80`	`80`
`81`		`- AABB implCalcBounds(const IObjectFinder&) const final`
	`81`	`+ std::optional<AABB> implCalcBounds(const IObjectFinder&) const final`
`82`	`82`	`{`
`83`	`83`	`return bounding_aabb_of(m_Xform.translation);`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ namespace osc::mi`
`34`	`34`	`return identity<Transform>();`
`35`	`35`	`}`
`36`	`36`
`37`		`- AABB implCalcBounds(const IObjectFinder&) const final`
	`37`	`+ std::optional<AABB> implCalcBounds(const IObjectFinder&) const final`
`38`	`38`	`{`
`39`		`- return AABB{};`
	`39`	`+ return std::nullopt;`
`40`	`40`	`}`
`41`	`41`	`};`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ namespace osc::mi`
`116`	`116`	`m_Xform.scale = {1.0f, 1.0f, 1.0f};`
`117`	`117`	`}`
`118`	`118`
`119`		`- AABB implCalcBounds(const IObjectFinder&) const final`
	`119`	`+ std::optional<AABB> implCalcBounds(const IObjectFinder&) const final`
`120`	`120`	`{`
`121`	`121`	`return bounding_aabb_of(m_Xform.translation);`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ namespace osc::mi`
`137`	`137`	`setXform(lookup, getXForm(lookup).with_rotation(newRotation));`
`138`	`138`	`}`
`139`	`139`
`140`		`- AABB calcBounds(const IObjectFinder& lookup) const`
	`140`	`+ std::optional<AABB> calcBounds(const IObjectFinder& lookup) const`
`141`	`141`	`{`
`142`	`142`	`return implCalcBounds(lookup);`
`143`	`143`	`}`
`@@ -218,6 +218,6 @@ namespace osc::mi`
`218`	`218`	`virtual Transform implGetXform(const IObjectFinder&) const = 0;`
`219`	`219`	`virtual void implSetXform(const IObjectFinder&, const Transform&) {}`
`220`	`220`
`221`		`- virtual AABB implCalcBounds(const IObjectFinder&) const = 0;`
	`221`	`+ virtual std::optional<AABB> implCalcBounds(const IObjectFinder&) const = 0;`
`222`	`222`	`};`
`223`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,12 @@ osc::mi::Mesh::Mesh(`
`34`	`34`	`m_Name{SanitizeToOpenSimComponentName(m_Path.filename().replace_extension().string())}`
`35`	`35`	`{}`
`36`	`36`
`37`		`-AABB osc::mi::Mesh::calcBounds() const`
	`37`	`+std::optional<AABB> osc::mi::Mesh::calcBounds() const`
`38`	`38`	`{`
`39`		`- return transform_aabb(m_Transform, m_MeshData.bounds());`
	`39`	`+ return m_MeshData.bounds().transform([this](const AABB& localBounds)`
	`40`	`+ {`
	`41`	`+ return transform_aabb(m_Transform, localBounds);`
	`42`	`+ });`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`void osc::mi::Mesh::reloadMeshDataFromDisk()`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ namespace osc::mi`
`58`	`58`	`m_Transform = t;`
`59`	`59`	`}`
`60`	`60`
`61`		`- AABB calcBounds() const;`
	`61`	`+ std::optional<AABB> calcBounds() const;`
`62`	`62`
`63`	`63`	`void reloadMeshDataFromDisk();`
`64`	`64`
`@@ -113,7 +113,7 @@ namespace osc::mi`
`113`	`113`	`setXform(t);`
`114`	`114`	`}`
`115`	`115`
`116`		`- AABB implCalcBounds(const IObjectFinder&) const final`
	`116`	`+ std::optional<AABB> implCalcBounds(const IObjectFinder&) const final`
`117`	`117`	`{`
`118`	`118`	`return calcBounds();`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ namespace osc::mi`
`91`	`91`	`m_Position = t.translation;`
`92`	`92`	`}`
`93`	`93`
`94`		`- AABB implCalcBounds(const IObjectFinder&) const final`
	`94`	`+ std::optional<AABB> implCalcBounds(const IObjectFinder&) const final`
`95`	`95`	`{`
`96`	`96`	`return bounding_aabb_of(m_Position);`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ TEST(GenerateModelDecorations, RadiusOfContactSphereIsCorrectlyUpdated)`
`577`	`577`	`// Before changing radius: it should be as-set`
`578`	`578`	`{`
`579`	`579`	`const auto decorations = GenerateModelDecorations(cache, model, state);`
`580`		`- const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds));`
	`580`	`+ const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds).value());`
`581`	`581`	`ASSERT_NEAR(volume, 0.2f0.2f0.2f, 0.001f);`
`582`	`582`	`}`
`583`	`583`
`@@ -588,7 +588,7 @@ TEST(GenerateModelDecorations, RadiusOfContactSphereIsCorrectlyUpdated)`
`588`	`588`	`// After changing radius: should update it`
`589`	`589`	`{`
`590`	`590`	`const auto decorations = GenerateModelDecorations(cache, model, state);`
`591`		`- const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds));`
	`591`	`+ const float volume = volume_of(bounding_aabb_of(decorations, &SceneDecoration::world_space_bounds).value());`
`592`	`592`	`ASSERT_NEAR(volume, 1.0f1.0f1.0f, 0.001f);`
`593`	`593`	`}`
`594`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,11 @@ namespace osc::mi`
`23`	`23`	`SceneDecorationFlags flags = SceneDecorationFlag::Default;`
`24`	`24`	`};`
`25`	`25`
`26`		`- inline AABB calcBounds(const DrawableThing& dt)`
	`26`	`+ inline std::optional<AABB> calcBounds(const DrawableThing& dt)`
`27`	`27`	`{`
`28`		`- return transform_aabb(dt.transform, dt.mesh.bounds());`
	`28`	`+ return dt.mesh.bounds().transform([&dt](const AABB& localBounds)`
	`29`	`+ {`
	`30`	`+ return transform_aabb(dt.transform, localBounds);`
	`31`	`+ });`
`29`	`32`	`}`
`30`	`33`	`}`