Changeset 2170 for GTP

Timestamp:

02/26/07 23:47:04 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)
• Preprocessing/src/HierarchyManager.cpp (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (2 diffs)
• Preprocessing/src/VspTree.cpp (modified) (1 diff)
• Preprocessing/src/VspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -742 +742 @@
         }
 
-        InitItemBufferPass(); // create material for item buffer pass
+        // create material for item buffer pass
+        InitItemBufferPass();
 
         // save ambient light to reset later

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

@@ -2492 +2492 @@
 void HierarchyManager::CreateTraversalTree()
 {
+        int mind, maxd;
+        mVspTree->EvalMinMaxDepth(mind, maxd);
+
+        cout << "old tree balance: " << mind << " " << maxd << endl;
         mTraversalTree = new TraversalTree;
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -6989 +6989 @@
 
                 // hack: just show final view cells
-                int pass = (int)mViewCells.size();
+                const int pass = (int)mViewCells.size();
+
                 //for (int pass = histoStepSize; pass <= numLeaves; pass += histoStepSize)
                 if (1)
@@ -7017 +7018 @@
         ViewCellsManager::FinalizeViewCells(createMesh);
 
-        if (1)
-        {       
-                if (mHierarchyManager->mUseTraversalTree)
-                {
-                        // create a traversal tree for optimal view cell casting
-                        mHierarchyManager->CreateTraversalTree();
-                }
-        }
-}
-
-
-}
+        if (mHierarchyManager->mUseTraversalTree)
+        {
+                // create a traversal tree for optimal view cell casting
+                mHierarchyManager->CreateTraversalTree();
+        }
+}
+
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

@@ -3464 +3464 @@
 
 
-}
+void VspTree::EvalMinMaxDepth(int &minDepth, int &maxDepth)
+{
+        stack<pair<VspNode *, int> > nodeStack;
+        nodeStack.push(pair<VspNode *, int>(mRoot, 0));
+
+        minDepth = 999999;
+        maxDepth = 0;
+
+        while (!nodeStack.empty())
+        {
+                VspNode *node = nodeStack.top().first;
+                const int depth = nodeStack.top().second;
+
+                nodeStack.pop();
+                
+                if (node->IsLeaf())
+                {
+                        // test if this leaf is in valid view space
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
+
+                        if (depth < minDepth)
+                                minDepth = depth;
+
+                        if (depth > maxDepth)
+                                maxDepth = depth;
+                }
+                else
+                {
+                        VspInterior *interior = static_cast<VspInterior *>(node);
+
+                        nodeStack.push(pair<VspNode *, int>(interior->GetBack(), depth + 1));
+                        nodeStack.push(pair<VspNode *, int>(interior->GetFront(), depth + 1));
+                }
+        }
+}
+
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

@@ -922 +922 @@
         float PrepareHeuristics(KdLeaf *leaf);
 
-        
+        void EvalMinMaxDepth(int &minDepth, int &maxDepth);
+
         /////////////////////////////////////////////////////////////////////////////