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

Timestamp:

07/07/06 16:14:33 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -10 +10 @@
 #include "RayInfo.h"
 #include "gzstream.h"
-#include "mixkit/MxHeap.h"
+#include "FlexibleHeap.h"
 
 
@@ -48 +48 @@
 /** Candidate for a view space / object space split.
 */
-class SplitCandidate: public MxHeapable
+class SplitCandidate: public Heapable
 {  
 public:
@@ -62 +62 @@
 
         /// priority of this split
-        float mPriority;
-        
-        /// pointers used for building up heap
-        SplitCandidate *mParent;
-        SplitCandidate *mLeft;
-        SplitCandidate *mRight;
-
-        SplitCandidate(): mPriority(0) 
+        //float mPriority;
+        
+        SplitCandidate()
         {};
 
@@ -75 +70 @@
         {}
 
+        virtual void EvalPriority() = 0;
         virtual int Type() const = 0;
-
-        /** Returns cost of the traversal data.
-        */
-        float GetPriority() const
-        {
-                return mPriority;
-        }
-
-        /*friend bool operator<(const SplitCandidate &a, const SplitCandidate &b)
-        {
-                return a.GetPriority() < b.GetPriority();
-        }*/
 };
 
@@ -462 +446 @@
 
 
+#if 0
 typedef std::priority_queue<SplitCandidate *, 
                                                         std::vector<SplitCandidate *>, 
                                                         GtPriority<std::vector<SplitCandidate *>::value_type> > SplitQueue;
-
-#if TODO
-/** candidate for a view space split
-*/
-class OspSplitCandidate: public SplitCandidate
-{  
-        /// parent data
-        OspTraversalData mParentData;
-                
-        VspOspSplitCandidate(): mRenderCost(0) 
-        {};
-
-        int Type() const { return OSP_CANDIDATE; } 
-
-        VspOspSplitCandidate(const AxisAlignedPlane &plane, const VspOspTraversalData &tData): 
-        mSplitPlane(plane), mParentData(tData), mRenderCost(0)
-        {}
-};
 #endif
+
+typedef FlexibleHeap<SplitCandidate *> SplitQueue;
 
 /** View Space Partitioning tree.
@@ -588 +557 @@
         {  
         public:
+                static VspTree* sVspTree;
                 /// parent data
                 VspTraversalData mParentData;
                 
-                VspSplitCandidate()
+                VspSplitCandidate(const VspTraversalData &tData): mParentData(tData)
                 {};
 
                 int Type() const { return VIEW_SPACE; }
+
+                void EvalPriority()
+                {
+                        sVspTree->EvalSplitCandidate(*this);    
+                }
 
                 VspSplitCandidate(const AxisAlignedPlane &plane, const VspTraversalData &tData): 
@@ -796 +771 @@
         /** Evaluates candidate for splitting.
         */
-        void EvalSplitCandidate(VspTraversalData &tData, VspSplitCandidate &splitData);
+        void EvalSplitCandidate(VspSplitCandidate &splitData);
 
         /** Evaluates render cost decrease of next split.
@@ -1206 +1181 @@
         {  
         public:
+                static OspTree* sOspTree;
+
                 /// parent data
                 OspTraversalData mParentData;
                 
-                OspSplitCandidate()
+                OspSplitCandidate(const OspTraversalData &tData): mParentData(tData)
                 {};
 
                 int Type() const { return VIEW_SPACE; }
+        
+                void EvalPriority()
+                {
+                        sOspTree->EvalSplitCandidate(*this);    
+                }
 
                 OspSplitCandidate(const AxisAlignedPlane &plane, const OspTraversalData &tData): 
@@ -1376 +1358 @@
         /** Evaluates candidate for splitting.
         */
-        void EvalSplitCandidate(OspTraversalData &tData, OspSplitCandidate &splitData);
+        void EvalSplitCandidate(OspSplitCandidate &splitData);
 
         /** Computes priority of the traversal data and stores it in tData.
@@ -1706 +1688 @@
         SplitCandidate *NextSplitCandidate();
 
-        void RepairQueue();
+        void RepairQueue(const vector<SplitCandidate *> &dirtyList);
 
         AxisAlignedBox3 mBoundingBox;