Changeset 1786 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

Timestamp:

11/24/06 00:24:41 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -207 +207 @@
         inline void SetTimeStamp(const int timeStamp) { mTimeStamp = timeStamp; };
 
-        /////////////////////////////////////
-        //-- mailing options
-        
-//      static void NewMail(const int reserve = 1) {
-//              sMailId += sReservedMailboxes;
-//              sReservedMailboxes = reserve;
-//      }
-        
-//      void Mail() { mMailbox = sMailId; }
-//      bool Mailed() const { return mMailbox == sMailId; }
-
-//      void Mail(const int mailbox) { mMailbox = sMailId + mailbox; }
-//      bool Mailed(const int mailbox) const { return mMailbox == sMailId + mailbox; }
-
-//      int IncMail() { return ++ mMailbox - sMailId; }
-
-//      static int sMailId;
-//      //int mMailbox;
-//      static int sReservedMailboxes;
-
-
-
-        /////////////////////////////////////////////
+
+        ////////////////////////
         //-- inherited functions from Intersectable
 
@@ -266 +245 @@
 
         ///////////////////////////////////
+
+        float mRenderCost;
 
 protected:
@@ -644 +625 @@
         void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 
+        float GetRenderCostIncrementially(BvhNode *node) const;
+
+
 protected:
 
@@ -911 +895 @@
         bool InitialTerminationCriteriaMet(const BvhTraversalData &tData) const;
 
-        float mMinInitialSurfaceArea;
-        int mInitialObjectsSize;
 
 protected:
@@ -1007 +989 @@
         float mMemoryConst;
 
+        int mMaxTests;
+
         bool mIsInitialSubdivision;
 
         bool mApplyInitialPartition;
-
-        int mMaxTests;
+        
+        int mInitialMinObjects;
+        float mInitialMaxAreaRatio;
+        float mInitialMinArea;
 };