Changeset 2735 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

Timestamp:

06/04/08 01:49:14 (16 years ago)

Author:

mattausch

Message:

added new importance sampling method for gvs

File:

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

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

@@ -1 @@
-
 #include "SamplingStrategy.h"
 #include "Ray.h"
@@ -18 +17 @@
 #define USE_HALTON 1
 
+
 namespace GtpVisibilityPreprocessor {
 
@@ -27 +27 @@
 #endif
   
-//HaltonSequence SamplingStrategy::sHalton;
-
 HaltonSequence ObjectBasedDistribution::sHalton;
 HaltonSequence MixtureDistribution::sHalton;
@@ -39 +37 @@
 HaltonSequence ViewCellBasedDistribution::sHalton;
 HaltonSequence ViewCellBorderBasedDistribution::sHalton;
+HaltonSequence ProbablyVisibleDistribution::sHalton;
+
+
 
 SamplingStrategy::SamplingStrategy(Preprocessor &preprocessor): 
@@ -575 +576 @@
   {
 #ifdef USE_PERFTIMER
-        const float vcTime = viewCellCastTimer.TotalTime();
-        const float pvsTime = pvsTimer.TotalTime();
-        const float haltonTime = haltonTimer.TotalTime();
+        const double vcTime = viewCellCastTimer.TotalTime();
+        const double pvsTime = pvsTimer.TotalTime();
+        const double haltonTime = haltonTimer.TotalTime();
         
         cout << "view cell cast time: " << vcTime << " s" << endl;
@@ -881 +882 @@
 
 
-}
-
-
+bool ProbablyVisibleDistribution::GenerateSample(SimpleRay &ray)
+{       
+        static Vector3 origin;
+        static Vector3 direction; 
+        static Vector3 point;
+        static Vector3 normal;
+        
+        float r[2];
+        sHalton.GetNext(2, r);
+ 
+        r[0] *= (float)(*mObjects).size() - 1.0f;
+        const int i = (int)r[0];
+ 
+        Intersectable *obj = (*mObjects)[i];
+        
+        obj->GetRandomSurfacePoint(point, normal);
+
+        // get point on view cell surface
+        if (1)
+                origin = mViewCell->GetBox().GetRandomSurfacePoint();
+        else
+                origin = mViewCell->GetBox().GetUniformRandomSurfacePoint();
+
+        direction = point - origin;
+  
+        const float c = Magnitude(direction);
+  
+        if (c <= Limits::Small) 
+                return false;
+
+        ray = SimpleRay(origin, direction, PROBABLY_VISIBLE_DISTRIBUTION, 1.0f);
+
+        return true;
+}
+
+}
+
+