Changeset 1824 for GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

Timestamp:

11/28/06 19:46:36 (18 years ago)

Author:

bittner

Message:

global lines support

File:

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

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

@@ -3 +3 @@
 
 #include <vector>
+#include <algorithm>
 #include "Matrix4x4.h"
 #include "Vector3.h"
@@ -46 +47 @@
           Intersectable *mObject;
 
-        /// the face of the intersectable
+                /// the face of the intersectable
           int mFace;
 
           Intersection(const float t,
-                                   const Vector3 &normal,
-                                   Intersectable *object,
-                                   const int face): 
-          mT(t), mNormal(normal), mObject(object), mFace(face) 
+                                                                 const Vector3 &normal,
+                                                                 Intersectable *object,
+                                                                 const int face): 
+                        mT(t), mNormal(normal), mObject(object), mFace(face) 
           {}
-
+                
           Intersection(): mT(0), mNormal(0,0,0), mObject(NULL), mFace(0) 
           {}
-
+                
           bool operator<(const Intersection &b) const 
           {
@@ -113 +114 @@
   void Init(const VssRay &vssRay);
 
+        void SortIntersections() {
+                sort(intersections.begin(), intersections.end());
+        }
+        
   Intersectable *GetIntersectionObject(const int i) const {
     return intersections[i].mObject;
@@ -215 +220 @@
 
   int GetType() const { return mType; }
+  void SetType(const int t) { mType = t; }
   
   // make such operation to slightly change the ray direction
@@ -313 +319 @@
   Vector3 mDirection;
   float mPdf;
-
-  SimpleRay() {}
+        int mType;
+        
+  SimpleRay(): mType(Ray::LOCAL_RAY) {}
   SimpleRay(const Vector3 &o, const Vector3 &d, const float p=1.0f):
-        mOrigin(o), mDirection(d), mPdf(p) {}
-
+                mOrigin(o), mDirection(d), mPdf(p), mType(Ray::LOCAL_RAY) {}
+        
   Vector3 Extrap(const float t) const {
         return mOrigin + mDirection * t;