Changeset 867 for GTP/trunk/App

Timestamp:

04/30/06 15:37:38 (19 years ago)

Author:

mattausch

Message:

kicked out toggling of arb / iv queries

Location:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Files:

• TerrainFrameListener.cpp (modified) (6 diffs)
• TerrainFrameListener.h (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -107 +107 @@
 mVisibilityThreshold(0),
 mAssumedVisibility(0),
-#if 0
+#if 1
 mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
 #else
@@ -154 +154 @@
 mRecordDemo(false),
 mSavePrecomputedFps(false),
-mUseArbQueries(false),
 mUseBufferedInputMouse(false),
 mVizScale(25)
@@ -234 +233 @@
         mTimer = Root::getSingleton().getTimer();
         mTimeFrameEnded = mTimeFrameStarted = mTimer->getMilliseconds();
-                
-        //if (mSceneMgr->getSceneNode("robot Entity1Node")->getAttachedObject(0)->getMovableType() == "Entity")
-        //      Ogre::LogManager::getSingleton().logMessage("found entity");
-        
-        // arb or nv queries
-        //mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
+        
+        if (0 && (mSceneMgr->getSceneNode("robot Entity1Node")->getAttachedObject(0)->getMovableType() == "Entity"))
+                Ogre::LogManager::getSingleton().logMessage("found entity");
+        
         
         // reset statistics
@@ -1137 +1134 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleUseArbQueries()
-{
-        mUseArbQueries = !mUseArbQueries;
-
-        mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
-        
-        if (mUseArbQueries)
-        {
-                mUseArbQueriesInfo->setCaption(": ARB");
-        }
-        else
-        {
-                mUseArbQueriesInfo->setCaption(": NV");
-        }
-}
-//-----------------------------------------------------------------------
 void TerrainFrameListener::toggleShowViz()
 {
@@ -1351 +1332 @@
     case KC_E: // hack for recording demo using precomputed fps
                 mSavePrecomputedFps = !mSavePrecomputedFps;
-                break;
-        
-        case KC_Q:
-                toggleUseArbQueries();
                 break;
         case KC_O:
@@ -1717 +1694 @@
         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;
 

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h

@@ -184 +184 @@
         void updateStats();
 
-        /** Toggles wether help screen is shown or not.
+        /** Toggles whether help screen is shown or not.
         */
         void toggleShowHelp();
         
-        /** Toggles wether shadows are shown or not.
+        /** Toggles whether shadows are shown or not.
         */
         void toggleShowShadows();
+        /** if camera stats (e.g, location, orientation, ...) should be displayed-
+        */
         void toggleDisplayCameraDetails();
         /** Takes screenshot of the current scene.
@@ -211 +213 @@
         */
         void toggleShowOctree();
-        /** Toggles wether we use the initial depth pass.
+        /** Toggles whether we use the initial depth pass.
         */
         void toggleUseDepthPass();
-        /** Toggles wether we use ARB or NV queries.
-        */
-        void toggleUseArbQueries();
-        /** Toggles wether the visualization is shown.
+        /** Toggles whether the visualization is shown.
         */
         void toggleShowViz();
-        /** Toggles wether the frames are recorded.
+        /** Toggles whether the frames are recorded.
         */
         void toggleRecord();
@@ -316 +315 @@
         OverlayElement *mTestGeometryForVisibleLeavesInfo;
         OverlayElement *mUseDepthPassInfo;
-        OverlayElement *mUseArbQueriesInfo;
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mObjectsCountInfo;
@@ -344 +342 @@
         bool mShowOctree;
         bool mUseDepthPass;
-        bool mUseArbQueries;
         bool mShowVisualization;
         bool mCullCamera;