Changeset 99 for trunk/VUT/work/ogre_changes/Plugins

Timestamp:

05/15/05 04:08:02 (19 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp (modified) (6 diffs)

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

@@ -316 +316 @@
 
     mOctree = new Octree( 0 );
-#ifdef OGRE_COHERENT_OCCLUSION_CULLING
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mNumOctreeNodes = 1;
-#endif // OGRE_COHERENT_OCCLUSION_CULLING
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
     mMaxDepth = depth;
     mBox = box;
@@ -461 +461 @@
         {
             octant -> mChildren[ x ][ y ][ z ] = new Octree( octant );
-#ifdef OGRE_COHERENT_OCCLUSION_CULLING
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mNumOctreeNodes ++;
-#endif // OGRE_COHERENT_OCCLUSION_CULLING
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
             const Vector3 *corners = octant -> mBox.getAllCorners();
@@ -1028 +1028 @@
 
     mOctree = new Octree( 0 );
-#ifdef OGRE_COHERENT_OCCLUSION_CULLING
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mNumOctreeNodes = 1;
-#endif // OGRE_COHERENT_OCCLUSION_CULLING
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
     mOctree->mBox = box;
 
@@ -1166 +1166 @@
     return q;
 }
-#ifdef OGRE_COHERENT_OCCLUSION_CULLING
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
 //-----------------------------------------------------------------------
 void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant)
@@ -1177 +1177 @@
                 OctreeNode *sn = *it;
 
-        mNumObjects++;
+        ++mNumObjects;
 
                 // check bounding box visibility of scene nodes
@@ -1187 +1187 @@
 
                         if (mDisplayNodes)
+                        {
                                 getRenderQueue()->addRenderable(sn);
+                        }
 
                         // check if the scene manager or this node wants the bounding box shown.
                         if (sn->getShowBoundingBox() || mShowBoundingBoxes)
+                        {
                                 sn->_addBoundingBoxToQueue(getRenderQueue());
-
-                        if (mShowBoxes)
-                                getRenderQueue()->addRenderable(octant->getWireBoundingBox());
+                        }
                 }
         ++it;
         }
 
+        if (mShowBoxes)
+        {
+                getRenderQueue()->addRenderable(octant->getWireBoundingBox());
+                ++mNumObjects;
+        }
+
         SceneManager::_renderVisibleObjects();
 
-        // delete all rendered objects from renderqueue
+        // delete all rendered objects from the render queue
         _deleteRenderedQueueGroups();
 }
-#endif // OGRE_COHERENT_OCCLUSION_CULLING
-}
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+}