Changeset 86 for trunk/VUT/work

Timestamp:

05/06/05 01:39:32 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work

Files:

• TestCulling/SceneContentGenerator.cpp (modified) (3 diffs)
• TestCulling/SceneContentGenerator.h (modified) (2 diffs)
• TestCulling/TestCullingApplication.cpp (modified) (6 diffs)
• TestCulling/TestCullingApplication.h (modified) (2 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (7 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (3 diffs)

trunk/VUT/work/TestCulling/SceneContentGenerator.cpp

@@ -20 +20 @@
 mMaxPos(Vector3(70.0f, 70.0f, 600.0f)), 
 mMinAngle(Vector3(0.0f, 0.0f, 0.0f)),
-mMaxAngle(Vector3(360, 360, 360))
+mMaxAngle(Vector3(360, 360, 360)),
+mScale(0.05, 0.05, 0.05)
 {
 }
@@ -67 +68 @@
 
         currentObject->attachObject(ent);
-        currentObject->setScale(0.1f, 0.1f, 0.1f);
+        currentObject->setScale(mScale);
                 
         currentObject->yaw(Degree(rotation.x));
@@ -106 +107 @@
         return mCount;
 }
+//-----------------------------------------------------------------------
+void SceneContentGenerator::SetScale(Vector3 scale)
+{
+        mScale = scale;
+}
 } // namespace Ogre

trunk/VUT/work/TestCulling/SceneContentGenerator.h

@@ -35 +35 @@
         void SetMaxPos(Vector3 maxPos);
         int GetObjectCount();
+        void SetScale(Vector3 scale);
 
 protected:
@@ -42 +43 @@
         Vector3 mMaxPos;
         Vector3 mMinPos;
-        
+        Vector3 mScale;
+
         SceneManager *mSceneMgr;
         int mCount;             // The number of objects on the screen

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -54 +54 @@
 
         mSceneContentGenerator = new SceneContentGenerator(mSceneMgr);
-        mSceneContentGenerator->GenerateScene(330, "robot.mesh");
+        mSceneContentGenerator->GenerateScene(3000, "sphere.mesh");
 
         // Create a skybox
@@ -101 +101 @@
                                                                            CEGUI::Renderer *renderer,
                                                                            SceneContentGenerator *sceneContentGenerator)
