Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/IntersectableWrapper.h

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/IntersectableWrapper.h (modified) (4 diffs)

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

@@ -40 +40 @@
         
         int CastRay(Ray &ray);
+        int CastSimpleRay(const SimpleRay &ray) { return 0;}
+        int CastSimpleRay(const SimpleRay &ray, int RayIndex) { return 0;}
+  
         
         bool IsConvex() const;
@@ -193 +196 @@
 
         int CastRay(Ray &ray);
+
+        int CastSimpleRay(const SimpleRay &ray);
+        int CastSimpleRay(const SimpleRay &ray, int rayIndex);
+        
         AxisAlignedBox3 GetBox() const;
         int NumberOfFaces() const;
         Vector3 GetNormal(const int idx) const;
+        Vector3 GetNormal() const { return mItem.GetNormal();}
 
         float GetArea() const {return mItem.GetArea();}
@@ -207 +215 @@
 
         int GetRandomSurfacePoint(const float u,
-                                                          const float v,
-                                                          Vector3 &point, Vector3 &normal);
+                                  const float v,
+                                  Vector3 &point, Vector3 &normal);
 
         
         int GetRandomVisibleSurfacePoint(Vector3 &point,
-                                                                         Vector3 &normal,
-                                                                         const Vector3 &viewpoint,
-                                                                         const int maxTries);
+                                         Vector3 &normal,
+                                         const Vector3 &viewpoint,
+                                         const int maxTries);
 
         int GetRandomEdgePoint(Vector3 &point, Vector3 &normal);
@@ -244 +252 @@
 
         // hack
-        ContainerIntersectable::~ContainerIntersectable() 
+        ~ContainerIntersectable() 
         {
                 delete mItem;