Changeset 1449 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h

Timestamp:

09/21/06 19:14:24 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h (modified) (6 diffs)

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

@@ -72 +72 @@
         /// accumulated depth
         int accumDepth;
-
+        /// time spent for queue repair
         float repairTime;
+        // global cost ratio violations
+        int mGlobalCostMisses;
 
         // Constructor
@@ -88 +90 @@
         double AvgDepth() const { return accumDepth / (double)Leaves();}
 
-        void Reset() 
-        {
+        void Reset()
+        {
+                mGlobalCostMisses = 0;
                 nodes = 0;
                 maxDepth = 0;
@@ -247 +250 @@
 
         void RunConstruction(
+                const bool repairQueue,
                 const VssRayContainer &sampleRays,
                 const ObjectContainer &objects,
                 AxisAlignedBox3 *forcedViewSpace);
-
+        
+        void RunConstruction(const bool repairQueue);
+                
         bool ApplySubdivisionCandidate(SubdivisionCandidate *sc);
 
@@ -306 +312 @@
         int GetObjectSpaceSubdivisionDepth() const;
 
+        void ConstructInterleaved(
+                const VssRayContainer &sampleRays,
+                const ObjectContainer &objects,
+                AxisAlignedBox3 *forcedViewSpace);
+
+        void ConstructMultiLevel(
+                const VssRayContainer &sampleRays,
+                const ObjectContainer &objects,
+                AxisAlignedBox3 *forcedViewSpace);
+
+        void ResetObjectSpaceSubdivision(const ObjectContainer &objects);
+
 protected:
 
@@ -329 +347 @@
         SubdivisionCandidate *mCurrentCandidate;
 
+        ////////
         //-- global criteria
         float mTermMinGlobalCostRatio;
         int mTermGlobalCostMissTolerance;
-        int mGlobalCostMisses;
-
+        
         /// keeps track of cost during subdivision
         float mTotalCost;
@@ -348 +366 @@
 
         bool mStartWithObjectSpace;
+
+        bool mUseMultiLevelConstruction;
 };