Changeset 143 for trunk/VUT/work

Timestamp:

06/21/05 18:14:30 (19 years ago)

Author:

mattausch

Message:

updated visibility queries

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainFrameListener.cpp (modified) (5 diffs)
• TerrainFrameListener.h (modified) (1 diff)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -353 +353 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::ApplyVisibilityQuery(bool fromPoint, bool relativeVisibility)
+void TerrainFrameListener::ApplyVisibilityQuery(bool fromPoint, bool projectedPixels)
 {
         InfoContainer<GtpVisibility::NodeInfo> visibleNodes;
@@ -362 +362 @@
                 mVisibilityManager->GetQueryManager()->
                         ComputeFromPointVisibility(mCamNode->getPosition(), &visibleNodes, 
-                                                                           &visibleGeometry, relativeVisibility);
+                                                                           &visibleGeometry, projectedPixels);
         }
         else
         {
                 mVisibilityManager->GetQueryManager()->ComputeCameraVisibility(*mCamera,
-                            &visibleNodes, &visibleGeometry, relativeVisibility);
+                            &visibleNodes, &visibleGeometry, projectedPixels);
         }
 
@@ -377 +377 @@
         for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
         {
-                averageGeometryVis += (*geomIt).GetVisibility();
-
-                std::stringstream d; d << "Geometry visibility: " << (*geomIt).GetVisibility();
+                averageGeometryVis += (*geomIt).GetVisiblePixels();
+
+                std::stringstream d; d << "Geometry visibility: " << (*geomIt).GetVisiblePixels();
                 LogManager::getSingleton().logMessage(d.str());
         }
@@ -387 +387 @@
         for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
         {
-                averageNodeVis += (*nodesIt).GetVisibility();
-
-                std::stringstream d; d << "Node visibility: " << (*nodesIt).GetVisibility();
+                averageNodeVis += (*nodesIt).GetVisiblePixels();
+
+                std::stringstream d; d << "Node visibility: " << (*nodesIt).GetVisiblePixels();
                 LogManager::getSingleton().logMessage(d.str());
         }
@@ -405 +405 @@
                 //-- visibility queries stats
                 int idx = fromPoint ?  1 : 0;
-                idx += relativeVisibility ? 2 : 0;
+                idx += projectedPixels ? 2 : 0;
 
                 sprintf(str, ": %s", queryTypeCaptions[idx].c_str()); 

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

@@ -117 +117 @@
                 and their visibility information.
                 @param fromnPoint if query should be from point or from camera
-                @param relativeVisibility if query should return number of visible pixels or the ratio
+                @param projectedPixels if query should return number of visible pixels or the ratio
                 visible pixels / projected pixels.
         */
-        void ApplyVisibilityQuery(bool fromPoint, bool relativeVisibility);
+        void ApplyVisibilityQuery(bool fromPoint, bool projectedPixels);
 
         void toggleShowQueryStats();