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

Timestamp:

10/16/06 07:58:19 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -50 +50 @@
 public:
         /// total number of entries in the pvs
-        int pvsEntries;
+        int mPvsEntries;
         /// storage cost
-        int memory;
+        int mMemory;
         /// total number of nodes
-        int nodes;
+        int mNodes;
         /// maximal reached depth
-        int maxDepth;
+        int mMaxDepth;
         /// accumulated depth
-        int accumDepth;
+        int mAccumDepth;
         /// time spent for queue repair
-        float repairTime;
+        float mRepairTime;
+
         // global cost ratio violations
         int mGlobalCostMisses;
+        /// total cost of subdivision
+        float mTotalCost;
+        /// render cost decrease of subdivision
+        float mRenderCostDecrease;
 
         // Constructor
@@ -70 +75 @@
         }
 
-        int Nodes() const {return nodes;}
-        int Interior() const { return nodes / 2; }
-        int Leaves() const { return (nodes / 2) + 1; }
+        int Nodes() const {return mNodes;}
+        int Interior() const { return mNodes / 2; }
+        int Leaves() const { return (mNodes / 2) + 1; }
         
         // TODO: computation wrong
-        double AvgDepth() const { return accumDepth / (double)Leaves();}
+        double AvgDepth() const { return mAccumDepth / (double)Leaves();}
 
         void Reset()
         {
                 mGlobalCostMisses = 0;
-                nodes = 0;
-                maxDepth = 0;
-                accumDepth = 0;
-                repairTime = 0;
-                memory = 0;
-                pvsEntries = 0;
+                mTotalCost = 0;
+                mRenderCostDecrease = 0;
+
+                mNodes = 0;
+                mMaxDepth = 0;
+                mAccumDepth = 0;
+                mRepairTime = 0;
+                mMemory = 0;
+                mPvsEntries = 0;
         }
 
@@ -201 +209 @@
         */
         //AxisAlignedBox3 GetViewSpaceBox() const;
+
         /** Returns object space bounding box.
         */
@@ -257 +266 @@
         /** Repairs the dirty entries of the candidate queue.
         */
-        void RepairQueue();
-
-        /** Collect the list of dirty candidates after the current subdivision candidate
-                split.
-        */
-        void CollectDirtyCandidates(vector<SubdivisionCandidate *> &dirtyList);
+        void RepairQueue(SubdivisionCandidate *sc);
+
+        /** Collect the list of dirty candidates after the current 
+                subdivision candidate split.
+        */
+        void CollectDirtyCandidates(
+                SubdivisionCandidate *sc,
+                vector<SubdivisionCandidate *> &dirtyList);
 
         /** Evaluate subdivision stats for log.
         */
-        void EvalSubdivisionStats(const float renderCostDecr);
+        void EvalSubdivisionStats();
 
         void AddSubdivisionStats(
@@ -274 +285 @@
                 const int totalPvsEntries);
 
-        void CollectObjectSpaceDirtyList();
-        void CollectViewSpaceDirtyList();
-
-        bool AddSampleToPvs(Intersectable *obj, 
-                                                const float pdf,
-                                                float &contribution) const;
-
-        void CollectViewSpaceDirtyList(SubdivisionCandidateContainer &dirtyList);
-        void CollectObjectSpaceDirtyList(SubdivisionCandidateContainer &dirtyList);
+        bool AddSampleToPvs(
+                Intersectable *obj, 
+                const float pdf,
+                float &contribution) const;
+
+        void CollectViewSpaceDirtyList(
+                SubdivisionCandidate *sc,
+                SubdivisionCandidateContainer &dirtyList);
+
+        void CollectObjectSpaceDirtyList(
+                SubdivisionCandidate *sc,
+                SubdivisionCandidateContainer &dirtyList);
                 
-        void ExportOspTree(Exporter *exporter, const ObjectContainer &objects) const;
+        void ExportOspTree(
+                Exporter *exporter, 
+                const ObjectContainer &objects) const;
 
         void ParseEnvironment();
@@ -313 +329 @@
 
         void ConstructInterleaved(
+                const VssRayContainer &sampleRays,
+                const ObjectContainer &objects,
+                AxisAlignedBox3 *forcedViewSpace);
+
+        void ConstructInterleaved2(
                 const VssRayContainer &sampleRays,
                 const ObjectContainer &objects,
@@ -359 +380 @@
         int mSavedViewSpaceSubdivisionType;
         /// the current subdivision candidate
-        SubdivisionCandidate *mCurrentCandidate;
+        //SubdivisionCandidate *mCurrentCandidate;
 
 
@@ -389 +410 @@
 
         /// keeps track of cost during subdivision
-        float mTotalCost;
+        //float mTotalCost;
         /// statistics about the hierarchy
         HierarchyStatistics mHierarchyStats;
@@ -396 +417 @@
         int mMinDepthForViewSpaceSubdivion;
         
+        int mMinRenderCostDecrease;
+
         ofstream mSubdivisionStats;