Changeset 2257 for OGRE/trunk

Timestamp:

03/18/07 00:25:35 (18 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• include/OgreOctree.h (modified) (2 diffs)
• include/OgreOctreeSceneManager.h (modified) (1 diff)
• src/OgreOctree.cpp (modified) (2 diffs)
• src/OgreOctreeSceneManager.cpp (modified) (2 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. 
+        */
+        bool isOctreeFullyVisible(void);
         /** Gets this node's parent (NULL if this is the root).
         */
@@ -205 +209 @@
         int mLastVisited;
         bool mVisible;
-        
+        bool mFullyVisible;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 };

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

@@ -123 +123 @@
                 @param passes if passes should be left in queue for later processing
         */
-        void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters, 
+        void _renderOctant(Camera* cam, 
+                                           Octree *octree, 
+                                           bool onlyShadowCasters, 
                 const int leavePassesInQueue = 0);
 
-        /** Returns stored list of boxes */
+        void _renderOctantRecursive(Camera* cam, 
+                                                                Octree *octree, 
+                                                                bool onlyShadowCasters, 
+                                                                const int leavePassesInQueue = 0);
+
+
+        /** Returns stored list of boxes 
+        */
         BoxList *getBoxes();
+
 #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)
+        , mLastVisited(0), mVisible(false), mLastRendered(-1), mFullyVisible(false)
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 {
@@ -205 +205 @@
 {
         return mVisible;
+}
+//-----------------------------------------------------------------------       
+void Octree::setOctreeFullyVisible(bool visible)
+{
+        mFullyVisible = visible;
+}
+//-----------------------------------------------------------------------       
+bool Octree::isOctreeFullyVisible()
+{
+        return mFullyVisible;
 }
 //-----------------------------------------------------------------------       

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

@@ -1214 +1214 @@
                                                                            const int leavePassesInQueue)
 {
-        // delete previously rendered objects from the render queue
-        //_deleteRenderedQueueGroups(leavePassesInQueue);
-
         RenderQueueGroup *currentGroup = 
                 getRenderQueue()->getQueueGroup(getRenderQueue()->getDefaultQueueGroup());
+        // clear relevant passes rendered in last frame
         currentGroup->clear(leavePassesInQueue);
 
@@ -1260 +1258 @@
 
         //-- the actual rendering
-        //SceneManager::_renderVisibleObjects();
-        /*** msz: modified for v1-2-0 compatibility. what value for 2nd param?
-         *** any preparation necessary?? ***/
+        _renderQueueGroupObjects(currentGroup, QueuedRenderableCollection::OM_PASS_GROUP);
+}
+//-----------------------------------------------------------------------
+void OctreeSceneManager::_renderOctantRecursive(Camera *cam, 
+                                                                                                Octree *octant, 
+                                                                                                bool onlyShadowCasters, 
+                                                                                                const int leavePassesInQueue)
+{
+        RenderQueueGroup *currentGroup = 
+                getRenderQueue()->getQueueGroup(getRenderQueue()->getDefaultQueueGroup());
+        currentGroup->clear(leavePassesInQueue);
+
+        // Add stuff to be rendered
+        walkOctree(static_cast < OctreeCamera * > ( cam ), 
+                           getRenderQueue(), 
+                           octant, 
+                           false, 
+                           onlyShadowCasters);
+
+        //-- the actual rendering
         _renderQueueGroupObjects(currentGroup, QueuedRenderableCollection::OM_PASS_GROUP);
 }