Changeset 1604 for GTP/trunk/App/Demos

Timestamp:

10/10/06 16:43:07 (18 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -115 +115 @@
 mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
 mNodeVizMode(NODEVIZ_NONE),
-mVizCameraHeight(Real(4000.0)),
+mVizCameraHeight(Real(2000.0)),
 mCamNode(camNode),
 mAppState(WALKTHROUGH),
@@ -128 +128 @@
 mRMouseDown(false),
 mShowOctree(false),
+mShowViewCells(false),
 mUseDepthPass(false),
 mTestGeometryForVisibleLeaves(false),
@@ -243 +244 @@
         
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
+        mSceneMgr->setOption("ShowViewCells", &mShowViewCells);
         mSceneMgr->setOption("CullCamera", &mCullCamera);
         mSceneMgr->setOption("PrepareVisualization", &mShowVisualization);
@@ -444 +446 @@
         }
 
-        //-- set parameters for visualization
         if (mShowVisualization)
         {
+                ////////////////
+                //-- set parameters for visualization
+
                 // important for visualization => draw octree bounding boxes
-                //mSceneMgr->setOption("ShowOctree", &mShowVisualization);
+                if (0)
+                        mSceneMgr->setOption("ShowOctree", &mShowVisualization);
                 
                 ///////////////
@@ -466 +471 @@
                         -mCamera->getDerivedDirection().z));
                 
+                const float moveFactor = 200;
                 // move by a constant so view plane is on bottom of viewport
-                mVizCamera->moveRelative(Vector3(0, 800, 0));
+                mVizCamera->moveRelative(Vector3(0, moveFactor, 0));
         }
         else
@@ -1185 +1191 @@
         mShowOctree = !mShowOctree;
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
+}
+//-----------------------------------------------------------------------
+void TerrainFrameListener::toggleShowViewCells()
+{
+        mShowViewCells = !mShowViewCells;
+        mSceneMgr->setOption("ShowViewCells", &mShowViewCells);
 }
 //-----------------------------------------------------------------------
@@ -1363 +1375 @@
 
         case KC_C:
-
                 if (mItemBufferMode != GtpVisibility::QueryManager::GEOMETRY_VISIBILITY)
+                {
                         mItemBufferMode = GtpVisibility::QueryManager::GEOMETRY_VISIBILITY;
+                }
                 else
+                {
                         mItemBufferMode = GtpVisibility::QueryManager::PATCH_VISIBILITY;
-
+                }
                 break;
 
@@ -1378 +1392 @@
                 break;
 
+        ///////////////
         //-- visualization
         case KC_1:
@@ -1396 +1411 @@
                 toggleRecord();
                 break;
-#if USE_PERFHUD
+//#if USE_PERFHUD
         case KC_F1:
                 toggleShowHelp();
@@ -1413 +1428 @@
                 applyObjectType();
                 break;
-        #endif
+//#endif
+
         case KC_F8:
-                mApplication->generateScene(500, mCurrentObjectType);
+                {       // generate new objects
+                        const int objNum = 500;
+                        mApplication->generateScene(objNum, mCurrentObjectType);
+                }
                 break;
         case KC_F9:
@@ -1432 +1451 @@
         case KC_8:
                 changeAssumedVisibility(-5);
-        //      changeAssumedVisibility(-500);
+                // changeAssumedVisibility(-500);
                 break;
         case KC_9:
-        //      changeAssumedVisibility(500);
                 changeAssumedVisibility(5);
+                // changeAssumedVisibility(500);
                 break;
         case KC_LSHIFT:
@@ -1455 +1474 @@
         case KC_V:
                 toggleUseViewCells();
+                break;
+        case KC_L:
+                toggleShowViewCells();
                 break;
         case KC_Q:

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

@@ -210 +210 @@
         void changeVizScale(const int incr);
         void setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves);
-        /** Shows octree hierarchy of the scene.
+        /** Shows visualization of octree hierarchy nodes.
         */
         void toggleShowOctree();
+        /** Shows visualization of the view cells.
+        */
+        void toggleShowViewCells();
         /** Toggles between view cells / no view cells.
         */
@@ -353 +356 @@
         bool mTestGeometryForVisibleLeaves;
         bool mShowOctree;
+        bool mShowViewCells;
         bool mUseDepthPass;
         bool mShowVisualization;

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

@@ -239 +239 @@
                                  GtpVisibility::VisibilityEnvironment::FRUSTUM_CULLING;
                  }
+                 else // default rendering
+                 {
+                         mAlgorithm = 
+                                 GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS;
+                 }
         }
 
@@ -289 +294 @@
         mCamNode->attachObject(mCamera);
         
+        ///////////////////
         //-- create visualization camera
+
         mVizCamera = mSceneMgr->createCamera("VizCam");
         mVizCamera->setPosition(mCamNode->getPosition());
@@ -700 +707 @@
                 if (rit->movable->getName() != "PlayerCam")
                 {
-                        mCamNode->setPosition(mCamNode->getPosition().x,
+                        mCamNode->setPosition(
+                                mCamNode->getPosition().x,
                                 rit->movable->getWorldBoundingBox().getCenter().y + 2, 
                                 mCamNode->getPosition().z);
         
-                        /*
-                        std::stringstream d;
-                        d << "World: " << it->movable->getWorldBoundingBox().getCenter().y <<
-                        ", Object: " << it->movable->getBoundingBox().getCenter().y <<
-                        ", Camera: " << mCamera->getDerivedPosition();
-
-                        LogManager::getSingleton().logMessage(d.str());*/
-
                         return true;
                 }

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

@@ -29 +29 @@
 {
 public:
+        
         VisualizationRenderTargetListener(SceneManager *sceneMgr);