]> git.mxchange.org Git - simgear.git/blobdiff - simgear/io/sg_binobj.cxx
remove CopyPolicy from ModelRegistry
[simgear.git] / simgear / io / sg_binobj.cxx
index 0a7799702932aee536a35cc17d8ee45774501d36..3c3213082ae7e033945b3325426439597af9c6c9 100644 (file)
@@ -2,7 +2,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
 //
 // 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$
 //
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #include <simgear/compiler.h>
+#include <simgear/debug/logstream.hxx>
 
 #include <stdio.h>
 #include <time.h>
-#include <zlib.h>
 
-#include <list>
-#include STL_STRING
+#include <vector>
+#include <string>
+#include <iostream>
 
 #include <simgear/bucket/newbucket.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include "lowlevel.hxx"
 #include "sg_binobj.hxx"
 
-#ifdef _MSC_VER
-#  include <Win32/mkdir.hpp>
-#endif
 
-FG_USING_STD( cout );
-FG_USING_STD( endl );
+using std::string;
+using std::vector;
+using std::cout;
+using std::endl;
 
-enum {
+enum sgObjectTypes {
     SG_BOUNDING_SPHERE = 0,
 
     SG_VERTEX_LIST = 1,
+    SG_COLOR_LIST = 4,
     SG_NORMAL_LIST = 2,
     SG_TEXCOORD_LIST = 3,
 
+    SG_POINTS = 9,
+
     SG_TRIANGLE_FACES = 10,
     SG_TRIANGLE_STRIPS = 11,
     SG_TRIANGLE_FANS = 12
-} tgObjectTypes;
+};
+
+enum sgIndexTypes {
+    SG_IDX_VERTICES =  0x01,
+    SG_IDX_NORMALS =   0x02,
+    SG_IDX_COLORS =    0x04,
+    SG_IDX_TEXCOORDS = 0x08
+};
+
+enum sgPropertyTypes {
+    SG_MATERIAL = 0,
+    SG_INDEX_TYPES = 1
+};
+
+
+class sgSimpleBuffer {
+
+private:
+
+    char *ptr;
+    unsigned int size;
 
-enum {
-    SG_MATERIAL = 0
-} tgPropertyTypes;
+public:
+
+    inline sgSimpleBuffer( unsigned int s )
+    {
+       size = 1;
+       while ( size < s ) {
+           size *= 2;
+       }
+        SG_LOG(SG_EVENT, SG_DEBUG, "Creating a new buffer of size = " << size);
+       ptr = new char[size];
+    }
+
+    inline ~sgSimpleBuffer() {
+       delete [] ptr;
+    }
+
+    inline unsigned int get_size() const { return size; }
+    inline char *get_ptr() const { return ptr; }
+    inline void resize( unsigned int s ) {
+       if ( s > size ) {
+           if ( ptr != NULL ) {
+               delete [] ptr;
+           }
+           while ( size < s ) {
+               size *= 2;
+           }
+            SG_LOG(SG_EVENT, SG_DEBUG, "resizing buffer to size = " << size);
+           ptr = new char[size];
+       }
+    }
+};
 
 
 // calculate the center of a list of points, by taking the halfway
 // point between the min and max points.
