Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Objects / obj.hxx

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index 1a3d8b9348ef3f58b5efb881d3179247e6e9fc49..1a197d5f0a2b759322a6be773811195356ced3c7 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -1,4 +1,5 @@
-// obj.hxx -- routines to handle WaveFront .obj-ish format files.
+// obj.hxx -- routines to handle loading scenery and building the plib
+//            scene graph.
 //
 // Written by Curtis Olson, started October 1997.
 //
@@ -30,25 +31,15 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
-// #ifdef HAVE_WINDOWS_H
-// #  include <windows.h>
-// #endif
-
-// #include <GL/glut.h>
-
 #include STL_STRING
 
-#include <plib/ssg.h>          // plib include
+#include <plib/ssg.h>           // plib include
 
+#include <simgear/bucket/newbucket.hxx>
 #include <simgear/math/sg_types.hxx>
-
-#include <Scenery/tileentry.hxx>
+#include <simgear/scene/material/matlib.hxx>
 
 SG_USING_STD(string);
 
@@ -57,34 +48,20 @@ SG_USING_STD(string);
 #define FG_MAX_NODES 4000
 
 
-// Load an Binary obj file
+// Load a Binary obj file
 bool fgBinObjLoad( const string& path, const bool is_base,
-                  Point3D *center,
-                  double *bounding_radius,
-                  ssgBranch* geometry,
-                  ssgBranch* rwy_lights,
-                  ssgVertexArray *ground_lights );
-
-// Load an ascii object file
-ssgBranch *fgAsciiObjLoad(const string& path, FGTileEntry *tile,
-                         ssgVertexArray *lights, const bool is_base);
+                   Point3D *center,
+                   double *bounding_radius,
+                   SGMaterialLib *matlib,
+                   ssgBranch* geometry,
+                   ssgBranch* rwy_lights,
+                   ssgBranch* taxi_lights,
+                   ssgVertexArray *ground_lights );
 
 // Generate an ocean tile
 bool fgGenTile( const string& path, SGBucket b,
-               Point3D *center,
-               double *bounding_radius,
-               ssgBranch* geometry );
-
-
-// Create an ssg leaf
-ssgLeaf *gen_leaf( const string& path,
-                  const GLenum ty, const string& material,
-                  const point_list& nodes, const point_list& normals,
-                  const point_list& texcoords,
-                  const int_list node_index,
-                  const int_list normal_index,
-                  const int_list& tex_index,
-                  const bool calc_lights, ssgVertexArray *lights );
+                Point3D *center, double *bounding_radius,
+                SGMaterialLib *matlib, ssgBranch* geometry );
 
 
 #endif // _OBJ_HXX