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

Timestamp:

10/23/06 20:24:14 (18 years ago)

Author:

mattausch

Message:

updated priority meaurement: taking total cost and memory into account

File:

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

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

@@ -41 +41 @@
 class BvHierarchy;
 class Exporter;
+class ViewCellsParseHandlers;
+
 
 #define COUNT_ORIGIN_OBJECTS 1
@@ -130 +132 @@
 class HierarchyManager
 {
-        friend VspTree;
-        friend OspTree;
-        friend BvHierarchy;
-        friend ViewCellsParseHandlers;
-
 public:
         /** Constructor with the view space partition tree and
@@ -233 +230 @@
         } 
 
+        HierarchyStatistics &GetHierarchyStats() { return mHierarchyStats; };
+
+        inline bool ConsiderMemory() const { return mConsiderMemory; }
+
 protected:
 
@@ -254 +255 @@
         float GetObjectSpaceMemUsage() const;
 
+
         //////////////////////////////
         // the main loop
-        //////////////////////
 
         /** This is for interleaved construction / sequential construction.
@@ -270 +271 @@
         int RunConstruction(SplitQueue &splitQueue,
                                                 SubdivisionCandidateContainer &chosenCandidates,
-                                                const float minRenderCostDecr,
+                                                //const float minRenderCostDecr,
+                                                SubdivisionCandidate *oldCandidate,
                                                 const int minSteps);
 
@@ -344 +346 @@
         bool StartViewSpaceSubdivision() const;
 
+
         ////////////////////////////
         // Helper function for preparation of subdivision
-        ///////
 
         /** Prepare bv hierarchy for subdivision
@@ -493 +495 @@
         float mTermMaxMemory;
 
+
         ////////////////////
 
+        /// number of minimal steps of the same type
         int mMinStepsOfSameType;
 
@@ -532 +536 @@
 
         float mMemoryConst;
+
+
+        friend VspTree;
+        friend OspTree;
+        friend BvHierarchy;
+        friend ViewCellsParseHandlers;
+
 };