Changeset 107 for trunk/VUT/work/TestCullingTerrain

Timestamp:

05/23/05 01:31:08 (19 years ago)

Author:

mattausch

Message:

added frame interpolation

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainContentGenerator.cpp (deleted)
• TerrainContentGenerator.h (deleted)
• TestCullingTerrain.vcproj (modified) (5 diffs)
• TestCullingTerrainApplication.cpp (modified) (13 diffs)
• TestCullingTerrainApplication.h (modified) (6 diffs)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj

@@ -21 +21 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\GtpVisibility\include;..\include;..\TestCulling"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\GtpVisibility\include;..\..\Ogre\include;..\include;..\TestCulling"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG;PLUGIN_TERRAIN_IMPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"
@@ -72 +72 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\ReferenceApplication\ReferenceAppLayer\include&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\GtpVisibility\include;..\include;..\TestCulling"
+                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\ReferenceApplication\ReferenceAppLayer\include&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\GtpVisibility\include;..\include;..\TestCulling"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
                                 RuntimeLibrary="2"
@@ -83 +83 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OGREMain.LIB Plugin_OctreeSceneManager.lib CEGUIBase.lib OgreGUIRenderer.lib"
+                                AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib"
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;"
+                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="2"
@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
-                                RelativePath="..\TestCulling\SceneContentGenerator.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\TerrainContentGenerator.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\TestCullingTerrainApplication.cpp">
                         </File>
@@ -136 +130 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
-                                RelativePath="..\TestCulling\SceneContentGenerator.h">
-                        </File>
-                        <File
-                                RelativePath=".\TerrainContentGenerator.h">
-                        </File>
-                        <File
                                 RelativePath=".\TestCullingTerrainApplication.h">
                         </File>

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -23 +23 @@
 #define VIZ_VIEWPORT_Z_ORDER 10
 
+const char* frame_outfile = "frame.out";
+const char* objects_outfile = "objects.out";
+
 /*******************************************************/
 /*     TestCullingTerrainApplication implementation    */
@@ -45 +48 @@
         *       because then the camera is displayed correctly in the visualization
         */
-        
         mCamNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(
                 "CamNode1", Vector3(707, 5000, 528));
@@ -126 +128 @@
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
-        mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 5000.0f, 3000.0f));
-
-        mTerrainContentGenerator->GenerateScene(1500, "robot.mesh");
-//      mTerrainContentGenerator->GenerateScene(500, "ninja.mesh");
+
+        // if no objects file generate yourself
+        if (!mTerrainContentGenerator->LoadObjects("objects.out"))
+        {
+                // the objects are generated on the whole terrain
+                // height is restricted to 50, so no objects appear on peaks 
+                // => there is much occlusion
+                mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 50.0f, 3000.0f));
+                mTerrainContentGenerator->GenerateScene(1500, "robot");
+                //      mTerrainContentGenerator->GenerateScene(500, "ninja");
+        }
 
         // no limitations needed anymore: the user can set 
         // objects also on peaks of terrain
-        mTerrainContentGenerator->SetMaxHeight(5000); 
+        mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 5000.0f, 3000.0f));
 }
 //-----------------------------------------------------------------------
@@ -192 +201 @@
 mCamNode(camNode),
 mCullCamera(false),
-mState(WALKTHROUGH),
-mCurrentFrame(1)
+mAppState(WALKTHROUGH),
+mCurrentFrame(0),
+mRecord(false),
+mTimeElapsed(0)
 {
         // Reduce move speed
@@ -270 +281 @@
                  // Get results, create a node/entity on the position
                  mCurrentObject = mTerrainContentGenerator->GenerateSceneObject(
-                         mouseRay.getOrigin(), mouseRay.getDirection(), "robot.mesh");
+                         mouseRay.getOrigin(), Vector3(0,0,0), "robot.mesh");
                 
          mLMouseDown = true; 
