Changeset 175 for trunk/VUT/work/TestCullingTerrain

Timestamp:

07/14/05 20:54:07 (19 years ago)

Author:

mattausch

Message:

added trees

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainFrameListener.cpp (modified) (8 diffs)
• TestCullingTerrainApplication.cpp (modified) (4 diffs)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -16 +16 @@
 String TerrainFrameListener::msAlgorithmCaptions[] = 
 {
+        "Coherent Hierarchical Culling",
         "View Frustum Culling", 
-        "Stop and Wait Culling", 
-        "Coherent Hierarchical Culling"
+        "Stop and Wait Culling"
 };
 
@@ -42 +42 @@
 {
         0,
-        7,
+        0,
+        //7,
         0
 };
@@ -49 +50 @@
 {
         0.1,
-        0.6,
-        0.07
+        0.03,
+        //0.1,
+        0.04
 };
 
@@ -56 +58 @@
 {
         "robot",
-        "athene",
+        //"athene",
+        "natFX_Tree1_LOD2",
         //"tree2",
         //"HongKong_Tower",
@@ -111 +114 @@
 mShowOctree(false),
 mUseDepthPass(false),
-mTestGeometryForVisibleLeaves(true),
+mTestGeometryForVisibleLeaves(false),
 mShowVisualization(false),
 mCullCamera(false),
@@ -426 +429 @@
         int itemBufferMode = useItemBuffer ? mItemBufferMode : 0;
         
-        int queryModes = GtpVisibility::QueryManager::PATCH_VISIBILITY; 
+        int queryModes = 0;
+        queryModes |= GtpVisibility::QueryManager::PATCH_VISIBILITY; 
         queryModes |= GtpVisibility::QueryManager::GEOMETRY_VISIBILITY;
         queryModes |= GtpVisibility::QueryManager::NODE_VISIBILITY;
-
+        
         mQueryManager = new OcclusionQueriesQueryManager(sm->GetHierarchyInterface(),
-                        mWindow->getViewport(0), queryModes, useItemBuffer);
+                        mWindow->getViewport(0), queryModes, itemBufferMode);
 
         //mQueryManager = new PlatformQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0), false);
@@ -455 +459 @@
                 
         std::stringstream d; 
-        d << msQueryTypeCaptions[fromPoint ?  1 : 0].c_str() << " "
+        d << "Query mode: " << queryModes << ", "
+          << msQueryTypeCaptions[fromPoint ?  1 : 0].c_str() << " "
           << msQueryRelativeVisCaptions[relativeVisibility ? 1 : 0].c_str() << " "
       << msQueryMethodCaptions[useItemBuffer ? 1 : 0].c_str();
@@ -744 +749 @@
 {
         mCurrentAlgorithm = (mCurrentAlgorithm + 1) % 
-                GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS,
-
+                (GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS - 1);
         setAlgorithm(mCurrentAlgorithm);
 }

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -228 +228 @@
 {
         // Set ambient light
-        mAmbientLight = ColourValue(0.5, 0.5, 0.5);
+        mAmbientLight = ColourValue(0.5 , 0.5, 0.5);
         mSceneMgr->setAmbientLight(mAmbientLight);
         
@@ -256 +256 @@
         
         // Create a skybox
-        mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 5000, false);
+        mSceneMgr->setSkyBox(true, "Examples/CloudyNoonSkyBox", 5000, true);
         
         std::string terrain_cfg("terrain.cfg");
@@ -301 +301 @@
         if (!mTerrainContentGenerator->LoadObjects("objects.out"))
         {
-                // to provide much occlusion,
-                // height is restricted to 50 => no objects are created on peaks
-                mTerrainContentGenerator->SetMinPos(Vector3(mTerrainMinPos));
-                mTerrainContentGenerator->SetMaxPos(Vector3(mTerrainMaxPos.x, 50.0f, mTerrainMaxPos.z));
-                mTerrainContentGenerator->SetOffset(0);
-
                 // the objects are generated randomly distributed over the terrain
-                generateScene(1500, 0);
+                generateScene(900, 0);
+                generateScene(500, 1);
+                generateScene(100, 2);
+        }
+
+        // no limitations on height => it is possible for the user to put single 
+        // objects on peaks of the terrain (only few, not relevant for occlusion)
+        mTerrainContentGenerator->SetMaxPos(mTerrainMaxPos);
+}
+//-----------------------------------------------------------------------
+void  TestCullingTerrainApplication::generateScene(int num, int objectType)
+{
+        Vector3 scale(TerrainFrameListener::msObjectScales[objectType], 
+                                  TerrainFrameListener::msObjectScales[objectType],
+                                  TerrainFrameListener::msObjectScales[objectType]);
+
+        // to provide much occlusion,
+        // height is restricted to 50 => no objects are created on peaks
+        mTerrainContentGenerator->SetMinPos(Vector3(mTerrainMinPos));
+        mTerrainContentGenerator->SetMaxPos(Vector3(mTerrainMaxPos.x, 75.0f, mTerrainMaxPos.z));
+        
+        mTerrainContentGenerator->SetScale(scale);
+        mTerrainContentGenerator->SetOffset(TerrainFrameListener::msObjectTerrainOffsets[objectType]);
+        mTerrainContentGenerator->GenerateScene(num, TerrainFrameListener::msObjectCaptions[objectType]);
+
+        if (objectType != 0) // from our objects, only robot has animation phases
+                return;
+
+        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)
+        {
+                mEntityStates.push_back(new EntityState((*entList)[i], 
+                        EntityState::WAITING, Math::RangeRandom(0.5, 1.5)));
         }
 
@@ -314 +342 @@
         // objects on peaks of the terrain (only few, not relevant for occlusion)
         mTerrainContentGenerator->SetMaxPos(mTerrainMaxPos);
-}
-//-----------------------------------------------------------------------
-void  TestCullingTerrainApplication::generateScene(int num, int objectType)
-{
-        Vector3 scale(TerrainFrameListener::msObjectScales[objectType], 
-                                  TerrainFrameListener::msObjectScales[objectType],
-                                  TerrainFrameListener::msObjectScales[objectType]);
-
-        mTerrainContentGenerator->SetScale(scale);
-        mTerrainContentGenerator->SetOffset(TerrainFrameListener::msObjectTerrainOffsets[objectType]);
-        mTerrainContentGenerator->GenerateScene(num, TerrainFrameListener::msObjectCaptions[objectType]);
-
-        if (objectType != 0) // from our objects, only robot has animation phases
-                return;
-
-        EntityList *entList = mTerrainContentGenerator->GetGeneratedEntities();
-
-        //-- add animation state for new robots (located at the end of the list)
-        for (int i = entList->size() - num; i < (int)entList->size(); ++i)
-        {
-                mEntityStates.push_back(new EntityState((*entList)[i], 
-                        EntityState::WAITING, Math::RangeRandom(0.5, 1.5)));
-        }
 }
 //-----------------------------------------------------------------------