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

Timestamp:

10/24/06 10:15:48 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -122 +122 @@
                 "Hierarchy.Construction.considerMemory", mConsiderMemory);
 
+        Environment::GetSingleton()->GetBoolValue(
+                "Hierarchy.Construction.considerMemory2", mConsiderMemory2);
+
         Environment::GetSingleton()->GetFloatValue(
                 "Hierarchy.Termination.maxMemory", mTermMaxMemory);
@@ -141 +144 @@
         Debug << "minimal number of steps from same type: " << mMinStepsOfSameType << endl;
         Debug << "maximal allowed memory: " << mTermMaxMemory << endl;
-        Debug << "consider mem: " << mConsiderMemory << endl;
+        Debug << "consider memory: " << mConsiderMemory << endl;
+        Debug << "consider memory2: " << mConsiderMemory << endl;
         Debug << "mem const: " << mMemoryConst << endl;
 
@@ -422 +426 @@
                 // decide upon next split type
                 const float vspPriority =  viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20;
-                const float ospPriority =  viewSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20;
+                const float ospPriority =  objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20;
                 
                 cout << "new decicion, vsp: " << vspPriority << ", osp: " << ospPriority << endl;
@@ -429 +433 @@
                 if (ospPriority >= vspPriority)
                 {
-                        // use splits of one kind until rendercost decrease of other domain is reached
-                        renderCostDecr = vspPriority;
-                        cout << "comparing with this render cost: " << renderCostDecr << endl;
+                        cout << "osp" << endl;
                         // dirtied view space candidates
                         SubdivisionCandidateContainer dirtyVspList;
@@ -450 +452 @@
                 else
                 {
-                        // use splits of one kind until rendercost slope is reached
-                        renderCostDecr = ospPriority;
-                        cout << "comparing with this render cost: " << renderCostDecr << endl;
-
+                        cout << "vsp" << endl;
+                        
                         /////////////////
                         // subdivide view space with respect to the objects