Changeset 1816 for GTP/trunk/App

Timestamp:

11/28/06 12:50:34 (18 years ago)

Author:

mattausch

Message:

changed scenemanager: options are directly given to it

Location:

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

Files:

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

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

@@ -1868 +1868 @@
         initOverlayElement(&mThresholdInfo, ext, "Threshold", top, ": 0"); top += vert_space;
         initOverlayElement(&mTestGeometryForVisibleLeavesInfo, ext, 
-                "TestGeometryForVisibleLeaves", top, ": true"); top += vert_space;
+                                           "TestGeometryForVisibleLeaves", top, ": true"); top += vert_space;
         initOverlayElement(&mUseDepthPassInfo, ext, "UseDepthPass", top, ": false"); top += vert_space;
         initOverlayElement(&mAssumedVisibilityInfo, ext, "AssumedVisibility", top, ": 0"); top += vert_space;
@@ -1916 +1916 @@
         initOverlayElement(&mQueryPatchVisibilityInfo , ext, "PatchVisibility", top,    ": 0"); top += vert_space;
 
-
-        OverlayElement *queryPanel = OverlayManager::getSingleton().
-                getOverlayElement("Example/Visibility/Query/QueryPanel");
+        OverlayElement *queryPanel = 
+                OverlayManager::getSingleton().getOverlayElement("Example/Visibility/Query/QueryPanel");
 
         queryPanel->setHeight(top + border_height);

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

@@ -192 +192 @@
         }
 
-        
         val = config.getSetting("ViewCells");
 
@@ -246 +245 @@
         }
 
-        /////////////////////////
+        /////////////
         // setup scene
 
-        //-- load the scene from specified file
         if (!LoadScene(mFilename))
         {
@@ -380 +378 @@
                                                                                                 const int index)
 {
-
-
-
         mIVReader = new IVReader();
 
         Timer *timer = PlatformManager::getSingleton().createTimer();
         timer->reset();
+
         if (1)
         {
@@ -405 +401 @@
                 mIVReader->collapse();
                 OGRE_DELETE(mIVReader);
-
 
                 std::stringstream d; 
@@ -458 +453 @@
 void TestCullingTerrainApplication::createScene()
 {
+        /////////
         //-- load scene
         loadConfig("terrainCulling.cfg");
@@ -505 +501 @@
         }
         
-
-        setupGui(); //-- CEGUI setup
+        ////// 
+        //-- CEGUI setup
+        setupGui();
 
         // occluder plane to test visibility
@@ -529 +526 @@
         mSceneMgr->setShadowColour(ColourValue(0.5, 0.5, 0.5));
 
-        //////////////77
+        //////////////
         //-- terrain content setup
 
@@ -786 +783 @@
                 {
                         // load collada files
-                        // load iv files
                         LoadSceneCollada(fn, mSceneMgr->getRootSceneNode(), i);         
                 }

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

@@ -200 +200 @@
         StaticGeometry *mStaticGeometry;
     
-
 private:
+
         void chooseSceneManager(void);
 };