Changeset 85 for trunk/VUT/work/TestCullingTerrain

Timestamp:

05/04/05 17:58:13 (19 years ago)

Author:

mattausch

Message:

corrected bug so chc is much faster than stop and wait

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainContentGenerator.cpp (modified) (2 diffs)
• TerrainContentGenerator.h (modified) (1 diff)
• TestCullingTerrainApplication.cpp (modified) (6 diffs)
• TestCullingTerrainApplication.h (modified) (3 diffs)

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.cpp

@@ -53 +53 @@
 {
         mMinPos = Vector3(0.0f, 5000.0f, 0.0f);
-        mMaxPos = Vector3(1000.0f, 5000.0f, 1000.0f);
+        mMaxPos = Vector3(3000.0f, 5000.0f, 3000.0f);
 
         mMinAngle = Vector3(0.0f, 0.0f, 0.0f);
@@ -87 +87 @@
         mMaxHeight = maxHeight;
 }
-//-----------------------------------------------------------------------
-int TerrainContentGenerator::GetObjectCount()
-{
-        return mCount;
-}
 
 } // namespace Ogre

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.h

@@ -34 +34 @@
 
         void SetMaxHeight(Real maxHeight);
-        int GetObjectCount();
-
+        
 protected:
         RayQueryExecutor *mRayQueryExecutor;

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -86 +86 @@
 
         // Set a nice viewpoint
-        mCamera->setPosition(707,2500,528);
+        mCamera->setPosition(707, 2500, 528);
         mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
         
@@ -96 +96 @@
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
-        mTerrainContentGenerator->GenerateScene(300, "robot.mesh");
+        mTerrainContentGenerator->GenerateScene(500, "robot.mesh");
         // no limitations needed anymore: the user can set 
         // objects also on peaks of terrain
@@ -151 +151 @@
         mRotateSpeed *= 2;
 
-        mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING,
-        mThreshold = 0;
+        mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
+        mVisibilityThreshold = 0;
     
         // Register this so that we get mouse events.
@@ -182 +182 @@
         mRenderedNodesInfo->setCaption(": 0");
         mNumObjectsInfo->setCaption(": 0");
+
+        setAlgorithm(mCurrentAlgorithm);
 
     pOver->show();
@@ -287 +289 @@
         timeDelay -= evt.timeSinceLastFrame;
 
-    KEY_PRESSED(KC_SPACE, 0.3, changeAlgorithm());
+    KEY_PRESSED(KC_SPACE, 0.3, nextAlgorithm());
 
         KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
@@ -300 +302 @@
 void MouseQueryListener::changeThreshold(int incr)
 {
-        mThreshold += incr; if(mThreshold < 0) mThreshold = 0;
-        
-        char str[100]; sprintf(str,": %d", mThreshold);
-
-        mSceneMgr->setOption("Threshold", &mThreshold); 
+        mVisibilityThreshold += incr; 
+        if(mVisibilityThreshold < 0) mVisibilityThreshold = 0;
+        
+        char str[100]; sprintf(str,": %d", mVisibilityThreshold);
+
+        mSceneMgr->setOption("Threshold", &mVisibilityThreshold); 
         mThresholdInfo->setCaption(str);
 }
 //-----------------------------------------------------------------------
-void MouseQueryListener::changeAlgorithm()
+void MouseQueryListener::nextAlgorithm()
 {
         mCurrentAlgorithm = ++mCurrentAlgorithm % 
                 GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS,
 
+        setAlgorithm(mCurrentAlgorithm);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::setAlgorithm(int algorithm)
+{
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
         mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm);

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -59 +59 @@
         void keyClicked(KeyEvent* e);
 
-        void changeAlgorithm();
+        void nextAlgorithm();
+        void setAlgorithm(int algorithm);
         void changeThreshold(int incr);
         void changeStats();
@@ -71 +72 @@
         bool mShutdownRequested;
         int mCurrentAlgorithm;
-        int mThreshold;
+        int mVisibilityThreshold;
 
         OverlayElement *mAlgorithmInfo;
@@ -97 +98 @@
 
 protected:
-        void createScene(void);
-        void createFrameListener(void);
-        void setupGui(void);
-        virtual void createCamera(void);
+        void createScene();
+        void createFrameListener();
+        void setupGui();
+        virtual void createCamera();
 
         CEGUI::OgreCEGUIRenderer *mGUIRenderer;