Changeset 74 for trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

Timestamp:

05/01/05 23:29:27 (19 years ago)

Author:

mattausch

Message:

added support for release mode

File:

• trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (14 diffs)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -3 +3 @@
         TestCullingTerrainApplication.cpp
     \brief
-        Tests the occlusion culling algorithm
+        Tests the visibility culling algorithm
 */
 
@@ -44 +44 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingTerrainApplication::generateSceneObject(const Vector3 &translationRatio, 
-                                         const Vector3 &rotationRatio, const int idx, const String& entName)
-{
-        // Setup the ray scene query
-        /*Vector3 rotation = mMinAngle + rotationRatio * (mMaxAngle - mMinAngle);
-        Vector3 translation = mMinTranslation + translationRatio * (mMaxTranslation - mMinTranslation);
-
-        translation.y = 5000;
-    Ray ray(translation, Vector3::NEGATIVE_UNIT_Y);
-    mRaySceneQuery->setRay(ray);
-
-    // Execute query
-        RaySceneQueryResult &result = mRaySceneQuery->execute();
-        RaySceneQueryResult::iterator itr = result.begin( );
-
-        // Get results, create a node/entity on the position
-        if ( itr != result.end() && itr->worldFragment )
-        {
-                char name[16];
-                sprintf( name, "%s%d", entName.c_str(), mCount++ );
-
-                Entity *ent = mSceneMgr->createEntity( name, entName );
-                SceneNode currentObject = mSceneMgr->getRootSceneNode( )->createChildSceneNode( String(name) + "Node", itr->worldFragment->singleIntersection );
-                currentObject->attachObject( ent );
-                currentObject->setScale( 0.1f, 0.1f, 0.1f );
-        }*/
-}
-
-//-----------------------------------------------------------------------
 void TestCullingTerrainApplication::createScene( void )
 {
         mRayQueryExecutor = new RayQueryExecutor(mSceneMgr);
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr, mRayQueryExecutor);
+
         // Set ambient light
         mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
@@ -111 +83 @@
         terrain_cfg = mResourcePath + terrain_cfg;
 #endif
-        mSceneMgr -> setWorldGeometry( terrain_cfg );
+        mSceneMgr->setWorldGeometry(terrain_cfg);
         // Infinite far plane?
         if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_INFINITE_FAR_PLANE))
@@ -124 +96 @@
         // CEGUI setup
         setupGui();
+
+        mTerrainContentGenerator->generateScene(100);
 }
 //-----------------------------------------------------------------------
@@ -149 +123 @@
 void TestCullingTerrainApplication::chooseSceneManager(void)
 {
-    //mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
         mSceneMgr = mRoot->getSceneManager(ST_EXTERIOR_CLOSE);
 }
@@ -171 +144 @@
         mRotateSpeed *= 2;
 
-        mCurrentAlgorithm = 0;//VisibilitySceneTraverser::RENDER_COHERENT;
+        mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING,
         mThreshold = 0;
     
@@ -179 +152 @@
         mEventProcessor->addKeyListener(this);
 
-        mRaySceneQuery = mSceneMgr->createRayQuery(Ray());
+        mRayQueryExecutor = new RayQueryExecutor(mSceneMgr);
 
         // show overlay
         Overlay* pOver = OverlayManager::getSingleton().getByName("Example/VisibilityDemoOverlay"); 
 
-        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/AlgorithmInfo");
-        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/ThresholdInfo");
-        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/FrustumCulledNodesInfo");
-        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/QueryCulledNodesInfo");
-    mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/TraversedNodesInfo");
-        mSceneNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/SceneNodesInfo");
-        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/HierarchyNodesInfo");
-        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/RenderedNodesInfo");
+        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/AlgorithmInfo");
+        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ThresholdInfo");
+        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/FrustumCulledNodesInfo");
+        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueryCulledNodesInfo");
+    mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/TraversedNodesInfo");
+        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo");
+        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo");
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -198 +170 @@
         mQueryCulledNodesInfo->setCaption(": 0");
         mTraversedNodesInfo->setCaption(": 0");
-        mSceneNodesInfo->setCaption(": 0");
         mHierarchyNodesInfo->setCaption(": 0");
         mRenderedNodesInfo->setCaption(": 0");
