Changeset 1106 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h

Timestamp:

07/10/06 01:57:41 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h (modified) (24 diffs)

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

@@ -181 +181 @@
         int splits[3];
         
-        // totals number of rays
-        int rays;
         // maximal reached depth
         int maxDepth;
@@ -194 +192 @@
         // max depth nodes
         int minPvsNodes;
-        // nodes with minimum PVS
-        int minRaysNodes;
-        // max ray contribution nodes
-        int maxRayContribNodes;
         // minimum area nodes
         int minProbabilityNodes;
         /// nodes termination because of max cost ratio;
         int maxCostNodes;
-        // max number of rays per node
+        // max number of objects per node
         int maxObjectRefs;
+        int objectRefs;
         /// samples contributing to pvs
         int contributingSamples;
@@ -214 +209 @@
         /// accumulated number of rays refs
         int accumRays;
+        /// potentially visible objects from this leaf
         int pvs;
+
         // accumulated depth (used to compute average)
         int accumDepth;
@@ -230 +227 @@
         // TODO: computation wrong
         double AvgDepth() const { return accumDepth / (double)Leaves();}; 
-        double AvgRays() const { return accumRays / (double)Leaves();}; 
+        
 
         void Reset() 
@@ -244 +241 @@
                 maxDepthNodes = 0;
                 minPvsNodes = 0;
-                minRaysNodes = 0;
-                maxRayContribNodes = 0;
+        
                 minProbabilityNodes = 0;
                 maxCostNodes = 0;
@@ -254 +250 @@
                 maxPvs = 0;
                 invalidLeaves = 0;
-                accumRays = 0;
+                objectRefs = 0;
         }
+
 
         void Print(ostream &app) const;
@@ -558 +555 @@
         public:
                 static VspTree* sVspTree;
-                /// parent data
+                /// parent node traversal data
                 VspTraversalData mParentData;
                 
@@ -619 +616 @@
         /** Returns box which bounds the whole tree.
         */
-        AxisAlignedBox3 GetBoundingBox()const;
+        AxisAlignedBox3 GetBoundingBox() const;
 
         /** Returns root of the view space partitioning tree.
@@ -1060 +1057 @@
         /// number of currenly generated view cells
         int mCreatedViewCells;
-
-private:
-
-        /// Generates unique ids for PVS criterium
-        static void GenerateUniqueIdsForPvs();
-
-        //-- unique ids for PVS criterium
-        static int sFrontId; 
-        static int sBackId;
-        static int sFrontAndBackId;
 };
 
@@ -1088 +1075 @@
         public:
                 /// the current node
-                KdNode *mNode;
+                KdLeaf *mNode;
                 /// current depth
                 int mDepth;
                 /// rays piercing this node
-                RayInfoContainer *mRays;
+                //RayInfoContainer *mRays;
                 /// the probability that this node contains view point
                 float mProbability;
@@ -1106 +1093 @@
                 float mPriority;
 
-                
-                /** Returns average ray contribution.
-                */
-                float GetAvgRayContribution() const
-                {
-                        return (float)mPvs / ((float)mRays->size() + Limits::Small);
-                }
-
 
                 OspTraversalData():
                 mNode(NULL),
                 mDepth(0),
-                mRays(NULL),
                 mPvs(0),
                 mProbability(0.0),
@@ -1126 +1104 @@
                 {}
                 
