fly/flightgear
1
0
Fork 0
Code Activity

Pass NULL for ColourArray when creating cloud objects.

Browse source
This commit is contained in:
curt 2000-03-06 23:28:52 +00:00
parent 28f17b1052
commit 8d27e09b91
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Objects/materialmgr.cxx
View file

@ -176,7 +176,7 @@ fgMATERIAL_MGR::load_lib ( void )
FGPath tex_file( current_options.get_fg_root() );
tex_file.append( "Textures" );
tex_file.append( m.get_texture_name() );
tex_file.concat( ".rgb" );
// tex_file.concat( ".rgb" );
FG_LOG( FG_TERRAIN, FG_INFO, " Loading material "
<< material_name << " (" << tex_file.c_str() << ")");

8
src/Objects/obj.cxx
View file

@ -229,7 +229,6 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
ssgVertexArray *vl = new ssgVertexArray( 4 );
ssgNormalArray *nl = new ssgNormalArray( 4 );
ssgTexCoordArray *tl = new ssgTexCoordArray( 4 );
ssgColourArray *cl = new ssgColourArray( 4 );
// sgVec3 *vtlist = new sgVec3 [ 4 ];
// t->vec3_ptrs.push_back( vtlist );
@ -254,7 +253,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
}
ssgLeaf *leaf =
new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, cl );
new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, NULL );
leaf->setState( state );
@ -757,7 +756,6 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) {
ssgVertexArray *vl = new ssgVertexArray( size );
ssgNormalArray *nl = new ssgNormalArray( size );
ssgTexCoordArray *tl = new ssgTexCoordArray( size );
ssgColourArray *cl = new ssgColourArray();
sgVec2 tmp2;
sgVec3 tmp3;
@ -776,11 +774,11 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) {
if ( token == "tf" ) {
// triangle fan
leaf =
new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, cl );
new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, NULL );
} else {
// triangle strip
leaf =
new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, cl );
new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, NULL );
}
// leaf->makeDList();
leaf->setState( state );