Changeset 1020 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h

Timestamp:

06/18/06 03:47:06 (18 years ago)

Author:

mattausch

Message:

worked on view-object space partition
fixed some loading bugs
fixeds some exporting bugs using line segments
enabling other methods for view space sampling in ViewCellsManager? OBJECT_DIRECTION_BASED_DISTRIBUTION)
added class interface for a sampling strategy

File:

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

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

@@ -168 +168 @@
                 VspBspTraversalData mParentData;
                 // prioriry of this split
-                float mRenderCost;
-
-                VspBspSplitCandidate(): mRenderCost(0) 
+                float mPriority;
+
+                VspBspSplitCandidate(): mPriority(0) 
                 {};
 
                 VspBspSplitCandidate(const Plane3 &plane, const VspBspTraversalData &tData): 
-                mSplitPlane(plane), mParentData(tData), mRenderCost(0)
+                mSplitPlane(plane), mParentData(tData), mPriority(0)
                 {}
 
                 /** Returns cost of the traversal data.
                 */
-                float GetCost() const
+                float GetPriority() const
                 {
 #if 1
-                        return mRenderCost;
+                        return mPriority;
 #else
                         return (float) (-mDepth); // for kd tree
@@ -190 +190 @@
                 friend bool operator<(const VspBspSplitCandidate &a, const VspBspSplitCandidate &b)
                 {
-                        return a.GetCost() < b.GetCost();
+                        return a.GetPriority() < b.GetPriority();
                 }
     };
@@ -211 +211 @@
         /** Constructs the tree from a given set of rays.
                 @param sampleRays the set of sample rays the construction is based on
-                @param viewCells if not NULL, new view cells are 
-                created in the leafs and stored in the container
+                @param forcedBoundingBox overwrites the view space box
         */
         void Construct(const VssRayContainer &sampleRays,
@@ -454 +453 @@
                                            VspBspTraversalData &tData);
 
+        /** Subdivides node using a best split priority queue.
+            @param tQueue the best split priority queue
+                @param splitCandidate the candidate for the next split
+                @returns new root of the subtree
+        */
         BspNode *Subdivide(VspBspSplitQueue &tQueue,
                                            VspBspSplitCandidate &splitCandidate);
@@ -459 +463 @@
         /** Constructs the tree from the given traversal data.
                 @param polys stores set of polygons on which subdivision may be based
-                @param rays storesset of rays on which subdivision may be based
+                @param rays stores set of rays on which subdivision may be based
         */
         void Construct(const PolygonContainer &polys, RayInfoContainer *rays);
@@ -496 +500 @@
 
         /** Subdivides leaf.
-                @param leaf the leaf to be subdivided
-                
-                @param polys the polygons to be split
-                @param frontPolys returns the polygons in front of the split plane
-                @param backPolys returns the polygons in the back of the split plane
+                        
+                @param tData data object holding, e.g., a pointer to the leaf
+                @param frontData returns the data (e.g.,  pointer to the leaf) in front of the split plane
+                @param backData returns the data (e.g.,  pointer to the leaf) in the back of the split plane
                 
                 @param rays the polygons to be filtered
                 @param frontRays returns the polygons in front of the split plane
-                @param backRays returns the polygons in the back of the split plane
+                @param coincident returns the polygons which are coincident to the plane and thus discarded 
+                for traversal
 
                 @returns the root of the subdivision
@@ -699 +703 @@
 
 
+        /** Adds stats to subdivision log file.
+        */
+        void AddSubdivisionStats(const int viewCells,
+                                                         const float renderCostDecr,
+                                                         const float splitCandidateCost,
+                                                         const float totalRenderCost,
+                                                         const float avgRenderCost);
 
         ///////////////////////////////////////////////////////////
@@ -716 +727 @@
 
         /// sorted split candidates used for sweep-heuristics
-        vector<SortableEntry> *mSplitCandidates;
+        vector<SortableEntry> *mLocalSplitCandidates;
 
         /// box around the whole view domain
@@ -837 +848 @@
         // if rays should be stored in leaves
         bool mStoreRays;
-        /// render cost weight between expected value and variance
+        /// weight between  render cost (expected value) and variance
         float mRenderCostWeight;
-        
+        /// weight between  render cost decrease and node render cost
+        float mRenderCostDecreaseWeight;
 
         //-- subdivision statistics