@@ -326 +337 @@
 bool MouseQueryListener::frameStarted(const FrameEvent &evt)
 {
-        switch (mState)
+        switch (mAppState)
         {
         case REPLAY:
-                SetCurrentCameraPath(mCamNode);
-                mCamNode->setPosition(mCameraPath[mCurrentFrame].position);
-                mCamNode->setOrientation(mCameraPath[mCurrentFrame].orientation);
-                (mCurrentFrame++) % mCameraPath.size();
+                setCurrentFrameInfo(evt.timeSinceLastFrame);
                 break;
         case WALKTHROUGH:
+                if (mRecord)
+                {
+                        addFrameInfo(mCamNode, evt.timeSinceLastFrame);
+                        // print recording message
+                        mWindow->setDebugText("Recording frame " + 
+                                StringConverter::toString(mFrameInfo.size() - 1));
+                }       
+        
                 Clamp2Terrain();
-
-        case RECORD:
-                AddCameraPath(mCamNode);
                 break;
         default:
                 break;
-        };
+        };      
         
         if (mShowVisualization)
@@ -358 +371 @@
                 mVizCamera->setPosition(camPos.x, mVizCameraHeight, camPos.z);
 
-                // Point down -Z axis
+                // point down -Z axis
                 mVizCamera->pitch(Radian(Degree(270.0)));
         
-                // Rotation arounnd X axis
+                // rotation arounnd X axis
                 mVizCamera->yaw(Math::ATan2(-mCamera->getDerivedDirection().x, 
                         -mCamera->getDerivedDirection().z));
                 
+                // move by a constant so view plane is on bottom of viewport
                 mVizCamera->moveRelative(Vector3(0, 800, 0));
         }
@@ -392 +406 @@
         timeDelay -= evt.timeSinceLastFrame;
 
-    KEY_PRESSED(KC_SPACE, 0.3, nextAlgorithm());
+        KEY_PRESSED(KC_SPACE, 0.3, nextAlgorithm());
 
         KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
@@ -399 +413 @@
         KEY_PRESSED(KC_1, 0.3, toggleShowViz());
         KEY_PRESSED(KC_2, 0.3, toggleRenderNodesForViz());
+        
         KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
         KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
+        
         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));
+
+        KEY_PRESSED(KC_F1, 0.3, nextAppState());
+        KEY_PRESSED(KC_F2, 0.3, toggleRecord());
+        KEY_PRESSED(KC_F3, 0.3, mTerrainContentGenerator->WriteObjects(objects_outfile));
+        //KEY_PRESSED(KC_F3, 0.3, writeFrames());
+        //KEY_PRESSED(KC_F4, 0.3, loadFrames());
+
         updateStats();
 
-        return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);
-}
+        //return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);
+        return ExampleFrameListener::frameEnded(evt);
+}
+//-----------------------------------------------------------------------
 void MouseQueryListener::moveCamera()
 {
@@ -417 +439 @@
 }
 //-----------------------------------------------------------------------
