X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2Fsg_binobj.hxx;h=7f6726407ef0ec37e2f737b62ac6c08d05487a44;hb=6b58afe8234155e8c6e5bf3d4a43dbd5d0ab9ba7;hp=dc0bdd1400ac8987fb58afa86bc6505f86f3fcbc;hpb=75911b6c643d8e5597565bc63c34bdc2009a037a;p=simgear.git diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx index dc0bdd14..7f672640 100644 --- a/simgear/io/sg_binobj.hxx +++ b/simgear/io/sg_binobj.hxx @@ -5,7 +5,7 @@ // Written by Curtis Olson, started January 2000. // -// Copyright (C) 2000 Curtis L. Olson - curt@flightgear.org +// Copyright (C) 2000 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 published by @@ -19,7 +19,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$ @@ -28,12 +28,6 @@ #define _SG_BINOBJ_HXX -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - #include #include #include @@ -43,12 +37,12 @@ #include #include -#include STL_STRING +#include /** 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; @@ -74,13 +68,13 @@ typedef group_list::const_iterator const_group_list_iterator; * - property: prop_typecode, nbytes, BYTE+ * * - obj_typecode: bounding sphere | vertices | normals | texcoords | - * triangles | fans | strips + * points | triangles | fans | strips * * - prop_typecode: material_name | ??? * - * - nelements: SHORT (Gives us 65536 which ought to be enough, right?) + * - nelements: USHORT (Gives us 65536 which ought to be enough, right?) * - * - nproperties: SHORT + * - nproperties: USHORT * * - *_typecode: CHAR * @@ -91,65 +85,116 @@ typedef group_list::const_iterator const_group_list_iterator; * - vertex: FLOAT, FLOAT, FLOAT */ class SGBinObject { - Point3D gbs_center; + unsigned short version; + + SGVec3d gbs_center; float gbs_radius; - point_list wgs84_nodes; - point_list normals; - point_list texcoords; - group_list tris_v; - group_list tris_tc; - string_list tri_materials; - group_list strips_v; - group_list strips_tc; - string_list strip_materials; - group_list fans_v; - group_list fans_tc; - string_list fan_materials; + + std::vector wgs84_nodes; // vertex list + std::vector colors; // color list + std::vector normals; // normal list + std::vector texcoords; // texture coordinate list + + group_list pts_v; // points vertex index + group_list pts_n; // points normal index + group_list pts_c; // points color index + group_list pts_tc; // points texture coordinate index + string_list pt_materials; // points materials + + group_list tris_v; // triangles vertex index + group_list tris_n; // triangles normal index + group_list tris_c; // triangles color index + group_list tris_tc; // triangles texture coordinate index + string_list tri_materials; // triangles materials + + group_list strips_v; // tristrips vertex index + group_list strips_n; // tristrips normal index + group_list strips_c; // tristrips color index + group_list strips_tc; // tristrips texture coordinate index + string_list strip_materials;// tristrips materials + + group_list fans_v; // fans vertex index + group_list fans_n; // fans normal index + group_list fans_c; // fans color index + group_list fans_tc; // fans texture coordinate index + string_list fan_materials; // fans materials public: - inline Point3D get_gbs_center() const { return gbs_center; } - inline void set_gbs_center( Point3D p ) { gbs_center = p; } + inline unsigned short get_version() const { return version; } + + 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; } inline void set_gbs_radius( float r ) { gbs_radius = r; } - inline point_list get_wgs84_nodes() const { return wgs84_nodes; } - inline void set_wgs84_nodes( point_list n ) { wgs84_nodes = n; } - - inline point_list get_normals() const { return normals; } - inline void set_normals( point_list n ) { normals = n; } + inline const std::vector& get_wgs84_nodes() const + { return wgs84_nodes; } + inline void set_wgs84_nodes( const std::vector& n ) + { wgs84_nodes = n; } - inline point_list get_texcoords() const { return texcoords; } - inline void set_texcoords( point_list t ) { texcoords = t; } - - inline group_list get_tris_v() const { return tris_v; } - inline void set_tris_v( group_list g ) { tris_v = g; } - inline group_list get_tris_tc() const { return tris_tc; } - inline void set_tris_tc( group_list g ) { tris_tc = g; } - inline string_list get_tri_materials() const { return tri_materials; } - inline void set_tri_materials( string_list s ) { tri_materials = s; } + inline const std::vector& get_colors() const { return colors; } + inline void set_colors( const std::vector& c ) { colors = c; } + + inline const std::vector& get_normals() const { return normals; } + inline void set_normals( const std::vector& n ) { normals = n; } - inline group_list get_strips_v() const { return strips_v; } - inline void set_strips_v( group_list g ) { strips_v = g; } - inline group_list get_strips_tc() const { return strips_tc; } - inline void set_strips_tc( group_list g ) { strips_tc = g; } - inline string_list get_strip_materials() const { return strip_materials; } - inline void set_strip_materials( string_list s ) { strip_materials = s; } + inline const std::vector& get_texcoords() const { return texcoords; } + inline void set_texcoords( const std::vector& t ) { texcoords = t; } - inline group_list get_fans_v() const { return fans_v; } - inline void set_fans_v( group_list g ) { fans_v = g; } - inline group_list get_fans_tc() const { return fans_tc; } - inline void set_fans_tc( group_list g ) { fans_tc = g; } - inline string_list get_fan_materials() const { return fan_materials; } - inline void set_fan_materials( string_list s ) { fan_materials = s; } + 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; } + inline void set_pts_n( const group_list& g ) { pts_n = g; } + inline const group_list& get_pts_c() const { return pts_c; } + inline void set_pts_c( const group_list& g ) { pts_c = g; } + inline const group_list& get_pts_tc() const { return pts_tc; } + inline void set_pts_tc( const group_list& g ) { pts_tc = g; } + inline const string_list& get_pt_materials() const { return pt_materials; } + inline void set_pt_materials( const string_list& s ) { pt_materials = s; } + + inline const group_list& get_tris_v() const { return tris_v; } + inline void set_tris_v( const group_list& g ) { tris_v = g; } + inline const group_list& get_tris_n() const { return tris_n; } + inline void set_tris_n( const group_list& g ) { tris_n = g; } + inline const group_list& get_tris_c() const { return tris_c; } + inline void set_tris_c( const group_list& g ) { tris_c = g; } + inline const group_list& get_tris_tc() const { return tris_tc; } + inline void set_tris_tc( const group_list& g ) { tris_tc = g; } + inline const string_list& get_tri_materials() const { return tri_materials; } + inline void set_tri_materials( const string_list& s ) { tri_materials = s; } + + inline const group_list& get_strips_v() const { return strips_v; } + inline void set_strips_v( const group_list& g ) { strips_v = g; } + inline const group_list& get_strips_n() const { return strips_n; } + inline void set_strips_n( const group_list& g ) { strips_n = g; } + inline const group_list& get_strips_c() const { return strips_c; } + inline void set_strips_c( const group_list& g ) { strips_c = g; } + + inline const group_list& get_strips_tc() const { return strips_tc; } + inline void set_strips_tc( const group_list& g ) { strips_tc = g; } + inline const string_list& get_strip_materials() const { return strip_materials; } + inline void set_strip_materials( const string_list& s ) { strip_materials = s; } + + inline const group_list& get_fans_v() const { return fans_v; } + inline void set_fans_v( const group_list& g ) { fans_v = g; } + inline const group_list& get_fans_n() const { return fans_n; } + inline void set_fans_n( const group_list& g ) { fans_n = g; } + inline const group_list& get_fans_c() const { return fans_c; } + inline void set_fans_c( const group_list& g ) { fans_c = g; } + + inline const group_list& get_fans_tc() const { return fans_tc; } + inline void set_fans_tc( const group_list& g ) { fans_tc = g; } + inline const string_list& get_fan_materials() const { return fan_materials; } + inline void set_fan_materials( const string_list& s ) { fan_materials = s; } /** * Read a binary file object and populate the provided structures. * @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 @@ -160,7 +205,7 @@ 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 ); /** * Write out the structures to an ASCII file. We assume that the @@ -171,20 +216,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 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