Changeset 106 for trunk/VUT

Timestamp:

05/20/05 20:28:30 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• scripts/GtpVisibility.suo (modified) (previous)
• work/TestCulling/SceneContentGenerator.cpp (modified) (4 diffs)
• work/TestCulling/SceneContentGenerator.h (modified) (1 diff)
• work/TestCullingTerrain/IoManager.cpp (deleted)
• work/TestCullingTerrain/IoManager.h (deleted)
• work/TestCullingTerrain/TerrainContentGenerator.cpp (modified) (1 diff)
• work/TestCullingTerrain/TerrainContentGenerator.h (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (5 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.h (modified) (7 diffs)

trunk/VUT/work/TestCulling/SceneContentGenerator.cpp

@@ -15 +15 @@
 //-----------------------------------------------------------------------
 SceneContentGenerator::SceneContentGenerator(SceneManager *sm):
-mSceneMgr(sm), mCount(0),
+mSceneMgr(sm), mObjectCount(0),
 mMinPos(Vector3(-70.0f, -70.0f, 0.0f)),
 mMaxPos(Vector3(70.0f, 70.0f, 600.0f)), 
@@ -32 +32 @@
         Vector3 translationRatio;
 
-        int currentCount = mCount;
+        int currentCount = mObjectCount;
         int limit = 0;
 
         //-- create random values between zero and one
-        while ((mCount - currentCount < numObjects) && (limit < 50000))
+        while ((mObjectCount - currentCount < numObjects) && (limit < 50000))
         {
                 rotationRatio.x = rand() / (float) RAND_MAX;
@@ -59 +59 @@
 {
         char name[25];
-        sprintf(name, "Entity%d", mCount++);
+        sprintf(name, "Entity%d", mObjectCount++);
                 
         Entity *ent = mSceneMgr->createEntity(name, objName);
@@ -98 +98 @@
 int SceneContentGenerator::GetObjectCount()
 {
-        return mCount;
+        return mObjectCount;
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCulling/SceneContentGenerator.h

@@ -46 +46 @@
 
         SceneManager *mSceneMgr;
-        int mCount;             // The number of objects on the screen
+        int mObjectCount;               // The number of objects on the screen
 };
 

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.cpp

@@ -69 +69 @@
 {
         Vector3 queryResult;
-        
+        Vector3 pos(position.x, 5000, position.z);
         if (mRayQueryExecutor->executeRayQuery(&queryResult, position, Vector3::NEGATIVE_UNIT_Y))
         {

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.h

@@ -22 +22 @@
 };
 
-/** Class which fills a terrain with content in a random fashion 
+/** 
+        Class which randomly fills a terrain with objects.
 */
 class TerrainContentGenerator: public SceneContentGenerator
@@ -30 +31 @@
         ~TerrainContentGenerator();
 
+        /** 
+                Generates objects and places it on the terrain
+        */
         SceneNode *GenerateSceneObject(const Vector3 &position, 
                 const Vector3 &rotation, const String &objName);
-
+        
+        /** maximum height where objects can be put into the terrain */
         void SetMaxHeight(Real maxHeight);
         

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -192 +192 @@
 mCamNode(camNode),
 mCullCamera(false),
-mDirection(Vector3::ZERO),
-mDistance(0)
+mState(WALKTHROUGH),
+mCurrentFrame(1)
 {
         // Reduce move speed
@@ -241 +241 @@
         mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
 
-        // Create the walking list
-        /*Vector3 queryResult;
-        mWalkList.push_back(Vector3(1550.0f, 5000.0f, 250.0f));
-        mWalkList.push_back(Vector3(100.0f, 5000.0f, 750.0f));
-
-        mTerrainContentGenerator->GenerateSceneObject(mCamera->getPosition(), Vector3::ZERO, "knot.mesh");
-        mTerrainContentGenerator->GenerateSceneObject(Vector3(1550.0f, 5000.0f, 250.0f), Vector3::ZERO, "knot.mesh");
-        mTerrainContentGenerator->GenerateSceneObject(Vector3(100.0f, 5000.0f, 750.0f), Vector3::ZERO, "knot.mesh");
-*/
         pOver->show();
 } 
@@ -337 +328 @@
         switch (mState)
         {
-        case STATE_RECORD:
+        case REPLAY:
+                SetCurrentCameraPath(mCamNode);
+                mCamNode->setPosition(mCameraPath[mCurrentFrame].position);
+                mCamNode->setOrientation(mCameraPath[mCurrentFrame].orientation);
+                (mCurrentFrame++) % mCameraPath.size();
+                break;
+        case WALKTHROUGH:
                 Clamp2Terrain();
-        case STATE_REPLAY:
-                
-                mCamera->setPosition(mPosition[mCurrentFrame]);
-                mCamera->setOrientation(
-        case STATE_:
-        
-
-        // save for walkthrough
-        if(mState == STATE_RECORD)
-        {
-                mPositions.push_back(mCamera->GetPosition());
-                mOrientations.push_back(mCamera->GetOrientation());
-        }
-        
-
+
+        case RECORD:
+                AddCameraPath(mCamNode);
+                break;
+        default:
+                break;
+        };
+        
         if (mShowVisualization)
         {
@@ -413 +403 @@
         KEY_PRESSED(KC_3, 0, zoomVizCamera(50));
         KEY_PRESSED(KC_4, 0, zoomVizCamera(-50));
-        
+        KEY_PRESSED(KC_F1, 0, setState(RECORD));
+        KEY_PRESSED(KC_F2, 0, setState(REPLAY));
+        KEY_PRESSED(KC_F3, 0, setState(WALKTHROUGH));
         updateStats();
 
@@ -593 +585 @@
         e->consume();
 }
+//-----------------------------------------------------------------------
+void MouseQueryListener::AddCameraPath(SceneNode *camNode)
+{
+        frame_info info;
+        info.orientation = mCamNode->getOrientation();
+        info.position = mCamNode->getPosition();
+        mCameraPath.push_back(info);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::SetCurrentCameraPath(SceneNode *camNode)
+{
+        mCamNode->setPosition(mCameraPath[mCurrentFrame].position);
+        mCamNode->setOrientation(mCameraPath[mCurrentFrame].orientation);
+        (mCurrentFrame++) % mCameraPath.size();
+}
+
 /**************************************************************/
 /*      VisualizationRenderTargetListener implementation      */
 /**************************************************************/
+
 VisualizationRenderTargetListener::VisualizationRenderTargetListener(SceneManager *sceneMgr)
 :RenderTargetListener(), mSceneMgr(sceneMgr)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -8 +8 @@
 #include "VisibilityEnvironment.h"
 #include <OgreRenderTargetListener.h>
-#include <vector.h>
+#include <vector>
 
 Real timeDelay = 0;
@@ -26 +26 @@
         "Coherent Hierarchical Culling"
 };
-typedef struct frame_info
+
+/** The information about camera position and orienation per frame */
+typedef struct
 {
+        Vector3 position;
+        Quaternion orientation;
+} frame_info;
 
-}
-        Position
-typedef std::pair<Vector3 frame_pair
+
 class VisualizationRenderTargetListener: public RenderTargetListener
 {
@@ -47 +50 @@
 {
 public:
-
+        
     MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, 
                 CEGUI::Renderer *renderer, TerrainContentGenerator *contentGenerator, Camera *vizCamera,
@@ -92 +95 @@
         void zoomVizCamera(int zoom);
         void moveCamera();
+        void AddCameraPath(SceneNode *camNode);
+        void SetCurrentCameraPath(SceneNode *camNode);
+
+        enum {WALKTHROUGH, REPLAY} State;
 
 
 protected:
         void Clamp2Terrain();
-
-        bool NextLocation();
-
+        
     bool mLMouseDown, mRMouseDown;     // True if the mouse buttons are down
     SceneManager *mSceneMgr;           // A pointer to the scene manager
@@ -107 +112 @@
         int mCurrentAlgorithm;
         int mVisibilityThreshold;
-
+        
         OverlayElement *mAlgorithmInfo;
         OverlayElement *mThresholdInfo;
@@ -120 +125 @@
 
         SceneNode *mCurrentObject;         // The newly created object
-        int mCount;                        // The number of robots on the screen
+        int mObjectCount;                 // The number of robots on the screen
 
         RayQueryExecutor *mRayQueryExecutor;
@@ -136 +141 @@
         Camera *mVizCamera;
         SceneNode *mCamNode;
-        Real mWalkSpeed;
-        Real mDistance;
-        Vector3 mDestination;
-        Vector3 mDirection;
-
+        
         //std::deque<Vector3> mWalkList;   // The list of points we are walking to
-        vector<
-        std::vector<Ogre::Vector3> mPositions;
-        std::vector<Ogre::Quaternion> mOrientations;
-
+        std::vector<frame_info> mCameraPath;
+                
+        int mCurrentFrame;
+        // the current application state
+        int mState;
 };