+void MouseQueryListener::writeFrames()
+{
+        std::ofstream ofstr(frame_outfile);
+        
+        std::vector<frame_info>::const_iterator it, it_end;
+
+        it_end = mFrameInfo.end();
+        for(it = mFrameInfo.begin(); it < it_end; ++it)
+        {
+                ofstr << StringConverter::toString((*it).position) << " " 
+                        << StringConverter::toString((*it).orientation) << " "
+                        << StringConverter::toString((*it).timeElapsed) << "\n";
+        }
+        ofstr.close();
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::loadFrames()
+{
+        std::ifstream ifstr(frame_outfile);
+        char line[256];
+        frame_info info;
+
+        // reset current values
+        mFrameInfo.clear();
+        mCurrentFrame = 0;
+        
+        while (!ifstr.eof()) 
+        {
+                ifstr.getline(line, 256);
+                sscanf(line, "%f %f %f %f %f %f %f %f", &info.position.x, &info.position.y, &info.position.z,
+                                &info.orientation.w, &info.orientation.x, &info.orientation.y, &info.orientation.z,
+                                &info.timeElapsed);
+                
+                mFrameInfo.push_back(info);
+                
+                /*
+                std::stringstream d;
+                d << StringConverter::toString(info.position) << " " << StringConverter::toString(info.orientation);
+                LogManager::getSingleton().logMessage(d.str());
+                */
+        }
+        ifstr.close();
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::setAppState(int state)
+{
+        mAppState = state;
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::nextAppState()
+{
+        mCurrentFrame = 0;
+
+        // if last state was replay state
+        if (mAppState == REPLAY)
+        {
+                // reset debug text and write frame info to file
+                mWindow->setDebugText("");
+                writeFrames();
+                
+                //-- write out stats
+                std::stringstream d;
+                d << "Algorithm: " << mCurrentAlgorithmCaptions[mCurrentAlgorithm] << "\n"
+                  << "avg. FPS: " << mWindow->getAverageFPS() << "\n"
+                  << "best FPS: " << mWindow->getBestFPS() << "\n"
+                  << "worst FPS: " << mWindow->getWorstFPS() << "\n"
+                  << "best frame time: " <<     mWindow->getBestFrameTime() << "\n"
+                  << "worst frame time: " << mWindow->getWorstFrameTime();
+                
+                LogManager::getSingleton().logMessage(d.str());
+        }
+        
+        //-- set the next státe
+        mAppState = (mAppState + 1) % STATE_NUM;
+
+        // replay recorded walkthrough
+        if (mAppState == REPLAY)
+        {
+                // no recording during replay
+                mRecord = false;
+
+                // load recorded walkthrough
+                if (mFrameInfo.size() == 0)
+                {
+                        loadFrames();
+                }
+
+                // if there are no recorded frames => set next state
+                if (mFrameInfo.size() == 0) 
+                {
+                        nextAppState();
+                }
+                else
+                {
+                        mWindow->setDebugText("Replay");
+                        
+                        // reset, because we measure fps stats during walkthrough
+                        mWindow->resetStatistics();
+
+                        //-- initialise frame data
+                        mTimeElapsed = 0;
+
+                        mCamNode->setPosition(mFrameInfo[0].position);
+                        mCamNode->setOrientation(mFrameInfo[0].orientation);
+                }
+        }
+
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleRecord()
+{
+        mRecord = !mRecord;
+
+        // clear previous camera path
+        if (mRecord)
+                mFrameInfo.clear();
+        else
+                mWindow->setDebugText("");
+}
+//-----------------------------------------------------------------------
 void MouseQueryListener::changeThreshold(int incr)
 {
@@ -452 +594 @@
 void MouseQueryListener::nextAlgorithm()
 {
-        mCurrentAlgorithm = ++mCurrentAlgorithm % 
+        mCurrentAlgorithm = (mCurrentAlgorithm + 1) % 
                 GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS,
 
@@ -586 +728 @@
 }
 //-----------------------------------------------------------------------
-void MouseQueryListener::AddCameraPath(SceneNode *camNode)
+void MouseQueryListener::addFrameInfo(SceneNode *camNode, Real timeElapsed)
 {
         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();
+        info.timeElapsed = timeElapsed;
+
+        mFrameInfo.push_back(info);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::setCurrentFrameInfo(Real timeElapsed)
+{
+        //-- find right frame relative to elapsed frame time            
+        mTimeElapsed -= timeElapsed;
+
+        while ((mTimeElapsed <= 0) && (mCurrentFrame < (int)mFrameInfo.size() - 1))
+        {
+                mTimeElapsed += mFrameInfo[mCurrentFrame ++].timeElapsed;
+                /*std::stringstream d;
+                d << StringConverter::toString(mTimeElapsed) << " " 
+                        << StringConverter::toString(timeElapsed)  << " " 
+                        << StringConverter::toString(mFrameInfo[mCurrentFrame - 1].timeElapsed) 
+                        << " " << mCurrentFrame;
+                LogManager::getSingleton().logMessage(d.str());*/
+        }
+
+        frame_info new_frame = mFrameInfo[mCurrentFrame];
+        frame_info old_frame = mFrameInfo[mCurrentFrame - 1];
+                
+        //-- interpolate frames
+        Real factor = 1;
+
+        if (old_frame.timeElapsed > 0)
+                factor = mTimeElapsed / old_frame.timeElapsed;
+
+        Vector3 camPos = old_frame.position + factor * (new_frame.position - old_frame.position);
+        Quaternion camOrienation = Quaternion::Slerp(factor, old_frame.orientation, 
+                new_frame.orientation, true);
+
+        mCamNode->setPosition(camPos);
+        mCamNode->setOrientation(camOrienation);
+        /*
+        std::stringstream d;
+        d << "old pos: " << StringConverter::toString(old_frame.position) << "\n"
+          << "interp pos: " << StringConverter::toString(camPos) << "\n"
+          << " new pos: " << StringConverter::toString(new_frame.position);
+        LogManager::getSingleton().logMessage(d.str());*/
+
+        // stop replay after a full walkthrough
+        if (mCurrentFrame == (int)mFrameInfo.size() - 1)
+        {
+                nextAppState();
+        }
 }
 
@@ -604 +786 @@
 /*      VisualizationRenderTargetListener implementation      */
 /**************************************************************/
-
+//-----------------------------------------------------------------------
 VisualizationRenderTargetListener::VisualizationRenderTargetListener(SceneManager *sceneMgr)
 :RenderTargetListener(), mSceneMgr(sceneMgr)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -5 +5 @@
 #include "CEGUIForwardRefs.h"
 #include "ExampleApplication.h"
-#include "TerrainContentGenerator.h"
+#include "OgreTerrainContentGenerator.h"
 #include "VisibilityEnvironment.h"
 #include <OgreRenderTargetListener.h>
@@ -32 +32 @@
         Vector3 position;
         Quaternion orientation;
+        Real timeElapsed;
 } frame_info;
 
@@ -84 +85 @@
         void keyClicked(KeyEvent* e);
 
+        enum  {WALKTHROUGH, REPLAY, STATE_NUM};
+
         void nextAlgorithm();
-        void setAlgorithm(int algorithm);
         void changeThreshold(int incr);
         void updateStats();
+
         void toggleUseOptimization();
         void toggleShowOctree();
@@ -93 +96 @@
         void toggleShowViz();
         void toggleRenderNodesForViz();
+        void toggleRecord();
+
         void zoomVizCamera(int zoom);
+        
+        void addFrameInfo(SceneNode *camNode, Real timeElapsed);
+        void setCurrentFrameInfo(Real timeElapsed);
+
+        void setAppState(int state);
+        void nextAppState();
+
+        void setAlgorithm(int algorithm);
+
         void moveCamera();
-        void AddCameraPath(SceneNode *camNode);
-        void SetCurrentCameraPath(SceneNode *camNode);
-
-        enum {WALKTHROUGH, REPLAY} State;
-
+        
+        void writeFrames();
+        void loadFrames();
 
 protected:
@@ -124 +136 @@
         OverlayElement *mQueriesIssuedInfo;
 
-        SceneNode *mCurrentObject;         // The newly created object
-        int mObjectCount;                 // The number of robots on the screen
+        SceneNode *mCurrentObject;    // the newly created object
+        int mObjectCount;             // The number of objects on the screen
 
         RayQueryExecutor *mRayQueryExecutor;
@@ -143 +155 @@
         
         //std::deque<Vector3> mWalkList;   // The list of points we are walking to
-        std::vector<frame_info> mCameraPath;
+        std::vector<frame_info> mFrameInfo;
                 
         int mCurrentFrame;
         // the current application state
-        int mState;
+        int mAppState;
+        bool mRecord;
+        Real mTimeElapsed;
 };