Changeset 932

Timestamp:

05/08/06 18:58:16 (18 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• TerrainFrameListener.cpp (modified) (3 diffs)
• TestCullingTerrainApplication.cpp (modified) (4 diffs)
• TestCullingTerrainApplication.h (modified) (1 diff)

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

@@ -191 +191 @@
 
         //-- overlays
-        mMyStatsOverlay = OverlayManager::getSingleton().getByName("Example/Visibility/MyStatsOverlay");
-        mMyStatsAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/MyAlgorithmInfo");
-        mMyStatsAlgorithmInfo->setCaption("hehaah2");
-
-        char str[100]; sprintf(str,": %d", 0);
-        mMyStatsFpsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/MyFpsInfo");
-        mMyStatsFpsInfo->setCaption(str);
-        
-        //mMyStatsAlgorithmInfo->setTop(top);
-        
+   
         initVisStatsOverlay(); // visibility stats overlay
         initHelpOverlay();     // help overlay
@@ -207 +198 @@
         // show stats overlays
         if (!DEMO_HACK)
+        {
                 showStats(true);
+        }
         else
+        {
+                mMyStatsOverlay = OverlayManager::getSingleton().getByName("Example/Visibility/MyStatsOverlay");
+                mMyStatsAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/MyAlgorithmInfo");
+                mMyStatsAlgorithmInfo->setCaption("");
+        
+                const int top = 10;
+                mMyStatsAlgorithmInfo->setTop(top);
+
+                char str[100]; sprintf(str,": %d", 0);
+                mMyStatsFpsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/MyFpsInfo");
+                mMyStatsFpsInfo->setCaption(str);
+
                 mMyStatsOverlay->show();
-
+        }
 
         // note: larger magnification for terrain to show single objects
@@ -522 +527 @@
 
         // no visibility manager available => no visibility scene manager, return
-        GtpVisibility::VisibilityManager *visManager;
+        GtpVisibility::VisibilityManager *visManager = NULL;
         
         if (!mSceneMgr->getOption("VisibilityManager", visManager))
                 return;
 
-        GtpVisibility::HierarchyInterface *hierarchyInterface;
+        GtpVisibility::HierarchyInterface *hierarchyInterface = NULL;
         if (!mSceneMgr->getOption("HierarchyInterface", hierarchyInterface))
                 return;

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

@@ -153 +153 @@
 
 
-/*********************************************************/
-/*      TestCullingTerrainApplication implementation     */
-/*********************************************************/
+/**************************************************************/
+/*        TestCullingTerrainApplication implementation        */
+/**************************************************************/
 
 
@@ -193 +193 @@
                  mViewCellsFilename = val.c_str();
         }*/
+
+        Vector3 v = Vector3::UNIT_SCALE;
+
+        val = config.getSetting("ViewX");
+
+        if (!val.empty())
+                v.x = atof( val.c_str() );
+
+        val = config.getSetting("ViewY");
+        
+        if (!val.empty())
+                v.y = atof(val.c_str());
+
+        val = config.getSetting("ViewZ");
+        
+        if (!val.empty())
+                v.z = atof( val.c_str());
+
+        // set camera position accordingly
+        mCamNode->setPosition(v);
 }
 //-----------------------------------------------------------------------
@@ -274 +294 @@
         if (1)
         {
-                std::string logFilename = "IVLog" + index;
-                logFilename += ".log";
-
+                std::string logFilename = "IVLog" + Ogre::StringConverter().toString(index) + ".log";
+                
                 Log *log = LogManager::getSingleton().createLog(logFilename);
                 mIVReader->setLog(log);
@@ -661 +680 @@
                 {
                         // hack: set postion manually for vienna
-                        mCamNode->setPosition(Vector3(830, 300, -540));
-                        mCamNode->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
+                        //mCamNode->setPosition(Vector3(830, 300, -540));
+                        //mCamNode->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
 
                         // load iv files

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

@@ -135 +135 @@
         */
         void loadConfig(const String& filename);
-        // if hilly terrain should be loaded
+        
+        /// if hilly terrain should be loaded
         static bool msShowHillyTerrain;