Changeset 135 for trunk/VUT/work/ogre_changes

Timestamp:

06/16/05 18:13:33 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work/ogre_changes

Files:

• OgreMain/src/OgreSceneManager.cpp (modified) (3 diffs)
• Plugins/OctreeSceneManager/include/OgreOctree.h (modified) (1 diff)
• Plugins/OctreeSceneManager/src/OgreOctree.cpp (modified) (7 diffs)
• Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp (modified) (3 diffs)

trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneManager.cpp

@@ -779 +779 @@
 void SceneManager::_renderScene(Camera* camera, Viewport* vp, bool includeOverlays)
 {
-        LogManager::getSingleton().logMessage("***********RENDER SCENE************");
-    Root::getSingleton()._setCurrentSceneManager(this);
+        Root::getSingleton()._setCurrentSceneManager(this);
     // Prep Pass for use in debug shadows
     initShadowVolumeMaterials();
@@ -4200 +4199 @@
 void SceneManager::_renderSceneNode(Camera *cam, SceneNode *node, bool leaveTransparentsInQueue)
 {
+        // delete previously rendered objects from renderqueue
+        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
+
         node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
         SceneManager::_renderVisibleObjects();
-
-        // delete all rendered objects from renderqueue
-        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
 }
 //-----------------------------------------------------------------------
@@ -4248 +4247 @@
 void SceneManager::_renderMovableObject(MovableObject *mov, const bool leaveTransparentsInQueue)
 {
+        // delete previously rendered objects from renderqueue
+        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
+
         mov->_updateRenderQueue(getRenderQueue());
         SceneManager::_renderVisibleObjects();
-        
-        // delete rendered objects from renderqueue
-        //TODO: should be first
-        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
 }
 #endif //GTP_VISIBILITY_MODIFIED_OGRE

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h

@@ -157 +157 @@
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        public:
-                /** Returns last visited frame id. */
-                int lastVisited(void);
-                /** Set to current frame id.
-        @param current frame id.
-        */
-                void setLastVisited(int frameid);
-                /** Makes this octree become visible / invisble.
-        @param visible Whether this node is to be made visible or invisible
-        */
-                void setOctreeVisible(bool visible);
-                /** Returns true if this node is marked visible, false otherwise. 
-                */
-                bool isOctreeVisible(void);
-                /** Gets this node's parent (NULL if this is the root).
-                */
-                Octree *getParent();
-                /** Frame id when this octree was last rendered. 
-                @return last rendered frame id
-                */      
-                int lastRendered(void);
-                /** Sets frame id when this octree was last rendered. 
-                @param last rendered frame id
-                */
-                void setLastRendered(int frameid);
-                /** Returns current depth of octree 
-                @return current depth
-                */
-                int getDepth();
-
-        protected:
-
-                int mLastRendered;
-                int mLastVisited;
-                bool mVisible;
-                int mDepth;
+public:
+        /** Returns last visited frame id. */
+        int lastVisited(void);
+        /** Set to current frame id.
+    @param current frame id.
+    */
+        void setLastVisited(int frameid);
+        /** Makes this octree become visible / invisble.
+    @param visible Whether this node is to be made visible or invisible
+    */
+        void setOctreeVisible(bool visible);
+        /** Returns true if this node is marked visible, false otherwise. 
+        */
+        bool isOctreeVisible(void);
+        /** Gets this node's parent (NULL if this is the root).
+        */
+        Octree *getParent();
+        /** Frame id when this octree was last rendered. 
+        @return last rendered frame id
+        */      
+        int lastRendered(void);
+        /** Sets frame id when this octree was last rendered. 
+        @param last rendered frame id
+        */
+        void setLastRendered(int frameid);
+        /** Returns current depth of octree 
+        @return current depth
+        */
+        int getDepth();
+        /** Returns real extent of the octree, i.e., the merged extent of the bounding boxes. */
+        AxisAlignedBox _getWorldAABB(void) const;
+
+        /** Updates bounds of real aabb of octree. */
+        void _updateBounds();
+
+protected:
+        
+        /** the real extent of the octree. */
+        AxisAlignedBox mWorldAABB;
+
+        int mLastRendered;
+        int mLastVisited;
+        bool mVisible;
+        int mDepth;
 
 #endif // GTP_VISIBILITY_MODIFIED_OGRE

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

@@ -142 +142 @@
     _ref();
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        _updateBounds();
+#endif
+
 }
 
@@ -151 +155 @@
     //update total counts.
     _unref();
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        _updateBounds();
+#endif
 }
 
@@ -165 +173 @@
         mWireBoundingBox = new WireBoundingBox();
 
-        mWireBoundingBox->setupBoundingBox(mBox);
+        //mWireBoundingBox->setupBoundingBox(mBox);
+        mWireBoundingBox->setupBoundingBox(mWorldAABB);
     return mWireBoundingBox;
 }
@@ -171 +180 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
 //-----------------------------------------------------------------------       
-int Octree::lastVisited(void)
+int Octree::lastVisited()
 {
         return mLastVisited;
@@ -181 +190 @@
 }
 //-----------------------------------------------------------------------       
-int Octree::lastRendered(void)
+int Octree::lastRendered()
 {
         return mLastRendered;
@@ -196 +205 @@
 }
 //-----------------------------------------------------------------------       
-bool Octree::isOctreeVisible(void)
+bool Octree::isOctreeVisible()
 {
         return mVisible;
@@ -210 +219 @@
         return mDepth;
 }
+//-----------------------------------------------------------------------       
+AxisAlignedBox Octree::_getWorldAABB(void) const
+{
+        return mWorldAABB;
+}
+//-----------------------------------------------------------------------
+void Octree::_updateBounds()
+{
+        // Reset bounds first
+    mWorldAABB.setNull();
+
+    // Update bounds from own attached objects
+        NodeList::iterator it, it_end;
+        it_end = mNodes.end();
+
+    for (it = mNodes.begin(); it != it_end; ++it)
+    {
+        // Merge world bounds of each object
+                mWorldAABB.merge((*it)->_getWorldAABB());
+    }
+
+    // Merge with children
+        for (int i = 0; i < 2; ++i)
+    {
+        for (int j = 0; j < 2; ++j)
+        {
+            for (int k = 0; k < 2; ++k)
+            {
+                if (mChildren[i][j][k] != 0)
+                                {
+                                        mWorldAABB.merge(mChildren[i][j][k]->_getWorldAABB());
+                                }
+            }
+        }
+        }
+        // recursively update parent bounds
+        if (mParent)
+        {
+                mParent->_updateBounds();
+        }
+ }
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp

@@ -428 +428 @@
             _addOctreeNode( onode, mOctree );
     }
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        else // still update because bounding box may be different
+        {
+                onode -> getOctant() -> _updateBounds();
+        }
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 }
 
@@ -1172 +1178 @@
                                                                            bool leaveTransparentsInQueue)//, bool useZPassQueue)
 {
+        // delete previously rendered objects from the render queue
+        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
+
         //Add stuff to be rendered;
     NodeList::iterator it = octant->mNodes.begin();
@@ -1211 +1220 @@
         //-- the actual rendering
         SceneManager::_renderVisibleObjects();
-        // delete all rendered objects from the render queue
-        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
 }
 #endif // GTP_VISIBILITY_MODIFIED_OGRE