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

Timestamp:

02/08/07 15:46:23 (17 years ago)

Author:

bittner

Message:

simple ray separated

File:

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

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

@@ -47 +47 @@
           Intersectable *mObject;
 
-                /// the face of the intersectable
+        /// the face of the intersectable
           int mFace;
 
@@ -315 +315 @@
 };
 
-struct SimpleRay
-{
-  Vector3 mOrigin;
-  Vector3 mDirection;
-  short mType;
-  short mDistribution;
-  // generator Id -> relative to the generating distribution!
-  int mGeneratorId;
-  float mPdf;
-  
-  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++;
-  }
-
-  float GetParam(const int axis) const {
-        if (axis < 3)
-          return mOrigin[axis];
-        else
-          return mDirection[axis-3];
-  }
-  
-  Vector3 Extrap(const float t) const {
-          return mOrigin + mDirection * t;
-  }
-
-  friend ostream &operator<<(ostream &s, const SimpleRay &r)
-  {
-          return s << "origin=" << r.mOrigin << " dir=" << r.mDirection;
-  };
-};
-
-class SimpleRayContainer : public vector<SimpleRay>
-{
-public:
-    
-  SimpleRayContainer():vector<SimpleRay>() {}
-  
-  void NormalizePdf(float scale = 1.0f) {
-        iterator it = begin();
-        float sumPdf = 0.0f;
-        for (; it != end(); it++)
-          sumPdf += (*it).mPdf;
-
-        float c = scale/sumPdf;
-        
-        for (it = begin(); it != end(); it++) {
-          (*it).mPdf*=c;
-        }
-  }
-  
-  void AddRay(const SimpleRay &ray) {
-        push_back(ray);
-  }
-};
 
 }