Changeset 2742 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

06/06/08 17:40:59 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (27 diffs)

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

@@ -140 +140 @@
 
                 // note: deletion of the ray is handled by ray pool
+                mRayCaster->SheduleRayForDeletion(ray);
         }
 }
@@ -209 +210 @@
 
         mGvsStats.mReverseSamples += (int)reverseRays.size();
-
         EnqueueRays(reverseRays);
 
@@ -234 +234 @@
         simpleRays.clear();
 
-        CreateRandomizedReverseRays(currentRay, predictedHit, simpleRays, 16);
+        CreateRandomizedReverseRays(currentRay, predictedHit, simpleRays, 16, hitTriangle);
 
         static VssRayContainer reverseRays;
@@ -344 +344 @@
 bool GvsPreprocessor::HandleRay(VssRay *vssRay)
 {
-        if (!vssRay || !HasContribution(*vssRay))
+        if (!vssRay)
                 return false;
 
+        if (!HasContribution(*vssRay))
+        {
+                mRayCaster->SheduleRayForDeletion(vssRay);
+                return false;
+        }
+        
         if (0 && GVS_DEBUG)
                 mVssRays.push_back(new VssRay(*vssRay));
@@ -354 +360 @@
 
         ++ mGvsStats.mTotalContribution;
+
+        if (mRayQueue.size() % 10000 == 0)
+                cout << "ray queue size: " << mRayQueue.size() << endl;
+
+        if (mGvsStats.mTotalContribution % 10000 == 0)
+                cout << "contri: " << mGvsStats.mTotalContribution << endl;
 
         return true;
@@ -452 +464 @@
         // cast single ray to check if a triangle was missed. note: not efficient!!
         newRay = mRayCaster->CastRay(sray, mViewCellsManager->GetViewSpaceBox(), !mPerViewCell);
+        ++ castRays;
+        
         castTimer.Exit();
 
-        ++ castRays;
-
-        // this ray will not be further processed
-        // note: ray deletion is handled by ray pool
-        if (!newRay) return castRays;
-
-        rayTimer.Entry();
-
-        // new triangle discovered? => add new ray to queue
-        HandleRay(newRay);
-
-        rayTimer.Exit();
-        
+        if (!newRay)
+                return castRays;
+
         //newRay->mFlags |= VssRay::BorderSample;
 
         // cast reverse rays if necessary
-        castRays += CheckDiscontinuity(ray2, hitTriangle, oldRay);
-
+        castRays += CheckDiscontinuity(*newRay, hitTriangle, oldRay);
+        
         // subdivide further
         castRays += SubdivideEdge(hitTriangle, p1, p, ray1, *newRay, oldRay);
         castRays += SubdivideEdge(hitTriangle, p, p2, *newRay, ray2, oldRay);
-        
+
+        rayTimer.Entry();
+
+        // new triangle discovered? => add new ray to queue
+        HandleRay(newRay);
+
+        rayTimer.Exit();
+
         return castRays;
 }
@@ -549 +560 @@
         int castRays = (int)simpleRays.size();
 
-        // handle cast rays
-        EnqueueRays(vssRays);
-
         if (0)
         {
@@ -567 +575 @@
                         (*rit)->mFlags |= VssRay::BorderSample;
         }
-
+#if 0
     // recursivly subdivide each edge
         for (int i = 0; i < numBorderSamples; ++ i)
@@ -580 +588 @@
                                                                   currentRay);
         }
-        
+#endif  
         mGvsStats.mBorderSamples += castRays;
         
+        // handle cast rays
+        EnqueueRays(vssRays);
+
         return castRays;
 }
@@ -602 +613 @@
                 cout << "error: gvs sampling for " << Intersectable::GetTypeName(tObj) << " not implemented" << endl;
 
+        
+        static SimpleRayContainer simpleRays;
+        simpleRays.clear();
+        
+
         generationTimer.Entry();
-
+#if 0
         static VertexContainer enlargedTriangle;
         enlargedTriangle.clear();
@@ -625 +641 @@
         }
 
-        /// create rays from sample points and handle them
-        static SimpleRayContainer simpleRays;
-        simpleRays.clear();
-        
         VertexContainer::const_iterator vit, vit_end = subdivEnlargedTri.end();
 
@@ -639 +651 @@
         }
 
-        
+#endif  
         //////////
         //-- fill up simple rays with random rays so we can cast 16 rays at a time
@@ -675 +687 @@
         int castRays = (int)simpleRays.size();
 
