Changeset 1607

Timestamp:

10/10/06 20:28:52 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Files:

• TerrainFrameListener.cpp (modified) (7 diffs)
• TerrainFrameListener.h (modified) (2 diffs)
• TestCullingTerrainApplication.cpp (modified) (2 diffs)
• TestCullingTerrainApplication.h (modified) (1 diff)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -90 +90 @@
 //-----------------------------------------------------------------------
 TerrainFrameListener::TerrainFrameListener(RenderWindow* win, Camera* cam, 
-                                                                           SceneManager *sceneManager, 
-                                                                           CEGUI::Renderer *renderer,
-                                                                           TerrainContentGenerator *sceneGenerator,
-                                                                           Camera *vizCamera,
-                                                                           SceneNode *camNode,
-                                                                           Light *sunLight,
-                                                                           TestCullingTerrainApplication *app): 
+                                                                                   SceneManager *sceneManager, 
+                                                                                   CEGUI::Renderer *renderer,
+                                                                                   TerrainContentGenerator *sceneGenerator,
+                                                                                   Camera *vizCamera,
+                                                                                   SceneNode *camNode,
+                                                                                   Light *sunLight,
+                                                                                   TestCullingTerrainApplication *app): 
 mCamera(cam),
 mWindow(win),
@@ -161 +161 @@
 mUseViewCells(false),
 mViewCellsLoaded(false),
-mUseVisibilityFilter(false)
+mUseVisibilityFilter(false),
+mFloorDist(2)
 {
         //mInputDevice = PlatformManager::getSingleton().createInputReader();
@@ -398 +399 @@
         }
 
-        if (mUseAnimation) // update animations
-        {
+        if (mUseAnimation) 
+        {
+                // update animation phases
                 mApplication->updateAnimations(evt.timeSinceLastFrame);
         }
@@ -482 +484 @@
         }
 
+        //////////////
         //-- set application state
+
         switch (mAppState)
         {
@@ -516 +520 @@
                 else
                 {
-                        mApplication->Clamp2FloorPlane();
+                        mApplication->Clamp2FloorPlane(mFloorDist);
                 }
 
@@ -967 +971 @@
         mSceneMgr->setOption("NodeVizScale", &mVizScale);
 }
-
+//-----------------------------------------------------------------------
+void TerrainFrameListener::changeFloorDist(const float incr)
+{
+        mFloorDist += incr; 
+
+        if (mFloorDist < 2) 
+        {       
+                mFloorDist = 2;
+        }
+}
 //-----------------------------------------------------------------------
 void TerrainFrameListener::zoomVizCamera(int zoom)
@@ -1629 +1642 @@
                 changeVizScale(1);
         }
+        
+        if (mInputDevice->isKeyDown(KC_7))
+        {
+                changeFloorDist(-1);
+        }
+        
+        if (mInputDevice->isKeyDown(KC_8))
+        {
+                changeFloorDist(1);
+        }
+
 
         // show the results

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h

@@ -231 +231 @@
         */
         void toggleRecord();
+
+        void changeFloorDist(const float incr);
 
         /** Applies visibility query. Collects the visible objects 
@@ -443 +445 @@
         bool mViewCellsLoaded;
         bool mUseVisibilityFilter;
+
+        float mFloorDist;
 };
 

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

@@ -693 +693 @@
 
 //-----------------------------------------------------------------------
-bool TestCullingTerrainApplication::Clamp2FloorPlane()
+bool TestCullingTerrainApplication::Clamp2FloorPlane(const float dist)
 {
     // clamp to floor plane
@@ -702 +702 @@
     
         RaySceneQueryResult::iterator rit = qryResult.begin();
- 
+        bool success = false;
+float yVal = 0;
+float minVal = 999999999999;
+
         while (rit != qryResult.end() && rit->movable)
         {
                 if (rit->movable->getName() != "PlayerCam")
                 {
+                        // place on the ground object
+                        yVal = rit->movable->getWorldBoundingBox().getCenter().y;
+                                if (yVal < minVal)
+                                        minVal = yVal;
+
+                        //std::stringstream d; d << "dist: " << dist << endl;
+                        //Ogre::LogManager()
+                        success = true;
+                }
+
+                ++ rit;
+        }
+    
+        // place on the ground object
+        if (success)
                         mCamNode->setPosition(
                                 mCamNode->getPosition().x,
-                                rit->movable->getWorldBoundingBox().getCenter().y + 2, 
+                                minVal + dist, 
                                 mCamNode->getPosition().z);
-        
-                        return true;
-                }
-
-                ++ rit;
-        }
-    
+
         OGRE_DELETE(raySceneQuery);
-        return false;
+        return success;
 }
 

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.h

@@ -121 +121 @@
         bool Clamp2Terrain(SceneNode *node, int terrainOffs);
 
-        /** Clamps camera to floor plane: used for vienna set.
-        */
-        bool Clamp2FloorPlane();
+        /** Clamps camera to floor plane: used e.g., for vienna set.
+        */
+        bool Clamp2FloorPlane(const float dist);
 
         /** Loads iv geometry.