Changeset 435 for trunk/VUT/GtpVisibilityPreprocessor/src

Timestamp:

11/25/05 16:51:47 (19 years ago)

Author:

bittner

Message:

default.env cleanup

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Makefile (modified) (2 diffs)
• VssTree.cpp (modified) (6 diffs)
• VssTree.h (modified) (1 diff)
• X3dExporter.cpp (modified) (1 diff)
• default.env (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (1.07a) (Qt 3.3.2) on: Wed Nov 23 09:47:01 2005
+# Generated by qmake (1.07a) (Qt 3.3.2) on: Fri Nov 25 16:40:39 2005
 # Project:  preprocessor.pro
 # Template: app
@@ -762 +762 @@
                 AxisAlignedBox3.h \
                 Statistics.h \
+                Containers.h \
                 Vector3.h \
                 common.h \

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.cpp

@@ -479 +479 @@
                                                         );
 
-  //    cout<<axis<<" r="<<costRatio<<endl;
+  cout<<axis<<" r="<<costRatio<<endl;
         
   if (costRatio > termMaxCostRatio) {
@@ -1611 +1611 @@
           leaves++;
           VssTreeLeaf *leaf = (VssTreeLeaf *)node;
-          float c = leaf->GetAvgRayContribution();
+          float c = leaf->GetImportance();
           if (c > maxRayContribution)
                 maxRayContribution = c;
@@ -1645 +1645 @@
     if (node->IsLeaf()) {
           VssTreeLeaf *leaf = (VssTreeLeaf *)node;
-          float c = leaf->GetAvgRayContribution();
+          float c = leaf->GetImportance();
           int num = (c*ratioPerLeaf + 0.5);
           //                    cout<<num<<" ";
@@ -1776 +1776 @@
   for (i=0; i < leaves.size() && k < numberOfLeaves; i++)
         if (ValidLeaf(leaves[i])) {
-          float c = leaves[i]->GetAvgRayContribution();
+          float c = leaves[i]->GetImportance();
           sumContrib += c;
           //            cout<<"ray contrib "<<i<<" : "<<c<<endl;
@@ -1789 +1789 @@
           k++;
           VssTreeLeaf *leaf = leaves[i];
-          float c = leaf->GetAvgRayContribution();
+          float c = leaf->GetImportance();
           int num = (c*ratioPerLeaf + 0.5);
           GenerateLeafRays(leaf, num, rays);
@@ -1829 +1829 @@
 
         
+float
+VssTreeLeaf::GetImportance()  const
+{
+  return GetAvgRayContribution();
+}

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.h

@@ -465 +465 @@
                 return GetPvsSize()/((float)rays.size() + Limits::Small);
         }
+
+  float GetImportance() const;
 
         float GetSqrRayContribution() const {

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -764 +764 @@
                                         Vector3 direction = VssRay::GetDirection(v.x, v.y);
                                         direction.Normalize();
-                                        float k = 100.0f*leaf->GetAvgRayContribution();
+                                        float k = 100.0f*leaf->GetImportance();
                                         // get 4 corners of the ray directions
                                         

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -32 +32 @@
 
 VssTree {
-        useRss    true
+        useRss    false
         epsilon         1e-6
 
@@ -39 +39 @@
         minRays         100
         minSize         0.001
-  maxCostRatio  1.1
+        maxCostRatio    0.98
         maxRayContribution 0.05
         
@@ -45 +45 @@
         maxStaticMemory 50
 
-#       splitType regular
+        splitType regular
 #       splitType heuristic
-        splitType hybrid
+#       splitType hybrid
         splitUseOnlyDrivingAxis true
 
@@ -227 +227 @@
 }
 
-VssTree {
-        epsilon         1e-6
-
-        maxDepth        40
-        minPvs          1
-        minRays         50
-        minSize         0.00001
-        maxCostRatio    0.95
-        maxRayContribution 0.05
-        
-        maxTotalMemory  400
-        maxStaticMemory 20
-
-        splitType regular
-#       splitType heuristics
-
-        numberOfEndPointDomains 10000
-        ct_div_ci       0.0
-        randomize       false
-
-        refDirBoxMaxSize        0.1
-}
 
 VspKdTree {