Changeset 141 for trunk/VUT/work

Timestamp:

06/21/05 11:18:09 (20 years ago)

Author:

mattausch

Message:

fixed visibility queries using occlusion queries
fixed visualization

Location:

trunk/VUT/work

Files:

• TestCullingTerrain/TerrainFrameListener.cpp (modified) (2 diffs)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp (added)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -373 +373 @@
         float averageGeometryVis = 0;
 
-        for (int i=0; i < visibleGeometry.size(); ++i)
-        {
-                averageGeometryVis += visibleGeometry[i].GetVisibility();
-
-                std::stringstream d; d << "Geometry visibility: " << visibleGeometry[i].GetVisibility();
+        InfoContainer<GtpVisibility::MeshInfo>::iterator geomIt, geomIt_end = visibleGeometry.end();
+
+        for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
+        {
+                averageGeometryVis += (*geomIt).GetVisibility();
+
+                std::stringstream d; d << "Geometry visibility: " << (*geomIt).GetVisibility();
                 LogManager::getSingleton().logMessage(d.str());
         }
-        for (int i=0; i < visibleNodes.size(); ++i)
-        {
-                averageNodeVis += visibleNodes[i].GetVisibility();
-
-                std::stringstream d; d << "Node visibility: " << visibleNodes[i].GetVisibility();
+
+        InfoContainer<GtpVisibility::NodeInfo>::iterator nodesIt, nodesIt_end = visibleNodes.end();
+
+        for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
+        {
+                averageNodeVis += (*nodesIt).GetVisibility();
+
+                std::stringstream d; d << "Node visibility: " << (*nodesIt).GetVisibility();
                 LogManager::getSingleton().logMessage(d.str());
         }
 
-        averageNodeVis /= (float)visibleNodes.size();
-        averageGeometryVis /= (float)visibleGeometry.size();
+        if ((int)visibleNodes.size())
+                averageNodeVis /= (float)visibleNodes.size();
+        if ((int)visibleGeometry.size())
+                averageGeometryVis /= (float)visibleGeometry.size();
 
         char str[100];
@@ -437 +444 @@
                         Vector3(camPos.x, 5000.0f, camPos.z), Vector3::NEGATIVE_UNIT_Y))
         {
-                const int overTerrain = 200;
-                mCamNode->setPosition(camPos.x, queryResult.y + overTerrain, camPos.z);
+                const int terrainOffs = 10;
+                mCamNode->setPosition(camPos.x, queryResult.y + terrainOffs, camPos.z);
         }
 }