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

Timestamp:

10/24/06 17:42:03 (18 years ago)

Author:

mattausch

Message:

worked on pvs heuristics

File:

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

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

@@ -256 +256 @@
         
         // calculate cost in MB
-        const float memoryCost = mHierarchyStats.mMemory  / (1024.0f * 1024.0f)
+        const float memoryCost = mHierarchyStats.mMemory  / float(1024 * 1024)
                                                          + objectSpaceMem + viewSpaceMem;
 
@@ -383 +383 @@
         // number of initial splits
         const int minSteps = mMinStepsOfSameType;
+        const int maxSteps = mMinStepsOfSameType + 500;
         float renderCostDecr = Limits::Infinity;
 
-        SubdivisionCandidate *osc = 
-                PrepareObjectSpaceSubdivision(sampleRays, objects);
+        SubdivisionCandidate *osc = PrepareObjectSpaceSubdivision(sampleRays, objects);
         
         objectSpaceQueue.Push(osc);
@@ -399 +399 @@
         // for first round, use sah splits. Once view space partition
         // has started, use render cost heuristics instead
-        const int ospSteps = RunConstruction(objectSpaceQueue, dirtyVspList, NULL, minSteps);
+        const int ospSteps = 
+                RunConstruction(objectSpaceQueue, dirtyVspList, NULL, minSteps, maxSteps);
 
         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
@@ -440 +441 @@
                         // for first round, use sah splits. Once view space partition
                         // has started, use render cost heuristics instead
-                        const int ospSteps = 
-                                RunConstruction(objectSpaceQueue, dirtyVspList, viewSpaceQueue.Top(), minSteps);
+                        const int ospSteps = RunConstruction(objectSpaceQueue, 
+                                                                                                 dirtyVspList, 
+                                                                                                 viewSpaceQueue.Top(), 
+                                                                                                 minSteps, 
+                                                                                                 maxSteps);
 
                         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
@@ -461 +465 @@
                         // process view space candidates
                         const int vspSteps = 
-                                RunConstruction(viewSpaceQueue, dirtyOspList, objectSpaceQueue.Top(), minSteps);
+                                RunConstruction(viewSpaceQueue, dirtyOspList, objectSpaceQueue.Top(), minSteps, maxSteps);
 
                         cout << "\n" << vspSteps << " view space partition steps taken" << endl;
@@ -700 +704 @@
 
         // memory size in byte
-        mHierarchyStats.mMemory += (float)ObjectPvs::GetEntrySizeByte();
+        mHierarchyStats.mMemory += (float)ObjectPvs::GetEntrySizeByte() * pvsEntriesIncr;
         mHierarchyStats.mRenderCostDecrease = sc->GetRenderCostDecrease();
 
@@ -841 +845 @@
 
                         cout << "\nstarting object space subdivision after " 
-                                 << mVspTree->mVspStats.nodes << " (" 
-                                 << mMinStepsOfSameType << ") " << endl;
+                                 << mVspTree->mVspStats.nodes << " (" << mMinStepsOfSameType << ") " << endl;
 
                         SubdivisionCandidate *ospSc = PrepareObjectSpaceSubdivision(sampleRays, objects);
@@ -895 +898 @@
                                                                           SubdivisionCandidateContainer &dirtyCandidates,
                                                                           SubdivisionCandidate *oldCandidate,
-                                                                          const int minSteps)
-{
+                                                                          const int minSteps,
+                                                                          const int maxSteps)
+{
+        if (minSteps >= maxSteps)
+                cout << "error!! " << minSteps << " equal or larger maxSteps" << endl;
+
         int steps = 0;
         SubdivisionCandidate::NewMail();
@@ -908 +915 @@
 
                 // minimum slope reached
-                if ((sc->GetPriority() < threshold) && !(steps < minSteps))
-                {
-                        cout << "**************** breaking on " << sc->GetPriority() << " smaller than " << threshold << endl;
+                if ((steps > maxSteps) || 
+                        ((sc->GetPriority() < threshold) && !(steps < minSteps)))
+                {
+                        cout << "\n**************** breaking on " << sc->GetPriority() << " smaller than " << threshold << endl;
                         break;
                 }