Changeset 1715 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

11/06/06 20:47:06 (18 years ago)

Author:

bittner

Message:

new visibility filter support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (6 diffs)

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

@@ -26 +26 @@
 
 
+#define ABS_CONTRIBUTION_WEIGHT 1.0f
+
 // warning: Should not count origin object for sampling because it disturbs heuristics
-#define SAMPLE_ORIGIN_OBJECTS 1  // matt temp
+#define SAMPLE_ORIGIN_OBJECTS 0  // matt temp
 
 // $$JB HACK
@@ -666 +668 @@
         bool success = parser.ParseViewCellsFile(filename, &vm, objects, bconverter);
 
+        cout<<"viewcells parsed "<<endl<<flush;
+        
         if (success)
         {
@@ -2028 +2032 @@
         }
 
-        return ray.mRelativePvsContribution;
+        return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
+          (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
 }
 
@@ -2415 +2420 @@
         float viewSpaceFilterSize = Magnitude(mViewSpaceBox.Size())*relViewSpaceFilterSize;
         float spatialFilterSize = Magnitude(kdTree->GetBox().Size())*relSpatialFilterSize;
-
+        
         int i;
         for (i=0, it = mViewCells.begin(); it != it_end; ++ it, ++ i) {
-                ApplyFilter(*it,
-                        kdTree,
-                        viewSpaceFilterSize,
-                        spatialFilterSize,
-                        newPvs[i]
-                        );
-        }
-
+          ApplyFilter(*it,
+                                  kdTree,
+                                  viewSpaceFilterSize,
+                                  spatialFilterSize,
+                                  newPvs[i]
+                                  );
+        }
+        
         // now replace all pvss
         for (i = 0, it = mViewCells.begin(); it != it_end; ++ it, ++ i) {
-
-                ObjectPvs &pvs = (*it)->GetPvs();
-                pvs.Clear();
-                pvs = newPvs[i];
-                newPvs[i].Clear();
+          
+          ObjectPvs &pvs = (*it)->GetPvs();
+          pvs.Clear();
+          pvs = newPvs[i];
+          newPvs[i].Clear();
         }
 
@@ -2489 +2494 @@
 }
 
+
+void
+ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
+                                                           KdTree *kdTree,
+                                                           const float filterSize,
+                                                           ObjectPvs &pvs
+                                                           )
+{
+  // first determine the average
+
+
+
+}
+  
 
 void ViewCellsManager::ExportColor(Exporter *exporter, 
@@ -5622 +5641 @@
         }
 
-        return ray.mRelativePvsContribution;
+        
+
+        return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
+          (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
 }