initial caching of repeated data

Author: psi29a

apps/openmw/mwrender/objectpaging.cpp

@@ -111,6 +111,26 @@ namespace MWRender
                     return {};
             }
         }
+
+        // Retrieve pre-computed template radius from node user data, or compute fallback
+        // to ensure robustness in case radius wasn't pre-computed
+        float getTemplateRadius(const osg::Node* node)
+        {
+            if (!node)
+                return 0.0f;
+
+            const auto* userDataContainer = node->getUserDataContainer();
+            if (!userDataContainer || userDataContainer->getNumUserObjects() == 0)
+                return node->getBound().radius();  // Fallback: compute if not cached
+
+            // First user object should be the template radius FloatValueObject
+            if (const auto* floatValue = dynamic_cast<const osg::FloatValueObject*>(
+                    userDataContainer->getUserObject(0)))
+                return floatValue->getValue();
+
+            // Fallback: compute radius if not cached as expected
+            return node->getBound().radius();
+        }
     }
 
     osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char /*lod*/,
@@ -794,7 +814,9 @@ namespace MWRender
                     continue;
             }
 
-            const float radius2 = cnode->getBound().radius2() * ref.mScale * ref.mScale;
+            // Use pre-computed template radius to avoid expensive getBound() traversal
+            const float templateRadius = getTemplateRadius(cnode);
+            const float radius2 = templateRadius * templateRadius * ref.mScale * ref.mScale;
             if (radius2 < dSqr * minSize * minSize && !activeGrid)
             {
                 std::lock_guard<std::mutex> lock(mSizeCacheMutex);
@@ -844,8 +866,10 @@ namespace MWRender
             {
                 const PagedCellRef& ref = *refPtr;
 
+                // Use pre-computed template radius for merge decision culling
+                const float templateRadius = getTemplateRadius(cnode);
                 if (!activeGrid && minSizeMerged != minSize
-                    && cnode->getBound().radius2() * ref.mScale * ref.mScale
+                    && templateRadius * templateRadius * ref.mScale * ref.mScale
                         < (viewPoint - ref.mPosition).length2() * minSizeMerged * minSizeMerged)
                     continue;
 

components/resource/scenemanager.cpp

@@ -9,6 +9,7 @@
 #include <osg/Group>
 #include <osg/Node>
 #include <osg/UserDataContainer>
+#include <osg/ValueObject>
 
 #include <osgAnimation/BasicAnimationManager>
 #include <osgAnimation/Bone>
@@ -1017,6 +1018,13 @@ namespace Resource
             else
                 loaded->getBound();
 
+            // Pre-compute and cache the bounding radius as user data to avoid redundant
+            // getBound() calls during object paging visibility checks
+            const float radius = loaded->getBound().radius();
+            // Store as first user object for quick retrieval
+            loaded->getOrCreateUserDataContainer()->addUserObject(
+                new osg::FloatValueObject("template_radius", radius));
+
             mCache->addEntryToObjectCache(path.value(), loaded);
             return loaded;
         }