Merge branch 'maint' into next

[simgear.git] / simgear / scene / tgdb / obj.hxx

diff --git a/simgear/scene/tgdb/obj.hxx b/simgear/scene/tgdb/obj.hxx
index 5e3ae30a586bc1107aa10d25e25aa41dbf68dada..126ed6ccab3645d05fe7afe7f38accb8f4039cef 100644 (file)
--- a/simgear/scene/tgdb/obj.hxx
+++ b/simgear/scene/tgdb/obj.hxx
@@ -25,43 +25,37 @@
 #ifndef _SG_OBJ_HXX
 #define _SG_OBJ_HXX
 
-
 #ifndef __cplusplus
 # error This library requires C++
 #endif
 
-
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
-#include <osg/Array>
+#include <osg/Node>
 #include <osg/Group>
 
-#include <simgear/math/point3d.hxx>
+#include "SGOceanTile.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 class SGBucket;
 class SGMaterialLib;
 
-
-// Load a Binary obj file
-bool SGBinObjLoad( const string& path, const bool is_base,
-                   Point3D *center,
-                   double *bounding_radius,
-                   SGMaterialLib *matlib,
-                   bool use_random_objects,
-                   osg::Group *geometry,
-                   osg::Group *vasi_lights,
-                   osg::Group *rwy_lights,
-                   osg::Group *taxi_lights,
-                   osg::Vec3Array *ground_lights );
-
 // Generate an ocean tile
-bool SGGenTile( const string& path, SGBucket b,
-                Point3D *center, double *bounding_radius,
-                SGMaterialLib *matlib, osg::Group *geometry );
-
+inline bool SGGenTile( const std::string&, const SGBucket& b,
+                       SGMaterialLib *matlib, osg::Group* group )
+{
+  // Generate an ocean tile
+  osg::Node* node = SGOceanTile(b, matlib);
+  if (!node)
+    return false;
+  group->addChild(node);
+  return true;
+}
+
+osg::Node*
+SGLoadBTG(const std::string& path, SGMaterialLib *matlib, bool calc_lights, bool use_random_objects, bool use_random_vegetation);
 
 #endif // _SG_OBJ_HXX