[MOAB-dev] r3641 - in MOAB/trunk/src: . moab

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-17 11:00:29 -0500 (Wed, 17 Mar 2010)
New Revision: 3641

Modified:
   MOAB/trunk/src/OrientedBoxTreeTool.cpp
   MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp
Log:
make function that passes back a moab::OrientedBox private, as that is not part of the moab API

Modified: MOAB/trunk/src/OrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/src/OrientedBoxTreeTool.cpp	2010-03-17 01:34:30 UTC (rev 3640)
+++ MOAB/trunk/src/OrientedBoxTreeTool.cpp	2010-03-17 16:00:29 UTC (rev 3641)
@@ -1732,7 +1732,7 @@
 }
   
 
-static ErrorCode recursive_stats( OrientedBoxTreeTool* tool,
+ErrorCode OrientedBoxTreeTool::recursive_stats( OrientedBoxTreeTool* tool,
                                     Interface* instance,
                                     EntityHandle set,
                                     int depth,

Modified: MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp
===================================================================
--- MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp	2010-03-17 01:34:30 UTC (rev 3640)
+++ MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp	2010-03-17 16:00:29 UTC (rev 3641)
@@ -31,6 +31,8 @@
 
 class Range;
 class OrientedBox;
+class StatData;
+class CartVect;
 
 class OrientedBoxTreeTool
 {
@@ -300,13 +302,6 @@
      * Get the oriented box for a node in an oriented bounding box tree.
      */
     ErrorCode box( EntityHandle node_set,
-                     OrientedBox& box );
-    
-    /**\brief Get oriented box at node in tree
-     *
-     * Get the oriented box for a node in an oriented bounding box tree.
-     */
-    ErrorCode box( EntityHandle node_set,
                      double center[3],
                      double axis1[3],
                      double axis2[3],
@@ -404,6 +399,17 @@
     struct SetData;
   private:
   
+    friend class RayIntersector;
+    friend class TreeNodePrinter;
+    friend class RayIntersectSets;
+    
+    /**\brief Get oriented box at node in tree
+     *
+     * Get the oriented box for a node in an oriented bounding box tree.
+     */
+    ErrorCode box( EntityHandle node_set,
+                     OrientedBox& box );
+  
     ErrorCode build_tree( const Range& entities, 
                             EntityHandle& set, 
                             int depth,
@@ -413,6 +419,14 @@
                             EntityHandle& node_set,
                             int depth,
                             const Settings& settings );
+
+    ErrorCode recursive_stats( OrientedBoxTreeTool* tool,
+                                    Interface* instance,
+                                    EntityHandle set,
+                                    int depth,
+                                    StatData& data,
+                                    unsigned& count_out,
+                                    CartVect& dimensions_out );
   
     Interface* instance;
     Tag tagHandle;