X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObjects%2Fobj.hxx;h=05a7180d7afc78f3180197b4646519de4e49abeb;hb=b4a9d7621597c9eef97f8ec84d246d5585b4b7ea;hp=b2df767c9d9b4208b13c9b7edb0b02305b44473a;hpb=8ce39244df6832756d13ac599662635f58b1143e;p=flightgear.git

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index b2df767c9..05a7180d7 100644
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -34,7 +34,7 @@
 #  include <config.h>
 #endif
 
-#include <Include/compiler.h>
+#include <simgear/compiler.h>
 
 // #ifdef HAVE_WINDOWS_H
 // #  include <windows.h>
@@ -44,17 +44,39 @@
 
 #include STL_STRING
 
-#include <ssg.h>		// plib include
+#include <plib/ssg.h>		// plib include
+
+#include <simgear/math/sg_types.hxx>
 
 #include <Scenery/tileentry.hxx>
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
-// Load a .obj file and build the fragment list
-ssgBranch *fgObjLoad(const string& path, FGTileEntry *tile, const bool is_base);
+// duplicated from the TerraGear tools
+#define FG_MAX_NODES 4000
 
 
-#endif // _OBJ_HXX
+// Load a binary object file
+ssgBranch *fgBinObjLoad(const string& path, FGTileEntry *tile,
+			ssgVertexArray *lights, const bool is_base);
+
+// Load an ascii object file
+ssgBranch *fgAsciiObjLoad(const string& path, FGTileEntry *tile,
+			  ssgVertexArray *lights, const bool is_base);
+
+// Generate an ocean tile
+ssgBranch *fgGenTile( const string& path, FGTileEntry *t);
 
 
+// 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& tex_index,
+		   const bool calc_lights, ssgVertexArray *lights );
+
+
+#endif // _OBJ_HXX