-        // handle cast rays
-        EnqueueRays(vssRays);
-
-
-#if 1
+#if 0
         for (size_t i = 0; i < vssRays.size(); ++ i)
         {
@@ -685 +693 @@
                 castRays += CheckDiscontinuity2(*vssRays[i], hitTriangle, currentRay);
         }
-
+#endif
+#if 0
 
     // recursivly subdivide each edge
@@ -702 +711 @@
 
         mGvsStats.mBorderSamples += castRays;
-        
+
+        // handle cast rays
+        EnqueueRays(vssRays);
+
         return castRays;
 }
@@ -844 +856 @@
         else
         {
-                GenerateRays(mUseDeterministicGvs ? numSamples : numSamples / 16, *mDistribution, simpleRays, sInvalidSamples);
+                GenerateRays(mUseDeterministicGvs ? 
+                        numSamples : numSamples / 16, *mDistribution, simpleRays, sInvalidSamples);
         }
 
@@ -883 +896 @@
 
 
-void GvsPreprocessor::EnqueueRays(VssRayContainer &samples)
+void GvsPreprocessor::EnqueueRays(const VssRayContainer &samples)
 {
         rayTimer.Entry();
@@ -893 +906 @@
                 VssRay *ray = *vit;
                 HandleRay(ray);
-                // note: deletion of invalid samples handked by ray pool
         }
 
@@ -918 +930 @@
                 else
                         castSamples += AdaptiveBorderSamplingOpt(*ray);
-
-                // note: don't have to delete because handled by ray pool
         }
 
@@ -2001 +2011 @@
 void GvsPreprocessor::PrepareProbablyVisibleSampling()
 {
-        
         // warning: using mailing!
         Intersectable::NewMail();
@@ -2043 +2052 @@
                                                                                                   const Vector3 &predictedPoint, 
                                                                                                   SimpleRayContainer &rays, 
-                                                                                                  int number)
+                                                                                                  int number,
+                                                                                                  const Triangle3 &triangle)
 {
         size_t currentNumber = rays.size();
@@ -2052 +2062 @@
         {
                 SimpleRay simpleRay;
-                if (CreateRandomizedReverseRay(ray, predictedPoint, simpleRay))
+                if (CreateRandomizedReverseRay(ray, predictedPoint, simpleRay, triangle))
                         rays.push_back(simpleRay);
         }
 
+        if (rays.size() != 16)
+                cout << "x";
+        //else cout <<"y";
         //cout << "generated " << rays.size() << " rays" << endl;
 }
@@ -2062 +2075 @@
 bool GvsPreprocessor::CreateRandomizedReverseRay(const VssRay &ray, 
                                                                                                  const Vector3 &predictedPoint, 
-                                                                                                 SimpleRay &simpleRay)
-{
-        //Vector3 nd = ray.GetNormalizedDir();
+                                                                                                 SimpleRay &simpleRay,
+                                                                                                 const Triangle3 &triangle)
+{
+        /*Vector3 nd = ray.GetNormalizedDir();
         const AxisAlignedBox3 box = mCurrentViewCell->GetBox();
         //Vector3 nd = box.GetNearestFace(origin).GetNormal();
@@ -2070 +2084 @@
 
         // Compute right handed coordinate system from direction
-        /*Vector3 U, V;
+        Vector3 U, V;
         nd.RightHandedBase(U, V);
         
@@ -2079 +2093 @@
 
         Vector2 vr2(rr[0], rr[1]);
-        const float sigma = 1.0f;//triangle.GetBoundingBox().Radius() * mRadiusOfInfluence;
+        const float sigma = triangle.GetBoundingBox().Radius() * 1.0f;
         Vector2 gaussvec2;
 
         GaussianOn2D(vr2, sigma, // input
                          gaussvec2); // output
-        
-        const Vector3 shift = gaussvec2.xx * U + gaussvec2.yy * V;
-
-        Vector3 newOrigin = ray.mOrigin + shift;
         */
+        const Vector3 shift = 0;//gaussvec2.xx * U + gaussvec2.yy * V;
+
+        const Vector3 newTermination = ray.mTermination + shift;
+        
         //cout << "o: " << origin << " new o: " << newOrigin << endl;
-        Vector3 newOrigin = box.GetRandomPoint();
-        Vector3 direction = predictedPoint - newOrigin;
+        Vector3 newOrigin = mCurrentViewCell->GetBox().GetRandomPoint();
+        Vector3 direction = newTermination - newOrigin;
 
         const float len = Magnitude(direction);
@@ -2101 +2115 @@
 
         if (0 && !IntersectsViewCell(newOrigin, -direction))
-        {
-                //cout << "x";
                 return false;
-        }
 
         //cout << "y";
@@ -2114 +2125 @@
 }
 
-
-}
+}