Changeset 369 for trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h

Timestamp:

11/02/05 17:45:25 (19 years ago)

Author:

bittner

Message:

sampling contribution changes

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h

@@ -23 +23 @@
 public:
   enum RayType { LOCAL_RAY, GLOBAL_RAY, LINE_SEGMENT };
-
+        
   enum { NO_INTERSECTION=0, INTERSECTION_OUT_OF_LIMITS, INTERSECTION };
 
@@ -36 +36 @@
     // can be either mesh or a viewcell
     Intersectable *mObject;
-
+                
     // the face of the intersectable
     int mFace;
 
     Intersection(const float t,
-                 Intersectable *object,
-                 const int face):mT(t), mObject(object), mFace(face) {}
-
+                                                                 Intersectable *object,
+                                                                 const int face):mT(t), mObject(object), mFace(face) {}
+                
     Intersection() {}
-
+                
     bool operator<(
-                   const Intersection &b) const {
+                                                                         const Intersection &b) const {
       return 
-        mT
-        <
-        b.mT;
+                                mT
+                                <
+                                b.mT;
     }
     
@@ -70 +70 @@
   Ray(const Vector3 &wherefrom,
       const Vector3 &whichdir,
-      const int _type,
-      const void *_originCell = NULL) {
+      const int _type) {
     loc = wherefrom;
     if (_type == LINE_SEGMENT)
@@ -94 +93 @@
   // Inititalize the ray again when already constructed
   void Init(const Vector3 &wherefrom,
-            const Vector3 &whichdir,
-            const int _type, 
-            bool dirNormalized = false) {
+                                                const Vector3 &whichdir,
+                                                const int _type, 
+                                                bool dirNormalized = false) {
     loc = wherefrom;
     dir = (dirNormalized || _type == LINE_SEGMENT) ? whichdir: Normalize(whichdir) ;
@@ -252 +251 @@
   int mRays;
   int mContributions;
-  PassingRaySet() {
+
+        PassingRaySet() {
     Reset();
   }
-  void
+
+        void
   Reset();
   
   void AddRay(const Ray &ray, const int contributions);
+        void AddRay2(const Ray &ray,
+                                                         const int objects,
+                                                         const int viewcells);
+
   int GetEntryIndex(const Vector3 &direction) const;