Changeset 1829 for GTP/trunk/Lib

Timestamp:

11/29/06 12:18:27 (18 years ago)

Author:

bittner

Message:

ray caster bug fix

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• InternalRayCaster.cpp (modified) (1 diff)
• RssTree.cpp (modified) (4 diffs)
• run_test2 (modified) (1 diff)

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

@@ -56 +56 @@
         }
   
+        mPreprocessor.SetupRay(ray, simpleRay.mOrigin, -simpleRay.mDirection);
+        ray.mFlags &= ~Ray::CULL_BACKFACES;
   
   if (castDoubleRay && mKdTree->CastRay(ray)) 
                 {
-                        mPreprocessor.SetupRay(ray, simpleRay.mOrigin, -simpleRay.mDirection);
-                        ray.mFlags &= ~Ray::CULL_BACKFACES;
                         hitB.mObject = ray.intersections[0].mObject;
                         hitB.mPoint = ray.Extrap(ray.intersections[0].mT);

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

@@ -2834 +2834 @@
           sumContributions += c1;
           if (c1 > maxContribution)
-                maxContribution = c1;
+                        maxContribution = c1;
           
           //$$ 20.7. changed to sqr to pronouce higher contribution so that
@@ -2842 +2842 @@
           sumRelContributions += c2;
           if (c2 > maxRelContribution)
-                maxRelContribution = c2;
+                        maxRelContribution = c2;
 
           //sumWeights += weight;
@@ -2850 +2850 @@
         float distImportance = 0.0f;
 
+        float spatialArea = GetBBox(leaf).SurfaceArea();
+        float dirArea = GetDirBBox(leaf).SurfaceArea();
         if (leaf->rays.size()) {
           // compute average length of the ray 
           float avgLength = sumLength/leaf->rays.size();
           // compute estimated area of the visible surface corresponding to these rays
-          float ss = GetBBox(leaf).SurfaceArea()/2.0f;
-          float sd = GetDirBBox(leaf).SurfaceArea();
+          float ss = spatialArea/2.0f;
+          float sd = dirArea;
           float s = ss + avgLength*(2*sqrt(ss*sd) + avgLength*sd);
           
@@ -2864 +2866 @@
         // sumWeights = leaf->mTotalRays;
 
+        //$$ test 30.11. 2006 
+        // normalize per volume of the cell not the number of rays!
+        sumWeights = spatialArea*dirArea;
+        
         if (sumWeights != 0.0f) {
           leaf->mImportance =

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -42 +42 @@
 $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
  -rss_use_importance+ -rss_update_subdivision+ -rss_split=hybrid -hybrid_depth=10 \
- -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-i-combined-update-ccb12-n.log \
--preprocessor_histogram_file=$PREFIX-i-combined-update-ccb12-n.hlog
+ -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-i-combined-update-ccb12-nn.log \
+-preprocessor_histogram_file=$PREFIX-i-combined-update-ccb12-nn.hlog