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

Timestamp:

12/12/06 17:25:53 (18 years ago)

Author:

bittner

Message:

mixture distribution initial coding

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h (modified) (1 diff)

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

@@ -316 +316 @@
 struct SimpleRay
 {
-  int mId;
   Vector3 mOrigin;
   Vector3 mDirection;
+  short mType;
+  short mDistribution;
   float mPdf;
-  int mType;
-
-  static int sSimpleRayId;
+  
   SimpleRay(): mType(Ray::LOCAL_RAY) {
+  }
+  
+  SimpleRay(const Vector3 &o,
+                        const Vector3 &d,
+                        const short distribution,
+                        const float weight
+                        ):
+        mOrigin(o),
+        mDirection(d),
+        mType(Ray::LOCAL_RAY),
+        mDistribution(distribution),
+        mPdf(weight)
+  {     
         //      mId = sSimpleRayId++;
   }
   
-  SimpleRay(const Vector3 &o, const Vector3 &d, const float p=1.0f):
-        mOrigin(o), mDirection(d), mPdf(p), mType(Ray::LOCAL_RAY) {     
-        //      mId = sSimpleRayId++;
-  }
-        
   Vector3 Extrap(const float t) const {
         return mOrigin + mDirection * t;