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

Timestamp:

07/19/06 18:31:33 (18 years ago)

Author:

mattausch

Message:

worked on vsp osp tree

File:

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

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

@@ -34 +34 @@
 class OspTree;
 class KdIntersectable;
-
-
-
+class KdTree;
+class VspTree;
 class KdTreeStatistics;
+
+
 
 template <typename T> class GtPriority
@@ -410 +411 @@
 class VspLeaf: public VspNode 
 {
+        friend VspTree;
 
 public:
@@ -802 +804 @@
                                                          float &pBack) const;
 
-        void ComputeBoundingBox(const RayInfoContainer &rays,
-                AxisAlignedBox3 *forcedBoundingBox);
+        void ComputeBoundingBox(const VssRayContainer &rays,
+                                                        AxisAlignedBox3 *forcedBoundingBox);
 
         /** Evaluates candidate for splitting.
@@ -1262 +1264 @@
         OspTree();
 
+        OspTree(const KdTree &kdTree);
+
         /** Default destructor.
         */
@@ -1481 +1485 @@
                 OspTraversalData &backData);
 
-        void SplitObjects(const AxisAlignedPlane & splitPlane,
+        void SplitObjects(KdLeaf *leaf,
+                                          const AxisAlignedPlane & splitPlane,
                                           const ObjectContainer &objects,
                                           ObjectContainer &front,
                                           ObjectContainer &back);
 
-#if DEPRECATED
-         /** does some post processing on the objects in the new child leaves.
-         */
-        void ProcessLeafObjects(KdLeaf *parent, KdLeaf *front, KdLeaf *back) const;
-#endif
+        /** does some post processing on the objects in the new child leaves.
+        */
+        void ProcessMultipleRefs(KdLeaf *leaf) const;
+
         /** Selects an axis aligned for the next split.
                 @returns cost for this split
@@ -1603 +1607 @@
         */
         void ComputeBoundingBox(const ObjectContainer &objects,
-                AxisAlignedBox3 *forcedBoundingBox);
+                                                        AxisAlignedBox3 *forcedBoundingBox);
 
         void CollectDirtyCandidates(OspSplitCandidate *sc,
@@ -1616 +1620 @@
                 RayInfoContainer &rays);
 
+
+        void ReadEnvironment();
 
 protected:
@@ -1700 +1706 @@
         /// stores the kd node intersectables used for pvs
         KdIntersectableMap mKdIntersectables;
+
+
+private:
+
+        bool mCopyFromKdTree;
 };