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

Timestamp:

07/18/06 19:03:14 (18 years ago)

Author:

mattausch

Message:

added kd pvs support, changed way of counting pvs

File:

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

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

@@ -33 +33 @@
 class KdLeaf;
 class OspTree;
+class KdIntersectable;
+
 
 
@@ -461 +463 @@
 #endif
 
+typedef map<KdNode *, KdIntersectable *> KdIntersectableMap;
+
 typedef FlexibleHeap<SplitCandidate *> SplitQueue;
 
@@ -980 +984 @@
                 
         */
-        void AddToPvs(VspLeaf *leaf,
+        void AddSamplesToPvs(VspLeaf *leaf,
                                   const RayInfoContainer &rays, 
                                   float &sampleContributions,
                                   int &contributingSamples);
+
+        bool AddKdLeafToPvs(KdLeaf *leaf, ViewCell *vc, float &pvs, float &contribution);
 
         /** Propagates valid flag up the tree.
@@ -1018 +1024 @@
 protected:
 
-        bool mUseKdPvs;
-
-        enum {PER_OBJECT, PER_KDLEAF};
+        bool mUseKdPvsForHeuristics;
+        bool mStoreKdPvs;
 
         ViewCellsManager *mViewCellsManager;
@@ -1036 +1041 @@
         /// box around the whole view domain
         AxisAlignedBox3 mBoundingBox;
-
 
 
@@ -1339 +1343 @@
 #endif
 
+        /** Returns or creates a new intersectable for use in a kd based pvs.
+                The OspTree is responsible for destruction of the intersectable.
+        */
+        KdIntersectable *GetOrCreateKdIntersectable(KdNode *node);
+
         /** Collects rays stored in the leaves.
         */
@@ -1549 +1558 @@
                 float &pFront,
                 float &pBack);
-        /** Adds ray sample contributions to the PVS.
-                @param sampleContributions the number contributions of the samples
-                @param contributingSampels the number of contributing rays
-                
-        */
-        void AddToPvs(VspLeaf *leaf,
-                                  const RayInfoContainer &rays, 
-                                  float &sampleContributions,
-                                  int &contributingSamples);
-
+        
         /** Propagates valid flag up the tree.
         */
@@ -1667 +1667 @@
 
 
-
         //-- split heuristics based parameters
         
@@ -1698 +1697 @@
         /// weight between  render cost decrease and node render cost
         float mRenderCostDecreaseWeight;
+
+        /// stores the kd node intersectables used for pvs
+        KdIntersectableMap mKdIntersectables;
 };