Don't use floats where ints are more appropriate

[simgear.git] / simgear / io / sg_binobj.cxx

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index 86c0fba2b13d1d257c1602b4fcf443d2c041a456..b07bc525198db0b6b7687ece684108b63712988f 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -22,7 +22,12 @@
 //
 
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/compiler.h>
+#include <simgear/debug/logstream.hxx>
 
 #include <stdio.h>
 #include <time.h>
@@ -39,11 +44,6 @@
 SG_USING_STD( string );
 SG_USING_STD( vector );
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
-SG_USING_STD( cout );
-SG_USING_STD( endl );
-#endif
-
 
 enum {
     SG_BOUNDING_SPHERE = 0,
@@ -89,7 +89,7 @@ public:
        while ( size < s ) {
            size *= 2;
        }
-       cout << "Creating a new buffer of size = " << size << endl;
+        SG_LOG(SG_EVENT, SG_DEBUG, "Creating a new buffer of size = " << size);
        ptr = new char[size];
     }
 
@@ -107,7 +107,7 @@ public:
            while ( size < s ) {
                size *= 2;
            }
-           cout << "resizing buffer to size = " << size << endl;
+            SG_LOG(SG_EVENT, SG_DEBUG, "resizing buffer to size = " << size);
            ptr = new char[size];
        }
     }
@@ -316,13 +316,13 @@ bool SGBinObject::read_bin( const string& file ) {
     fans_c.clear();
     fans_tc.clear();
     fan_materials.clear();
-   
+
     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;
+            SG_LOG( SG_EVENT, SG_ALERT,
+               "ERROR: opening " << file << " or " << filegz << "for reading!");
 
            return false;
        }
@@ -346,7 +346,7 @@ bool SGBinObject::read_bin( const string& file ) {
        return false;
     }
 
-    // read calender time
+    // read creation time
     unsigned int foo_calendar_time;
     sgReadUInt( fp, &foo_calendar_time );
 
@@ -360,7 +360,7 @@ bool SGBinObject::read_bin( const string& file ) {
     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
@@ -440,15 +440,14 @@ bool SGBinObject::read_bin( const string& file ) {
                sgReadBytes( fp, nbytes, ptr );
                int count = nbytes / (sizeof(float) * 3);
                float *fptr = (float *)ptr;
+               wgs84_nodes.reserve( count );
                for ( k = 0; k < count; ++k ) {
                    if ( sgIsBigEndian() ) {
                        sgEndianSwap( (unsigned int *)&(fptr[0]) );
                        sgEndianSwap( (unsigned int *)&(fptr[1]) );
                        sgEndianSwap( (unsigned int *)&(fptr[2]) );
                    }
-                   p = Point3D( fptr[0], fptr[1], fptr[2] );
-                   // cout << "node = " << p << endl;
-                   wgs84_nodes.push_back( p );
+                   wgs84_nodes.push_back( Point3D(fptr[0], fptr[1], fptr[2]) );
                    fptr += 3;
                }
            }
@@ -474,6 +473,7 @@ bool SGBinObject::read_bin( const string& file ) {
                sgReadBytes( fp, nbytes, ptr );
                int count = nbytes / (sizeof(float) * 4);
                float *fptr = (float *)ptr;
+               colors.reserve(count);
                for ( k = 0; k < count; ++k ) {
                    if ( sgIsBigEndian() ) {
                        sgEndianSwap( (unsigned int *)&(fptr[0]) );
@@ -481,9 +481,7 @@ bool SGBinObject::read_bin( const string& file ) {
                        sgEndianSwap( (unsigned int *)&(fptr[2]) );
                        sgEndianSwap( (unsigned int *)&(fptr[3]) );
                    }
-                   p = Point3D( fptr[0], fptr[1], fptr[2] );
-                   // cout << "node = " << p << endl;
-                   colors.push_back( p );
+                   colors.push_back( Point3D( fptr[0], fptr[1], fptr[2] ) );
                    fptr += 4;
                }
            }
@@ -508,6 +506,7 @@ bool SGBinObject::read_bin( const string& file ) {
                unsigned char *ptr = (unsigned char *)(buf.get_ptr());
                sgReadBytes( fp, nbytes, ptr );
                int count = nbytes / 3;
+               normals.reserve( count );
                for ( k = 0; k < count; ++k ) {
                     sgdVec3 normal;
                     sgdSetVec3( normal,
@@ -516,9 +515,7 @@ bool SGBinObject::read_bin( const string& file ) {
                                (ptr[2]) / 127.5 - 1.0 );
                     sgdNormalizeVec3( normal );
 
-                   p = Point3D( normal[0], normal[1], normal[2] );
-                   // cout << "normal = " << p << endl;
-                   normals.push_back( p );
+                   normals.push_back(Point3D(normal[0], normal[1], normal[2]));
                    ptr += 3;
                }
            }
@@ -544,14 +541,13 @@ bool SGBinObject::read_bin( const string& file ) {
                sgReadBytes( fp, nbytes, ptr );
                int count = nbytes / (sizeof(float) * 2);
                float *fptr = (float *)ptr;
+               texcoords.reserve(count);
                for ( k = 0; k < count; ++k ) {
                    if ( sgIsBigEndian() ) {
                        sgEndianSwap( (unsigned int *)&(fptr[0]) );
                        sgEndianSwap( (unsigned int *)&(fptr[1]) );
                    }
-                   p = Point3D( fptr[0], fptr[1], 0 );
-                   // cout << "texcoord = " << p << endl;
-                   texcoords.push_back( p );
+                   texcoords.push_back( Point3D( fptr[0], fptr[1], 0 ) );
                    fptr += 2;
                }
            }