Changeset 343 for trunk/VUT/work/iv

Timestamp:

10/20/05 18:49:11 (19 years ago)

Author:

mattausch

Message:

added switch between NV and ARB queries in the render system and in the demos.
Fixed render queue bug: when clearing queue, we traversed through all priority groups
to clear the passmaps. This became very slow because had to traverse many elements (over 1000
for city demo). Now all we destroy the priority groups for each rendering (per hierarchy node).

Location:

trunk/VUT/work/iv

Files:

• IVFrameListener.cpp (modified) (7 diffs)
• IVFrameListener.h (modified) (3 diffs)
• TestCullingIVApplication.cpp (modified) (1 diff)

trunk/VUT/work/iv/IVFrameListener.cpp

@@ -48 +48 @@
 mVisibilityThreshold(0),
 mAssumedVisibility(0),
-mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
+//mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
+//mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING),
+mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::FRUSTUM_CULLING),
 mNodeVizMode(NODEVIZ_NONE),
 mVizCameraHeight(Real(2500.0)),
@@ -63 +65 @@
 mShowOctree(false),
 mUseDepthPass(false),
+mUseArbQueries(false),
 mTestGeometryForVisibleLeaves(false),
 mShowVisualization(false),
@@ -123 +126 @@
         mSceneMgr->setOption("DelayRenderTransparents", &delayRenderTransparents);
         mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
-        
+        mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
+
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
         mSceneMgr->setOption("CullCamera", &mCullCamera);
@@ -571 +575 @@
                         guiAvg->setCaption(avgFpsString + StringConverter::toString(avgFps) + " ms");
                 }
+                //std::stringstream d; d << "frame rate :" << stats.lastFPS;
+                //Ogre::LogManager::getSingleton().logMessage(d.str());
 
                 guiCurr->setCaption(currFpsString + StringConverter::toString(stats.lastFPS));
@@ -646 +652 @@
 
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
+}
+//-----------------------------------------------------------------------
+void IVFrameListener::toggleUseArbQueries()
+{
+        mUseArbQueries = !mUseArbQueries;
+
+        mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
+        
+        if (mUseArbQueries)
+        {
+                mUseArbQueriesInfo->setCaption(": ARB");
+        }
+        else
+        {
+                mUseArbQueriesInfo->setCaption(": NV");
+        }
 }
 //-----------------------------------------------------------------------
@@ -808 +830 @@
                 mShiftPressed = true;
                 break;
-
+        case KC_A:
+                toggleUseArbQueries();
+                break;
         default:
                 break;
@@ -1121 +1145 @@
         initOverlayElement(&mAssumedVisibilityInfo, ext, "AssumedVisibility", top, ": 0"); top += vert_space;
         initOverlayElement(&mCurrentObjectTypeInfo, ext, "CurrentObjectType", top, ": "); top += vert_space;
+        initOverlayElement(&mUseArbQueriesInfo, ext, "UseArbQueries", top, ": NV"); top += vert_space;
         //initOverlayElement(&mHelpInfo, ext, "Help", top, ": "); top += vert_space;
 

trunk/VUT/work/iv/IVFrameListener.h

@@ -115 +115 @@
         void toggleShowOctree();
         void toggleUseDepthPass();
+        void toggleUseArbQueries();
         void toggleShowViz();
         void toggleRecord();
@@ -159 +160 @@
         OverlayElement *mTestGeometryForVisibleLeavesInfo;
         OverlayElement *mUseDepthPassInfo;
+        OverlayElement *mUseArbQueriesInfo;
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mObjectsCountInfo;
@@ -180 +182 @@
         bool mShowOctree;
         bool mUseDepthPass;
+        bool mUseArbQueries;
         bool mShowVisualization;
         bool mCullCamera;

trunk/VUT/work/iv/TestCullingIVApplication.cpp

@@ -92 +92 @@
         mSceneMgr->setOption("NodeVizScale", &scale);
         // HACK: change this to relative path
-        String path = "D:/svn/gtp/trunk/VUT/Ogre/resources/";
+        String path = "D:/svn/trunk/VUT/Ogre/resources/";
                 
         SceneNode *node1 = mSceneMgr->getRootSceneNode()->createChildSceneNode("Node1");