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

Timestamp:

07/05/06 16:21:45 (18 years ago)

Author:

mattausch

Message:

worked on object space /view space partitioning

File:

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

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

@@ -882 +882 @@
                                                          float maxBand);
 
-        /** Prepares objects for SAH.
-                @returns pvs size of the ray container
-        */
-        int PrepareHeuristics(const RayInfoContainer &rays);
-
-        int PrepareHeuristics(Intersectable *object);
-
         /** Computes pvs increase with respect to the previous pvs for SAH.
         */
@@ -916 +909 @@
         void RemoveContriFromPvs(KdLeaf *leaf, int &pvs) const;
         void AddContriToPvs(KdLeaf *leaf, int &pvs) const;
+
+        /** Prepares objects for SAH.
+                @returns pvs size of the ray container
+        */
+        int PrepareHeuristics(const RayInfoContainer &rays);
+
+        int PrepareHeuristics(Intersectable *object);
 
         /** Subdivides the rays into front and back rays according to the split plane.
@@ -1333 +1333 @@
         // For sorting objects
         // --------------------------------------------------------------
-        struct SortableEntry
+        struct  SortableEntry
         {
-                enum EType 
+                enum
                 {
-                        ERayMin,
-                        ERayMax
+                        BOX_MIN,
+                        BOX_MAX
                 };
 
                 int type;
                 float value;
-                VssRay *ray;
-  
+                Intersectable *mObject;
+
                 SortableEntry() {}
-                SortableEntry(const int t, const float v, VssRay *r):type(t),
-                                          value(v), ray(r) 
+
+                SortableEntry(const int t, const float v, Intersectable *obj):
+                type(t), value(v), mObject(obj) 
+                {}
+
+                bool operator<(const SortableEntry &b) const 
                 {
-                }
-                
-                friend bool operator<(const SortableEntry &a, const SortableEntry &b) 
-                {
-                        return a.value < b.value;
+                        return value < b.value;
                 }
         };
 
+ 
         /** faster evaluation of split plane cost for kd axis aligned cells.
         */
@@ -1449 +1450 @@
         /** Computes best cost for axis aligned planes.
         */
-        float EvalLocalCostHeuristics(const RayInfoContainer &rays,
+/*      float EvalLocalCostHeuristics(const RayInfoContainer &rays,
                                                                   const AxisAlignedBox3 &box,
                                                                   const int pvsSize,
                                                                   const int axis,
                                                                   float &position);
+*/
+        float EvalLocalCostHeuristics(BspLeaf *node,
+                const AxisAlignedBox3 &box,
+                const int axis,
+                float &position,
+                int &objectsBack,
+                int &objectsFront);
 
         /** Subdivides the rays into front and back rays according to the split plane.
@@ -1523 +1531 @@
         float GetMemUsage() const;
 
+        /** Evaluates the influence on the pvs of the visibility event ve.
+                @param ve the visibility event
+                @param pvsLeft updates the left pvs
+                @param rightPvs updates the right pvs
+        */
+        void EvalPvsIncr(const SortableEntry &ve,
+                                          int &pvsLeft,
+                                          int &pvsRight) const;
+
+        void RemoveContriFromPvs(Intersectable *object, int &pvs) const;
+        void AddContriToPvs(Intersectable *object, int &pvs) const;
+
+        /** Prepares objects for SAH.
+                @returns pvs size of the ray container
+        */
+        int PrepareHeuristics(const RayInfoContainer &rays);
+
+        int PrepareHeuristics(Intersectable *object);
 
 protected: