Changeset 346

Timestamp:

10/21/05 20:28:11 (19 years ago)

Author:

mattausch

Message:

updated terrain removed debug messages from chc

Location:

trunk/VUT

Files:

• GtpVisibility/src/CoherentHierarchicalCullingManager.cpp (modified) (8 diffs)
• GtpVisibility/src/StopAndWaitCullingManager.cpp (modified) (1 diff)
• Ogre/resources/terrain.cfg (modified) (2 diffs)
• Ogre/src/OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• chcdemo/RenderTraverser.cpp (modified) (5 diffs)
• work/TestCullingTerrain/TerrainFrameListener.cpp (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -25 +25 @@
         unsigned int visiblePixels = 0;
         bool isAvailable = false;
-        Ogre::LogManager::getSingleton().logMessage("Coherent Hierarchical Culling\n");
+        //Ogre::LogManager::getSingleton().logMessage("Coherent Hierarchical Culling");
 
         //-- PART 1: process finished occlusion queries
@@ -37 +37 @@
                         
                         queryQueue.pop();
-
-                        std::stringstream d2; d2 << "fetch node from query queue " << node;
-                        Ogre::LogManager::getSingleton().logMessage(d2.str());
 
                         if (visiblePixels > mVisibilityThreshold)
@@ -63 +60 @@
                         mHierarchyInterface->GetQueue()->pop();
                                 
-                        std::stringstream d2; d2 << "fetch node from hierarchy queue " << node;
-                        Ogre::LogManager::getSingleton().logMessage(d2.str());
-
                         bool intersects = false;
 
@@ -87 +81 @@
                                 bool wasVisible = mHierarchyInterface->IsNodeVisible(node) && 
                                         (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId() - 1);
-                                if (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId())
-                                {
-                                std::stringstream d2; d2 << "!!!!lastVisited: " << mHierarchyInterface->LastVisited(node) << " " << node;
-                                Ogre::LogManager::getSingleton().logMessage(d2.str());
-                                std::stringstream d; d << "!!!!!frameid: " << mHierarchyInterface->GetFrameId() << " " << node << "\n";
-                                Ogre::LogManager::getSingleton().logMessage(d.str());
-                                }
+                                
                                 // if we assume node to be visible in this frame => skip query 
                                 // TODO: check this (not the expected speed up)
@@ -105 +93 @@
                 // identify nodes that we cannot skip queries for
                                 // geometry not only in leaves => test for renderable geometry
+                                // we also need to test if node was processed in current frame, otherwise
+                                // node is tested several times because of priority queue
                                 bool issueQuery = (mHierarchyInterface->LastVisited(node) != mHierarchyInterface->GetFrameId())
                                                 && (!wasVisible || mHierarchyInterface->HasGeometry(node));
@@ -113 +103 @@
                                 // update node's visited flag
                                 mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
-
-                                std::stringstream d2; d2 << "lastVisited: " << mHierarchyInterface->LastVisited(node) << " " << node;
-                                Ogre::LogManager::getSingleton().logMessage(d2.str());
 
                                 // skip testing previously visible nodes without geometry
@@ -129 +116 @@
                                 if (wasVisible)
                                 {
-                                                std::stringstream d2; d2 << "traversing node " << node;
-                                        Ogre::LogManager::getSingleton().logMessage(d2.str());
                                         mHierarchyInterface->TraverseNode(node);
                                 }
@@ -162 +147 @@
 {
         // -- set node to be visible in this frame, then traverse it
-        std::stringstream d2; d2 << "skipping node " << node;
-                                        Ogre::LogManager::getSingleton().logMessage(d2.str());
         mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
         
-        mHierarchyInterface->SetNodeVisible(node, true);
         mHierarchyInterface->PullUpVisibility(node);                    
         mHierarchyInterface->TraverseNode(node);

trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

@@ -19 +19 @@
                 bool intersects = false;
         
-                //if (mHierarchyInterface->HasGeometry(node) && (!mHierarchyInterface->IsLeaf(node))) ++ mNumFrustumCulledNodes;
-                                //      Ogre::LogManager::getSingleton().logMessage("no geometry");
-                        //else if (!mHierarchyInterface->IsLeaf(node)) ++ mNumQueriesIssued;//  Ogre::LogManager::getSingleton().logMessage("has geometry");
-/*if (!mHierarchyInterface->HasGeometry(node))
-                                        Ogre::LogManager::getSingleton().logMessage("no geometry");
-                                else    Ogre::LogManager::getSingleton().logMessage("has geometry");*/
                 if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
                 {

trunk/VUT/Ogre/resources/terrain.cfg

@@ -26 +26 @@
 
 # How large is each tile? Must be (2^n)+1 and be smaller than PageSize
-TileSize=65
+TileSize=129
 
 # The maximum error allowed when determining which LOD to use
@@ -32 +32 @@
 
 # The size of a terrain page, in world units
-PageWorldX=3000
-PageWorldZ=3000
+PageWorldX=5000
+PageWorldZ=5000
 # Maximum height of the terrain 
-MaxHeight=300
+MaxHeight=500
 
 # Upper LOD limit

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -36 +36 @@
                         if (nextChild)
                         {
-                                        std::stringstream d2; d2 << "pushing node " << nextChild;
-                                        Ogre::LogManager::getSingleton().logMessage(d2.str());
                                 mDistanceQueue->push(nextChild);
                         }

trunk/VUT/chcdemo/RenderTraverser.cpp

@@ -182 +182 @@
                                         // update node's visited flag
                                         node->SetLastVisited(mFrameID);
-
+                                        node->SetVisible(true);
                                         PullUpVisibility(node);
                                         TraverseNode(node);
@@ -192 +192 @@
                                         
                                         // identify nodes that we cannot skip queries for
-                                        bool leafOrWasInvisible = !wasVisible || node->IsLeaf();
+                                        bool leafOrWasInvisible = (node->LastVisited() != mFrameID) && (!wasVisible || node->IsLeaf());
 
                                         // reset node's visibility classification 
@@ -199 +199 @@
                                         // update node's visited flag
                                         node->SetLastVisited(mFrameID);
-                                        //if (mFrameID == node->LastVisited()) mNumFrustumCulledNodes ++;
+                                        
                                         // skip testing previously visible interior nodes
                                         if(leafOrWasInvisible)
@@ -215 +215 @@
                         {
                                 // for stats
-                                //mNumFrustumCulledNodes ++;
+                                mNumFrustumCulledNodes ++;
                         }
                 }
@@ -331 +331 @@
         // get next available test id
         unsigned int occlusionQuery = mOcclusionQueries[mCurrentTestIdx++];
-        mNumFrustumCulledNodes ++;
+        
         node->SetOcclusionQuery(occlusionQuery);
         // do the actual occlusion query for this node

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -52 +52 @@
         0.03,
         //0.1,
-        0.04
+        0.03
 };
 
@@ -423 +423 @@
 
                 // clamp camera so we always walk along the terrain
-                mApplication->Clamp2Terrain(mCamNode, 10);
+                mApplication->Clamp2Terrain(mCamNode, 5);
                 break;
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -297 +297 @@
 
         mTerrainMinPos = EntityState::msMinPos = Vector3(0, 0, 0);
-        mTerrainMaxPos = EntityState::msMaxPos = Vector3(3000, 5000, 3000);
+        mTerrainMaxPos = EntityState::msMaxPos = Vector3(5000, 5000, 5000);
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
         
         // if no objects in file, we generate new objects
-        //if (!mTerrainContentGenerator->LoadObjects("objects.out"))
-        //{
+        if (!mTerrainContentGenerator->LoadObjects("objects.out"))
+        {
                 // the objects are generated randomly distributed over the terrain
-                generateScene(900, 0); // create soldiers, trees, ninjas
-                generateScene(500, 1);
-                generateScene(100, 2);
-        //}
+                generateScene(1000, 0); // create soldiers, trees, ninjas
+                generateScene(1000, 1);
+                generateScene(200, 2);
+        }
 
         // no limitations on height => it is possible for the user to put single 
@@ -319 +319 @@
         float val = TerrainFrameListener::msObjectScales[objectType];
         Vector3 scale(val, val, val); 
-
+        const float maxHeight = 100;
         // 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->SetMaxPos(Vector3(mTerrainMaxPos.x, maxHeight, mTerrainMaxPos.z));
         std::stringstream d; d << "objscale: " << scale[0];
         Ogre::LogManager::getSingleton().logMessage(d.str());