//
+#ifdef HAVE_CONFIG_H
+# include <simgear_config.h>
+#endif
+
#include <simgear/compiler.h>
+#include <simgear/debug/logstream.hxx>
#include <stdio.h>
#include <time.h>
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,
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];
}
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];
}
}
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;
}
}
// 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
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
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;
}
}
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]) );
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;
}
}
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,
(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;
}
}
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;
}
}