Replace SG_USE_STD() by using std::

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

diff --git a/simgear/scene/tgdb/obj.hxx b/simgear/scene/tgdb/obj.hxx
index b1b2697867397854574a9acd693afd0690a5aed8..126ed6ccab3645d05fe7afe7f38accb8f4039cef 100644 (file)
--- a/simgear/scene/tgdb/obj.hxx
+++ b/simgear/scene/tgdb/obj.hxx
@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started October 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -25,41 +25,37 @@
 #ifndef _SG_OBJ_HXX
 #define _SG_OBJ_HXX
 
-
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
-
+#endif
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
-#include <plib/ssg.h>           // plib include
+#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,
-                   ssgBranch* geometry,
-                   ssgBranch* rwy_lights,
-                   ssgBranch* taxi_lights,
-                   ssgVertexArray *ground_lights );
-
 // Generate an ocean tile
-bool sgGenTile( const string& path, SGBucket b,
-                Point3D *center, double *bounding_radius,
-                SGMaterialLib *matlib, ssgBranch* 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