Changeset 2308 for OGRE

Timestamp:

04/02/07 11:59:11 (18 years ago)

Author:

mattausch

Message:

 

Location:

OGRE/trunk/ogre_changes/Ogre1.2/PlugIns/OctreeSceneManager

Files:

• include/OgreOctree.h (modified) (3 diffs)
• src/OgreOctree.cpp (modified) (4 diffs)

OGRE/trunk/ogre_changes/Ogre1.2/PlugIns/OctreeSceneManager/include/OgreOctree.h

@@ -177 +177 @@
         */
         bool isOctreeVisible(void);
-        void setOctreeFullyVisible(bool visible);
-        /** Returns true if this node is marked visible, false otherwise. 
+        
+        /** Returns true if all children of this nodes are fully visible, false otherwise. 
         */
         bool isOctreeFullyVisible(void);
@@ -201 +201 @@
         void _updateBounds();
 
+        void _incNumChildren();
+
+        void setOctreeFullyVisible(bool visible);
+
+        float getVisibilityRatio();
+
+        void setNumVisibleLeaves(int leaves);
+        int getNumVisibleLeaves();
+
+        void setNumLeaves(int leaves);
+        int getNumLeaves();
+
 protected:
         
@@ -209 +221 @@
         int mLastVisited;
         bool mVisible;
+
         bool mFullyVisible;
+
+        int mNumVisibleLeaves;
+        int mNumLeaves;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 };

OGRE/trunk/ogre_changes/Ogre1.2/PlugIns/OctreeSceneManager/src/OgreOctree.cpp

@@ -87 +87 @@
       mHalfSize( 0, 0, 0 )
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        , mLastVisited(0), mVisible(false), mLastRendered(-1), mFullyVisible(false)
+        , mLastVisited(0), mVisible(false), mLastRendered(-1)
+        , mNumLeaves(1), mNumVisibleLeaves(0)
+        , mFullyVisible(false)
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 {
@@ -105 +107 @@
 
     mNumNodes = 0;
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        // recursively update number of children
+        if (0) _incNumChildren();
+#endif;
 }
 
@@ -214 +221 @@
 bool Octree::isOctreeFullyVisible()
 {
+        // all childrens are visible
+#if 0
+        return mNumChildren == mNumVisibleChildren;
+#else
         return mFullyVisible;
-}
-//-----------------------------------------------------------------------       
+#endif
+}
+//-----------------------------------------------------------------------       
+float Octree::getVisibilityRatio()
+{
+        // all childrens are visible
+        return (float)mNumVisibleLeaves / (float)mNumLeaves;
+}
+//-----------------------------------------------------------------------
+void Octree::setNumVisibleLeaves(int leaves)
+{
+        int mNumVisibleLeaves = leaves;
+}
+//-----------------------------------------------------------------------
+int Octree::getNumVisibleLeaves()
+{
+        return mNumVisibleLeaves;
+}
+//-----------------------------------------------------------------------
+void Octree::setNumLeaves(int leaves)
+{
+        mNumLeaves = leaves;
+}
+//-----------------------------------------------------------------------
+int Octree::getNumLeaves()
+{
+        return mNumLeaves;
+}
+//-----------------------------------------------------------------------
 Octree *Octree::getParent()
 {
@@ -267 +305 @@
                 mParent->_updateBounds();
         }
- }
+}
+
+
+void Octree::_incNumChildren()
+{
+/*      ++ mNumChildren;
+
+        if (mParent)    
+        {
+                mParent->_incNumChildren();
+        }*/
+}
 
 #endif //GTP_VISIBILITY_MODIFIED_OGRE