Changeset 2731 for GTP/trunk

Timestamp:

06/03/08 03:25:49 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_gvs_vps.sh (modified) (2 diffs)
• src/Environment.cpp (modified) (1 diff)
• src/GlRenderer.cpp (modified) (1 diff)
• src/GvsPreprocessor.cpp (modified) (9 diffs)
• src/GvsPreprocessor.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -26 +26 @@
 #LOG_PREFIX=../src/SG08/rebut-arena-pixel2
 LOG_PREFIX=../src/SG08/speedtest
-LOG_PREFIX=../src/SG08/arena_trees
+LOG_PREFIX=../src/SG08/importance_3.0
 
 ENVIRONMENT=gvs.env
@@ -42 +42 @@
 -gvs_total_samples=1000000 \
 -gvs_samples_per_pass=1000000 \
--gvs_initial_samples=1 \
+-gvs_initial_samples=16 \
 -gvs_max_viewcells=3 \
--gvs_min_contribution=500 \
+-gvs_min_contribution=50 \
 -gvs_per_viewcell=true \
 -preprocessor_detect_empty_viewspace+ \
+-preprocessor_snap_error_frames+ \
 -kd_pvs_area=1e-4 \
 -view_cells_use_kd_pvs+ \

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

@@ -1923 +1923 @@
                                    "false");
         
+        
+        RegisterOption("Preprocessor.snapErrorFrames",
+                                   optBool,
+                                   "preprocessor_snap_error_frames",
+                                   "false");
+        
+
         RegisterOption("Preprocessor.useVbos",
                                    optBool,

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

@@ -148 +148 @@
                                                       mDetectEmptyViewSpace);
 
-        //mSnapErrorFrames = false;
-        mSnapErrorFrames = true;
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.snapErrorFrames",
+                                                      mSnapErrorFrames);
 
         mSnapPrefix = "snap/";

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

@@ -25 +25 @@
 #define NOT_ACCOUNTED_OBJECT 0
 #define ACCOUNTED_OBJECT 2
-
+#define DETERMINISTIC_GVS 0
 
 static const float MIN_DIST = 0.001f;
@@ -182 +182 @@
         reverseRays.clear();
 
-        if (0)
+        if (DETERMINISTIC_GVS)
         {
                 VssRay *reverseRay = 
@@ -301 +301 @@
 bool GvsPreprocessor::HandleRay(VssRay *vssRay)
 {
-        if (!HasContribution(*vssRay))
+        if (!vssRay || !HasContribution(*vssRay))
                 return false;
 
@@ -491 +491 @@
 
         const int numRandomRays = 16 - (int)simpleRays.size();
-        SimpleRay mainRay = SimpleRay(currentRay.GetOrigin(), 
-                                          currentRay.GetNormalizedDir(), 
-                                                                  SamplingStrategy::GVS, 
-                                                                  1.0f);
-
-        GenerateJitteredRays(simpleRays, mainRay, numRandomRays, 0);
-        //GenerateRays(numRandomRays, *mDistribution, simpleRays, sInvalidSamples);
+
+        if (!DETERMINISTIC_GVS)
+        {
+                if (0)
+                {
+                        SimpleRay mainRay = SimpleRay(currentRay.GetOrigin(), 
+                                                          currentRay.GetNormalizedDir(), 
+                                                                                  SamplingStrategy::GVS, 
+                                                                                  1.0f);
+                        
+                        GenerateJitteredRays(simpleRays, mainRay, numRandomRays, 0);
+                }
+                else
+                        GenerateImportanceSamples(currentRay, hitTriangle, numRandomRays, simpleRays);
+        }
+        else
+                GenerateRays(numRandomRays, *mDistribution, simpleRays, sInvalidSamples);
 
         generationTimer.Exit();
@@ -799 +809 @@
         castTimer.Entry();
 
-        if (0)
+        if (DETERMINISTIC_GVS)
         {
                 const bool castDoubleRays = !mPerViewCell;
@@ -1511 +1521 @@
                         
                         // compute the pixel error of this visibility solution
-                        if (mEvaluatePixelError)
+                        if (0 && mEvaluatePixelError)
                                 ComputeRenderError();
                 }
@@ -1521 +1531 @@
         ComputeViewCellGeometryIntersection();
                 
+        // compute the pixel error of this visibility solution
+        if (mEvaluatePixelError)
+                ComputeRenderError();
 
         ////////
@@ -1865 +1878 @@
 
 
-SimpleRay GvsPreprocessor::GenerateJitteredSample(const SimpleRay &sray)
-{
-        // mutate the origin
-        Vector3 d = sray.mDirection;
+void GvsPreprocessor::GenerateImportanceSamples(const VssRay &ray, 
+                                                                                                const Triangle3 &triangle, 
+                                                                                                int numSamples,
+                                                                                                SimpleRayContainer &simpleRays)
+{
+        const size_t samplesSize = simpleRays.size();
+
+        while (simpleRays.size() < (samplesSize + numSamples))
+        {
+                SimpleRay sray;
+                if (GenerateImportanceSample(ray, triangle, sray))
+                        simpleRays.push_back(sray);
+        }
+}
+
+
+bool GvsPreprocessor::GenerateImportanceSample(const VssRay &ray, 
+                                                                                           const Triangle3 &triangle, 
+                                                                                           SimpleRay &sray)
+{
+        Vector3 d = ray.GetDir();
   
         // Compute right handed coordinate system from direction
         Vector3 U, V;
-        d.RightHandedBase(U, V);
+
+        Vector3 nd = Normalize(d);
+        nd.RightHandedBase(U, V);
+        
+        Vector3 origin = ray.mOrigin;
+        Vector3 termination = ray.mTermination;
 
         float rr[2];
@@ -1880 +1915 @@
 
         Vector2 vr2(rr[0], rr[1]);
+        const float sigma = triangle.GetBoundingBox().Radius() * 3.0f;
         Vector2 gaussvec2;
-
-        const float sigma = 0.2f;
 
         GaussianOn2D(vr2, sigma, // input
                          gaussvec2); // output
         
-        Vector3 shift = gaussvec2.xx * U + gaussvec2.yy * V;
-        
-        d += shift;
+        const Vector3 shift = gaussvec2.xx * U + gaussvec2.yy * V;
+
+        //cout << "t: " << termination;
+        termination += shift;
+        //cout << " new t: " << termination << endl;
+        Vector3 direction = termination - origin;
+
+        const float len = Magnitude(direction);
+        
+        if (len < Limits::Small)
+                return false;
   
-        d.Normalize();
-
-        return SimpleRay(sray.mOrigin, d, SamplingStrategy::GVS, 1.0f);
-}
-
-
-}
+        direction /= len;
+
+        // $$ jb the pdf is yet not correct for all sampling methods!
+        const float pdf = 1.0f;
+        sray = SimpleRay(origin, direction, SamplingStrategy::GVS, pdf);
+        
+        return true;
+}
+
+
+}

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

@@ -274 +274 @@
         virtual void ComputeRenderError();
 
-        SimpleRay GenerateJitteredSample(const SimpleRay &ray);
-
+        bool GenerateImportanceSample(const VssRay &ray, const Triangle3 &triangle, SimpleRay &sray);
+
+        void GenerateImportanceSamples(const VssRay &ray, 
+                                           const Triangle3 &triangle, 
+                                                                   int numSamples,
+                                                                   SimpleRayContainer &simpleRays);
 
         //////////////////////