Changeset 104 for trunk

Timestamp:

05/19/05 17:30:36 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• Ogre/src/OgreVisibilitySceneManagerDll.cpp (modified) (1 diff)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)
• scripts/GtpVisibility.suo (modified) (previous)
• work/TestCulling/SceneContentGenerator.cpp (modified) (1 diff)
• work/TestCullingTerrain/IoManager.cpp (added)
• work/TestCullingTerrain/IoManager.h (added)
• work/TestCullingTerrain/TerrainContentGenerator.cpp (modified) (1 diff)
• work/TestCullingTerrain/TerrainContentGenerator.h (modified) (1 diff)
• work/TestCullingTerrain/TestCullingTerrain.vcproj (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (8 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.h (modified) (2 diffs)
• work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h (modified) (2 diffs)

trunk/VUT/Ogre/src/OgreVisibilitySceneManagerDll.cpp

@@ -39 +39 @@
 namespace Ogre {
 
-// VisibilityDotSceneManager *occlusionDotPlugin;
+// VisibilityDotSceneManager *cullingDotPlugin;
 VisibilityOctreeSceneManager *cullingOctreePlugin;
 VisibilityTerrainSceneManager *cullingTerrainPlugin;

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -93 +93 @@
         {       
                 TerrainSceneManager::_renderVisibleObjects();
+        
                 return;
         } 

trunk/VUT/work/TestCulling/SceneContentGenerator.cpp

@@ -73 +73 @@
         currentObject->roll(Degree(rotation.z));
 
-        /*
-        char msg[100];
-        sprintf(msg, "pos: %3.3f %3.3f %3.3f\n", position.x, position.y, position.z);
-        OutputDebugString(msg);
-        */
-
         return currentObject;
 }

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.cpp

@@ -82 +82 @@
 }
 //-----------------------------------------------------------------------
+RayQueryExecutor *TerrainContentGenerator::GetRayQueryExecutor()
+{
+        return mRayQueryExecutor;
+}
+//-----------------------------------------------------------------------
 void TerrainContentGenerator::SetMaxHeight(Real maxHeight)
 {

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.h

@@ -35 +35 @@
         void SetMaxHeight(Real maxHeight);
         
+        RayQueryExecutor *GetRayQueryExecutor();
+
 protected:
         RayQueryExecutor *mRayQueryExecutor;

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>
@@ -136 +139 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
+                                RelativePath=".\IoManager.h">
+                        </File>
+                        <File
                                 RelativePath="..\TestCulling\SceneContentGenerator.h">
                         </File>

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -68 +68 @@
         else
         {
-                 mVizCamera->setFarClipDistance(1000);
-                 mCamera->setFarClipDistance(1000);
+                 mVizCamera->setFarClipDistance(20000);
+                 mCamera->setFarClipDistance(20000);
         }       
 }
@@ -191 +191 @@
 mVizCameraHeight(Real(2500.0)),
 mCamNode(camNode),
-mCullCamera(false)
+mCullCamera(false),
+mDirection(Vector3::ZERO),
+mDistance(0)
 {
         // Reduce move speed
@@ -238 +240 @@
         mSceneMgr->setOption("ShowVisualization", &mShowVisualization);
         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();
@@ -322 +334 @@
 }
 //-----------------------------------------------------------------------
+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)
 {
-        clamp2Terrain();
+        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();
 
         if (mShowVisualization)
@@ -346 +405 @@
                 mVizCamera->yaw(Math::ATan2(-mCamera->getDerivedDirection().x, 
                         -mCamera->getDerivedDirection().z));
+                
+                mVizCamera->moveRelative(Vector3(0, 800, 0));
         }
 
@@ -351 +412 @@
 }
 //-----------------------------------------------------------------------
-void MouseQueryListener::clamp2Terrain()
+void MouseQueryListener::Clamp2Terrain()
 {
         // clamp to terrain
@@ -379 +440 @@
         KEY_PRESSED(KC_1, 0.3, toggleShowViz());
         KEY_PRESSED(KC_2, 0.3, toggleRenderNodesForViz());
-
-        if (!mShowVisualization)
-        {
-                KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
-                KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
-        }
-        else
-        {
-                KEY_PRESSED(KC_SUBTRACT, 0, zoomVizCamera(50));
-                KEY_PRESSED(KC_ADD, 0, zoomVizCamera(-50));
-        }
-
+        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));
+        
         updateStats();
 
@@ -521 +575 @@
                 //vizvp->setClearEveryFrame(false);
 
-                // Create a skyplane (for visualization)
-                /*Plane plane;
-                plane.d = 1000;
+                // Create a skyplane (for visualization background)
+                /*
+                Plane plane;
+                plane.d = -1000;
                 plane.normal = Vector3::UNIT_Y;
-                mSceneMgr->setSkyPlane( true, plane, "Examples/Rockwall", 4000, 75, false);
+                mSceneMgr->setSkyPlane(true, plane, "Examples/TransparentTest", 4000, 75, false);
                 */
+                
         }
         else

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -88 +88 @@
         void moveCamera();
 
+
 protected:
-        void clamp2Terrain();
+        void Clamp2Terrain();
+
+        bool NextLocation();
 
     bool mLMouseDown, mRMouseDown;     // True if the mouse buttons are down
@@ -128 +131 @@
         Camera *mVizCamera;
         SceneNode *mCamNode;
+        Real mWalkSpeed;
+        Real mDistance;
+        Vector3 mDestination;
+        Vector3 mDirection;
 
+        std::deque<Vector3> mWalkList;   // The list of points we are walking to
 };
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h

@@ -156 +156 @@
     Octree * mParent;
 
-#ifdef OGRE_COHERENT_OCCLUSION_CULLING
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         public:
                 /** Returns last visited frame id. */
@@ -194 +194 @@
                 int mDepth;
 
-#endif //OGRE_COHERENT_OCCLUSION_CULLING
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 };