Changeset 1673

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/vsposp_typical.sh (modified) (2 diffs)
• src/BvHierarchy.cpp (modified) (1 diff)
• src/BvHierarchy.h (modified) (2 diffs)
• src/Environment.cpp (modified) (1 diff)
• src/HierarchyManager.cpp (modified) (5 diffs)
• src/HierarchyManager.h (modified) (1 diff)
• src/Pvs.h (modified) (1 diff)
• src/VspTree.cpp (modified) (2 diffs)
• src/VspTree.h (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.sh

@@ -12 +12 @@
 
 #SCENE=vsposp_typical
-SCENE=soda5_vsposp
-#SCENE=soda_vsposp
+#SCENE=soda5_vsposp
+SCENE=soda_vsposp
 #SCENE=vienna_vsposp
 #SCENE=arena_vsposp
@@ -71 +71 @@
   -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \
   -hierarchy_construction_type=2 \
-  -hierarchy_construction_consider_memory=false \
+  -hierarchy_construction_consider_memory2=true \
+ -bvh_construction_render_cost_decrease_weight=0.99 \
+ -vsp_construction_render_cost_decrease_weight=0.99 \
   -hierarchy_construction_multilevel=false \
   -hierarchy_term_memory_const=0.9 \

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

@@ -548 +548 @@
                 priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
-                if (1)//0 && mHierarchyManager->mConsiderMemory)
+                if (mHierarchyManager->mConsiderMemory2)
                 {
                         priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);

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

@@ -441 +441 @@
                 {
                         HierarchyManager *hm = sBvHierarchy->mHierarchyManager;
+                
                         if (hm->ConsiderMemory())
                         {
@@ -446 +447 @@
                                 const float mc = hm->GetHierarchyStats().mMemory +
                                                                  (float)mPvsEntriesIncr * ObjectPvs::GetEntrySizeByte();
-                                //cout << "x";
+                                
                                 return - (rc * mc) / float(1024 * 1024);
                         }

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

@@ -2522 +2522 @@
                                         "false");
 
+        RegisterOption("Hierarchy.Construction.considerMemory2",
+                                        optBool,
+                                        "hierarchy_construction_consider_memory2=",
+                                        "false");
+
         RegisterOption("Hierarchy.Construction.repairQueue",
                                         optBool,

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

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

@@ -535 +535 @@
         bool mConsiderMemory;
 
+        /// constant value for driving the heuristics
         float mMemoryConst;
-
+        
+        bool mConsiderMemory2;
 
         friend VspTree;

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

@@ -497 +497 @@
 float Pvs<T, S>::GetEntrySize()
 {
-        return (float)sizeof(T) + sizeof(S) / float(1024 * 1024);
+        return (float)(sizeof(T) + sizeof(S)) / float(1024 * 1024);
 }
 

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

@@ -786 +786 @@
 
 
-void VspTree::EvalSubdivisionCandidate(VspSubdivisionCandidate &splitCandidate, bool computeSplitPlane)
+void VspTree::EvalSubdivisionCandidate(VspSubdivisionCandidate &splitCandidate, 
+                                                                           bool computeSplitPlane)
 {
         if (computeSplitPlane)
@@ -825 +826 @@
         float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
-        if (1)//0 && mHierarchyManager->mConsiderMemory)
+        if (mHierarchyManager->mConsiderMemory2)
         {
                 priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);

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

@@ -864 +864 @@
         int PrepareHeuristics(KdLeaf *leaf);
 
-        /** Reevaluates the priority of this split candidate
-                @returns priority
-        */
-        //float EvalPriority(const VspSubdivisionCandidate &splitCandidate) const;
-
+        
         /////////////////////////////////////////////////////////////////////////////
 
@@ -1073 +1069 @@
         bool mOutOfMemory;
 
-
+        ////////////
         //-- split heuristics based parameters