Changeset 1314 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

09/03/06 03:13:29 (18 years ago)

Author:

mattausch

Message:

started osp mesh construction for obj files. Introduced new primitive faceintersectable

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (4 diffs)

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

@@ -105 +105 @@
                 "Hierarchy.Construction.minDepthForOsp", mMinDepthForObjectSpaceSubdivion);
         
+        Environment::GetSingleton()->GetBoolValue(
+                "Hierarchy.Construction.repairQueue", mRepairQueue);
+
         Debug << "******** Hierachy Manager Parameters ***********" << endl;
         Debug << "max leaves: " << mTermMaxLeaves << endl;
         Debug << "min global cost ratio: " << mTermMinGlobalCostRatio << endl;
         Debug << "global cost miss tolerance: " << mTermGlobalCostMissTolerance << endl;
+        Debug << "construction type: " << mConstructionType << endl;
+        Debug << "min depth for object space subdivision: " << mMinDepthForObjectSpaceSubdivion << endl;
+        Debug << "repair queue: " << mRepairQueue << endl;
 }
 
@@ -343 +349 @@
         PrepareViewSpaceSubdivision(sampleRays, objects, forcedViewSpace);
 
-        //const bool repairQueue = false;
-        const bool repairQueue = true;
-cout << "here55 " << mVspTree->mVspStats.maxDepth << " (" << mMinDepthForObjectSpaceSubdivion << ") " << endl;
         // start object space subdivision immediately?
         if (StartObjectSpaceSubdivision())
@@ -379 +382 @@
                         // reevaluate candidates affected by the split for view space splits, 
                         // this would be object space splits and other way round
-                        if (repairQueue) RepairQueue();
+                        if (mRepairQueue) RepairQueue();
                 }
 
@@ -386 +389 @@
                 if (StartObjectSpaceSubdivision())
                 {
+                        mObjectSpaceSubdivisionType = savedObjectSpaceSubdivisionType;
+
+                        cout << "starting object space subdivision at maximal view space subdivison depth " << mVspTree->mVspStats.maxDepth << " (" << mMinDepthForObjectSpaceSubdivion << ") " << endl;
+                        PrepareObjectSpaceSubdivision(sampleRays, objects);
+
                         cout << "reseting queue ... ";
                         ResetQueue();
                         cout << "finished" << endl;
-
-                        cout << "starting object space subdivision at maximal view space subdivison depth " << mVspTree->mVspStats.maxDepth << " (" << mMinDepthForObjectSpaceSubdivion << ") " << endl;
-                                                
-                        mObjectSpaceSubdivisionType = savedObjectSpaceSubdivisionType;
-                        PrepareObjectSpaceSubdivision(sampleRays, objects);
                 }