Changeset 134 for trunk

Timestamp:

06/15/05 08:57:24 (20 years ago)

Author:

mattausch

Message:

fixed some bugs

Location:

trunk/VUT

Files:

• Ogre/src/OgrePlatformQueryManager.cpp (modified) (6 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -42 +42 @@
 
         /* 
-                Test again to get exact visibility with regard to the current camera.
-                Issue all queries first to avoid starvation & stalls.
+                Two query lists:
+                We test two to get exact visibility with regard to the current camera and
+                issue all queries at once to avoid starvation & stalls.
         */
         GtpVisibility::QueryList queryList[2];
@@ -67 +68 @@
                         queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*nodeIt, false));
                         
-                        // store geometry of nodes in geometry list
-                        mHierarchyInterface->GetGeometry(*nodeIt, &geometryList, false);
+                        // store geometry of the hierarchy node in a geometry list (only once!)
+                        if (i == n - 2)
+                        {
+                                mHierarchyInterface->GetGeometry(*nodeIt, &geometryList, false);
+                        }
                 }
 
@@ -93 +97 @@
 
                 // to obtain the correct number of projected pixels, depth write must be disabled
-                bool enableDepthCheck = (i != n - 2);
+                bool enableDepthWrite = (i != n - 2);
 
                 // this option must be provided by the scene manager
-                pfHierarchyInterface->GetSceneManager()->setOption("DepthCheck", &enableDepthCheck);
+                pfHierarchyInterface->GetSceneManager()->setOption("DepthWrite", &enableDepthWrite);
         }
 
@@ -103 +107 @@
         unsigned int visiblePixels;
 
-        GtpVisibility::QueryList::iterator absQueryIt, relQueryIt;
+        GtpVisibility::QueryList::iterator visQueryIt, projQueryIt;
 
-        absQueryIt = queryList[0].begin();
-        relQueryIt = queryList[1].begin();
+        visQueryIt = queryList[0].begin();
+        projQueryIt = queryList[1].begin();
         
         for (nodeIt = nodeList->begin(); nodeIt != nodeIt_end; ++nodeIt)
         {
-                (*absQueryIt)->GetQueryResult(visiblePixels, true);
+                (*visQueryIt)->GetQueryResult(visiblePixels, true);
 
                 float vis = (float)visiblePixels;
@@ -116 +120 @@
                 if (relativeVisibility)
                 {
-                        (*relQueryIt)->GetQueryResult(visiblePixels, true);
+                        (*projQueryIt)->GetQueryResult(visiblePixels, true);
                         std::stringstream d; d << "relativ " << visiblePixels;
                         LogManager::getSingleton().logMessage(d.str());
@@ -124 +128 @@
                                 vis /= (float) visiblePixels;
                         }
-                        ++relQueryIt;
+                        ++projQueryIt;
                 }
 
-                ++absQueryIt;
+                ++visQueryIt;
 
                 // leave nodes with visibilty 0 in queue: 

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -389 +389 @@
                 return true;
         }
-        if (key == "DepthCheck")
+        if (key == "DepthWrite")
         {
                 mEnableDepthWrite = (*static_cast<const bool *>(val));