Changeset 2728 for GTP

Timestamp:

05/30/08 10:38:15 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GvsPreprocessor.cpp (modified) (1 diff)
• GvsPreprocessor.h (modified) (1 diff)
• SamplingStrategy.cpp (modified) (1 diff)
• SamplingStrategy.h (modified) (2 diffs)

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

@@ -1716 +1716 @@
 
 
-
-}
+void Preprocessor::CastRays4(SimpleRayContainer &rays, VssRayContainer &vssRays)
+{
+        const int packetSize = 4;
+
+        static int hit_triangles[packetSize];
+        static float dist[packetSize];
+        static Vector3 dirs[packetSize];
+        static Vector3 shifts[packetSize];
+        static Vector3 origs[packetSize];
+
+
+        SimpleRayContainer::const_iterator it, it_end = rays.end();
+
+        for (it = rays.begin(); it != it_end; ++ it)
+        {
+
+                SimpleRay mainRay = *it;
+
+                origs[0] = mainRay.mOrigin;
+                dirs[0] = mainRay.mDirection;
+
+                for (i = 1; i < packetSize; i++) 
+                {
+                        origs[i] = mainRay.mOrigin;
+
+                        const float pertubDir = 0.01f;
+                        Vector3 pertub;
+
+                        pertub.x = RandomValue(-pertubDir, pertubDir);
+                        pertub.y = RandomValue(-pertubDir, pertubDir);
+                        pertub.z = RandomValue(-pertubDir, pertubDir);
+
+                        dirs[i] = mainRay.mDirection + pertub;
+                        const float c = Magnitude(newDir);
+                        dirs{i] *= 1.0f / c;
+                }
+
+                AxisAlignedBox3 box;
+                preprocessor->mRayCaster->CastRaysPacket4(box.Min(),
+                                                                                                  box.Max(),
+                                                                                                  origs,
+                                                                                                  dirs,
+                                                                                                  hit_triangles,
+                                                                                                  dist);       
+        }
+
+        DeterminePvsObjects(vssRays);
+}
+
+
+}

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

@@ -166 +166 @@
                                                   VssRayContainer &reverseRays);
 
+        virtual void CastRays4(SimpleRayContainer &rays,
+                                                   VssRayContainer &vssRays);
+
         /** Returns true if we sampled a closer triangle than with the previous ray. 
                 Does reverse sampling if gap found.

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

@@ -803 +803 @@
 bool ViewCellBasedDistribution::GenerateSample(SimpleRay &ray)
 {
+        
+        static Vector3 origin;
+        static Vector3 direction; 
+        static Vector3 point;
+        static Vector3 normal;
+        static float r[2];
+
         sHalton.GetNext(2, r);
         direction = UniformRandomVector(r[0], r[1]);

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

@@ -7 +7 @@
 #include "common.h"
 #include "Halton.h"
-#include "Vector3.h"
+
 
 namespace GtpVisibilityPreprocessor {
@@ -263 +263 @@
         ViewCell *mViewCell;
 
-        Vector3 origin;
-        Vector3 direction; 
-        Vector3 point;
-        Vector3 normal;
-        float r[2];
 
         static HaltonSequence sHalton;