Changeset 2745 for GTP/trunk

Timestamp:

06/09/08 16:35:30 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/gvs.env (modified) (1 diff)
• scripts/run_gvs_vps.sh (modified) (2 diffs)
• src/GvsPreprocessor.cpp (modified) (8 diffs)
• src/GvsPreprocessor.h (modified) (1 diff)
• src/SamplingStrategy.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/gvs.env

@@ -36 +36 @@
 
         # internal: 0 intel: 1 2: havran 3: havran dyn
-        rayCastMethod 1
+        rayCastMethod 3
 
         exportVisibility false

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

@@ -18 +18 @@
 SCENE=../data/vienna/city_full_hp.obj
 #SCENE=../data/vienna/vienna_rep.obj
-#SCENE=../data/vienna/vienna_cropped.obj
+SCENE=../data/vienna/vienna_cropped.obj
 
 VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz 
@@ -38 +38 @@
 -preprocessor=gvs \
 -preprocessor_use_vbos- \
--gvs_epsilon=0.001 \
+-gvs_epsilon=0.0001 \
 -gvs_total_samples=1000000 \
 -gvs_samples_per_pass=1000000 \
--gvs_initial_samples=128 \
+-gvs_initial_samples=10000 \
 -gvs_max_viewcells=1 \
--gvs_min_contribution=200 \
+-gvs_min_contribution=50 \
 -gvs_per_viewcell=true \
--gvs_threshold=0.5 \
+-gvs_threshold=0.05 \
 -gvs_radius_of_influence=5.0 \
--gvs_use_deterministic_gvs- \
+-gvs_use_deterministic_gvs+ \
 -gvs_initial_jitter=0.1 \
 -preprocessor_detect_empty_viewspace+ \

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

@@ -34 +34 @@
 static VizStruct currentViz;
 
+static int successfullReverseRays = 0;
+
 
 ///////////
@@ -200 +202 @@
 
         mGvsStats.mReverseSamples += (int)reverseRays.size();
-        EnqueueRays(reverseRays);
+        successfullReverseRays = EnqueueRays(reverseRays);
 
         return (int)reverseRays.size();
@@ -477 +479 @@
 
         // cast reverse rays if necessary
-        if (USE_REVERSE_SAMPLING) castRays += CheckDiscontinuity(*newRay, hitTriangle, oldRay);
-        
+        if (USE_REVERSE_SAMPLING) 
+        {
+                castRays += CheckDiscontinuity(*newRay, hitTriangle, oldRay);
+        
+                // also test reverse direction
+                if (newRay->mTerminationObject)
+                {
+                        TriangleIntersectable *tObj = static_cast<TriangleIntersectable *>(newRay->mTerminationObject);
+                        castRays += CheckDiscontinuity(oldRay, tObj->GetItem(), *newRay);
+                }
+        }
+
         if (GVS_DEBUG)
                 currentViz.enlargedTriangle.push_back(p);
@@ -604 +616 @@
                 {
                         if (USE_REVERSE_SAMPLING)
+                        {
                                 castRays += CheckDiscontinuity(*vssRays[i], hitTriangle, currentRay);
+                                
+                                // also test reverse direction
+                                if (vssRays[i]->mTerminationObject)
+                                {
+                                        TriangleIntersectable *tObj = static_cast<TriangleIntersectable *>(vssRays[i]->mTerminationObject);
+                                        castRays += CheckDiscontinuity(currentRay, tObj->GetItem(), *vssRays[i]);
+                                }
+                        }
 
                         castRays += SubdivideEdge(hitTriangle,
@@ -946 +967 @@
 
 
-void GvsPreprocessor::EnqueueRays(const VssRayContainer &samples)
-{
+int GvsPreprocessor::EnqueueRays(const VssRayContainer &samples)
+{
+        int success = 0;
         rayTimer.Entry();
 
@@ -955 +977 @@
         {
                 VssRay *ray = *vit;
-                HandleRay(ray);
+                if (HandleRay(ray)) ++ success;
         }
 
         rayTimer.Exit();
+
+        return success;
 }
 
@@ -1609 +1633 @@
                         cout << "contribution=" << mGvsStats.mPassContribution << " (of " << mMinContribution << ")" << endl;
                         cout << "obj contri=" << mCurrentViewCell->GetPvs().GetSize() - oldPvsSize << " (of " << mMinContribution << ")" << endl;
+                        cout << "successful reverse rays=" << successfullReverseRays << endl;
+                        cout << "cast reverse rays=" << mGvsStats.mReverseSamples << endl;
 
                         // termination criterium
@@ -1618 +1644 @@
                         mGvsStats.mPassContribution = 0;
                         passSamples = 0;
+                        successfullReverseRays = 0;
                         
+
                         // compute the pixel error of this visibility solution
                         if (1 && mEvaluatePixelError)

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

@@ -179 +179 @@
                 with respect to the previous ray.
         */
-        void EnqueueRays(const VssRayContainer &samples);
+        int EnqueueRays(const VssRayContainer &samples);
         /** Hepler function for adaptive border sampling. It finds 
                 new sample points around a triangle in a eps environment

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

@@ -815 +815 @@
         direction = UniformRandomVector(r[0], r[1]);
         
-##if 0
-        origin = mViewCell->GetBox().GetRandomPoint();
-#else
-        origin = mViewCell->GetBox().GetUniformRandomSurfacePoint();
-
-        //origin = mViewCell->GetBox().GetRandomSurfacePoint();
-        //mViewCell->GetRandomEdgePoint(origin, normal);
-        //origin = Vector3(680.682, 189.552, -278.177);
-
-        // move a little bit back to avoid piercing through walls
-        // that bound the view cell
-        origin -= 0.01f * normal;
-#endif
-                
+
+        if (1)
+        {
+                origin = mViewCell->GetBox().GetRandomPoint();
+        }
+        else
+        {
+                origin = mViewCell->GetBox().GetUniformRandomSurfacePoint();
+
+                //origin = mViewCell->GetBox().GetRandomSurfacePoint();
+                //mViewCell->GetRandomEdgePoint(origin, normal);
+                //origin = Vector3(680.682, 189.552, -278.177);
+
+                // move a little bit back to avoid piercing through walls
+                // that bound the view cell
+                origin -= 1e-4f * normal;
+        }
 
         static const float pdf = 1.0f;