X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObjects%2Fobj.cxx;h=4fb53463cdad10dd8d44140f64250677406f6e67;hb=b4a9d7621597c9eef97f8ec84d246d5585b4b7ea;hp=a2922c8faa41a05cead508fa07a201cda379d2bc;hpb=8497f9b1acddd448156d2cb62d884ebb3cebd29b;p=flightgear.git diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx index a2922c8fa..4fb53463c 100644 --- a/src/Objects/obj.cxx +++ b/src/Objects/obj.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include @@ -57,8 +57,8 @@ #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; @@ -87,12 +87,12 @@ static Point3D local_calc_tex_coords(const Point3D& node, const Point3D& ref) { 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 ); @@ -131,7 +131,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) { // 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 ); } @@ -143,7 +143,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) { 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;; @@ -157,7 +157,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) { 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() ); } @@ -242,37 +242,6 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) { } -#if defined ( PLIB_1_2_X ) -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 ); -} -#else -# define fgTriArea(p0,p1,p2) sgTriArea(p0,p1,p2) -#endif - - static void random_pt_inside_tri( float *res, float *n1, float *n2, float *n3 ) { @@ -305,15 +274,15 @@ static void gen_random_surface_points( ssgLeaf *leaf, ssgVertexArray *lights, // 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 @@ -338,7 +307,7 @@ static void gen_random_surface_points( ssgLeaf *leaf, ssgVertexArray *lights, // 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; @@ -375,10 +344,10 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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; } @@ -412,11 +381,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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 @@ -431,7 +396,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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" @@ -466,7 +431,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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 ); @@ -519,14 +484,14 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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 ); } @@ -566,7 +531,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, >> 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); @@ -578,7 +543,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, >> 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 :-(" ); @@ -596,14 +561,14 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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(); @@ -659,11 +624,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, // 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); @@ -757,7 +718,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, 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; } @@ -765,17 +726,13 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, } } } 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 } } @@ -784,7 +741,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, } stopwatch.stop(); - FG_LOG( FG_TERRAIN, FG_DEBUG, + SG_LOG( SG_TERRAIN, SG_DEBUG, "Loaded " << path << " in " << stopwatch.elapsedSeconds() << " seconds" ); @@ -792,13 +749,13 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, } -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; @@ -815,15 +772,15 @@ static ssgLeaf *gen_leaf( const string& 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, - "Ack! bad on the fly materia create = " + SG_LOG( SG_TERRAIN, SG_ALERT, + "Ack! bad on the fly material create = " << material << " in " << path ); } } @@ -842,10 +799,22 @@ static ssgLeaf *gen_leaf( const string& path, 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; @@ -889,7 +858,7 @@ static ssgLeaf *gen_leaf( const string& path, 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; } @@ -902,8 +871,8 @@ static ssgLeaf *gen_leaf( const string& path, // 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; @@ -984,24 +953,3 @@ static ssgBranch *fgBinObjLoad( const string& path, FGTileEntry *t, 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; -}