Changeset 44 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

04/12/05 18:32:32 (19 years ago)

Author:

mattausch

Message:

implementation for terrain + octree scenemanager

Location:

trunk/VUT/OcclusionCullingSceneManager/src

Files:

• OgreOcclusionCullingDotSceneManager.cpp (modified) (1 diff)
• OgreOcclusionCullingOctreeSceneManager.cpp (added)
• OgreOcclusionCullingSceneTraverser.cpp (modified) (5 diffs)
• OgreOcclusionCullingTerrainSceneManager.cpp (modified) (6 diffs)
• OgreOcclusionCullingTerrainSceneTraverser.cpp (modified) (4 diffs)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingDotSceneManager.cpp

@@ -5 +5 @@
 #include "OgreCamera.h"
 #include "OgreHardwareOcclusionQuery.h"
-//#include "OgreWireBoundingBox.h"
 #include "OgreSolidHalfBoundingBox.h"
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -4 +4 @@
 #include "OgreCamera.h"
 #include "OgreHardwareOcclusionQuery.h"
-//#include "OgreWireBoundingBox.h"
 #include "OgreSolidHalfBoundingBox.h"
 
@@ -55 +54 @@
                                 break;
                         case RENDER_COHERENT:
-                                renderCoherentWithQueue(cam);
+                                //renderCoherentWithQueue(cam);
+renderStopAndWait(cam);
                                 break;
                         default:
@@ -228 +228 @@
                 // change state so the bounding box gets not actually rendered on the screen
                 // TODO: in rendervisibleobjects, the rendermode is changed by ogre itself => change this!!
-                setRenderingMode(MODE_QUERY);
-                //setRenderingMode(MODE_RENDER);
+                
+                //setRenderingMode(MODE_QUERY);
+                setRenderingMode(MODE_RENDER);
 
                 // get next available test id
@@ -247 +248 @@
         {       
                 // avoid unnecessary state changes
-                if(mode != mQueryMode)
-                {
+                //if(mode != mQueryMode)
+                //{
                         bool enabled = (mode == MODE_RENDER);
                         
@@ -257 +258 @@
 
                         mQueryMode = mode;
-                }
+                //}
         }
         //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -5 +5 @@
 #include "OgreCamera.h"
 #include "OgreHardwareOcclusionQuery.h"
-//#include "OgreWireBoundingBox.h"
 #include "OgreSolidHalfBoundingBox.h"
 
@@ -19 +18 @@
                 //mDisplayNodes = true;
                 //mShowBoundingBoxes = true;
-                mShowBoxes = true;
-                //mMaxDepth = 20;
+                //mShowBoxes = true;
+                mMaxDepth = 20;
         }
         //-----------------------------------------------------------------------
@@ -66 +65 @@
         {
                 //char *msg = "now updating scenegraph\n"; OutputDebugString(msg);
+                //mOcclusionCullingTerrainSceneTraverser->preprocess();
+
         mOcclusionCullingTerrainSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
                 mOcclusionCullingTerrainSceneTraverser->setRenderSystem(mDestRenderSystem);
-        //mOcclusionCullingTerrainSceneTraverser->preprocess();
+        
                 mOcclusionCullingTerrainSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
 
@@ -99 +100 @@
         NodeList::iterator it = octant->mNodes.begin();
          
-        while ( it != octant->mNodes.end() )
+        while(it != octant->mNodes.end())
         {
             OctreeNode *sn = *it;
@@ -106 +107 @@
 
                         // check bounding box visibility of scene nodes
-                        if( cam->isVisible( sn->_getWorldAABB() ) )
+                        if (cam->isVisible(sn->_getWorldAABB()))
                         {
-                                sn->_addToRenderQueue(cam, getRenderQueue(), false );
+                                sn->_addToRenderQueue(cam, getRenderQueue(), false);
                                 //node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
-                                mVisible.push_back( sn );
+                                mVisible.push_back(sn);
 
-                                if ( mDisplayNodes )
-                                        getRenderQueue()->addRenderable( sn );
+                                if (mDisplayNodes)
+                                        getRenderQueue()->addRenderable(sn);
 
                                 // check if the scene manager or this node wants the bounding box shown.
@@ -119 +120 @@
                                         sn->_addBoundingBoxToQueue(getRenderQueue());
 
-                                if ( mShowBoxes )
+                                if (mShowBoxes)
                                         getRenderQueue()->addRenderable(octant->getWireBoundingBox());
                         }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneTraverser.cpp

@@ -23 +23 @@
         
                 // if we come across some renderable geometry => render it
-                if(octant->numNodes() > 0)
-                {
-                        renderOctant(cam, octant);
-                }
-
+                renderOctant(cam, octant);
+                
                 for(int i=0; i<8; i++)
                 {
@@ -90 +87 @@
                                 continue;
                         }
-                        // if intersects near plane => skip occlusion query because wrong results possible
+                        //if intersects near plane => skip occlusion query because wrong results possible
                         if(intersects)
                         {
@@ -212 +209 @@
                 {
                         // if we come across some renderable geometry => render it
-                        if(octant->numNodes() > 0)
-                        {
-                                renderOctant(cam, octant);
-                        }
-
+                        renderOctant(cam, octant);
+                        
                         octant->setOctreeVisible(true);
                         octant = octant->getParent();
@@ -224 +218 @@
         void OcclusionCullingTerrainSceneTraverser::renderOctant( Camera *cam, Octree *octant )
         {
+                //if(octant->numNodes() > 0)
                 if(octant->lastVisited() != octant->lastRendered())
                 {
-                        setRenderingMode(MODE_RENDER);
+                        //setRenderingMode(MODE_RENDER);
 
                         octant->setLastRendered(octant->lastVisited());