Changeset 154 for trunk/VUT/work/TestCullingTerrain

Timestamp:

07/04/05 17:57:51 (19 years ago)

Author:

mattausch

Message:

added item buffer queries.

Location:

trunk/VUT/work/TestCullingTerrain

Files:

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

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -9 +9 @@
 #include "OgreVisibilityTerrainSceneManager.h"
 #include "VisibilityInfo.h"
-#include "OgreItemBufferQueryManager.h";
+#include "OgreItemBufferQueryManager.h"
+#include "OgreOcclusionQueriesQueryManager.h"
+
+
+
+
 // output file for frame info
 const char* frames_out_filename = "frame.out";
@@ -16 +21 @@
 
 
+// --- captions for overlays
+
 String currentAlgorithmCaptions[GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS] = 
 {
@@ -23 +30 @@
 };
 
-String queryTypeCaptions[4] = 
-{
-        "from camera, visible pixels", 
-        "from viewpoint, visible pixels", 
-        "from camera, relative visibility",
-        "from viewpoint, relative visibility"
+String queryTypeCaptions[] = 
+{
+        "from camera", 
+        "from viewpoint"
+};
+
+String queryRelativeVisCaptions[] = 
+{
+        "visible pixels", 
+        "relative visibility"
+};
+
+String queryMethodCaptions[] = 
+{
+        "occlusion queries", 
+        "item buffer"
 };
 
@@ -360 +377 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::ApplyVisibilityQuery(bool fromPoint, bool relativeVisibility)
+void TerrainFrameListener::ApplyVisibilityQuery(bool fromPoint, bool relativeVisibility, 
+                                                                                                bool useItemBuffer)
 {
         // TODO: change this (does not work with other scene manager plugins)
-        VisibilityTerrainSceneManager *sm = dynamic_cast<VisibilityTerrainSceneManager *>(mSceneMgr);
-
-        mQueryManager = new ItemBufferQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0));
-        //mQueryManager = new PlatformQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0));
+        VisibilityTerrainSceneManager *sm = 
+                dynamic_cast<VisibilityTerrainSceneManager *>(mSceneMgr);
+
+        if (useItemBuffer)
+        {
+                mQueryManager = new ItemBufferQueryManager(sm->GetHierarchyInterface(), 
+                        mWindow->getViewport(0));
+        }
+        else
+        {
+                mQueryManager = new OcclusionQueriesQueryManager(sm->GetHierarchyInterface(), 
+                        mWindow->getViewport(0));
+        }
 
         sm->GetVisibilityManager()->SetQueryManager(mQueryManager);
@@ -403 +430 @@
                         ++geomSize;
                         
-                        std::stringstream d; d << "Geometry visibility: " << vis;
+                        std::stringstream d; d << "Geometry " << geomSize << " visibility: " << vis;
                         LogManager::getSingleton().logMessage(d.str());
                 }
@@ -431 +458 @@
                 averageGeometryVis /= (float)geomSize;
 
-        char str[100];
-
         //-- update visibility queries stats
     try 
         {
-                //-- visibility queries stats
-                int idx = fromPoint ?  1 : 0;
-                idx += relativeVisibility ? 2 : 0;
-
-                sprintf(str, ": %s", queryTypeCaptions[idx].c_str()); 
+                char str[100];
+                
+                sprintf(str, ": %s, %s, %s", 
+                                queryTypeCaptions[fromPoint ?  1 : 0].c_str(),
+                                queryRelativeVisCaptions[relativeVisibility ? 1 : 0].c_str(),
+                                queryMethodCaptions[useItemBuffer ? 1 : 0].c_str());
+
                 mQueryTypeInfo->setCaption(str);
 
@@ -912 +939 @@
                 break;
         case KC_F5:
-                ApplyVisibilityQuery(false, mShiftPressed);
+                ApplyVisibilityQuery(false, mShiftPressed, false);
                 break;
         case KC_F6:
-                ApplyVisibilityQuery(true, mShiftPressed);
-                break;
-
+                ApplyVisibilityQuery(true, mShiftPressed, false);
+                break;
+        case KC_F7:
+                ApplyVisibilityQuery(false, mShiftPressed, true);
+                break;
+        case KC_F8:
+                ApplyVisibilityQuery(true, mShiftPressed, true);
+                break;
         case KC_F11:
                 takeScreenShot();

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

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