Changeset 85 for trunk/VUT/work/TestCulling

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/TestCulling

Files:

• SceneContentGenerator.cpp (modified) (1 diff)
• SceneContentGenerator.h (modified) (1 diff)
• TestCullingApplication.cpp (modified) (13 diffs)
• TestCullingApplication.h (modified) (7 diffs)

trunk/VUT/work/TestCulling/SceneContentGenerator.cpp

@@ -101 +101 @@
         mMaxPos = maxPos;
 }
-
+//-----------------------------------------------------------------------
+int SceneContentGenerator::GetObjectCount()
+{
+        return mCount;
+}
 } // namespace Ogre

trunk/VUT/work/TestCulling/SceneContentGenerator.h

@@ -34 +34 @@
         void SetMinPos(Vector3 minPos);
         void SetMaxPos(Vector3 maxPos);
-        
+        int GetObjectCount();
+
 protected:
 

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -39 +39 @@
 }*/
 //-----------------------------------------------------------------------
+TestCullingApplication::~TestCullingApplication()
+{
+        delete mSceneContentGenerator;
+}
+//-----------------------------------------------------------------------
 void TestCullingApplication::createScene(void)
 {
@@ -48 +53 @@
         //l->setPosition(20,80,50);
 
-        SceneContentGenerator contentGenerator(mSceneMgr);
-        contentGenerator.GenerateScene(330, "robot.mesh");
+        mSceneContentGenerator = new SceneContentGenerator(mSceneMgr);
+        mSceneContentGenerator->GenerateScene(330, "robot.mesh");
 
         // Create a skybox
@@ -60 +65 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::setupGui( void )
+void TestCullingApplication::setupGui()
 {
          mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, ST_EXTERIOR_CLOSE);
@@ -74 +79 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::createFrameListener(void)
-{
-        mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer);
+void TestCullingApplication::createFrameListener()
+{
+        mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, 
+                mGUIRenderer, mSceneContentGenerator);
         mFrameListener->showDebugOverlay(true);
         mRoot->addFrameListener(mFrameListener);
@@ -91 +97 @@
 /***********************************************/
 //-----------------------------------------------------------------------
-MouseQueryListener::MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer)
+MouseQueryListener::MouseQueryListener(RenderWindow* win, Camera* cam, 
+                                                                           SceneManager *sceneManager, 
+                                                                           CEGUI::Renderer *renderer,
+                                                                           SceneContentGenerator *sceneContentGenerator)
         : ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), 
                 mShutdownRequested(false)
@@ -102 +111 @@
         mSceneMgr = sceneManager;
 
+        mSceneContentGenerator = sceneContentGenerator;
+
     // Reduce move speed
         mMoveSpeed = 50;
@@ -107 +118 @@
 
         mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
-        mThreshold = 0;
+        mVisibilityThreshold = 0;
     
         // Register this so that we get mouse events.
@@ -135 +146 @@
         mRenderedNodesInfo->setCaption(": 0");
         mNumObjectsInfo->setCaption(": 0");
+
+        setAlgorithm(mCurrentAlgorithm);
 
     pOver->show();
@@ -170 +183 @@
     if (e->getButtonID() & InputEvent::BUTTON0_MASK)
     {
-                CEGUI::MouseCursor::getSingleton().show( );
+                CEGUI::MouseCursor::getSingleton().show();
         mLMouseDown = false;
     }
@@ -176 +189 @@
     else if (e->getButtonID() & InputEvent::BUTTON1_MASK)
     {
-        CEGUI::MouseCursor::getSingleton().show( );
+        CEGUI::MouseCursor::getSingleton().show();
         mRMouseDown = false;
     }
@@ -209 +222 @@
         timeDelay -= evt.timeSinceLastFrame;
 
-    KEY_PRESSED(KC_SPACE, 0.3, changeAlgorithm());
+    KEY_PRESSED(KC_SPACE, 0.3, nextAlgorithm());
 
         KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
@@ -222 +235 @@
 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()
-{
-    mCurrentAlgorithm = ++mCurrentAlgorithm % GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS,
-
+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);
@@ -258 +278 @@
         mRenderedNodesInfo->setCaption(str);
 
-        sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount()); 
+        sprintf(str,": %d", mSceneContentGenerator->GetObjectCount()); 
         mNumObjectsInfo->setCaption(str);
 }

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -6 +6 @@
 #include "ExampleApplication.h"
 #include "VisibilityEnvironment.h"
-
+#include "SceneContentGenerator.h"
 
 Real timeDelay = 0;
@@ -30 +30 @@
 
     MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, 
-                        CEGUI::Renderer *renderer);
+                        CEGUI::Renderer *renderer, SceneContentGenerator *sceneContentGenerator);
 
 
@@ -60 +60 @@
         void keyClicked(KeyEvent* e);
 
-        void changeAlgorithm();
+        void nextAlgorithm();
+        void setAlgorithm(int algorithm);
         void changeThreshold(int incr);
         void changeStats();
@@ -72 +73 @@
         bool mShutdownRequested;
         int mCurrentAlgorithm;
-        int mThreshold;
+        int mVisibilityThreshold;
 
         OverlayElement *mAlgorithmInfo;
@@ -82 +83 @@
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mNumObjectsInfo;
+
+        SceneContentGenerator *mSceneContentGenerator;
 };
 
@@ -87 +90 @@
 class TestCullingApplication : public ExampleApplication
 {
+public:
+        ~TestCullingApplication();
+
 protected:
-        void createScene(void);
-        void createFrameListener(void);
-        void setupGui(void);
-        /** generates a the scene hierarchy with random values 
-        @param number of objects to generate
-        */
-        void GenerateScene(int numObjects);
-
-        /** generates a new scene object 
-        @param tranlationRatio ratio between minimal and maximal possible translation
-        @param rotationRatio ratio between minimal and maximal possible rotation
-        @idx the index of the new object
-        @entName the name of the object entity
-        */
-        void generateSceneObject(const Vector3 &translationRatio, const Vector3 &rotationRatio, 
-                                                         const int idx, const String &entName);
-
+        void createScene();
+        void createFrameListener();
+        void setupGui();
+        
         //virtual void createCamera(void);
 
@@ -116 +109 @@
         Vector3 mMaxAngle;
 
+        SceneContentGenerator *mSceneContentGenerator;
+
 private:
         void chooseSceneManager(void);