Changeset 105 for trunk

Timestamp:

05/20/05 10:20:05 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• scripts/GtpVisibility.suo (modified) (previous)
• work/TestCullingTerrain/IoManager.cpp (modified) (1 diff)
• work/TestCullingTerrain/IoManager.h (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrain.vcproj (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (3 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.h (modified) (3 diffs)

trunk/VUT/work/TestCullingTerrain/IoManager.cpp

@@ -25 +25 @@
 }
 
-void IoManager::AddNode(SceneNode *node)
+void IoManager::AddNode(Ogre::SceneNode *node)
 {
         mPositions.push_back(node->getPosition());

trunk/VUT/work/TestCullingTerrain/IoManager.h

@@ -5 +5 @@
 #include <OgreMath.h>
 #include <Ogre.h>
+#include <OgreSceneNode.h>
 
 class IoManager
@@ -12 +13 @@
 
         void Write();
-        AddNode(SceneNode *node);
+        void AddNode(Ogre::SceneNode *node);
+
+        std::vector<Ogre::Vector3> mPositions;
+        std::vector<Ogre::Quaternion> mOrientations;
 
 protected:
         std::ofstream mFile;
-        std::vector<Ogre::Vector3> mPositions;
-        std::vector<Ogre::Quaternion> mOrientations;
 };
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj

@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
-                                RelativePath=".\IoManager.cpp">
-                        </File>
-                        <File
                                 RelativePath="..\TestCulling\SceneContentGenerator.cpp">
                         </File>
@@ -139 +136 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
-                                RelativePath=".\IoManager.h">
-                        </File>
-                        <File
                                 RelativePath="..\TestCulling\SceneContentGenerator.h">
                         </File>

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -242 +242 @@
 
         // Create the walking list
-        Vector3 queryResult;
-
+        /*Vector3 queryResult;
         mWalkList.push_back(Vector3(1550.0f, 5000.0f, 250.0f));
         mWalkList.push_back(Vector3(100.0f, 5000.0f, 750.0f));
@@ -250 +249 @@
         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();
 } 
@@ -334 +333 @@
 }
 //-----------------------------------------------------------------------
-bool MouseQueryListener::NextLocation()
-{
-        if (mWalkList.empty())
-        {
-                return false;
-        }
-
-        mDestination = mWalkList.front();  // this gets the front of the deque
-        mWalkList.pop_front();             // this removes the front of the deque
- 
-        mDirection = mDestination - mCamNode->getPosition();
-        mDistance = mDirection.normalise();
- 
-        // change facing
-        Vector3 src = mCamNode->getOrientation() * Vector3::UNIT_X;
-
-        if ((1.0f + src.dotProduct(mDirection)) < 0.0001f)
-        {
-                mCamNode->yaw(Degree(180));
-        }
-        else
-        {
-                Ogre::Quaternion quat = src.getRotationTo(mDirection);
-                mCamNode->rotate(quat);
-        }
-
-        return true;
-}
-//-----------------------------------------------------------------------
 bool MouseQueryListener::frameStarted(const FrameEvent &evt)
 {
-        if (mDirection != Vector3::ZERO)
-        {
-                Real move = mWalkSpeed * evt.timeSinceLastFrame;
-                mDistance -= move;
- 
-                // If we are very close, just jump to the point
-                if (mDistance <= 0.0f)
-                {
-                        mCamNode->setPosition(mDestination);
-                        mDirection = Vector3::ZERO;
-                } 
-                // Otherwise, move some some
-                else
-                {
-                        mCamNode->translate(mDirection * move);
-                }
-        } 
-
-        Clamp2Terrain();
+        switch (mState)
+        {
+        case STATE_RECORD:
+                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());
+        }
+        
 
         if (mShowVisualization)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -8 +8 @@
 #include "VisibilityEnvironment.h"
 #include <OgreRenderTargetListener.h>
-
+#include <vector.h>
 
 Real timeDelay = 0;
@@ -26 +26 @@
         "Coherent Hierarchical Culling"
 };
+typedef struct frame_info
+{
 
+}
+        Position
+typedef std::pair<Vector3 frame_pair
 class VisualizationRenderTargetListener: public RenderTargetListener
 {
@@ -136 +141 @@
         Vector3 mDirection;
 
-        std::deque<Vector3> mWalkList;   // The list of points we are walking to
+        //std::deque<Vector3> mWalkList;   // The list of points we are walking to
+        vector<
+        std::vector<Ogre::Vector3> mPositions;
+        std::vector<Ogre::Quaternion> mOrientations;
+
 };