Changeset 145 for trunk/VUT/work

Timestamp:

06/22/05 10:05:06 (19 years ago)

Author:

mattausch

Message:

fixed bug when canceling login
fixed visibility queries using occlusion queries

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainFrameListener.cpp (modified) (2 diffs)
• TestCullingTerrainApplication.cpp (modified) (2 diffs)
• TestCullingTerrainApplication.h (modified) (1 diff)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -377 +377 @@
         for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
         {
-                averageGeometryVis += (*geomIt).GetVisiblePixels();
-
-                std::stringstream d; d << "Geometry visibility: " << (*geomIt).GetVisiblePixels();
+                float vis = relativeVisibility ? 
+                        (*geomIt).ComputeRelativeVisibility() : (float)(*geomIt).GetVisiblePixels();
+                
+                averageGeometryVis += vis;
+
+                std::stringstream d; d << "Geometry visibility: " << vis;
                 LogManager::getSingleton().logMessage(d.str());
         }
@@ -387 +390 @@
         for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
         {
-                averageNodeVis += (*nodesIt).GetVisiblePixels();
-
-                std::stringstream d; d << "Node visibility: " << (*nodesIt).GetVisiblePixels();
+                float vis = relativeVisibility ? 
+                        (*nodesIt).ComputeRelativeVisibility() : (float)(*nodesIt).GetVisiblePixels();
+                
+                averageNodeVis += vis;
+                
+                std::stringstream d; d << "Node visibility: " << vis;
                 LogManager::getSingleton().logMessage(d.str());
         }
 
-        if ((int)visibleNodes.size())
+        if (visibleNodes.size())
                 averageNodeVis /= (float)visibleNodes.size();
-        if ((int)visibleGeometry.size())
+        if (visibleGeometry.size())
                 averageGeometryVis /= (float)visibleGeometry.size();
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -18 +18 @@
 /*     TestCullingTerrainApplication implementation    */
 /*******************************************************/
-
+TestCullingTerrainApplication::TestCullingTerrainApplication():
+mTerrainContentGenerator(NULL)
+{
+}
 //-----------------------------------------------------------------------
 TestCullingTerrainApplication::~TestCullingTerrainApplication()
@@ -69 +72 @@
 bool TestCullingTerrainApplication::setup()
 {
-        bool result = ExampleApplication::setup();
-
-        if (mWindow)
+        bool carryOn = ExampleApplication::setup();
+
+        if (carryOn)
                 createRenderTargetListener();
 
-        return result;
+        return carryOn;
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -28 +28 @@
 {
 public:
+        TestCullingTerrainApplication();
         ~TestCullingTerrainApplication();