Changeset 54

Timestamp:

04/21/05 14:04:02 (19 years ago)

Author:

mattausch

Message:

fixed terrainscenemanager bug

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• include/OgreSolidHalfBoundingBox.h (modified) (2 diffs)
• scripts/Plugin_OcclusionCullingSceneManager.suo (modified) (previous)
• src/OgreOcclusionCullingOctreeSceneTraverser.cpp (modified) (8 diffs)
• src/OgreOcclusionCullingSceneTraverser.cpp (modified) (9 diffs)
• src/OgreOcclusionCullingTerrainSceneManager.cpp (modified) (1 diff)
• src/OgreSolidHalfBoundingBox.cpp (modified) (3 diffs)

trunk/VUT/OcclusionCullingSceneManager/include/OgreSolidHalfBoundingBox.h

@@ -17 +17 @@
         public:
 
-                SolidHalfBoundingBox(bool isFirstHalf);
-                void setupBoundingBox(const AxisAlignedBox& aabb);
+                SolidHalfBoundingBox( bool isFirstHalf );
+                void setupBoundingBox( const AxisAlignedBox& aabb );
                 /** Override this method to prevent parent transforms (rotation,translation,scale)
                 and to make it public.
@@ -29 +29 @@
                 @param the axis aligned bounding box for setting up the list.
         */
-                void setupBoundingBoxVertices(const AxisAlignedBox& aab);
-
+                void setupBoundingBoxVertices( const AxisAlignedBox& aab );
+                /** 
+                        Sets the material used for occlusion queries. 
+                        @remarks the material is called "OcclusionQuery" and
+                        uses no lighting, no depth write, and no colours
+                */
+                void setOcclusionQueryMaterial( void );
+                /** Whether this half box is the first or the second half of the bounding box. 
+                */
                 bool mIsFirstHalf;      
         };

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneTraverser.cpp

@@ -28 +28 @@
                 {
                         Octree *nextChild = octant->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1];
-
-                        /*char msg[100];
-                        sprintf(msg, "node number: %d %d %d\n", (i & 4) >> 2, (i & 2) >> 1, i & 1);
-                        OutputDebugString(msg);*/
 
                         if(nextChild)
@@ -59 +55 @@
                         }
 
+                        mRenderSystem->_setRasterisationMode(SDL_WIREFRAME);
+                        renderBoundingBox(&box);
+                        mRenderSystem->_setRasterisationMode(SDL_SOLID);
                         // update node's visited flag 
                         octant->setLastVisited(mFrameId);
@@ -86 +85 @@
                         bool intersects = false;
 
-                        /*char msg2[100];
-                        Vector3 min = box.getMinimum();
-                        Vector3 max = box.getMaximum();
-
-                        sprintf(msg2, "culling box: %3.3f %3.3f %3.3f %3.3f %3.3f %3.3f\n", min.x, min.y, min.z, max.x, max.y, max.z);
-                        OutputDebugString(msg2);*/
-
                         if(!cam->isVisible(box, intersects))
                         {
@@ -102 +94 @@
                         {
                                 octant->setOctreeVisible(true);
-                        //      char msg[100]; sprintf(msg, "intersecting\n");
-                        //      OutputDebugString(msg);
                                 traverseOctant(cam, octant);
                                 continue;
@@ -114 +104 @@
                         query->pullOcclusionQuery(&visiblePixels);
 
-                        char msg[100]; sprintf(msg, "visible pixels: %d\n", visiblePixels, intersects);
-                        OutputDebugString(msg);
+                        //char msg[100]; sprintf(msg, "visible pixels: %d\n", visiblePixels);
+                        //OutputDebugString(msg);
 
                         // node visible
@@ -124 +114 @@
                         else
                         {
+                                /*
+                                char msg2[100];
+                                Vector3 min = box.getMinimum();
+                                Vector3 max = box.getMaximum();
+
+                                sprintf(msg2, "culling box: %3.3f %3.3f %3.3f %3.3f %3.3f %3.3f\n", min.x, min.y, min.z, max.x, max.y, max.z);
+                                OutputDebugString(msg2);
+                                */
+
                                 mNumQueryCulledNodes ++;
                         }
@@ -192 +191 @@
                                 bool wasVisible = octant->isOctreeVisible() && (octant->lastVisited() == mFrameId - 1);
                                 
-                                /* 
-                                char msg[100];
-                                if(wasVisible) sprintf(msg, "yes, was visible, %d\n", mFrameId);
-                                else sprintf(msg, "no was invisible, %d\n", mFrameId);
-                                OutputDebugString(msg);
-                                */
-
                                 // identify nodes that we cannot skip queries for
                                 bool mustQuery = !wasVisible || (octant->numNodes() > 0) || isLeaf(octant);
@@ -242 +234 @@
 
                         //TODO: does nothing useful
-                        setRenderingMode(MODE_RENDER);
+                        //setRenderingMode(MODE_RENDER);
 
                         ((OctreeSceneManager *)mSceneManager)->_renderOctant(cam, octant);

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -44 +44 @@
 
                 initDistanceQueue(cam);
-
-                //deleteQueries();
-                //char *msg = "deleting queries\n"; OutputDebugString(msg);
-        //for(unsigned int i=0; i < 1000; i++)
-                //mOcclusionQueries.push_back(mRenderSystem->createHardwareOcclusionQuery());
-
-            //mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
 
                 switch(mCurrentAlgorithm)
@@ -235 +228 @@
                 // TODO: in rendervisibleobjects, the rendermode is changed by ogre itself => change this!!
                 
-                setRenderingMode(MODE_QUERY);
-                //mRenderSystem->_setRasterisationMode(SDL_SOLID);setRenderingMode(MODE_RENDER);
+                //setRenderingMode(MODE_QUERY);
+                //mRenderSystem->_setRasterisationMode(SDL_SOLID); setRenderingMode(MODE_RENDER);
 
                 // get next available test id
@@ -247 +240 @@
 
                 query->endOcclusionQuery();
-
-                
-                //mRenderSystem->_setRasterisationMode(SDL_WIREFRAME);
+        
+                /*mRenderSystem->_setRasterisationMode(SDL_WIREFRAME);
                 setRenderingMode(MODE_RENDER);
                 renderBoundingBox(box);
-                //mRenderSystem->_setRasterisationMode(SDL_SOLID);
+                mRenderSystem->_setRasterisationMode(SDL_SOLID);*/
                 
                 return query;
@@ -278 +270 @@
                 mRenderSystem->_setColourBufferWriteEnabled(enabled, enabled, enabled, enabled);
                         mRenderSystem->_setDepthBufferWriteEnabled(enabled);
-                        mRenderSystem->setLightingEnabled(enabled);
+                        //mRenderSystem->setLightingEnabled(enabled);
                 }
         }