-        : ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), 
-                mShutdownRequested(false)
-{
-
-        // Setup default variables
-        //mOgreHead = NULL;
-        mLMouseDown = false;
-        mRMouseDown = false;
-        mSceneMgr = sceneManager;
-
-        mSceneContentGenerator = sceneContentGenerator;
-
+: ExampleFrameListener(win, cam, false, true),
+mSceneMgr(sceneManager),
+mGUIRenderer(renderer), 
+mShutdownRequested(false), 
+mUseOptimization(false),
+mLMouseDown(false),
+mRMouseDown(false),
+mSceneContentGenerator(sceneContentGenerator),
+mVisibilityThreshold(0),
+mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING)
+{
     // Reduce move speed
         mMoveSpeed = 50;
         mRotateSpeed *= 2;
-
-        mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
-        mVisibilityThreshold = 0;
-    
+ 
         // Register this so that we get mouse events.
         mEventProcessor->addMouseListener(this);
@@ -137 +133 @@
         mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo");
         mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo");
+        mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo");
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -146 +143 @@
         mRenderedNodesInfo->setCaption(": 0");
         mNumObjectsInfo->setCaption(": 0");
+        mUseOptimizationInfo->setCaption(": true");
 
         setAlgorithm(mCurrentAlgorithm);
+        toggleUseOptimization();
 
     pOver->show();
@@ -226 +225 @@
         KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
         KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
+        KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
         //KEY_PRESSED(KC_T, 1, change);
       
@@ -250 +250 @@
 
         setAlgorithm(mCurrentAlgorithm);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleUseOptimization()
+{
+        mUseOptimization = !mUseOptimization;
+
+        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+
+        if(mUseOptimization)
+                mUseOptimizationInfo->setCaption(": true");
+        else
+                mUseOptimizationInfo->setCaption(": false");
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleShowOctree()
+{
+        mShowOctree = !mShowOctree;
+
+        mSceneMgr->setOption("ShowOctree", &mShowOctree);
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -64 +64 @@
         void changeThreshold(int incr);
         void changeStats();
+        void toggleUseOptimization();
+        void toggleShowOctree();
 
 protected:
@@ -83 +85 @@
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mNumObjectsInfo;
+        OverlayElement *mUseOptimizationInfo;
 
         SceneContentGenerator *mSceneContentGenerator;
+
+        bool mUseOptimization;
+        bool mShowOctree;
 };
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -96 +96 @@
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
+        
+        mTerrainContentGenerator->GenerateScene(500, "ninja.mesh");
         mTerrainContentGenerator->GenerateScene(500, "robot.mesh");
+
         // no limitations needed anymore: the user can set 
         // objects also on peaks of terrain
@@ -137 +140 @@
                                                                            CEGUI::Renderer *renderer,
                                                                            TerrainContentGenerator *sceneGenerator): 
-ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), 
-mShutdownRequested(false)
-{
-        // Setup default variables
-        mCurrentObject = NULL;
-        mLMouseDown = false;
-        mRMouseDown = false;
-        mSceneMgr = sceneManager;
-        mTerrainContentGenerator = sceneGenerator;
-
-    // Reduce move speed
+ExampleFrameListener(win, cam, false, true), 
+mGUIRenderer(renderer), 
+mShutdownRequested(false), 
+mUseOptimization(false),
+mLMouseDown(false),
+mRMouseDown(false),
+mSceneMgr(sceneManager),
+mCurrentObject(NULL),
+mTerrainContentGenerator(sceneGenerator),
+mVisibilityThreshold(0),
+mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING)
+{
+        // Reduce move speed
         mMoveSpeed = 50;
         mRotateSpeed *= 2;
-
-        mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
-        mVisibilityThreshold = 0;
     
         // Register this so that we get mouse events.
@@ -173 +175 @@
         mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo");
         mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo");
+        mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo");
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -182 +185 @@
         mRenderedNodesInfo->setCaption(": 0");
         mNumObjectsInfo->setCaption(": 0");
+        mUseOptimizationInfo->setCaption(": true");
 
         setAlgorithm(mCurrentAlgorithm);
+        toggleUseOptimization();
+        toggleShowOctree();
 
     pOver->show();
@@ -293 +299 @@
         KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
         KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
+        KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
+        KEY_PRESSED(KC_S, 0.3, toggleShowOctree());
         //KEY_PRESSED(KC_T, 1, change);
       
@@ -321 +329 @@
 void MouseQueryListener::setAlgorithm(int algorithm)
 {
+        //OutputDebugString("changing algorithm\n");
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
         mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm);
@@ -347 +356 @@
         sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount()); 
         mNumObjectsInfo->setCaption(str);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleUseOptimization()
+{
+        mUseOptimization = !mUseOptimization;
+
+        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+
+        if(mUseOptimization)
+                mUseOptimizationInfo->setCaption(": true");
+        else
+                mUseOptimizationInfo->setCaption(": false");
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleShowOctree()
+{
+        mShowOctree = !mShowOctree;
+
+        mSceneMgr->setOption("ShowOctree", &mShowOctree);
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -63 +63 @@
         void changeThreshold(int incr);
         void changeStats();
+        void toggleUseOptimization();
+        void toggleShowOctree();
 
 protected:
@@ -80 +82 @@
     OverlayElement *mTraversedNodesInfo;
         OverlayElement *mHierarchyNodesInfo;
-        //OverlayElement *mSceneNodesInfo;
+        OverlayElement *mUseOptimizationInfo;
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mNumObjectsInfo;
@@ -89 +91 @@
         RayQueryExecutor *mRayQueryExecutor;
         TerrainContentGenerator *mTerrainContentGenerator;
+
+        bool mUseOptimization;
+        bool mShowOctree;
 };