fly/flightgear
1
0
Fork 0
Code Activity

Working on adding textured airport runways.

Browse source
This commit is contained in:
curt 1999-10-18 04:55:58 +00:00
parent 0b55a915b4
commit 805878ebaf
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/Objects/obj.cxx
View file

@ -602,7 +602,7 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t) {
last2 = n4; last2 = n4;
// printf("a normal, texcoord, and vertex (4th)\n"); // printf("a normal, texcoord, and vertex (4th)\n");
} }
} else if ( token == "tf" ) { } else if ( (token == "tf") || (token == "ts") ) {
// triangle fan // triangle fan
// fgPrintf( FG_TERRAIN, FG_DEBUG, "new fan"); // fgPrintf( FG_TERRAIN, FG_DEBUG, "new fan");
@ -618,8 +618,12 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t) {
in >> tex; in >> tex;
fan_tex_coords.push_back( tex ); fan_tex_coords.push_back( tex );
if ( scenery_version >= 0.4 ) { if ( scenery_version >= 0.4 ) {
t->tclist[tex][0] *= (1000.0 / tex_width); if ( tex_width > 0 ) {
t->tclist[tex][1] *= (1000.0 / tex_height); t->tclist[tex][0] *= (1000.0 / tex_width);
}
if ( tex_height > 0 ) {
t->tclist[tex][1] *= (1000.0 / tex_height);
}
} }
pp.setx( tex_coords[tex][0] * (1000.0 / tex_width) ); pp.setx( tex_coords[tex][0] * (1000.0 / tex_width) );
pp.sety( tex_coords[tex][1] * (1000.0 / tex_height) ); pp.sety( tex_coords[tex][1] * (1000.0 / tex_height) );
@ -637,8 +641,12 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t) {
in >> tex; in >> tex;
fan_tex_coords.push_back( tex ); fan_tex_coords.push_back( tex );
if ( scenery_version >= 0.4 ) { if ( scenery_version >= 0.4 ) {
t->tclist[tex][0] *= (1000.0 / tex_width); if ( tex_width > 0 ) {
t->tclist[tex][1] *= (1000.0 / tex_height); t->tclist[tex][0] *= (1000.0 / tex_width);
}
if ( tex_height > 0 ) {
t->tclist[tex][1] *= (1000.0 / tex_height);
}
} }
pp.setx( tex_coords[tex][0] * (1000.0 / tex_width) ); pp.setx( tex_coords[tex][0] * (1000.0 / tex_width) );
pp.sety( tex_coords[tex][1] * (1000.0 / tex_height) ); pp.sety( tex_coords[tex][1] * (1000.0 / tex_height) );
@ -674,8 +682,12 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t) {
in >> tex; in >> tex;
fan_tex_coords.push_back( tex ); fan_tex_coords.push_back( tex );
if ( scenery_version >= 0.4 ) { if ( scenery_version >= 0.4 ) {
t->tclist[tex][0] *= (1000.0 / tex_width); if ( tex_width > 0 ) {
t->tclist[tex][1] *= (1000.0 / tex_height); t->tclist[tex][0] *= (1000.0 / tex_width);
}
if ( tex_height > 0 ) {
t->tclist[tex][1] *= (1000.0 / tex_height);
}
} }
pp.setx( tex_coords[tex][0] * (1000.0 / tex_width) ); pp.setx( tex_coords[tex][0] * (1000.0 / tex_width) );
pp.sety( tex_coords[tex][1] * (1000.0 / tex_height) ); pp.sety( tex_coords[tex][1] * (1000.0 / tex_height) );
@ -703,12 +715,24 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t) {
for ( i = 0; i < (int)fan_tex_coords.size(); ++i ) { for ( i = 0; i < (int)fan_tex_coords.size(); ++i ) {
tindex[i] = fan_tex_coords[i]; tindex[i] = fan_tex_coords[i];
} }
ssgLeaf *leaf = ssgLeaf *leaf;
new ssgVTable ( GL_TRIANGLE_FAN, if ( token == "tf" ) {
fan_vertices.size(), vindex, t->vtlist, // triangle fan
fan_vertices.size(), vindex, t->vnlist, leaf =
fan_tex_coords.size(), tindex, t->tclist, new ssgVTable ( GL_TRIANGLE_FAN,
0, NULL, NULL ) ; fan_vertices.size(), vindex, t->vtlist,
fan_vertices.size(), vindex, t->vnlist,
fan_tex_coords.size(), tindex,t->tclist,
0, NULL, NULL ) ;
} else {
// triangle strip
leaf =
new ssgVTable ( GL_TRIANGLE_STRIP,
fan_vertices.size(), vindex, t->vtlist,
fan_vertices.size(), vindex, t->vnlist,
fan_tex_coords.size(), tindex,t->tclist,
0, NULL, NULL ) ;
}
leaf->setState( state ); leaf->setState( state );
tile->addKid( leaf ); tile->addKid( leaf );