@@ -304 +296 @@
         {
                 //TODO: does not do any changes
-                setRenderingMode(MODE_RENDER);
+                //setRenderingMode(MODE_RENDER);
                 
                 if(node->lastRendered() != node->lastVisited())
@@ -383 +375 @@
                         halfbox->setupBoundingBox(*box);
                         
-                        mRenderSystem->_setWorldMatrix(Matrix4::IDENTITY);
-
-                        // Set world transformation
-                        /*halfbox->getWorldTransforms(xform);
+                        /*mRenderSystem->_setWorldMatrix(Matrix4::IDENTITY);
+
+                        halfbox->getWorldTransforms(xform);
 
                         int numMatrices = halfbox->getNumWorldTransforms();
@@ -397 +388 @@
                                 mRenderSystem->_setWorldMatrix(*xform);
                         }
-                        mRenderSystem->setClipPlanes(halfbox->getClipPlanes());*/
+                        mRenderSystem->setClipPlanes(halfbox->getClipPlanes());
 
                         static RenderOperation ro;
@@ -404 +395 @@
                         halfbox->getRenderOperation(ro);
                         ro.srcRenderable = halfbox; 
-                        mRenderSystem->_render(ro);
-
-                        //mSceneManager->myrenderSingleObject(getSolidHalfBoundingBox(half), getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), true);
+                        mRenderSystem->_render(ro);*/
+                        
+                        mSceneManager->myrenderSingleObject(getSolidHalfBoundingBox(half), 
+                                getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), true);
                 }
         }
@@ -444 +436 @@
                 {
                         mOcclusionQueries.push_back(mRenderSystem->createHardwareOcclusionQuery());
-                        //char *msg = "creating query!!\n"; OutputDebugString(msg);
                 }
                 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -18 +18 @@
                 mShowBoxes = true;
                 //mDisplayNodes = true;
-                //mShowBoundingBoxes = true;
-                //mMaxDepth = 20;
+                mShowBoundingBoxes = true;
+                mMaxDepth = 20;
         }
         //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/src/OgreSolidHalfBoundingBox.cpp

@@ -5 +5 @@
 #include "OgreHardwareBufferManager.h"
 #include "OgreCamera.h"
+#include "OgreMaterialManager.h"
 //#include <windows.h>
 
@@ -13 +14 @@
                 :WireBoundingBox(), mIsFirstHalf(isFirstHalf)
     {
+                setOcclusionQueryMaterial();
+                
                 mRenderOp.vertexData->vertexCount = 8;
         mRenderOp.operationType = RenderOperation::OT_TRIANGLE_FAN; 
@@ -95 +98 @@
         *xform = Matrix4::IDENTITY;
     }
+
+        void SolidHalfBoundingBox::setOcclusionQueryMaterial( void )
+        {
+                m_pMaterial = MaterialManager::getSingleton().getByName("OcclusionQuery");
+
+                if(m_pMaterial.isNull())
+                {
+                        m_pMaterial = MaterialManager::getSingleton().
+                                create("OcclusionQuery", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+                }
+
+                m_pMaterial->setColourWriteEnabled(false);
+                m_pMaterial->setDepthWriteEnabled(false);
+                m_pMaterial->setLightingEnabled(false);
+
+                setMaterial("OcclusionQuery");
+        }
 }