[MOAB-dev] r3419 - MOAB/trunk/test/obb

[bmsmith6 at wisc.edu]

Author: bmsmith
Date: 2009-12-18 15:11:40 -0600 (Fri, 18 Dec 2009)
New Revision: 3419

Modified:
   MOAB/trunk/test/obb/obb_test.cpp
   MOAB/trunk/test/obb/obb_time.cpp
Log:
Fix ray_intersect_sets calls from previous commit.



Modified: MOAB/trunk/test/obb/obb_test.cpp
===================================================================
--- MOAB/trunk/test/obb/obb_test.cpp	2009-12-18 20:20:06 UTC (rev 3418)
+++ MOAB/trunk/test/obb/obb_test.cpp	2009-12-18 21:11:40 UTC (rev 3419)
@@ -954,8 +954,8 @@
     
     const int NUM_NON_TOL_INT = 1;
     std::vector<double> intersections2;
-    std::vector<MBEntityHandle> surf_handles;
-    rval = tool.ray_intersect_sets( intersections2, surf_handles, root_set, tolerance, NUM_NON_TOL_INT, tests[i].point.array(), tests[i].direction.array(), 0 );
+    std::vector<MBEntityHandle> surf_handles, facet_handles;
+    rval = tool.ray_intersect_sets( intersections2, surf_handles, facet_handles, root_set, tolerance, NUM_NON_TOL_INT, tests[i].point.array(), tests[i].direction.array(), 0 );
     if (MB_SUCCESS != rval) {
       if (verbosity)
         std::cout << "  Call to MBOrientedBoxTreeTool::ray_intersect_sets failed." << std::endl;
@@ -1076,9 +1076,8 @@
     }
     else {
       std::vector<double> intersections;
-      std::vector<MBEntityHandle> surfaces;
-
-      rval = tool.ray_intersect_sets( intersections, surfaces, root_set, tolerance, 1000, rays[i].array(), rays[i+1].array(), 0 );
+      std::vector<MBEntityHandle> surfaces, facets;
+      rval = tool.ray_intersect_sets( intersections, surfaces, facets, root_set, tolerance, 1000, rays[i].array(), rays[i+1].array(), 0 );
       if (MB_SUCCESS != rval) {
         std::cout << "FAILED" << std::endl;
         result = false;

Modified: MOAB/trunk/test/obb/obb_time.cpp
===================================================================
--- MOAB/trunk/test/obb/obb_time.cpp	2009-12-18 20:20:06 UTC (rev 3418)
+++ MOAB/trunk/test/obb/obb_time.cpp	2009-12-18 21:11:40 UTC (rev 3419)
@@ -163,7 +163,7 @@
   
   const unsigned cached = 1000;
   std::vector<double> intersections;
-  std::vector<MBEntityHandle> sets;
+  std::vector<MBEntityHandle> sets, facets;
   MBCartVect point, dir;
   std::vector<MBCartVect> randrays;
   randrays.reserve( cached );
@@ -197,7 +197,8 @@
     intersections.clear();
     if (do_sets) {
       sets.clear();
-      rval = tool.ray_intersect_sets( intersections, sets, root, 1e-6, 1, point.array(), dir.array() );
+      facets.clear();
+      rval = tool.ray_intersect_sets( intersections, sets, facets, root, 1e-6, 1, point.array(), dir.array() );
     }
     else {
       rval = tool.ray_intersect_triangles( intersections, root, 1e-6, point.array(), dir.array() );