Changeset 2547 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

08/22/07 14:27:41 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (6 diffs)

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

@@ -387 +387 @@
 mOutOfBoundsCell(NULL),
 mStoreRays(false),
-//mStoreRays(true),
 mTimeStamp(1),
 mHierarchyManager(NULL)
 {
         mLocalSubdivisionCandidates = new vector<SortableEntry>;
-
-        bool randomize = false;
-        Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
-        if (randomize)
-                Randomize(); // initialise random generator for heuristics
+        ParseEnvironment();
+}
+
+
+VspTree::VspTree(const AxisAlignedBox3 &bbox):
+mRoot(NULL),
+mOutOfBoundsCell(NULL),
+mStoreRays(false),
+mTimeStamp(1),
+mHierarchyManager(NULL),
+mBoundingBox(bbox)
+{
+        mLocalSubdivisionCandidates = new vector<SortableEntry>;
+        ParseEnvironment();
+}
+
+
+
+void VspTree::ParseEnvironment()
+{
+        // initialise random generator for heuristics
+        bool randomize;
+    Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
+        if (randomize) Randomize(); 
 
         char subdivisionStatsLog[100];
         Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
         mSubdivisionStats.open(subdivisionStatsLog);
+
 
         /////////////
@@ -410 +429 @@
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.minProbability", mTermMinProbability);
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxRayContribution", mTermMaxRayContribution);
-        
+
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxViewCells", mMaxViewCells);
@@ -432 +451 @@
 
         Environment::GetSingleton()->GetFloatValue("VspTree.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
-        
+
         // if only the driving axis is used for axis aligned split
         Environment::GetSingleton()->GetBoolValue("VspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
@@ -439 +458 @@
 
         //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(VspViewCell));
-        //mMemoryConst = 50;//(float)(sizeof(VspViewCell));
         //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(ObjectPvs));
-
-        mMemoryConst = 16;//(float)sizeof(ObjectPvs);
-        
+        //mMemoryConst = (float)sizeof(ObjectPvs);
+
+        // hack
+        mMemoryConst = 16;
+
 
         //////////////
@@ -450 +470 @@
         Debug << "******* VSP options ********" << endl;
 
-    Debug << "max depth: " << mTermMaxDepth << endl;
+        Debug << "max depth: " << mTermMaxDepth << endl;
         Debug << "min PVS: " << mTermMinPvs << endl;
         Debug << "min probabiliy: " << mTermMinProbability << endl;
@@ -458 +478 @@
         Debug << "miss tolerance: " << mTermMissTolerance << endl;
         Debug << "max view cells: " << mMaxViewCells << endl;
+
         Debug << "randomize: " << randomize << endl;
-
         Debug << "min global cost ratio: " << mTermMinGlobalCostRatio << endl;
         Debug << "global cost miss tolerance: " << mTermGlobalCostMissTolerance << endl;