Changeset 2454 for OGRE/trunk/ogre_changes/Ogre1.2

Timestamp:

06/14/07 17:23:12 (17 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -201 +201 @@
         void _updateBounds();
 
-        void _incNumChildren();
-
+        /** Sets fully visible attribute.
+        */
         void setOctreeFullyVisible(bool visible);
 
-        float getVisibilityRatio();
-
-        void setNumVisibleLeaves(int leaves);
-        int getNumVisibleLeaves();
-
-        void setNumLeaves(int leaves);
-        int getNumLeaves();
+        /** Sets #frames this node is assumed to be visible.
+        */
+        void setAssumedVisible(int assumedVisible);
+        /** See set
+        */
+        int getAssumedVisible();
+        /** Decreases #frames this node is assumed to be visible.
+        */
+        void decAssumedVisible();
 
 protected:
@@ -223 +225 @@
 
         bool mFullyVisible;
-
-        int mNumVisibleLeaves;
-        int mNumLeaves;
+        int mAssumedVisible;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 };

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

@@ -88 +88 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         , mLastVisited(0), mVisible(false), mLastRendered(-1)
-        , mNumLeaves(1), mNumVisibleLeaves(0)
         , mFullyVisible(false)
+        , mAssumedVisible(0)
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 {
@@ -105 +105 @@
 
     mParent = parent;
-
     mNumNodes = 0;
-
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        // recursively update number of children
-        if (0) _incNumChildren();
-#endif;
 }
 
@@ -228 +222 @@
 #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;
+//-----------------------------------------------------------------------
+void Octree::setAssumedVisible(int assumedVisible)
+{
+        mAssumedVisible = assumedVisible;
+}
+//-----------------------------------------------------------------------
+int Octree::getAssumedVisible()
+{
+        return mAssumedVisible;
+}
+//-----------------------------------------------------------------------
+void Octree::decAssumedVisible()
+{
+        -- mAssumedVisible;
 }
 //-----------------------------------------------------------------------
@@ -308 +291 @@
 
 
-void Octree::_incNumChildren()
-{
-/*      ++ mNumChildren;
-
-        if (mParent)    
-        {
-                mParent->_incNumChildren();
-        }*/
-}
-
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }