X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2Fsg_binobj.hxx;h=d594113de0ef3b9e8f3b622df2e2441520f0d66e;hb=201cb61f842ef50a19438e3872ba22e588fa1afc;hp=be77d5864252149e7bfd52a11e21831c89e4020c;hpb=b1c49045a8cdf311bc06438ba361c9f815ee4d54;p=simgear.git

diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index be77d586..d594113d 100644
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -27,32 +27,24 @@
 #ifndef _SG_BINOBJ_HXX
 #define _SG_BINOBJ_HXX
 
-
-#include <plib/sg.h>
+#include <zlib.h> // for gzFile
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/math/sg_types.hxx>
-#include <simgear/math/point3d.hxx>
-#include <simgear/bucket/newbucket.hxx>
-
-#include <stdio.h>
-#include <time.h>
+#include <simgear/math/SGMath.hxx>
 
-#include <list>
+#include <vector>
 #include <string>
 
-
-
 /** STL Structure used to store object information */
-typedef vector < int_list > group_list;
+typedef std::vector < int_list > group_list;
 typedef group_list::iterator group_list_iterator;
 typedef group_list::const_iterator const_group_list_iterator;
 
-
-/** Magic Number for our file format */
-#define SG_FILE_MAGIC_NUMBER  ( ('S'<<24) + ('G'<<16) + SG_BINOBJ_VERSION )
-
+// forward decls
+class SGBucket;
+class SGPath;
 
 /**
  * A class to manipulate the simgear 3d object format.
@@ -88,6 +80,7 @@ typedef group_list::const_iterator const_group_list_iterator;
  * - vertex: FLOAT, FLOAT, FLOAT
 */
 class SGBinObject {
+private:
     unsigned short version;
 
     SGVec3d gbs_center;
@@ -122,13 +115,29 @@ class SGBinObject {
     group_list fans_tc;		// fans texture coordinate index
     string_list fan_materials;	// fans materials
 
+    void read_properties(gzFile fp, int nproperties);
+    
+    void read_object( gzFile fp,
+                             int obj_type,
+                             int nproperties,
+                             int nelements,
+                             group_list& vertices, 
+                             group_list& normals,
+                             group_list& colors,
+                             group_list& texCoords,
+                             string_list& materials);
+                             
+    void write_header(gzFile fp, int type, int nProps, int nElements);
+    void write_objects(gzFile fp, int type, const group_list& verts,
+        const group_list& normals, const group_list& colors, 
+        const group_list& texCoords, const string_list& materials);
+        
+    unsigned int count_objects(const string_list& materials);
 public:
 
     inline unsigned short get_version() const { return version; }
 
-    inline Point3D get_gbs_center() const { return Point3D::fromSGVec3(gbs_center); }
-    inline void set_gbs_center( const Point3D& p ) { gbs_center = p.toSGVec3d(); }
-    inline const SGVec3d& get_gbs_center2() const { return gbs_center; }
+    inline const SGVec3d& get_gbs_center() const { return gbs_center; }
     inline void set_gbs_center( const SGVec3d& p ) { gbs_center = p; }
 
     inline float get_gbs_radius() const { return gbs_radius; }
@@ -138,40 +147,16 @@ public:
     { return wgs84_nodes; }
     inline void set_wgs84_nodes( const std::vector<SGVec3d>& n )
     { wgs84_nodes = n; }
-    inline void set_wgs84_nodes( const point_list& n )
-    {
-      wgs84_nodes.resize(n.size());
-      for (unsigned i = 0; i < wgs84_nodes.size(); ++i)
-        wgs84_nodes[i] = n[i].toSGVec3d();
-    }
 
     inline const std::vector<SGVec4f>& get_colors() const { return colors; }
     inline void set_colors( const std::vector<SGVec4f>& c ) { colors = c; }
-    inline void set_colors( const point_list& c )
-    {
-      colors.resize(c.size());
-      for (unsigned i = 0; i < colors.size(); ++i)
-        colors[i] = SGVec4f(c[i].toSGVec3f(), 1);
-    }
-
+    
     inline const std::vector<SGVec3f>& get_normals() const { return normals; }
     inline void set_normals( const std::vector<SGVec3f>& n ) { normals = n; }
-    inline void set_normals( const point_list& n )
-    {
-      normals.resize(n.size());
-      for (unsigned i = 0; i < normals.size(); ++i)
-        normals[i] = n[i].toSGVec3f();
-    }
-
+    
     inline const std::vector<SGVec2f>& get_texcoords() const { return texcoords; }
     inline void set_texcoords( const std::vector<SGVec2f>& t ) { texcoords = t; }
-    inline void set_texcoords( const point_list& t )
-    {
-      texcoords.resize(t.size());
-      for (unsigned i = 0; i < texcoords.size(); ++i)
-        texcoords[i] = t[i].toSGVec2f();
-    }
-
+    
     inline const group_list& get_pts_v() const { return pts_v; }
     inline void set_pts_v( const group_list& g ) { pts_v = g; }
     inline const group_list& get_pts_n() const { return pts_n; }
@@ -223,7 +208,7 @@ public:
      * @param file input file name
      * @return result of read
      */
-    bool read_bin( const string& file );
+    bool read_bin( const std::string& file );
 
     /** 
      * Write out the structures to a binary file.  We assume that the
@@ -234,7 +219,10 @@ public:
      * @param b bucket for object location
      * @return result of write
      */
-    bool write_bin( const string& base, const string& name, const SGBucket& b );
+    bool write_bin( const std::string& base, const std::string& name, const SGBucket& b );
+
+
+    bool write_bin_file(const SGPath& file);
 
     /**
      * Write out the structures to an ASCII file.  We assume that the
@@ -245,30 +233,8 @@ public:
      * @param b bucket for object location
      * @return result of write
      */
-    bool write_ascii( const string& base, const string& name,
+    bool write_ascii( const std::string& base, const std::string& name,
 		      const SGBucket& b );
 };
 
-
-/**
- * \relates SGBinObject
- * Calculate the center of a list of points, by taking the halfway
- * point between the min and max points.
- * @param wgs84_nodes list of points in wgs84 coordinates
- * @return center point
- */
-Point3D sgCalcCenter( point_list& wgs84_nodes );
-
-
-/**
- * \relates SGBinObject
- * Calculate the bounding sphere of a set of nodes.
- * Center is the center of the tile and zero elevation.
- * @param center center of our bounding radius
- * @param wgs84_nodes list of points in wgs84 coordinates
- * @return radius
- */
-double sgCalcBoundingRadius( Point3D center, point_list& wgs84_nodes );
-
-
 #endif // _SG_BINOBJ_HXX