Changeset 499 for trunk

Timestamp:

01/04/06 20:03:54 (19 years ago)

Author:

bittner

Message:

updated vsspreprocessor castray to match rssprep - makes sure that only valid line segments are taken, although it is a bit slower now

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Makefile (modified) (1 diff)
• VssPreprocessor.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.0) on: st 4. I 15:01:55 2006
+# Generated by qmake (2.00a) (Qt 4.1.0) on: st 4. I 19:53:26 2006
 # Project:  preprocessor.pro
 # Template: app

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -56 +56 @@
                                                  )
 {
-  int hits = 0;
+
+    int hits = 0;
   static Ray ray;
   AxisAlignedBox3 box = mKdTree->GetBox();
@@ -64 +65 @@
   if (!sbox.IsInside(viewPoint))
         return 0;
-
+        
   SetupRay(ray, viewPoint, direction);
   // cast ray to KD tree to find intersection with other objects
@@ -70 +71 @@
   Vector3 pointA, pointB;
   float bsize = Magnitude(box.Size());
+
+  
   if (mKdTree->CastRay(ray)) {
         objectA = ray.intersections[0].mObject;
@@ -77 +80 @@
         // compute intersection with the scene bounding box
         float tmin, tmax;
-        box.ComputeMinMaxT(ray, &tmin, &tmax);
-        if (tmax > bsize) {
-          //                    cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
-          //                    cerr<<"ray"<<ray<<endl;
-        }
-        pointA = ray.Extrap(tmax);
-
+        if (box.ComputeMinMaxT(ray, &tmin, &tmax) && tmin < tmax)
+          pointA = ray.Extrap(tmax);
+        else
+          return 0;
   }
 
   bool detectEmptyViewSpace = true;
-
+        
   if (detectEmptyViewSpace) {
         SetupRay(ray, pointA, -direction);
   } else
         SetupRay(ray, viewPoint, -direction);
-
+        
+        
   if (mKdTree->CastRay(ray)) {
-
         objectB = ray.intersections[0].mObject;
         pointB = ray.Extrap(ray.intersections[0].mT);
-
   } else {
         objectB = NULL;
         float tmin, tmax;
-        box.ComputeMinMaxT(ray, &tmin, &tmax);
-        if (tmax > bsize) {
-          //                    cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
-          //                    cerr<<"ray"<<ray<<endl;
-        }
-
-        pointB = ray.Extrap(tmax);
-  }
-
+        if (box.ComputeMinMaxT(ray, &tmin, &tmax) && tmin < tmax)
+          pointB = ray.Extrap(tmax);
+        else
+          return 0;
+  }
+
+  //  if (objectA == NULL && objectB != NULL) {
+  if (1) {
+        // cast again to ensure that there is no objectA
+        SetupRay(ray, pointB, direction);
+        if (mKdTree->CastRay(ray)) {
+          objectA = ray.intersections[0].mObject;
+          pointA = ray.Extrap(ray.intersections[0].mT);
+        }
+  }
+  
+  
   VssRay *vssRay  = NULL;
 
-  bool validSample = true;
-  if (detectEmptyViewSpace) {
+  bool validSample = (objectA != objectB);
+  if (0 && detectEmptyViewSpace) {   // consider all samples valid
+        // check if the viewpoint lies on the line segment AB
         if (Distance(pointA, pointB) <
                 Distance(viewPoint, pointA) + Distance(viewPoint, pointB) - Limits::Small) {
@@ -119 +127 @@
         }
   }
-
+        
   if (validSample) {
         if (objectA) {
@@ -125 +133 @@
                                                   pointA,
                                                   objectB,
-                                                  objectA);
+                                                  objectA,
+                                                  mPass
+                                                  );
           vssRays.push_back(vssRay);
           hits ++;
         }
-
+        
         if (objectB) {
           vssRay = new VssRay(pointA,
                                                   pointB,
                                                   objectA,
-                                                  objectB);
+                                                  objectB,
+                                                  mPass
+                                                  );
           vssRays.push_back(vssRay);
           hits ++;
         }
   }
-
+        
   return hits;
 }