-                OspTraversalData(KdNode *node, 
+                OspTraversalData(KdLeaf *node, 
                                                  const int depth, 
-                                                 RayInfoContainer *rays,
                                                  const int pvs,
                                                  const float p,
@@ -1134 +1111 @@
                 mNode(node), 
                 mDepth(depth), 
-                mRays(rays),
                 mPvs(pvs),
                 mProbability(p),
@@ -1144 +1120 @@
 
                 OspTraversalData(const int depth, 
-                                                 RayInfoContainer *rays,
                                                  const AxisAlignedBox3 &box): 
                 mNode(NULL), 
                 mDepth(depth), 
-                mRays(rays),
                 mPvs(0),
                 mProbability(0),
@@ -1167 +1141 @@
                 void Clear()
                 {
-                        DEL_PTR(mRays);
                 }
 
@@ -1189 +1162 @@
                 {};
 
-                int Type() const { return VIEW_SPACE; }
+                int Type() const { return OBJECT_SPACE; }
         
                 void EvalPriority()
@@ -1231 +1204 @@
         /** Returns bounding box of the specified node.
         */
-        AxisAlignedBox3 GetBoundingBox(KdNode *node) const;
-
-        /** Returns list of BSP leaves with pvs smaller than
+        AxisAlignedBox3 GetBBox(KdNode *node) const;
+
+        /** Returns list of leaves with pvs smaller than
                 a certain threshold.
                 @param onlyUnmailed if only the unmailed leaves should be considered
                 @param maxPvs the maximal pvs of a leaf to be added (-1 means unlimited)
         */
-        void CollectLeaves(vector<VspLeaf *> &leaves, 
-                                           const bool onlyUnmailed = false,
-                                           const int maxPvs = -1) const;
-
-        /** Returns box which bounds the whole tree.
+        
+        void CollectLeaves(vector<KdLeaf *> &leaves) const;
+
+
+        /** Returns bounding box of the whole tree (= bbox of root node)
         */
         AxisAlignedBox3 GetBoundingBox()const;
@@ -1406 +1379 @@
                 @returns the root of the subdivision
         */
+        KdInterior *SubdivideNode(KdLeaf *leaf,
+                const AxisAlignedPlane &splitPlane,
+                const AxisAlignedBox3 &box,
+                OspTraversalData &frontData,
+                OspTraversalData &backData);
+
         void SplitObjects(const AxisAlignedPlane & splitPlane,
                                           const ObjectContainer &objects,
-                                          ObjectContainer &back,
-                                          ObjectContainer &front);
-
-        KdInterior *SubdivideNode(KdLeaf *leaf,
-                                                          const AxisAlignedPlane &splitPlane,
-                                                          const AxisAlignedBox3 &box,
-                                                          AxisAlignedBox3 &backBBox,
-                                                          AxisAlignedBox3 &frontBBox);
+                                          ObjectContainer &front,
+                                          ObjectContainer &back);
 
         void ProcessLeafObjects(KdLeaf *leaf, KdLeaf *parent) const;
@@ -1439 +1412 @@
                 const int axis,
                 float &position,
-                int &objectsBack,
-                int &objectsFront);
+                int &objectsFront,
+                int &objectsBack);
 
         /** Subdivides the rays into front and back rays according to the split plane.
@@ -1553 +1526 @@
         //-- local termination
 
-        /// minimal number of rays before subdivision termination
-        int mTermMinRays;
         /// maximal possible depth
         int mTermMaxDepth;
         /// mininum probability
         float mTermMinProbability;
-        /// mininum PVS
-        int mTermMinPvs;
+        /// minimal number of objects
+        int mTermMinObjects;
         /// maximal contribution per ray
         float mTermMaxRayContribution;
@@ -1569 +1540 @@
 
 
+
         //-- global criteria
         float mTermMinGlobalCostRatio;
@@ -1575 +1547 @@
 
         /// maximal number of view cells
-        int mMaxViewCells;
+        int mTermMaxLeaves;
         /// maximal tree memory
         float mMaxMemory;
@@ -1590 +1562 @@
         /// if only driving axis should be used for split
         bool mOnlyDrivingAxis;
-        /// if random split axis should be used
-        bool mUseRandomAxis;
-        /// if vsp bsp tree should simulate octree
-        bool mCirculatingAxis;
-        /// minimal relative position where the split axis can be placed
-        float mMinBand;
-        /// maximal relative position where the split axis can be placed
-        float mMaxBand;
-
-
+        
         /// current time stamp (used for keeping split history)
         int mTimeStamp;
@@ -1616 +1579 @@
         int mTotalPvsSize;
         /// number of currenly generated view cells
-        int mCreatedViewCells;
-
+        int mCreatedLeaves;
+
+        /// represents min and max band for sweep
         float mSplitBorder;
-
-
-private:
-
-        /// Generates unique ids for PVS criterium
-        static void GenerateUniqueIdsForPvs();
-
-        //-- unique ids for PVS criterium
-        static int sFrontId; 
-        static int sBackId;
-        static int sFrontAndBackId;
 };