@@ -207 +178 @@
 MouseQueryListener::~MouseQueryListener( )
 {
-        delete mRaySceneQuery;
+        delete mRayQueryExecutor;
 }
 //-----------------------------------------------------------------------
@@ -225 +196 @@
                  // Setup the ray scene query
          Ray mouseRay = mCamera->getCameraToViewportRay( e->getX(), e->getY() );
-         mRaySceneQuery->setRay( mouseRay );
-
-         // Execute query
-         RaySceneQueryResult &result = mRaySceneQuery->execute();
-         RaySceneQueryResult::iterator itr = result.begin( );
-
+   
+                 Vector3 queryResult;
          // Get results, create a node/entity on the position
-         if ( itr != result.end() && itr->worldFragment )
+                 if(mRayQueryExecutor->executeRayQuery(&queryResult, mouseRay))
          {
                          char name[16];
              sprintf( name, "Robot%d", mCount++ );
 
-             Entity *ent = mSceneMgr->createEntity( name, "robot.mesh" );
-             mCurrentObject = mSceneMgr->getRootSceneNode( )->createChildSceneNode( String(name) + "Node", itr->worldFragment->singleIntersection );
+             Entity *ent = mSceneMgr->createEntity(name, "robot.mesh");
+             mCurrentObject = mSceneMgr->getRootSceneNode()->
+                                 createChildSceneNode( String(name) + "Node", queryResult);
              mCurrentObject->attachObject( ent );
              mCurrentObject->setScale( 0.1f, 0.1f, 0.1f );
@@ -275 +243 @@
          if ( mLMouseDown )
      {
-                 Ray mouseRay = mCamera->getCameraToViewportRay( e->getX(), e->getY() );
-                 mRaySceneQuery->setRay( mouseRay );
-
-                 RaySceneQueryResult &result = mRaySceneQuery->execute();
-                 RaySceneQueryResult::iterator itr = result.begin( );
-
-                 if ( itr != result.end() && itr->worldFragment )
+                 Vector3 queryResult;
+                 Ray mouseRay = mCamera->getCameraToViewportRay(e->getX(), e->getY());
+
+                 if(mRayQueryExecutor->executeRayQuery(&queryResult, mouseRay))
                  {
-                         mCurrentObject->setPosition( itr->worldFragment->singleIntersection );
-                 } 
+                         mCurrentObject->setPosition(queryResult);
+                 }
      }
          // If we are dragging the right mouse button.
@@ -297 +262 @@
 {
         // clamp to terrain
-        Vector3 camPos = mCamera->getPosition( );
-    Ray cameraRay( Vector3(camPos.x, 5000.0f, camPos.z), Vector3::NEGATIVE_UNIT_Y );
-    mRaySceneQuery->setRay( cameraRay );
-
-    // Perform the scene query
-    RaySceneQueryResult &queryResult = mRaySceneQuery->execute();
-    RaySceneQueryResult::iterator it = queryResult.begin( );
-
-        if (it != queryResult.end() && it->worldFragment)
+        Vector3 camPos = mCamera->getPosition();
+        Vector3 queryResult;
+
+    if(mRayQueryExecutor->executeRayQuery(&queryResult, 
+                Vector3(camPos.x, 5000.0f, camPos.z), Vector3::NEGATIVE_UNIT_Y))
         {
-                SceneQuery::WorldFragment* wf = it->worldFragment;
-
-                mCamera->setPosition(mCamera->getPosition().x, wf->singleIntersection.y + 10, 
+                mCamera->setPosition(mCamera->getPosition().x, queryResult.y + 10, 
                         mCamera->getPosition().z);
         }
@@ -347 +306 @@
 void MouseQueryListener::changeAlgorithm()
 {
-    //mCurrentAlgorithm = ++mCurrentAlgorithm % VisibilitySceneTraverser::NUM_RENDERMODES;
+        mCurrentAlgorithm = ++mCurrentAlgorithm % 
+                GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS,
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -367 +327 @@
         mTraversedNodesInfo->setCaption(str);
 
-        mSceneMgr->getOption("NumSceneNodes", &opt); sprintf(str,": %d", opt); 
-        mSceneNodesInfo->setCaption(str);
-
-        mSceneMgr->getOption("NumOctreeNodes", &opt); sprintf(str,": %d", opt); 
+        mSceneMgr->getOption("NumHierarchyNodes", &opt); sprintf(str,": %d", opt); 
         mHierarchyNodesInfo->setCaption(str);