-static Point3D calc_center( point_list& wgs84_nodes ) {
+Point3D sgCalcCenter( point_list& wgs84_nodes ) {
     Point3D p, min, max;
 
     if ( wgs84_nodes.size() ) {
@@ -107,281 +159,242 @@ double sgCalcBoundingRadius( Point3D center, point_list& wgs84_nodes ) {
 }
 
 
-// write out the structures to an ASCII file.  We assume that the
-// groups come to us sorted by material property.  If not, things
-// don't break, but the result won't be as optimal.
-void sgWriteAsciiObj( const string& base, const string& name, const SGBucket& b,
-                     Point3D gbs_center, float gbs_radius,
-                     const point_list& wgs84_nodes, const point_list& normals,
-                     const point_list& texcoords, 
-                     const group_list& tris_v, const group_list& tris_tc, 
-                     const string_list& tri_materials,
-                     const group_list& strips_v, const group_list& strips_tc, 
-                     const string_list& strip_materials,
-                     const group_list& fans_v, const group_list& fans_tc,
-                     const string_list& fan_materials )
-{
-    Point3D p;
-    int i, j;
 
-    string dir = base + "/" + b.gen_base_path();
-    string command = "mkdir -p " + dir;
-#ifdef _MSC_VER
-    fg_mkdir( dir.c_str() );
-#else
-    system(command.c_str());
-#endif
-
-    // string file = dir + "/" + b.gen_index_str();
-    string file = dir + "/" + name;
-    cout << "Output file = " << file << endl;
-
-    FILE *fp;
-    if ( (fp = fopen( file.c_str(), "w" )) == NULL ) {
-       cout << "ERROR: opening " << file << " for writing!" << endl;
-       exit(-1);
-    }
-
-    cout << "triangles size = " << tris_v.size() << "  tri_materials = " 
-        << tri_materials.size() << endl;
-    cout << "strips size = " << strips_v.size() << "  strip_materials = " 
-        << strip_materials.size() << endl;
-    cout << "fans size = " << fans_v.size() << "  fan_materials = " 
-        << fan_materials.size() << endl;
-
-    cout << "points = " << wgs84_nodes.size() << endl;
-    cout << "tex coords = " << texcoords.size() << endl;
-    // write headers
-    fprintf(fp, "# FGFS Scenery\n");
-    fprintf(fp, "# Version %s\n", SG_SCENERY_FILE_FORMAT);
-
-    time_t calendar_time = time(NULL);
-    struct tm *local_tm;
-    local_tm = localtime( &calendar_time );
-    char time_str[256];
-    strftime( time_str, 256, "%a %b %d %H:%M:%S %Z %Y", local_tm);
-    fprintf(fp, "# Created %s\n", time_str );
-    fprintf(fp, "\n");
-
-    // write bounding sphere
-    fprintf(fp, "# gbs %.5f %.5f %.5f %.2f\n",
-           gbs_center.x(), gbs_center.y(), gbs_center.z(), gbs_radius);
-    fprintf(fp, "\n");
-
-    // dump vertex list
-    fprintf(fp, "# vertex list\n");
-    for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
-       p = wgs84_nodes[i] - gbs_center;
-       
-       fprintf(fp,  "v %.5f %.5f %.5f\n", p.x(), p.y(), p.z() );
-    }
-    fprintf(fp, "\n");
-
-    fprintf(fp, "# vertex normal list\n");
-    for ( i = 0; i < (int)normals.size(); ++i ) {
-       p = normals[i];
-       fprintf(fp,  "vn %.5f %.5f %.5f\n", p.x(), p.y(), p.z() );
-    }
-    fprintf(fp, "\n");
-
-    // dump texture coordinates
-    fprintf(fp, "# texture coordinate list\n");
-    for ( i = 0; i < (int)texcoords.size(); ++i ) {
-       p = texcoords[i];
-       fprintf(fp,  "vt %.5f %.5f\n", p.x(), p.y() );
+// read object properties
+static 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 )
+{
+    unsigned int nbytes;
+    unsigned char idx_mask;
+    int idx_size;
+    bool do_vertices, do_normals, do_colors, do_texcoords;
+    int j, k, idx;
+    sgSimpleBuffer buf( 32768 );  // 32 Kb
+    char material[256];
+
+    // default values
+    if ( obj_type == SG_POINTS ) {
+       idx_size = 1;
+       idx_mask = SG_IDX_VERTICES;
+       do_vertices = true;
+       do_normals = false;
+       do_colors = false;
+       do_texcoords = false;
+    } else {
+       idx_size = 2;
+       idx_mask = (char)(SG_IDX_VERTICES | SG_IDX_TEXCOORDS);
+       do_vertices = true;
+       do_normals = false;
+       do_colors = false;
+       do_texcoords = true;
     }
-    fprintf(fp, "\n");
-
-    // dump individual triangles if they exist
-    if ( tris_v.size() > 0 ) {
-       fprintf(fp, "# triangle groups\n");
 
-       int start = 0;
-       int end = 1;
-       string material;
-       while ( start < (int)tri_materials.size() ) {
-           // find next group
-           material = tri_materials[start];
-           while ( (end < (int)tri_materials.size()) && 
-                   (material == tri_materials[end]) )
-           {
-               // cout << "end = " << end << endl;
-               end++;
+    for ( j = 0; j < nproperties; ++j ) {
+       char prop_type;
+       sgReadChar( fp, &prop_type );
+
+       sgReadUInt( fp, &nbytes );
+       // cout << "property size = " << nbytes << endl;
+       if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+       char *ptr = buf.get_ptr();
+       sgReadBytes( fp, nbytes, ptr );
+       if ( prop_type == SG_MATERIAL ) {
+           strncpy( material, ptr, nbytes );
+           material[nbytes] = '\0';
+           // cout << "material type = " << material << endl;
+       } else if ( prop_type == SG_INDEX_TYPES ) {
+           idx_mask = ptr[0];
+           // cout << "idx_mask = " << (int)idx_mask << endl;
+           idx_size = 0;
+           do_vertices = false;
+           do_normals = false;
+           do_colors = false;
+           do_texcoords = false;
+           if ( idx_mask & SG_IDX_VERTICES ) {
+               do_vertices = true;
+               ++idx_size;
            }
-           // cout << "group = " << start << " to " << end - 1 << endl;
-
-           // make a list of points for the group
-           point_list group_nodes;
-           group_nodes.clear();
-           Point3D bs_center;
-           double bs_radius = 0;
-           for ( i = start; i < end; ++i ) {
-               for ( j = 0; j < (int)tris_v[i].size(); ++j ) {
-                   group_nodes.push_back( wgs84_nodes[ tris_v[i][j] ] );
-                   bs_center = calc_center( group_nodes );
-                   bs_radius = sgCalcBoundingRadius( bs_center, group_nodes );
-               }
+           if ( idx_mask & SG_IDX_NORMALS ) {
+               do_normals = true;
+               ++idx_size;
            }
-
-           // write group headers
-           fprintf(fp, "\n");
-           fprintf(fp, "# usemtl %s\n", material.c_str());
-           fprintf(fp, "# bs %.4f %.4f %.4f %.2f\n",
-                   bs_center.x(), bs_center.y(), bs_center.z(), bs_radius);
-
-           // write groups
-           for ( i = start; i < end; ++i ) {
-               fprintf(fp, "f");
-               for ( j = 0; j < (int)tris_v[i].size(); ++j ) {
-                   fprintf(fp, " %d/%d", tris_v[i][j], tris_tc[i][j] );
-               }
-               fprintf(fp, "\n");
+           if ( idx_mask & SG_IDX_COLORS ) {
+               do_colors = true;
+               ++idx_size;
+           }
+           if ( idx_mask & SG_IDX_TEXCOORDS ) {
+               do_texcoords = true;
+               ++idx_size;
            }
-
-           start = end;
-           end = start + 1;
        }
     }
 
-    // dump triangle groups
-    if ( strips_v.size() > 0 ) {
-       fprintf(fp, "# triangle strips\n");
-
-       int start = 0;
-       int end = 1;
-       string material;
-       while ( start < (int)strip_materials.size() ) {
-           // find next group
-           material = strip_materials[start];
-           while ( (end < (int)strip_materials.size()) && 
-                   (material == strip_materials[end]) )
-               {
-                   // cout << "end = " << end << endl;
-                   end++;
-               }
-           // cout << "group = " << start << " to " << end - 1 << endl;
-
-           // make a list of points for the group
-           point_list group_nodes;
-           group_nodes.clear();
-           Point3D bs_center;
-           double bs_radius = 0;
-           for ( i = start; i < end; ++i ) {
-               for ( j = 0; j < (int)strips_v[i].size(); ++j ) {
-                   group_nodes.push_back( wgs84_nodes[ strips_v[i][j] ] );
-                   bs_center = calc_center( group_nodes );
-                   bs_radius = sgCalcBoundingRadius( bs_center, group_nodes );
+    for ( j = 0; j < nelements; ++j ) {
+       sgReadUInt( fp, &nbytes );
+       // cout << "element size = " << nbytes << endl;
+       if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+       char *ptr = buf.get_ptr();
+       sgReadBytes( fp, nbytes, ptr );
+       int count = nbytes / (idx_size * sizeof(unsigned short));
+       unsigned short *sptr = (unsigned short *)ptr;
+       int_list vs; vs.clear();
+       int_list ns; ns.clear();
+       int_list cs; cs.clear();
+       int_list tcs; tcs.clear();
+       for ( k = 0; k < count; ++k ) {
+           if ( sgIsBigEndian() ) {
+               for ( idx = 0; idx < idx_size; ++idx ) {
+                   sgEndianSwap( (uint16_t *)&(sptr[idx]) );
                }
            }
-
-           // write group headers
-           fprintf(fp, "\n");
-           fprintf(fp, "# usemtl %s\n", material.c_str());
-           fprintf(fp, "# bs %.4f %.4f %.4f %.2f\n",
-                   bs_center.x(), bs_center.y(), bs_center.z(), bs_radius);
-
-           // write groups
-           for ( i = start; i < end; ++i ) {
-               fprintf(fp, "ts");
-               for ( j = 0; j < (int)strips_v[i].size(); ++j ) {
-                   fprintf(fp, " %d/%d", strips_v[i][j], strips_tc[i][j] );
-               }
-               fprintf(fp, "\n");
+           idx = 0;
+           if ( do_vertices ) {
+               vs.push_back( sptr[idx++] );
            }
-           
-           start = end;
-           end = start + 1;
+           if ( do_normals ) {
+               ns.push_back( sptr[idx++] );
+                   }
+           if ( do_colors ) {
+               cs.push_back( sptr[idx++] );
+           }
+           if ( do_texcoords ) {
+               tcs.push_back( sptr[idx++] );
+           }
+           // cout << sptr[0] << " ";
+           sptr += idx_size;
        }
+       // cout << endl;
+       vertices->push_back( vs );
+       normals->push_back( ns );
+       colors->push_back( cs );
+       texcoords->push_back( tcs );
+       materials->push_back( material );
     }
-
-    // close the file
-    fclose(fp);
-
-    command = "gzip --force --best " + file;
-    system(command.c_str());
 }
 
 
 // read a binary file and populate the provided structures.
-void sgReadBinObj( const string& file,
-                  Point3D &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 )
-{
-    Point3D p;
-    int i, j, k, m;
+bool SGBinObject::read_bin( const string& file ) {
+    SGVec3d p;
+    int i, j, k;
+    unsigned int nbytes;
+    sgSimpleBuffer buf( 32768 );  // 32 Kb
 
     // zero out structures
+    gbs_center = SGVec3d(0, 0, 0);
+    gbs_radius = 0.0;
+
     wgs84_nodes.clear();
     normals.clear();
     texcoords.clear();
 
+    pts_v.clear();
+    pts_n.clear();
+    pts_c.clear();
+    pts_tc.clear();
+    pt_materials.clear();
+
     tris_v.clear();
+    tris_n.clear();
+    tris_c.clear();
     tris_tc.clear();
     tri_materials.clear();
 
     strips_v.clear();
+    strips_n.clear();
+    strips_c.clear();
     strips_tc.clear();
     strip_materials.clear();
 
     fans_v.clear();
+    fans_n.clear();
+    fans_c.clear();
     fans_tc.clear();
     fan_materials.clear();
-   
-    cout << "Loading binary input file = " << file << endl;
 
     gzFile fp;
     if ( (fp = gzopen( file.c_str(), "rb" )) == NULL ) {
        string filegz = file + ".gz";
        if ( (fp = gzopen( filegz.c_str(), "rb" )) == NULL ) {
-           cout << "ERROR: opening " << file << " or " << filegz
-                << "for reading!" << endl;
-           exit(-1);
+            SG_LOG( SG_EVENT, SG_ALERT,
+               "ERROR: opening " << file << " or " << filegz << " for reading!");
+
+           return false;
        }
     }
 
+    sgClearReadError();
+
     // read headers
-    int header, version;
-    sgReadInt( fp, &header );
-    if ( ((header & 0xFF000000) >> 24) == 'T' &&
+    unsigned int header;
+    sgReadUInt( fp, &header );
+    if ( ((header & 0xFF000000) >> 24) == 'S' &&
         ((header & 0x00FF0000) >> 16) == 'G' ) {
-       cout << "Good header" << endl;
+       // cout << "Good header" << endl;
        // read file version
        version = (header & 0x0000FFFF);
-       cout << "File version = " << version << endl;
+       // cout << "File version = " << version << endl;
+    } else {
+       // close the file before we return
+       gzclose(fp);
+
+       return false;
     }
 
     // read creation time
-    time_t calendar_time;
-    sgReadLong( fp, &calendar_time );
+    unsigned int foo_calendar_time;
+    sgReadUInt( fp, &foo_calendar_time );
+
+#if 0
+    time_t calendar_time = foo_calendar_time;
+    // The following code has a global effect on the host application
+    // and can screws up the time elsewhere.  It should be avoided
+    // unless you need this for debugging in which case you should
+    // disable it again once the debugging task is finished.
     struct tm *local_tm;
     local_tm = localtime( &calendar_time );
     char time_str[256];
     strftime( time_str, 256, "%a %b %d %H:%M:%S %Z %Y", local_tm);
-    cout << "File created on " << time_str << endl;
+    SG_LOG( SG_EVENT, SG_DEBUG, "File created on " << time_str);
+#endif
 
     // read number of top level objects
-    short nobjects;
-    sgReadShort( fp, &nobjects );
-    cout << "Total objects to read = " << nobjects << endl;
+    unsigned short nobjects;
+    if ( version >= 7 ) {
+        sgReadUShort( fp, &nobjects );
+    } else {
+        short tmp;
+        sgReadShort( fp, &tmp );
+        nobjects = tmp;
+    }
+    // cout << "Total objects to read = " << nobjects << endl;
 
     // read in objects
     for ( i = 0; i < nobjects; ++i ) {
        // read object header
        char obj_type;
-       short nproperties, nelements;
+       unsigned short nproperties, nelements;
        sgReadChar( fp, &obj_type );
-       sgReadShort( fp, &nproperties );
-       sgReadShort( fp, &nelements );
+        if ( version >= 7 ) {
+            sgReadUShort( fp, &nproperties );
+            sgReadUShort( fp, &nelements );
+        } else {
+            short tmp;
+            sgReadShort( fp, &tmp );
+            nproperties = tmp;
+            sgReadShort( fp, &tmp );
+            nelements = tmp;
+        }
 
-       cout << "object " << i << " = " << (int)obj_type << " props = "
-            << nproperties << " elements = " << nelements << endl;
+       // cout << "object " << i << " = " << (int)obj_type << " props = "
+       //      << nproperties << " elements = " << nelements << endl;
            
        if ( obj_type == SG_BOUNDING_SPHERE ) {
            // read bounding sphere properties
@@ -389,31 +402,37 @@ void sgReadBinObj( const string& file,
                char prop_type;
                sgReadChar( fp, &prop_type );
 
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "property size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
            }
 
            // read bounding sphere elements
            for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "element size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
 
                double *dptr = (double *)ptr;
-               gbs_center = Point3D( dptr[0], dptr[1], dptr[2] );
-               cout << "Center = " << gbs_center << endl;
+               if ( sgIsBigEndian() ) {
+                   sgEndianSwap( (uint64_t *)&(dptr[0]) );
+                   sgEndianSwap( (uint64_t *)&(dptr[1]) );
+                   sgEndianSwap( (uint64_t *)&(dptr[2]) );
+               }
+               gbs_center = SGVec3d( dptr[0], dptr[1], dptr[2] );
+               // cout << "Center = " << gbs_center << endl;
                ptr += sizeof(double) * 3;
                
                float *fptr = (float *)ptr;
-               *gbs_radius = fptr[0];
-               cout << "Bounding radius = " << *gbs_radius << endl;
+               if ( sgIsBigEndian() ) {
+                   sgEndianSwap( (uint32_t *)fptr );
+               }
+               gbs_radius = fptr[0];
+               // cout << "Bounding radius = " << gbs_radius << endl;
            }
        } else if ( obj_type == SG_VERTEX_LIST ) {
            // read vertex list properties
@@ -421,224 +440,148 @@ void sgReadBinObj( const string& file,
                char prop_type;
                sgReadChar( fp, &prop_type );
 
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "property size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
            }
 
            // read vertex list elements
            for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "element size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
                int count = nbytes / (sizeof(float) * 3);
                float *fptr = (float *)ptr;
+               wgs84_nodes.reserve( count );
                for ( k = 0; k < count; ++k ) {
-                   p = Point3D( fptr[0], fptr[1], fptr[2] );
-                   cout << "node = " << p << endl;
-                   wgs84_nodes.push_back( p );
+                   if ( sgIsBigEndian() ) {
+                       sgEndianSwap( (uint32_t *)&(fptr[0]) );
+                       sgEndianSwap( (uint32_t *)&(fptr[1]) );
+                       sgEndianSwap( (uint32_t *)&(fptr[2]) );
+                   }
+                   wgs84_nodes.push_back( SGVec3d(fptr[0], fptr[1], fptr[2]) );
                    fptr += 3;
                }
            }
-       } else if ( obj_type == SG_NORMAL_LIST ) {
-           // read normal list properties
+       } else if ( obj_type == SG_COLOR_LIST ) {
+           // read color list properties
            for ( j = 0; j < nproperties; ++j ) {
                char prop_type;
                sgReadChar( fp, &prop_type );
 
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "property size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
            }
 
-           // read normal list elements
+           // read color list elements
            for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "element size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
-               int count = nbytes / 3;
+               int count = nbytes / (sizeof(float) * 4);
+               float *fptr = (float *)ptr;
+               colors.reserve(count);
                for ( k = 0; k < count; ++k ) {
-                   p = Point3D( ptr[0] / 256.0, ptr[1] / 256.0,
-                                ptr[2] / 256.0 );
-                   cout << "normal = " << p << endl;
-                   normals.push_back( p );
-                   ptr += 3;
+                   if ( sgIsBigEndian() ) {
+                       sgEndianSwap( (uint32_t *)&(fptr[0]) );
+                       sgEndianSwap( (uint32_t *)&(fptr[1]) );
+                       sgEndianSwap( (uint32_t *)&(fptr[2]) );
+                       sgEndianSwap( (uint32_t *)&(fptr[3]) );
+                   }
+                   SGVec4f color( fptr[0], fptr[1], fptr[2], fptr[3] );
+                   colors.push_back( color );
+                   fptr += 4;
                }
            }
-       } else if ( obj_type == SG_TEXCOORD_LIST ) {
-           // read texcoord list properties
+       } else if ( obj_type == SG_NORMAL_LIST ) {
+           // read normal list properties
            for ( j = 0; j < nproperties; ++j ) {
                char prop_type;
                sgReadChar( fp, &prop_type );
 
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "property size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
            }
 
-           // read texcoord list elements
+           // read normal list elements
            for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "element size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               unsigned char *ptr = (unsigned char *)(buf.get_ptr());
                sgReadBytes( fp, nbytes, ptr );
-               int count = nbytes / (sizeof(float) * 2);
-               float *fptr = (float *)ptr;
+               int count = nbytes / 3;
+               normals.reserve( count );
                for ( k = 0; k < count; ++k ) {
-                   p = Point3D( fptr[0], fptr[1], 0 );
-                   cout << "texcoord = " << p << endl;
-                   texcoords.push_back( p );
-                   fptr += 2;
+                    SGVec3f normal((ptr[0]) / 127.5 - 1.0,
+                                   (ptr[1]) / 127.5 - 1.0,
+                                   (ptr[2]) / 127.5 - 1.0);
+
+                   normals.push_back(normalize(normal));
+                   ptr += 3;
                }
            }
-       } else if ( obj_type == SG_TRIANGLE_FACES ) {
-           // read triangle face properties
+       } else if ( obj_type == SG_TEXCOORD_LIST ) {
+           // read texcoord list properties
            for ( j = 0; j < nproperties; ++j ) {
                char prop_type;
                sgReadChar( fp, &prop_type );
 
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "property size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
-               if ( prop_type == SG_MATERIAL ) {
-                   char material[256];
-                   strncpy( material, ptr, nbytes );
-                   material[nbytes] = '\0';
-                   cout << "material type = " << material << endl;
-                   tri_materials.push_back( material );
-               }
            }
 
-           // read triangle face elements
+           // read texcoord list elements
            for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "element size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
-               int count = nbytes / (sizeof(short) * 2 * 3);
-               short *sptr = (short *)ptr;
-               int_list vs, tcs;
+               int count = nbytes / (sizeof(float) * 2);
+               float *fptr = (float *)ptr;
+               texcoords.reserve(count);
                for ( k = 0; k < count; ++k ) {
-                   vs.clear(); tcs.clear();
-                   for ( m = 0; m < 3; ++m ) {
-                       vs.push_back( sptr[0] );
-                       tcs.push_back( sptr[1] );
-                       cout << sptr[0] << "/" << sptr[1] << " ";
-                       sptr += 2;
+                   if ( sgIsBigEndian() ) {
+                       sgEndianSwap( (uint32_t *)&(fptr[0]) );
+                       sgEndianSwap( (uint32_t *)&(fptr[1]) );
                    }
-                   cout << endl;
-                   tris_v.push_back( vs );
-                   tris_tc.push_back( tcs );
+                   texcoords.push_back( SGVec2f( fptr[0], fptr[1] ) );
+                   fptr += 2;
                }
            }
+       } else if ( obj_type == SG_POINTS ) {
+           // read point elements
+           read_object( fp, SG_POINTS, nproperties, nelements,
+                        &pts_v, &pts_n, &pts_c, &pts_tc, &pt_materials );
+       } else if ( obj_type == SG_TRIANGLE_FACES ) {
+           // read triangle face properties
+           read_object( fp, SG_TRIANGLE_FACES, nproperties, nelements,
+                        &tris_v, &tris_n, &tris_c, &tris_tc, &tri_materials );
        } else if ( obj_type == SG_TRIANGLE_STRIPS ) {
            // read triangle strip properties
-           for ( j = 0; j < nproperties; ++j ) {
-               char prop_type;
-               sgReadChar( fp, &prop_type );
-
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
-               sgReadBytes( fp, nbytes, ptr );
-               if ( prop_type == SG_MATERIAL ) {
-                   char material[256];
-                   strncpy( material, ptr, nbytes );
-                   material[nbytes] = '\0';
-                   cout << "material type = " << material << endl;
-                   strip_materials.push_back( material );
-               }
-           }
-
-           // read triangle strip elements
-           for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
-               sgReadBytes( fp, nbytes, ptr );
-               int count = nbytes / (sizeof(short) * 2 * 3);
-               short *sptr = (short *)ptr;
-               int_list vs, tcs;
-               vs.clear(); tcs.clear();
-               for ( k = 0; k < count; ++k ) {
-                   vs.push_back( sptr[0] );
-                   tcs.push_back( sptr[1] );
-                   cout << sptr[0] << "/" << sptr[1] << " ";
-                   sptr += 2;
-               }
-               cout << endl;
-               strips_v.push_back( vs );
-               strips_tc.push_back( tcs );
-           }
+           read_object( fp, SG_TRIANGLE_STRIPS, nproperties, nelements,
+                        &strips_v, &strips_n, &strips_c, &strips_tc,
+                        &strip_materials );
        } else if ( obj_type == SG_TRIANGLE_FANS ) {
            // read triangle fan properties
-           for ( j = 0; j < nproperties; ++j ) {
-               char prop_type;
-               sgReadChar( fp, &prop_type );
-
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
-               sgReadBytes( fp, nbytes, ptr );
-               if ( prop_type == SG_MATERIAL ) {
-                   char material[256];
-                   strncpy( material, ptr, nbytes );
-                   material[nbytes] = '\0';
-                   cout << "material type = " << material << endl;
-                   fan_materials.push_back( material );
-               }
-           }
-
-           // read triangle fan elements
-           for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
-               sgReadBytes( fp, nbytes, ptr );
-               int count = nbytes / (sizeof(short) * 2 * 3);
-               short *sptr = (short *)ptr;
-               int_list vs, tcs;
-               vs.clear(); tcs.clear();
-               for ( k = 0; k < count; ++k ) {
-                   vs.push_back( sptr[0] );
-                   tcs.push_back( sptr[1] );
-                   cout << sptr[0] << "/" << sptr[1] << " ";
-                   sptr += 2;
-               }
-               cout << endl;
-               fans_v.push_back( vs );
-               fans_tc.push_back( tcs );
-           }
+           read_object( fp, SG_TRIANGLE_FANS, nproperties, nelements,
+                        &fans_v, &fans_n, &fans_c, &fans_tc, &fan_materials );
        } else {
            // unknown object type, just skip
 
@@ -647,21 +590,19 @@ void sgReadBinObj( const string& file,
                char prop_type;
                sgReadChar( fp, &prop_type );
 
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "property size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "property size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
            }
 
            // read elements
            for ( j = 0; j < nelements; ++j ) {
-               int nbytes;
-               sgReadInt( fp, &nbytes );
-               cout << "element size = " << nbytes << endl;
-               char buf[nbytes];
-               char *ptr = buf;
+               sgReadUInt( fp, &nbytes );
+               // cout << "element size = " << nbytes << endl;
+               if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
+               char *ptr = buf.get_ptr();
                sgReadBytes( fp, nbytes, ptr );
            }
        }
@@ -669,45 +610,40 @@ void sgReadBinObj( const string& file,
 
     // close the file
     gzclose(fp);
+
+    if ( sgReadError() ) {
+       cout << "We detected an error while reading the file." << endl;
+       return false;
+    }
+
+    return true;
 }
 
 
 // write out the structures to a binary file.  We assume that the
 // groups come to us sorted by material property.  If not, things
 // don't break, but the result won't be as optimal.
-void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
-                   Point3D gbs_center, float gbs_radius,
-                   const point_list& wgs84_nodes, const point_list& normals,
-                   const point_list& texcoords, 
-                   const group_list& tris_v, const group_list& tris_tc, 
-                   const string_list& tri_materials,
-                   const group_list& strips_v, const group_list& strips_tc, 
-                   const string_list& strip_materials,
-                   const group_list& fans_v, const group_list& fans_tc,
-                   const string_list& fan_materials )
+bool SGBinObject::write_bin( const string& base, const string& name,
+                            const SGBucket& b )
 {
-    Point3D p;
-    sgVec2 t;
-    sgVec3 pt;
     int i, j;
+    unsigned char idx_mask;
+    int idx_size;
 
-    string dir = base + "/" + b.gen_base_path();
-    string command = "mkdir -p " + dir;
-#ifdef _MSC_VER
-    fg_mkdir( dir.c_str() );
-#else
-    system(command.c_str());
-#endif
-
-    string file = dir + "/" + name + ".gz";
-    cout << "Output file = " << file << endl;
+    SGPath file = base + "/" + b.gen_base_path() + "/" + name + ".gz";
+    file.create_dir( 0755 );
+    cout << "Output file = " << file.str() << endl;
 
     gzFile fp;
     if ( (fp = gzopen( file.c_str(), "wb9" )) == NULL ) {
-       cout << "ERROR: opening " << file << " for writing!" << endl;
-       exit(-1);
+       cout << "ERROR: opening " << file.str() << " for writing!" << endl;
+       return false;
     }
 
+    sgClearWriteError();
+
+    cout << "points size = " << pts_v.size() << "  pt_materials = " 
+        << pt_materials.size() << endl;
     cout << "triangles size = " << tris_v.size() << "  tri_materials = " 
         << tri_materials.size() << endl;
     cout << "strips size = " << strips_v.size() << "  strip_materials = " 
@@ -715,26 +651,43 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
     cout << "fans size = " << fans_v.size() << "  fan_materials = " 
         << fan_materials.size() << endl;
 
-    cout << "points = " << wgs84_nodes.size() << endl;
+    cout << "nodes = " << wgs84_nodes.size() << endl;
+    cout << "colors = " << colors.size() << endl;
+    cout << "normals = " << normals.size() << endl;
     cout << "tex coords = " << texcoords.size() << endl;
 
     // write header magic
-    sgWriteInt( fp, SG_FILE_MAGIC_NUMBER );
+    sgWriteUInt( fp, SG_FILE_MAGIC_NUMBER );
     time_t calendar_time = time(NULL);
-    sgWriteLong( fp, (long int)calendar_time );
+    sgWriteLong( fp, (int32_t)calendar_time );
 
     // calculate and write number of top level objects
     string material;
     int start;
     int end;
-    short nobjects = 0;
+    unsigned short nobjects = 0;
     nobjects++;                        // for gbs
     nobjects++;                        // for vertices
+    nobjects++;                        // for colors
     nobjects++;                        // for normals
     nobjects++;                        // for texcoords
 
+    // points
+    unsigned short npts = 0;
+    start = 0; end = 1;
+    while ( start < (int)pt_materials.size() ) {
+       material = pt_materials[start];
+       while ( (end < (int)pt_materials.size()) &&
+               (material == pt_materials[end]) ) {
+           end++;
+       }
+       npts++;
+       start = end; end = start + 1;
+    }
+    nobjects += npts;
+
     // tris
-    short ntris = 0;
+    unsigned short ntris = 0;
     start = 0; end = 1;
     while ( start < (int)tri_materials.size() ) {
        material = tri_materials[start];
@@ -748,7 +701,7 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
     nobjects += ntris;
 
     // strips
-    short nstrips = 0;
+    unsigned short nstrips = 0;
     start = 0; end = 1;
     while ( start < (int)strip_materials.size() ) {
        material = strip_materials[start];
@@ -762,7 +715,7 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
     nobjects += nstrips;
 
     // fans
-    short nfans = 0;
+    unsigned short nfans = 0;
     start = 0; end = 1;
     while ( start < (int)fan_materials.size() ) {
        material = fan_materials[start];
@@ -776,14 +729,14 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
     nobjects += nfans;
 
     cout << "total top level objects = " << nobjects << endl;
-    sgWriteShort( fp, nobjects );
+    sgWriteUShort( fp, nobjects );
 
     // write bounding sphere
     sgWriteChar( fp, (char)SG_BOUNDING_SPHERE );        // type
-    sgWriteShort( fp, 0 );                             // nproperties
-    sgWriteShort( fp, 1 );                             // nelements
+    sgWriteUShort( fp, 0 );                            // nproperties
+    sgWriteUShort( fp, 1 );                            // nelements
 
-    sgWriteInt( fp, sizeof(double) * 3 + sizeof(float) ); // nbytes
+    sgWriteUInt( fp, sizeof(double) * 3 + sizeof(float) ); // nbytes
     sgdVec3 center;
     sgdSetVec3( center, gbs_center.x(), gbs_center.y(), gbs_center.z() );
     sgWritedVec3( fp, center );
@@ -791,38 +744,105 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
 
     // dump vertex list
     sgWriteChar( fp, (char)SG_VERTEX_LIST );             // type
-    sgWriteShort( fp, 0 );                              // nproperties
-    sgWriteShort( fp, 1 );                              // nelements
-    sgWriteInt( fp, wgs84_nodes.size() * sizeof(float) * 3 ); // nbytes
+    sgWriteUShort( fp, 0 );                             // nproperties
+    sgWriteUShort( fp, 1 );                             // nelements
+    sgWriteUInt( fp, wgs84_nodes.size() * sizeof(float) * 3 ); // nbytes
     for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
-       p = wgs84_nodes[i] - gbs_center;
-       sgSetVec3( pt, p.x(), p.y(), p.z() );
-       sgWriteVec3( fp, pt );
+        SGVec3f p = toVec3f(wgs84_nodes[i] - gbs_center);
+       sgWriteVec3( fp, p.data() );
+    }
+
+    // dump vertex color list
+    sgWriteChar( fp, (char)SG_COLOR_LIST );             // type
+    sgWriteUShort( fp, 0 );                             // nproperties
+    sgWriteUShort( fp, 1 );                             // nelements
+    sgWriteUInt( fp, colors.size() * sizeof(float) * 4 ); // nbytes
+    for ( i = 0; i < (int)colors.size(); ++i ) {
+       sgWriteVec4( fp, colors[i].data() );
     }
 
     // dump vertex normal list
     sgWriteChar( fp, (char)SG_NORMAL_LIST );            // type
-    sgWriteShort( fp, 0 );                             // nproperties
-    sgWriteShort( fp, 1 );                             // nelements
-    sgWriteInt( fp, normals.size() * 3 );               // nbytes
+    sgWriteUShort( fp, 0 );                            // nproperties
+    sgWriteUShort( fp, 1 );                            // nelements
+    sgWriteUInt( fp, normals.size() * 3 );              // nbytes
     char normal[3];
     for ( i = 0; i < (int)normals.size(); ++i ) {
-       p = normals[i];
-       normal[0] = (char)(p.x() * 256);
-       normal[1] = (char)(p.y() * 256);
-       normal[2] = (char)(p.z() * 256);
+        SGVec3f p = normals[i];
+       normal[0] = (unsigned char)((p.x() + 1.0) * 127.5);
+       normal[1] = (unsigned char)((p.y() + 1.0) * 127.5);
+       normal[2] = (unsigned char)((p.z() + 1.0) * 127.5);
        sgWriteBytes( fp, 3, normal );
     }
 
     // dump texture coordinates
     sgWriteChar( fp, (char)SG_TEXCOORD_LIST );          // type
-    sgWriteShort( fp, 0 );                             // nproperties
-    sgWriteShort( fp, 1 );                             // nelements
-    sgWriteInt( fp, texcoords.size() * sizeof(float) * 2 ); // nbytes
+    sgWriteUShort( fp, 0 );                            // nproperties
+    sgWriteUShort( fp, 1 );                            // nelements
+    sgWriteUInt( fp, texcoords.size() * sizeof(float) * 2 ); // nbytes
     for ( i = 0; i < (int)texcoords.size(); ++i ) {
-       p = texcoords[i];
-       sgSetVec2( t, p.x(), p.y() );
-       sgWriteVec2( fp, t );
+       sgWriteVec2( fp, texcoords[i].data() );
+    }
+
+    // dump point groups if they exist
+    if ( pts_v.size() > 0 ) {
+       int start = 0;
+       int end = 1;
+       string material;
+       while ( start < (int)pt_materials.size() ) {
+           // find next group
+           material = pt_materials[start];
+           while ( (end < (int)pt_materials.size()) && 
+                   (material == pt_materials[end]) )
+               {
+                   // cout << "end = " << end << endl;
+                   end++;
+               }
+           // cout << "group = " << start << " to " << end - 1 << endl;
+
+           // write group headers
+           sgWriteChar( fp, (char)SG_POINTS );          // type
+           sgWriteUShort( fp, 2 );                      // nproperties
+           sgWriteUShort( fp, end - start );             // nelements
+
+           sgWriteChar( fp, (char)SG_MATERIAL );        // property
+           sgWriteUInt( fp, material.length() );        // nbytes
+           sgWriteBytes( fp, material.length(), material.c_str() );
+
+           idx_mask = 0;
+           idx_size = 0;
+           if ( pts_v.size() ) { idx_mask |= SG_IDX_VERTICES; ++idx_size; }
+           if ( pts_n.size() ) { idx_mask |= SG_IDX_NORMALS; ++idx_size; }
+           if ( pts_c.size() ) { idx_mask |= SG_IDX_COLORS; ++idx_size; }
+           if ( pts_tc.size() ) { idx_mask |= SG_IDX_TEXCOORDS; ++idx_size; }
+           sgWriteChar( fp, (char)SG_INDEX_TYPES );     // property
+           sgWriteUInt( fp, 1 );                        // nbytes
+           sgWriteChar( fp, idx_mask );
+
+           // write strips
+           for ( i = start; i < end; ++i ) {
+               // nbytes
+               sgWriteUInt( fp, pts_v[i].size() * idx_size
+                                 * sizeof(unsigned short) );
+               for ( j = 0; j < (int)pts_v[i].size(); ++j ) {
+                   if ( pts_v.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)pts_v[i][j] );
+                   }
+                   if ( pts_n.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)pts_n[i][j] );
+                   }
+                   if ( pts_c.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)pts_c[i][j] );
+                   }
+                   if ( pts_tc.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)pts_tc[i][j] );
+                   }
+               }
+           }
+           
+           start = end;
+           end = start + 1;
+       }
     }
 
     // dump individual triangles if they exist
@@ -834,7 +854,8 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
            // find next group
            material = tri_materials[start];
            while ( (end < (int)tri_materials.size()) && 
-                   (material == tri_materials[end]) )
+                   (material == tri_materials[end]) &&
+                   3*(end-start) < 32760 )
            {
                // cout << "end = " << end << endl;
                end++;
@@ -843,20 +864,42 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
 
            // write group headers
            sgWriteChar( fp, (char)SG_TRIANGLE_FACES ); // type
-           sgWriteShort( fp, 1 );                      // nproperties
-           sgWriteShort( fp, 1 );                      // nelements
+           sgWriteUShort( fp, 2 );                     // nproperties
+           sgWriteUShort( fp, 1 );                      // nelements
 
            sgWriteChar( fp, (char)SG_MATERIAL );       // property
-           sgWriteInt( fp, material.length() );        // nbytes
+           sgWriteUInt( fp, material.length() );        // nbytes
            sgWriteBytes( fp, material.length(), material.c_str() );
 
-           sgWriteInt( fp, (end - start) * 3 * 2 * sizeof(short) ); // nbytes
+           idx_mask = 0;
+           idx_size = 0;
+           if ( tris_v.size() ) { idx_mask |= SG_IDX_VERTICES; ++idx_size; }
+           if ( tris_n.size() ) { idx_mask |= SG_IDX_NORMALS; ++idx_size; }
+           if ( tris_c.size() ) { idx_mask |= SG_IDX_COLORS; ++idx_size; }
+           if ( tris_tc.size() ) { idx_mask |= SG_IDX_TEXCOORDS; ++idx_size; }
+           sgWriteChar( fp, (char)SG_INDEX_TYPES );     // property
+           sgWriteUInt( fp, 1 );                        // nbytes
+           sgWriteChar( fp, idx_mask );
+
+           // nbytes
+           sgWriteUInt( fp, (end - start) * 3 * idx_size
+                             * sizeof(unsigned short) );
 
            // write group
            for ( i = start; i < end; ++i ) {
                for ( j = 0; j < 3; ++j ) {
-                   sgWriteShort( fp, (short)tris_v[i][j] );
-                   sgWriteShort( fp, (short)tris_tc[i][j] );
+                   if ( tris_v.size() ) {
+                       sgWriteUShort( fp, (unsigned short)tris_v[i][j] );
+                   }
+                   if ( tris_n.size() ) {
+                       sgWriteUShort( fp, (unsigned short)tris_n[i][j] );
+                   }
+                   if ( tris_c.size() ) {
+                       sgWriteUShort( fp, (unsigned short)tris_c[i][j] );
+                   }
+                   if ( tris_tc.size() ) {
+                       sgWriteUShort( fp, (unsigned short)tris_tc[i][j] );
+                   }
                }
            }
 
@@ -883,20 +926,41 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
 
            // write group headers
            sgWriteChar( fp, (char)SG_TRIANGLE_STRIPS ); // type
-           sgWriteShort( fp, 1 );                       // nproperties
-           sgWriteShort( fp, end - start );             // nelements
+           sgWriteUShort( fp, 2 );                      // nproperties
+           sgWriteUShort( fp, end - start );             // nelements
 
-           sgWriteChar( fp, (char)SG_MATERIAL );       // property
-           sgWriteInt( fp, material.length() );        // nbytes
+           sgWriteChar( fp, (char)SG_MATERIAL );        // property
+           sgWriteUInt( fp, material.length() );        // nbytes
            sgWriteBytes( fp, material.length(), material.c_str() );
 
+           idx_mask = 0;
+           idx_size = 0;
+           if ( strips_v.size() ) { idx_mask |= SG_IDX_VERTICES; ++idx_size; }
+           if ( strips_n.size() ) { idx_mask |= SG_IDX_NORMALS; ++idx_size; }
+           if ( strips_c.size() ) { idx_mask |= SG_IDX_COLORS; ++idx_size; }
+           if ( strips_tc.size() ) { idx_mask |= SG_IDX_TEXCOORDS; ++idx_size;}
+           sgWriteChar( fp, (char)SG_INDEX_TYPES );     // property
+           sgWriteUInt( fp, 1 );                        // nbytes
+           sgWriteChar( fp, idx_mask );
+
            // write strips
            for ( i = start; i < end; ++i ) {
                // nbytes
-               sgWriteInt( fp, strips_v[i].size() * 2 * sizeof(short) );
+               sgWriteUInt( fp, strips_v[i].size() * idx_size
+                                 * sizeof(unsigned short));
                for ( j = 0; j < (int)strips_v[i].size(); ++j ) {
-                   sgWriteShort( fp, (short)strips_v[i][j] );
-                   sgWriteShort( fp, (short)strips_tc[i][j] );
+                   if ( strips_v.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)strips_v[i][j] );
+                   }
+                   if ( strips_n.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)strips_n[i][j] );
+                   }
+                   if ( strips_c.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)strips_c[i][j] );
+                   }
+                   if ( strips_tc.size() ) { 
+                       sgWriteUShort( fp, (unsigned short)strips_tc[i][j] );
+                   }
                }
            }
            
