Changeset 2739 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.h

Timestamp:

06/05/08 02:49:49 (16 years ago)

Author:

mattausch

Message:

worked on randomized sampling

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.h (modified) (5 diffs)

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

@@ -121 +121 @@
 
 protected:
-#if 0
-        struct PendingRay
-        {
-                PendingRay(VssRay *ray, const bool d)
-                        : mRay(ray), mFoundDiscontinuity(d) 
-                {}
-
-                VssRay *mRay;
-                bool mFoundDiscontinuity;
-        };
-
-        typedef stack<PendingRay> PendingQueue;
-#endif
+
         typedef stack<VssRay *> RayQueue;
 
@@ -140 +128 @@
                 by the queue and continues as long it finds new visible geometry 
                 (i.e., the queue is     not empty).
-
                 @returns the number of samples cast.
         */
         int ProcessQueue();
-
         /** Generates the rays starting the adaptive visibility sampling process.
         */
         int CastInitialSamples(int numSamples);
-
         /** Uses the information gained from the ray for doing adaptive border sampling.
                 This function tries to find the border of the triangle found visible by the
@@ -163 +148 @@
         */      
         int AdaptiveBorderSampling(const VssRay &currentRay);
+
         int AdaptiveBorderSamplingOpt(const VssRay &currentRay);
         /** The reverse sampling step. It is started once the cast
@@ -179 +165 @@
                                                    const Triangle3 &hitTriangle,
                                                    const VssRay &oldRay);
+        /** Returns true if we sampled a closer triangle than with the previous ray. 
+                Does reverse sampling if gap found.
+        */
+        int CheckDiscontinuity2(const VssRay &currentRay, 
+                                    const Triangle3 &hitTriangle,
+                                                        const VssRay &oldRay);
         /** Adds new samples to the ray queue and classifies them
                 with respect to the previous ray.
@@ -300 +292 @@
 
         void PrepareProbablyVisibleSampling();
+        
+        void CreateRandomizedReverseRays(const Vector3 &origin, 
+                                             const Vector3 &termination, 
+                                                                         const Triangle3 &triangle,                   
+                                                                         SimpleRayContainer &rays, 
+                                                                         int number);
+
+        bool CreateRandomizedReverseRay(const Vector3 &origin, 
+                                            const Vector3 &termination,
+                                                                        const Triangle3 &triangle,
+                                                                        SimpleRay &ray);
+
+        inline bool IntersectViewCell(Vector3 &origin, Vector3 &dir) const;