Changeset 2101 for GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

Timestamp:

02/08/07 11:42:53 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (11 diffs)

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

@@ -192 +192 @@
         }
 
-        val = config.getSetting("ViewCells");
+/*      val = config.getSetting("ViewCells");
 
         if (!val.empty())
@@ -218 +218 @@
                 mInitialPosition.z = atof( val.c_str());
 
-
-        val = config.getSetting("OnlineCullingAlgorithm");
+*/
+/*      val = config.getSetting("OnlineCullingAlgorithm");
 
         if (!val.empty())
@@ -248 +248 @@
         // setup scene
 
-        if (!LoadScene(mFilename))
-        {
-        LogManager::getSingleton().logMessage("error loading scene");
-        }
-        
         // set camera position accordingly
         mCamNode->setPosition(mInitialPosition);
+        */
 }
 //-----------------------------------------------------------------------
@@ -286 +282 @@
         *       because then the camera is displayed correctly in the visualization
         */
+        //Vector3 viewPoint(707, 5000, 528);
+        Vector3 viewPoint(830, 300, -540);
+        std::stringstream d; d << "here3: " << viewPoint;
+        Ogre::LogManager::getSingleton().logMessage(d.str());
         mCamNode = mSceneMgr->getRootSceneNode()->
-                createChildSceneNode("CamNode1", Vector3(707, 5000, 528));
+                createChildSceneNode("CamNode1", viewPoint);
         
         mCamNode->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
@@ -457 +457 @@
         loadConfig("terrainCulling.cfg");
         
+        if (!LoadScene(mFilename))
+                LogManager::getSingleton().logMessage("error loading scene");
+        
+        
         /////////////////////////////////////
 
@@ -481 +485 @@
         mSunLight->setSpecularColour(1, 1, 1);
 
-        // -- Fog
+        //-- Fog
+
         // NB it's VERY important to set this before calling setWorldGeometry 
         // because the vertex program picked will be different
@@ -492 +497 @@
         
         // terrain creation
-        if (msShowHillyTerrain)
-        {
-                std::string terrain_cfg("terrain.cfg");
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-                terrain_cfg = mResourcePath + terrain_cfg;
-#endif
+        if (1)//||msShowHillyTerrain)
+        {
+        mSceneMgr->getOption("ShowTerrain", &msShowHillyTerrain); 
+                std::string terrain_cfg("terrainCulling.cfg");
                 mSceneMgr->setWorldGeometry(terrain_cfg);
+
         }
         
@@ -555 +559 @@
 void  TestCullingTerrainApplication::generateScene(int num, int objectType)
 {
-        float val = TerrainFrameListener::msObjectScales[objectType];
+        const float val = TerrainFrameListener::msObjectScales[objectType];
         Vector3 scale(val, val, val); 
         const float maxHeight = 75;
@@ -564 +568 @@
         mTerrainContentGenerator->SetMaxPos(Vector3(mTerrainMaxPos.x, maxHeight, mTerrainMaxPos.z));
         
-        //std::stringstream d; d << "objscale: " << scale[0];
-        //Ogre::LogManager::getSingleton().logMessage(d.str());
-        
         mTerrainContentGenerator->SetScale(scale);
         mTerrainContentGenerator->SetOffset(TerrainFrameListener::msObjectTerrainOffsets[objectType]);
@@ -576 +577 @@
         EntityList *entList = mTerrainContentGenerator->GetGeneratedEntities();
 
+        /////////////
         //-- add animation state for new robots (located at the end of the list)
+        
         for (int i = (int)entList->size() - num; i < (int)entList->size(); ++i)
         {
@@ -800 +803 @@
 bool TestCullingTerrainApplication::LoadViewCells(const String &filename)
 {
-        LogManager::getSingleton().logMessage("loading view cells");
-
-        //-- the actual loading happens here
-        return mSceneMgr->setOption("LoadViewCells", filename.c_str());
+        // if not already loaded, 
+        // the scene manager will load the view cells
+        return mSceneMgr->setOption("UseViewCells", filename.c_str());
 }