@@ -923,20 +987,41 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
 
            // write group headers
            sgWriteChar( fp, (char)SG_TRIANGLE_FANS );   // type
-           sgWriteShort( fp, 1 );                       // nproperties
-           sgWriteShort( fp, end - start );             // nelements
+           sgWriteUShort( fp, 2 );                      // nproperties
+           sgWriteUShort( fp, end - start );             // nelements
 
            sgWriteChar( fp, (char)SG_MATERIAL );       // property
-           sgWriteInt( fp, material.length() );        // nbytes
+           sgWriteUInt( fp, material.length() );        // nbytes
            sgWriteBytes( fp, material.length(), material.c_str() );
 
+           idx_mask = 0;
+           idx_size = 0;
+           if ( fans_v.size() ) { idx_mask |= SG_IDX_VERTICES; ++idx_size; }
+           if ( fans_n.size() ) { idx_mask |= SG_IDX_NORMALS; ++idx_size; }
+           if ( fans_c.size() ) { idx_mask |= SG_IDX_COLORS; ++idx_size; }
+           if ( fans_tc.size() ) { idx_mask |= SG_IDX_TEXCOORDS; ++idx_size; }
+           sgWriteChar( fp, (char)SG_INDEX_TYPES );     // property
+           sgWriteUInt( fp, 1 );                        // nbytes
+           sgWriteChar( fp, idx_mask );
+
            // write fans
            for ( i = start; i < end; ++i ) {
                // nbytes
-               sgWriteInt( fp, fans_v[i].size() * 2 * sizeof(short) );
+               sgWriteUInt( fp, fans_v[i].size() * idx_size
+                                 * sizeof(unsigned short) );
                for ( j = 0; j < (int)fans_v[i].size(); ++j ) {
-                   sgWriteShort( fp, (short)fans_v[i][j] );
-                   sgWriteShort( fp, (short)fans_tc[i][j] );
+                   if ( fans_v.size() ) {
+                       sgWriteUShort( fp, (unsigned short)fans_v[i][j] );
+                   }
+                   if ( fans_n.size() ) {
+                       sgWriteUShort( fp, (unsigned short)fans_n[i][j] );
+                   }
+                   if ( fans_c.size() ) {
+                       sgWriteUShort( fp, (unsigned short)fans_c[i][j] );
+                   }
+                   if ( fans_tc.size() ) {
+                       sgWriteUShort( fp, (unsigned short)fans_tc[i][j] );
+                   }
                }
            }
            
