Changeset 2629 for GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h

Timestamp:

01/23/08 00:21:50 (16 years ago)

Author:

bittner

Message:

commit after merge with vlastimil

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h (modified) (7 diffs)

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

@@ -25 +25 @@
 struct SimpleRay;
 class RayPacket2x2;
-class Matrix4x4;
 
 /** This class provides an interface for ray casting.
@@ -37 +36 @@
     INTERNAL_RAYCASTER = 0,
     INTEL_RAYCASTER = 1,
-    HAVRAN_RAYCASTER = 2
+    HAVRAN_RAYCASTER = 2,
+    HAVRAN_DYN_RAYCASTER = 3
   };
 
@@ -72 +72 @@
                         const bool pruneInvalidRays = true);
 
+  virtual void
+  CastSimpleForwardRays(SimpleRayContainer &rays,
+                        const AxisAlignedBox3 &sbox
+                        ) { return;}
+  
   // Using packet of 4 rays supposing that these are coherent
   virtual void CastRaysPacket4(Vector3 origin4[],
@@ -82 +87 @@
   // ray shooting is computed !
   virtual void CastRaysPacket4(const Vector3 &minBox,
-                                                           const Vector3 &maxBox,
-                                                           const Vector3 origin4[],
-                                                           const Vector3 direction4[],
-                                                           int result4[],
-                                                           float dist4[]) {  }
+                               const Vector3 &maxBox,
+                               const Vector3 origin4[],
+                               const Vector3 direction4[],
+                               int result4[],
+                               float dist4[]) {  }
   
   // Just for testing concept
@@ -93 +98 @@
                                  const bool pruneInvalidRays = true)
   { }
+
+  virtual void AddDynamicObjecs(const ObjectContainer &objects, const Matrix4x4 &m)
+  { }
+
+  virtual void UpdateDynamicObjects(const Matrix4x4 &m)
+  { }
+
+  virtual void DeleteDynamicObjects()
+  { }
+
   
   /*virtual void CastRaysEye4(SimpleRayContainer &rays,
@@ -101 +116 @@
   */
 
+  // This sorts only rays by origin
   virtual void
   SortRays(SimpleRayContainer &rays);
 
-
-  virtual void AddDynamicObjecs(const ObjectContainer &objects, const Matrix4x4 &m) = 0;
-  virtual void UpdateDynamicObjects(const Matrix4x4 &m) = 0;
-  virtual void DeleteDynamicObjects() = 0;
-
+  // This sorts the ray by origin and direction
+  virtual void
+  SortRays2(SimpleRayContainer &rays);
+  
   // pool of vss rays to be used in one pass of the sampling
   struct VssRayPool 
@@ -173 +188 @@
                  const int depth,
                  float box[12]);
+
+  void _SortRays2(SimpleRayContainer &rays,
+                  const int l,
+                  const int r,
+                  const int depth,
+                  float box[12]);
   
   struct Intersection