Changeset 1123 for GTP/trunk

Timestamp:

07/12/06 08:23:09 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• VspOspTree.cpp (modified) (9 diffs)
• VspOspTree.h (modified) (3 diffs)

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

@@ -22 +22 @@
 
 #define USE_FIXEDPOINT_T 0
-#define COUNT_OBJECTS 0
+
 
 //-- static members
@@ -2649 +2649 @@
 mTimeStamp(1)
 {
-
         bool randomize = false;
         Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
@@ -2666 +2665 @@
         Environment::GetSingleton()->GetFloatValue("OspTree.Termination.maxCostRatio", mTermMaxCostRatio);
 
-        Environment::GetSingleton()->GetFloatValue("OspTree.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
-        Environment::GetSingleton()->GetIntValue("OspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
+        Environment::GetSingleton()->GetFloatValue("OspTree.Termination.minGlobalCostRatio",
+                mTermMinGlobalCostRatio);
+        Environment::GetSingleton()->GetIntValue("OspTree.Termination.mTermGlobalCostMissTolerance);
 
 
@@ -2678 +2678 @@
         // if only the driving axis is used for axis aligned split
         Environment::GetSingleton()->GetBoolValue("OspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
-        
         Environment::GetSingleton()->GetFloatValue("OspTree.maxStaticMemory", mMaxMemory);
-
         Environment::GetSingleton()->GetBoolValue("OspTree.useCostHeuristics", mUseCostHeuristics);
 
@@ -3117 +3115 @@
 int OspTree::PrepareHeuristics(Intersectable *object)
 {
-#if COUNT_OBJECTS
-        return 1;
-#else
-        // the priotity of the object is the number of view cell pvs entries of the object
-        return object->mViewCellPvs.GetSize();
-#endif
+        if (mUseSah)
+                return 1;
+        else
+                // the priotity of the object is the number of view cell pvs entries of the object
+                return object->mViewCellPvs.GetSize();
 }
 
@@ -3187 +3184 @@
 void OspTree::RemoveContriFromPvs(Intersectable *object, int &pvs) const
 {
-#if COUNT_OBJECTS
-        -- pvs;
-#else
-        // the cost of an object is the number of view cells it is part of
-        pvs -= object->mViewCellPvs.GetSize();
-#endif
+        if (mUseSah)
+                -- pvs;
+        else
+                // the cost of an object is the number of view cells it is part of
+                pvs -= object->mViewCellPvs.GetSize();
 }
 
@@ -3198 +3194 @@
 void OspTree::AddContriToPvs(Intersectable *object, int &pvs) const
 {
-#if COUNT_OBJECTS
-        ++ pvs;
-#else
-        // the cost of an object is the number of view cells it is part of
-        pvs += object->mViewCellPvs.GetSize();
-#endif
+        if (mUseSah)
+                ++ pvs;
+        else
+                // the cost of an object is the number of view cells it is part of
+                pvs += object->mViewCellPvs.GetSize();
 }
 
@@ -3287 +3282 @@
 float OspTree::EvalViewCellPvsIncr(Intersectable *object) const
 {
-#if COUNT_OBJECTS       
-        return 1;
-#else
-        return (float)object->mViewCellPvs.GetSize();
-#endif
+        if (mUseSah)
+                return 1;
+        else
+                return (float)object->mViewCellPvs.GetSize();
 }
 
@@ -3787 +3781 @@
 {
         RayInfoContainer *rays = new RayInfoContainer();
+
+        // makes no sense otherwise because only one kd cell available
+        // during view space partition
+        mVspTree.mPvsCountMethod = VspTree::PER_OBJECT;
+
         PrepareVsp(sampleRays, forcedViewSpace, *rays);
 

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

@@ -1023 +1023 @@
 
 
-
         //-- local termination
 
@@ -1596 +1595 @@
 
 
-
         //-- global criteria
 
@@ -1628 +1626 @@
         float mEpsilon;
 
+
+        bool mUseSah;
 
         /// subdivision stats output file