@@ -947,4 +1032,191 @@ void sgWriteBinObj( const string& base, const string& name, const SGBucket& b,
 
     // close the file
     gzclose(fp);
+
+    if ( sgWriteError() ) {
+       cout << "We detected an error while writing the file." << endl;
+       return false;
+    }
+
+    return true;
+}
+
+
+// write out the structures to an ASCII file.  We assume that the
+// groups come to us sorted by material property.  If not, things
+// don't break, but the result won't be as optimal.
+bool SGBinObject::write_ascii( const string& base, const string& name,
+                              const SGBucket& b )
+{
+    int i, j;
+
+    SGPath file = base + "/" + b.gen_base_path() + "/" + name;
+    file.create_dir( 0755 );
+    cout << "Output file = " << file.str() << endl;
+
+    FILE *fp;
+    if ( (fp = fopen( file.c_str(), "w" )) == NULL ) {
+       cout << "ERROR: opening " << file.str() << " for writing!" << endl;
+       return false;
+    }
+
+    cout << "triangles size = " << tris_v.size() << "  tri_materials = " 
+        << tri_materials.size() << endl;
+    cout << "strips size = " << strips_v.size() << "  strip_materials = " 
+        << strip_materials.size() << endl;
+    cout << "fans size = " << fans_v.size() << "  fan_materials = " 
+        << fan_materials.size() << endl;
+
+    cout << "points = " << wgs84_nodes.size() << endl;
+    cout << "tex coords = " << texcoords.size() << endl;
+    // write headers
+    fprintf(fp, "# FGFS Scenery\n");
+    fprintf(fp, "# Version %s\n", SG_SCENERY_FILE_FORMAT);
+
+    time_t calendar_time = time(NULL);
+    struct tm *local_tm;
+    local_tm = localtime( &calendar_time );
+    char time_str[256];
+    strftime( time_str, 256, "%a %b %d %H:%M:%S %Z %Y", local_tm);
+    fprintf(fp, "# Created %s\n", time_str );
+    fprintf(fp, "\n");
+
+    // write bounding sphere
+    fprintf(fp, "# gbs %.5f %.5f %.5f %.2f\n",
+           gbs_center.x(), gbs_center.y(), gbs_center.z(), gbs_radius);
+    fprintf(fp, "\n");
+
+    // dump vertex list
+    fprintf(fp, "# vertex list\n");
+    for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
+        SGVec3d p = wgs84_nodes[i] - gbs_center;
+       
+       fprintf(fp,  "v %.5f %.5f %.5f\n", p.x(), p.y(), p.z() );
+    }
+    fprintf(fp, "\n");
+
+    fprintf(fp, "# vertex normal list\n");
+    for ( i = 0; i < (int)normals.size(); ++i ) {
+        SGVec3f p = normals[i];
+       fprintf(fp,  "vn %.5f %.5f %.5f\n", p.x(), p.y(), p.z() );
+    }
+    fprintf(fp, "\n");
+
+    // dump texture coordinates
+    fprintf(fp, "# texture coordinate list\n");
+    for ( i = 0; i < (int)texcoords.size(); ++i ) {
+        SGVec2f p = texcoords[i];
+       fprintf(fp,  "vt %.5f %.5f\n", p.x(), p.y() );
+    }
+    fprintf(fp, "\n");
+
+    // dump individual triangles if they exist
+    if ( tris_v.size() > 0 ) {
+       fprintf(fp, "# triangle groups\n");
+
+       int start = 0;
+       int end = 1;
+       string material;
+       while ( start < (int)tri_materials.size() ) {
+           // find next group
+           material = tri_materials[start];
+           while ( (end < (int)tri_materials.size()) && 
+                   (material == tri_materials[end]) )
+           {
+               // cout << "end = " << end << endl;
+               end++;
+           }
+           // cout << "group = " << start << " to " << end - 1 << endl;
+
+           // make a list of points for the group
+           point_list group_nodes;
+           group_nodes.clear();
+           SGVec3d bs_center;
+           double bs_radius = 0;
+           for ( i = start; i < end; ++i ) {
+               for ( j = 0; j < (int)tris_v[i].size(); ++j ) {
+                    group_nodes.push_back( Point3D::fromSGVec3(wgs84_nodes[ tris_v[i][j] ]) );
+                   bs_center = sgCalcCenter( group_nodes ).toSGVec3d();
+                   bs_radius = sgCalcBoundingRadius( Point3D::fromSGVec3(bs_center), group_nodes );
+               }
+           }
+
+           // write group headers
+           fprintf(fp, "\n");
+           fprintf(fp, "# usemtl %s\n", material.c_str());
+           fprintf(fp, "# bs %.4f %.4f %.4f %.2f\n",
+                   bs_center.x(), bs_center.y(), bs_center.z(), bs_radius);
+
+           // write groups
+           for ( i = start; i < end; ++i ) {
+               fprintf(fp, "f");
+               for ( j = 0; j < (int)tris_v[i].size(); ++j ) {
+                   fprintf(fp, " %d/%d", tris_v[i][j], tris_tc[i][j] );
+               }
+               fprintf(fp, "\n");
+           }
+
+           start = end;
+           end = start + 1;
+       }
+    }
+
+    // dump triangle groups
+    if ( strips_v.size() > 0 ) {
+       fprintf(fp, "# triangle strips\n");
+
+       int start = 0;
+       int end = 1;
+       string material;
+       while ( start < (int)strip_materials.size() ) {
+           // find next group
+           material = strip_materials[start];
+           while ( (end < (int)strip_materials.size()) && 
+                   (material == strip_materials[end]) )
+               {
+                   // cout << "end = " << end << endl;
+                   end++;
+               }
+           // cout << "group = " << start << " to " << end - 1 << endl;
+
+           // make a list of points for the group
+           point_list group_nodes;
+           group_nodes.clear();
+           SGVec3d bs_center;
+           double bs_radius = 0;
+           for ( i = start; i < end; ++i ) {
+               for ( j = 0; j < (int)strips_v[i].size(); ++j ) {
+                    group_nodes.push_back( Point3D::fromSGVec3(wgs84_nodes[ strips_v[i][j] ]) );
+                   bs_center = sgCalcCenter( group_nodes ).toSGVec3d();
+                   bs_radius = sgCalcBoundingRadius( Point3D::fromSGVec3(bs_center), group_nodes );
+               }
+           }
+
+           // write group headers
+           fprintf(fp, "\n");
+           fprintf(fp, "# usemtl %s\n", material.c_str());
+           fprintf(fp, "# bs %.4f %.4f %.4f %.2f\n",
+                   bs_center.x(), bs_center.y(), bs_center.z(), bs_radius);
+
+           // write groups
+           for ( i = start; i < end; ++i ) {
+               fprintf(fp, "ts");
+               for ( j = 0; j < (int)strips_v[i].size(); ++j ) {
+                   fprintf(fp, " %d/%d", strips_v[i][j], strips_tc[i][j] );
+               }
+               fprintf(fp, "\n");
+           }
+           
+           start = end;
+           end = start + 1;
+       }
+    }
+
+    // close the file
+    fclose(fp);
+
+    string command = "gzip --force --best " + file.str();
+    system(command.c_str());
+
+    return true;
 }