Changeset 1899 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

12/15/06 18:01:34 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (3 diffs)
• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (1 diff)
• SamplingStrategy.cpp (modified) (2 diffs)
• SamplingStrategy.h (modified) (14 diffs)
• VspTree.cpp (modified) (1 diff)

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

@@ -646 +646 @@
                                                                   renderCostDecr);
         
-        if (0)
+        if (USE_AVGRAYCONTRI)
         {
                 // this leaf is a pvs entry in all the view cells
@@ -657 +657 @@
                         AvgRayContribution(pvs, splitCandidate.mParentData.mNumRays);
 
-                Debug << "bvh avgRayContri: " << avgRayContri << " #pvs: " << pvs << " #rays: " << splitCandidate.mParentData.mNumRays << endl;
-                cout << "bvh avgRayContri: " << avgRayContri << endl;
+                //Debug << "bvh avgRayContri: " << avgRayContri << " #pvs: " << pvs << " #rays: " << splitCandidate.mParentData.mNumRays << endl;
+                //cout << "bvh avgRayContri: " << avgRayContri << endl;
 
                 // high avg ray contri, the result is influenced by undersampling
@@ -665 +665 @@
                 {
                         const float factor = 1.0f + avgRayContri - mHierarchyManager->mMaxAvgRayContri;
-                        cout << "here5 " << factor << endl;
-
                         priority /= factor;
                 }

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

@@ -780 +780 @@
         // high avg ray contri, the result is influenced by undersampling
         // => decrease priority
-        if (0 && (sc->GetAvgRayContribution() > mMaxAvgRayContri))
+        if (USE_AVGRAYCONTRI && (sc->GetAvgRayContribution() > mMaxAvgRayContri))
         {
                 const float factor = 1.0f + sc->GetAvgRayContribution() - mMaxAvgRayContri;
-                cout << "here5 " << factor << endl;
+                cout << "h " << factor << endl;
 
                 mem *= factor;

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

@@ -45 +45 @@
 
 #define COUNT_ORIGIN_OBJECTS 1
-
+#define USE_AVGRAYCONTRI 1
 /** View space / object space hierarchy statistics.
 */

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

@@ -9 +9 @@
 namespace GtpVisibilityPreprocessor {
 
-HaltonSequence SamplingStrategy::sHalton;
+
+HaltonSequence ObjectBasedDistribution::sHalton;
+HaltonSequence MixtureDistribution::sHalton;
+HaltonSequence GlobalLinesDistribution::sHalton;
+HaltonSequence SpatialBoxBasedDistribution::sHalton;
+HaltonSequence ObjectDirectionBasedDistribution::sHalton;
+
 
 SamplingStrategy::SamplingStrategy(Preprocessor &preprocessor): 
@@ -132 +138 @@
   direction = Normalize(CosineRandomVector(r[2], r[3], normal));
   
-  origin += 1e-2*direction;
+  origin += 1e-2f*direction;
   
   // $$ jb the pdf is yet not correct for all sampling methods!

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

@@ -84 +84 @@
 
         Preprocessor &mPreprocessor;
-        static HaltonSequence sHalton;
 };
 
@@ -91 +90 @@
 {
  public:
-  //HaltonSequence mHalton;
+ 
   
   ObjectBasedDistribution(Preprocessor &preprocessor):
@@ -100 +99 @@
 private:
   virtual bool GenerateSample(SimpleRay &ray);
+
+   static HaltonSequence sHalton;
 };
 
@@ -119 +120 @@
 class ObjectDirectionBasedDistribution: public SamplingStrategy
 {
-  //HaltonSequence mHalton;
   
 public:
@@ -126 +126 @@
            mType = OBJECT_DIRECTION_BASED_DISTRIBUTION;
          }
-private:
+
+private:
+
+        static HaltonSequence sHalton;
         virtual bool GenerateSample(SimpleRay &ray);
 };
@@ -159 +162 @@
 {
  public:
-  //HaltonSequence mHalton;
-  SpatialBoxBasedDistribution(Preprocessor &preprocessor):
+         
+         SpatialBoxBasedDistribution(Preprocessor &preprocessor):
         SamplingStrategy(preprocessor){
         mType = SPATIAL_BOX_BASED_DISTRIBUTION;
@@ -167 +170 @@
 private:
            virtual bool GenerateSample(SimpleRay &ray);
+
+           static HaltonSequence sHalton;
 };
 
@@ -196 +201 @@
 
 
-
-
 class ViewCellBorderBasedDistribution: public SamplingStrategy
 {
@@ -206 +209 @@
 
   }
-  
+
+private:
   virtual bool GenerateSample(SimpleRay &ray);
 };
@@ -213 +217 @@
 {
 public:
-  //Halton<4> halton;
-  //HaltonSequence mHalton;
-
+ 
   GlobalLinesDistribution(Preprocessor &preprocessor):
         SamplingStrategy(preprocessor) {
@@ -221 +223 @@
   }
   
-  virtual bool GenerateSample(SimpleRay &ray);
+private:
+
+  virtual bool GenerateSample(SimpleRay &ray);
+
+   static HaltonSequence sHalton;
 };
 
@@ -238 +244 @@
 */
 
-class MixtureDistribution : public SamplingStrategy 
-{
-public:
-  // halton sequence generator for deciding between distributions
-  //HaltonSequence mHalton;
-  
+class MixtureDistribution: public SamplingStrategy 
+{
+public:
+   
   // container for the distributions
   vector<SamplingStrategy *> mDistributions;
@@ -259 +263 @@
   Reset();
   
-  // Generate a new sample according to a mixture distribution
-  virtual bool GenerateSample(SimpleRay &ray);
-
   // add contributions of the sample to the strategies
   void ComputeContributions(VssRayContainer &vssRays);
@@ -272 +273 @@
   Construct(char *str);
 
+private:
+
+   // Generate a new sample according to a mixture distribution
+  virtual bool GenerateSample(SimpleRay &ray);
+
+// halton sequence generator for deciding between distributions
+  static HaltonSequence sHalton;
   
 };

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

@@ -860 +860 @@
         // avg ray contri
 
-        if (0)
+        if (USE_AVGRAYCONTRI)
         {
                 const int pvs = EvalPvsEntriesSize(*splitCandidate.mParentData.mRays);
                 const float avgRayContri = (float)pvs / ((float)splitCandidate.mParentData.mRays->size() + Limits::Small);
 
-                Debug << "vsp avgRayContri: " << avgRayContri << " #pvs: " << pvs << " #rays: " << splitCandidate.mParentData.mRays->size() << endl;
-                cout << "vsp avgRayContri: " << avgRayContri << endl;
+                //Debug << "vsp avgRayContri: " << avgRayContri << " #pvs: " << pvs << " #rays: " << splitCandidate.mParentData.mRays->size() << endl;
+                //cout << "vsp avgRayContri: " << avgRayContri << endl;
 
                 // high avg ray contri very, the result is influenced by undersampling