# include <config.h>
#endif
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
# include <math.h>
#endif
#include <stdio.h>
#include <string.h>
-// #if defined ( __sun__ )
-// extern "C" void *memmove(void *, const void *, size_t);
-// extern "C" void *memset(void *, int, size_t);
-// #endif
-
#include <simgear/compiler.h>
#include <simgear/io/sg_binobj.hxx>
#include <simgear/math/polar3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/sg_random.h>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
#include <simgear/misc/stopwatch.hxx>
#include <simgear/misc/texcoord.hxx>
#include "matlib.hxx"
#include "obj.hxx"
-FG_USING_STD(string);
-FG_USING_STD(vector);
+SG_USING_STD(string);
+SG_USING_STD(vector);
typedef vector < int > int_list;
pp = sgCartToPolar3d(cp);
- // tmplon = pp.lon() * RAD_TO_DEG;
- // tmplat = pp.lat() * RAD_TO_DEG;
+ // tmplon = pp.lon() * SGD_RADIANS_TO_DEGREES;
+ // tmplat = pp.lat() * SGD_RADIANS_TO_DEGREES;
// cout << tmplon << " " << tmplat << endl;
- pp.setx( fmod(RAD_TO_DEG * FG_TEX_CONSTANT * pp.x(), 11.0) );
- pp.sety( fmod(RAD_TO_DEG * FG_TEX_CONSTANT * pp.y(), 11.0) );
+ pp.setx( fmod(SGD_RADIANS_TO_DEGREES * FG_TEX_CONSTANT * pp.x(), 11.0) );
+ pp.sety( fmod(SGD_RADIANS_TO_DEGREES * FG_TEX_CONSTANT * pp.y(), 11.0) );
if ( pp.x() < 0.0 ) {
pp.setx( pp.x() + 11.0 );
// set ssgState
state = newmat->get_state();
} else {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Ack! unknown usemtl name = " << "Ocean"
<< " in " << path );
}
double height = b.get_height();
double width = b.get_width();
- Point3D center = sgGeodToCart(Point3D(clon*DEG_TO_RAD,clat*DEG_TO_RAD,0.0));
+ Point3D center = sgGeodToCart(Point3D(clon*SGD_DEGREES_TO_RADIANS,clat*SGD_DEGREES_TO_RADIANS,0.0));
t->center = center;
// cout << "center = " << center << endl;;
Point3D rad[4];
int i;
for ( i = 0; i < 4; ++i ) {
- rad[i] = Point3D( geod[i].x() * DEG_TO_RAD, geod[i].y() * DEG_TO_RAD,
+ rad[i] = Point3D( geod[i].x() * SGD_DEGREES_TO_RADIANS, geod[i].y() * SGD_DEGREES_TO_RADIANS,
geod[i].z() );
}
}
-static float fgTriArea( sgVec3 p0, sgVec3 p1, sgVec3 p2 ) {
- /*
- From comp.graph.algorithms FAQ
- 2A(P) = abs(N.(sum_{i=0}^{n-1}(v_i x v_{i+1})))
- */
- sgVec3 sum;
- sgZeroVec3( sum );
-
- sgVec3 norm;
- sgMakeNormal( norm, p0, p1, p2 );
-
- float *vv[3];
- vv[0] = p0;
- vv[1] = p1;
- vv[2] = p2;
-
- for( int i=0; i<3; i++ ) {
- int ii = (i+1) % 3;
- sum[0] += (vv[i][1] * vv[ii][2] - vv[i][2] * vv[ii][1]) ;
- sum[1] += (vv[i][2] * vv[ii][0] - vv[i][0] * vv[ii][2]) ;
- sum[2] += (vv[i][0] * vv[ii][1] - vv[i][1] * vv[ii][0]) ;
- }
-
- return( sgAbs(sgScalarProductVec3( norm, sum )) * SG_HALF );
-}
-
-
static void random_pt_inside_tri( float *res,
float *n1, float *n2, float *n3 )
{
// generate a repeatable random seed
p1 = leaf->getVertex( 0 );
- unsigned int *seed = (unsigned int *)p1;
- sg_srandom( *seed );
+ unsigned int seed = (unsigned int)p1[0];
+ sg_srandom( seed );
for ( int i = 0; i < num; ++i ) {
leaf->getTriangle( i, &n1, &n2, &n3 );
p1 = leaf->getVertex(n1);
p2 = leaf->getVertex(n2);
p3 = leaf->getVertex(n3);
- double area = fgTriArea( p1, p2, p3 );
+ double area = sgTriArea( p1, p2, p3 );
double num = area / factor;
// generate a light point for each unit of area
// Load an Ascii obj file
-static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t,
+ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t,
ssgVertexArray *lights, const bool is_base)
{
FGNewMat *newmat = NULL;
tile -> setName ( (char *)path.c_str() ) ;
// Attempt to open "path.gz" or "path"
- fg_gzifstream in( path );
+ sg_gzifstream in( path );
if ( ! in.is_open() ) {
- FG_LOG( FG_TERRAIN, FG_DEBUG, "Cannot open file: " << path );
- FG_LOG( FG_TERRAIN, FG_DEBUG, "default to ocean tile: " << path );
+ SG_LOG( SG_TERRAIN, SG_DEBUG, "Cannot open file: " << path );
+ SG_LOG( SG_TERRAIN, SG_DEBUG, "default to ocean tile: " << path );
return NULL;
}
while ( ! in.eof() ) {
#endif
-#if defined( macintosh ) || defined( _MSC_VER )
in >> ::skipws;
-#else
- in >> skipws;
-#endif
if ( in.get( c ) && c == '#' ) {
// process a comment line
in >> scenery_version;
// cout << "scenery_version = " << scenery_version << endl;
if ( scenery_version > 0.4 ) {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"\nYou are attempting to load a tile format that\n"
<< "is newer than this version of flightgear can\n"
<< "handle. You should upgrade your copy of\n"
if ( ! shared_done ) {
// sanity check
if ( (int)nodes.size() != vncount ) {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Tile has mismatched nodes = " << nodes.size()
<< " and normals = " << vncount << " : "
<< path );
file += material;
cout << "current file = " << file << endl;
if ( ! material_lib.add_item( file ) ) {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Ack! unknown usemtl name = " << material
<< " in " << path );
} else {
// locate our newly created material
newmat = material_lib.find( material );
if ( newmat == NULL ) {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Ack! bad on the fly materia create = "
<< material << " in " << path );
}
>> normals[vncount][2];
vncount++;
} else {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Read too many vertex normals in " << path
<< " ... dying :-(" );
exit(-1);
>> tex_coords[vtcount][1];
vtcount++;
} else {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Read too many vertex texture coords in " << path
<< " ... dying :-("
);
t->ncount++;
}
} else {
- FG_LOG( FG_TERRAIN, FG_ALERT,
+ SG_LOG( SG_TERRAIN, SG_ALERT,
"Read too many nodes in " << path
<< " ... dying :-(");
exit(-1);
}
} else if ( (token == "tf") || (token == "ts") || (token == "f") ) {
// triangle fan, strip, or individual face
- // FG_LOG( FG_TERRAIN, FG_INFO, "new fan or strip");
+ // SG_LOG( SG_TERRAIN, SG_INFO, "new fan or strip");
fan_vertices.clear();
fan_tex_coords.clear();
// read all subsequent numbers until next thing isn't a number
while ( true ) {
-#if defined( macintosh ) || defined( _MSC_VER )
in >> ::skipws;
-#else
- in >> skipws;
-#endif
char c;
in.get(c);
if ( is_base ) {
if ( coverage > 0.0 ) {
if ( coverage < 10000.0 ) {
- FG_LOG(FG_INPUT, FG_ALERT, "Light coverage is "
+ SG_LOG(SG_INPUT, SG_ALERT, "Light coverage is "
<< coverage << ", pushing up to 10000");
coverage = 10000;
}
}
}
} else {
- FG_LOG( FG_TERRAIN, FG_WARN, "Unknown token in "
+ SG_LOG( SG_TERRAIN, SG_WARN, "Unknown token in "
<< path << " = " << token );
}
// eat white space before start of while loop so if we are
// done with useful input it is noticed before hand.
-#if defined( macintosh ) || defined( _MSC_VER )
in >> ::skipws;
-#else
- in >> skipws;
-#endif
}
}
}
stopwatch.stop();
- FG_LOG( FG_TERRAIN, FG_DEBUG,
+ SG_LOG( SG_TERRAIN, SG_DEBUG,
"Loaded " << path << " in "
<< stopwatch.elapsedSeconds() << " seconds" );
}
-static ssgLeaf *gen_leaf( const string& path,
- const GLenum ty, const string& material,
- const point_list& nodes, const point_list& normals,
- const point_list& texcoords,
- const int_list node_index,
- const int_list& tex_index,
- const bool calc_lights, ssgVertexArray *lights )
+ssgLeaf *gen_leaf( const string& path,
+ const GLenum ty, const string& material,
+ const point_list& nodes, const point_list& normals,
+ const point_list& texcoords,
+ const int_list node_index,
+ const int_list& tex_index,
+ const bool calc_lights, ssgVertexArray *lights )
{
double tex_width = 1000.0, tex_height = 1000.0;
ssgSimpleState *state = NULL;
float coverage = -1;
+ FGNewMat *newmat = material_lib.find( material );
+ if ( newmat == NULL ) {
+ // see if this is an on the fly texture
+ string file = path;
+ int pos = file.rfind( "/" );
+ file = file.substr( 0, pos );
+ cout << "current file = " << file << endl;
+ file += "/";
+ file += material;
+ cout << "current file = " << file << endl;
+ if ( ! material_lib.add_item( file ) ) {
+ SG_LOG( SG_TERRAIN, SG_ALERT,
+ "Ack! unknown usemtl name = " << material
+ << " in " << path );
+ } else {
+ // locate our newly created material
+ newmat = material_lib.find( material );
+ if ( newmat == NULL ) {
+ SG_LOG( SG_TERRAIN, SG_ALERT,
+ "Ack! bad on the fly material create = "
+ << material << " in " << path );
+ }
+ }
+ }
+
+ if ( newmat != NULL ) {
+ // set the texture width and height values for this
+ // material
+ tex_width = newmat->get_xsize();
+ tex_height = newmat->get_ysize();
+ state = newmat->get_state();
+ coverage = newmat->get_light_coverage();
+ // cout << "(w) = " << tex_width << " (h) = "
+ // << tex_width << endl;
+ } else {
+ coverage = -1;
+ }
+
+ // cout << "before list allocs" << endl;
+
int size = node_index.size();
+
+ if ( size < 1 ) {
+ SG_LOG( SG_TERRAIN, SG_ALERT, "Woh! list size < 1" );
+ exit(-1);
+ }
+
+ // cout << "before vl, size = " << size << endl;
ssgVertexArray *vl = new ssgVertexArray( size );
+ // cout << "before nl" << endl;
ssgNormalArray *nl = new ssgNormalArray( size );
+ // cout << "before tl" << endl;
ssgTexCoordArray *tl = new ssgTexCoordArray( size );
+ // cout << "before cl" << endl;
ssgColourArray *cl = new ssgColourArray( 1 );
sgVec4 color;
Point3D texcoord = texcoords[ tex_index[i] ];
sgSetVec2( tmp2, texcoord[0], texcoord[1] );
+ if ( tex_width > 0 ) {
+ tmp2[0] *= (1000.0 / tex_width);
+ }
+ if ( tex_height > 0 ) {
+ tmp2[1] *= (1000.0 / tex_height);
+ }
tl -> add( tmp2 );
}
// cout << material << endl;
// cout << "'" << endl;
- FGNewMat *newmat = material_lib.find( material );
- if ( newmat == NULL ) {
- // see if this is an on the fly texture
- string file = path;
- int pos = file.rfind( "/" );
- file = file.substr( 0, pos );
- cout << "current file = " << file << endl;
- file += "/";
- file += material;
- cout << "current file = " << file << endl;
- if ( ! material_lib.add_item( file ) ) {
- FG_LOG( FG_TERRAIN, FG_ALERT,
- "Ack! unknown usemtl name = " << material
- << " in " << path );
- } else {
- // locate our newly created material
- newmat = material_lib.find( material );
- if ( newmat == NULL ) {
- FG_LOG( FG_TERRAIN, FG_ALERT,
- "Ack! bad on the fly materia create = "
- << material << " in " << path );
- }
- }
- }
-
- if ( newmat != NULL ) {
- // set the texture width and height values for this
- // material
- tex_width = newmat->get_xsize();
- tex_height = newmat->get_ysize();
- state = newmat->get_state();
- coverage = newmat->get_light_coverage();
- // cout << "(w) = " << tex_width << " (h) = "
- // << tex_width << endl;
- } else {
- coverage = -1;
- }
-
leaf->setState( state );
if ( calc_lights ) {
if ( coverage > 0.0 ) {
if ( coverage < 10000.0 ) {
- FG_LOG(FG_INPUT, FG_ALERT, "Light coverage is "
+ SG_LOG(SG_INPUT, SG_ALERT, "Light coverage is "
<< coverage << ", pushing up to 10000");
coverage = 10000;
}
// Load an Binary obj file
-static ssgBranch *fgBinObjLoad( const string& path, FGTileEntry *t,
- ssgVertexArray *lights, const bool is_base)
+ssgBranch *fgBinObjLoad( const string& path, FGTileEntry *t,
+ ssgVertexArray *lights, const bool is_base)
{
int i;
return object;
}
-
-
-// Load an obj file
-ssgBranch *fgObjLoad( const string& path, FGTileEntry *t,
- ssgVertexArray *lights, const bool is_base)
-{
- ssgBranch *result = NULL;
-
- // try loading binary format
- result = fgBinObjLoad( path, t, lights, is_base );
- if ( result == NULL ) {
- // next try the older ascii format
- result = fgAsciiObjLoad( path, t, lights, is_base );
- if ( result == NULL ) {
- // default to an ocean tile
- result = fgGenTile( path, t );
- }
- }
-
- return result;
-}
projects / flightgear.git / blobdiff