Changeset 578

Timestamp:

01/25/06 18:28:09 (18 years ago)

Author:

mattausch

Message:

added upper and lower boundary for pvs penalty in heuristics

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (5 diffs)
• src/VspBspTree.cpp (modified) (5 diffs)
• src/VspBspTree.h (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -23 +23 @@
         useGlRenderer false
 #       type sampling
-#       type vss
-        type rss
+        type vss
+#       type rss
         detectEmptyViewSpace false
 }
@@ -176 +176 @@
         # samples used for view cell construction
         Construction {
-                samples 500000
-                samplesPerPass 50000
+                samples 1500000
+                samplesPerPass 40000
         }
 
         exportToFile false
-        loadFromFile true
+        loadFromFile false
 
         #type kdTree
@@ -271 +271 @@
 VspBspTree {
         Construction {
-                samples 90000
+                samples 900000
                 epsilon 0.005
                 randomize false
@@ -315 +315 @@
                 #maxAccRayLength        100
                 
-                maxViewCells            500
+                maxViewCells            5000
                 
                 # used for pvs criterium
@@ -336 +336 @@
         PostProcess {
                 maxCostRatio 0.1
-                minViewCells 5000
+                minViewCells 110
                 useRaysForMerge false
                 exportMergeStats false

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -38 +38 @@
 float BspMergeCandidate::sOverallCost = 0;
 bool BspMergeCandidate::sUseArea = false;
+
+
+int BspMergeCandidate::sUpperPvsLimit = 120;
+int BspMergeCandidate::sLowerPvsLimit = 5;
+
 
 
@@ -400 +405 @@
                                                           geom);
 
-        // first node is kd node
-        tData.mIsKdNode = true;
+        // first node is kd node, i.e. an axis aligned box
+        if (1)
+        tData.mIsKdNode = true;
+        else
+                tData.mIsKdNode = false;
 
         tStack.push(tData);
@@ -1386 +1394 @@
                 {
                         // try to equalize render differences
-                        const float oldCost = pOverall * (float)totalPvs + Limits::Small;
-                        float newCost = fabs(pvsFront * pFront - pvsBack * pBack);
+                        //const float oldCost = pOverall * (float)totalPvs + Limits::Small;
+                        //float newCost = fabs(pvsFront * pFront - pvsBack * pBack);
+                        const float oldCost = pOverall + Limits::Small;
+                        float newCost = (float)abs(pvsFront - pvsBack);
 
                         cost += mPvsFactor * newCost / oldCost;
@@ -3523 +3533 @@
 
 
+inline float BspMergeCandidate::EvalPvsPenalty(int pvs) const
+{
+        // clamp to minmax values
+        if (pvs > sUpperPvsLimit)
+                return (float)sUpperPvsLimit;
+        if (pvs < sLowerPvsLimit)
+                return (float)sLowerPvsLimit;
+
+        return (float)pvs;
+}
+
+
 void BspMergeCandidate::EvalMergeCost()
 {
@@ -3532 +3554 @@
         //const int newPvs = diff1 + vc1->GetPvs().GetSize();
         const int newPvs = ComputeMergedPvsSize(vc1->GetPvs(), vc2->GetPvs());
+        const float f = EvalPvsPenalty(newPvs);
 
         //-- compute ratio of old cost

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.h

@@ -763 +763 @@
 class BspMergeCandidate
 {  
+        friend class VspBspTree;
+
 public:
 
@@ -807 +809 @@
         static bool sUseArea;
 
+        static int sUpperPvsLimit;
+        static int sLowerPvsLimit;
+
+protected:
+
+        
         /** Evaluates the merge costs of the leaves.
         */
         void EvalMergeCost();
 
-protected:
+        /** penalty for a given pvs size.
+        */
+        inline float EvalPvsPenalty(int pvs) const;
 
         /** Cost of a view cell.