Changeset 1486 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

09/25/06 18:54:21 (18 years ago)

Author:

mattausch

Message:

worked on guided visibility sampling

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgrePlatformHierarchyInterface.cpp (modified) (6 diffs)
• OGRE/src/OgreVisibilityOptionsManager.cpp (modified) (1 diff)
• src/CoherentHierarchicalCullingManager.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgrePlatformHierarchyInterface.cpp

@@ -75 +75 @@
 {
         ResetQueries();
-
         OGRE_DELETE(mSolidBoundingBox);
 }
@@ -100 +99 @@
         mRenderSystem->_setWorldMatrix(Ogre::Matrix4::IDENTITY);
         mSceneManager->useRenderableViewProjModeWrapper(solidBox);
-        
+        // HACK! (mySetPass should be setPass)
         // set no depth write, no color, no lighting material
-        mSceneManager->setPassWrapper(solidBox->getTechnique()->getPass(0)); // HACK! (mySetPass should be setPass)
-        //mSceneManager->_setPass(solidBox->getTechnique()->getPass(0)); // HACK! (mySetPass should be setPass)
+        mSceneManager->setPassWrapper(solidBox->getTechnique()->getPass(0));
+        //mSceneManager->_setPass(solidBox->getTechnique()->getPass(0)); 
         //SetOcclusionPass();
 
@@ -130 +129 @@
                 mOcclusionQueries.push_back(new PlatformOcclusionQuery(mRenderSystem));
         }
+
+        std::stringstream d;
+        d << "resizing queries: " << (int)mOcclusionQueries.size() << endl;
+        LogManager::getSingleton().logMessage(d.str());
         
         return mOcclusionQueries[mCurrentTestIdx ++];
@@ -186 +189 @@
         if (mTestGeometryForVisibleLeaves && (mCamera == mCullCamera) && wasVisible && IsLeaf(node)) 
         {
-                //LogManager::getSingleton().logMessage("render node\n");
                 RenderNode(node);
         }
@@ -194 +196 @@
                 // must be treated differently to the scene geometry during rendering
                 mIsBoundingBoxQuery = true;
-
-                //LogManager::getSingleton().logMessage("render box\n");
                 RenderBoundingBox(GetBoundingBox(node));
 
@@ -227 +227 @@
         // get next available test id
         GtpVisibility::OcclusionQuery *query = GetNextOcclusionQuery();
-
+        
+        ////////
         //-- the actual query test
+
         query->BeginQuery();
-        
         RenderGeometry(mesh);
-
         query->EndQuery();
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilityOptionsManager.cpp

@@ -16 +16 @@
         {
                 // delete old queries (not needed for e.g., view frustum culling)
+                // note cannot be deleted because of new ogre occlusion query implementation
+                // there we cannot just delete the queries, so they would stay!
                 //mHierarchyInterface->ResetQueries();
                 mVisibilityManager->SetCullingManager(*static_cast<const 

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp

@@ -83 +83 @@
                         if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
                         {
-                                ++ mNumFrustumCulledNodes;
-                                
+                                ++ mNumFrustumCulledNodes;      
                                 if (mVisualizeCulledNodes)
                                 {
@@ -90 +89 @@
                                 }
                         }
-                        // -- if node intersects near plane, skip query because wrong results possible
+                        //-- if node intersects near plane, skip query because wrong results possible
                         else if (intersects)
                         {