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

Timestamp:

06/20/05 08:13:57 (20 years ago)

Author:

mattausch

Message:

fixed bug with tight octree boxes
added more flexible renderqueue (can delete per flag)
reordered functions in visibility terrain scene manager

Location:

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager

Files:

• include/OgreOctreeSceneManager.h (modified) (1 diff)
• src/OgreOctree.cpp (modified) (6 diffs)
• src/OgreOctreeSceneManager.cpp (modified) (1 diff)
• src/OgreTerrainPageSource.cpp (added)
• src/OgreTerrainRenderable.cpp (modified) (2 diffs)

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

@@ -112 +112 @@
                 @param octree the octant to be rendered (without children)
                 @param onlyShadowCasters if only shadow casters are rendered
-                @param leaveTransparentsInQueue if transparemt should be left in queue for later processing
+                @param passes if passes should be left in queue for later processing
         */
-        void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters, bool leaveTransparentsInQueue = false);
+        void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters, 
+                const int leavePassesInQueue = 0);
 
         /** Returns stored list of boxes */

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

@@ -36 +36 @@
 #include <OgreOctree.h>
 #include <OgreOctreeNode.h>
+#include <OgreLogManager.h>
 
 namespace Ogre
@@ -109 +110 @@
                 mDepth = 0;
 
+        _updateBounds();
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
     mNumNodes = 0;
@@ -175 +177 @@
         //mWireBoundingBox->setupBoundingBox(mBox);
         mWireBoundingBox->setupBoundingBox(mWorldAABB);
+
     return mWireBoundingBox;
 }
@@ -229 +232 @@
         // Reset bounds first
     mWorldAABB.setNull();
-
+  
     // Update bounds from own attached objects
         NodeList::iterator it, it_end;
@@ -247 +250 @@
             for (int k = 0; k < 2; ++k)
             {
-                if (mChildren[i][j][k] != 0)
+                if (mChildren[i][j][k])
                                 {
                                         mWorldAABB.merge(mChildren[i][j][k]->_getWorldAABB());
@@ -254 +257 @@
         }
         }
+        // HACK: clamp to bounds
+        AxisAlignedBox box;
+        _getCullBounds(&box);
+        mWorldAABB = mWorldAABB.intersection(box); 
+        
+        //std::stringstream d; d << "updating box: " << mWorldAABB << ", depth: " << mDepth << "null: " << mBox.isNull();
+        //LogManager::getSingleton().logMessage(d.str());
+
         // recursively update parent bounds
         if (mParent)

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

@@ -1176 +1176 @@
 //-----------------------------------------------------------------------
 void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant, bool onlyShadowCasters, 
-                                                                           bool leaveTransparentsInQueue)//, bool useZPassQueue)
+                                                                           const int leavePassesInQueue)
 {
         // delete previously rendered objects from the render queue
-        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
+        _deleteRenderedQueueGroups(leavePassesInQueue);
 
         //Add stuff to be rendered;

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

@@ -388 +388 @@
             if (mLastNextLevel != nextLevel)
             {
-                                //LogManager::getSingleton().logMessage("vbuffer binding");
-                if (nextLevel > 0)
-                {
-                                        //LogManager::getSingleton().logMessage("level > 0");
-                    mTerrain->vertexBufferBinding->setBinding(DELTA_BINDING, 
+                                if (nextLevel > 0)
+                {
+                                        mTerrain->vertexBufferBinding->setBinding(DELTA_BINDING, 
                         mDeltaBuffers[nextLevel - 1]);
                 }
                 else
-                {
-                                        //LogManager::getSingleton().logMessage("level <= 0 (dummy b)");
+                {                               
                     // bind dummy (incase bindings checked)
                     mTerrain->vertexBufferBinding->setBinding(DELTA_BINDING, 
@@ -406 +403 @@
 
         }
-                //else LogManager::getSingleton().logMessage("no lod morph");
-                /*std::stringstream d; 
-                d << "terrain: " << this->getName() << ", notify camera: " << cam->getName() << ", pos: " << StringConverter::toString(cam->getDerivedPosition()) << 
-                        ", distance: " << StringConverter::toString(L) << ", lod level: " << mLastNextLevel
-                        << ", render level: " << getRenderLevel() << ", morph factor: " << mLODMorphFactor;
-                LogManager::getSingleton().logMessage(d.str());*/
-
     }
     //-----------------------------------------------------------------------