Changeset 1824 for GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

Timestamp:

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

Author:

bittner

Message:

global lines support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

@@ -677 +677 @@
           ObjectContainer::const_iterator mi;
           for ( mi = leaf->mObjects.begin();
-                        mi != leaf->mObjects.end();
-                        mi++) {
-                Intersectable *object = *mi;
-                if (!object->Mailed() ) {
-                  object->Mail();
-                  if (ray.mFlags & Ray::STORE_TESTED_OBJECTS)
-                        ray.testedObjects.push_back(object);
-
-                  static int oi=1;
-                  if (MeshDebug) 
-                        cout<<"Object "<<oi++;
-                  
-                  hits += object->CastRay(ray);
-
-                  if (MeshDebug) {
-                        if (!ray.intersections.empty()) 
-                        cout<<"nearest t="<<ray.intersections[0].mT<<endl;
-                  else
-                        cout<<"nearest t=-INF"<<endl;
-                  }       
-                }
+                                        mi != leaf->mObjects.end();
+                                        mi++) {
+                        Intersectable *object = *mi;
+                        if (!object->Mailed() ) {
+                                object->Mail();
+                                if (ray.mFlags & Ray::STORE_TESTED_OBJECTS)
+                                        ray.testedObjects.push_back(object);
+                                
+                                static int oi=1;
+                                if (MeshDebug) 
+                                        cout<<"Object "<<oi++;
+                                
+                                hits += object->CastRay(ray);
+                                
+                                if (MeshDebug) {
+                                        if (!ray.intersections.empty()) 
+                                                cout<<"nearest t="<<ray.intersections[0].mT<<endl;
+                                        else
+                                                cout<<"nearest t=-INF"<<endl;
+                                }         
+                        }
           }
           
           if (hits && ray.GetType() == Ray::LOCAL_RAY)
-                if (ray.intersections[0].mT <= maxt)
-                  break;
+                        if (ray.intersections[0].mT <= maxt)
+                                break;
           
           // get the next node from the stack
           if (tStack.empty())
-                break;
+                        break;
           
           entp = extp;
           mint = maxt;
           if (ray.GetType() == Ray::LINE_SEGMENT && mint > 1.0f)
-                break;
+                        break;
           
           RayTraversalData &s  = tStack.top();