fly/flightgear
1
0
Fork 0
Code Activity

Debug output tweaks.

Browse source
This commit is contained in:
curt 1999-11-03 23:50:15 +00:00
parent bd198f503b
commit 1d6675a895
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Main/main.cxx
View file

@ -309,12 +309,21 @@ void fgRenderFrame( void ) {
xglDisable( GL_DEPTH_TEST );
xglDisable( GL_LIGHTING );
xglDisable( GL_CULL_FACE );
xglDisable( GL_FOG );
/* if ( current_options.get_fog() > 0 ) {
xglEnable( GL_FOG );
xglFogi( GL_FOG_MODE, GL_EXP2 );
xglFogfv( GL_FOG_COLOR, l->adj_fog_color );
} */
xglShadeModel( GL_SMOOTH );
if ( current_options.get_skyblend() ) {
fgSkyRender();
}
// xglDisable( GL_FOG );
// setup transformation for drawing astronomical objects
xglPushMatrix();
// Translate to view position

4
src/Objects/materialmgr.cxx
View file

@ -163,8 +163,6 @@ fgMATERIAL_MGR::load_lib ( void )
in >> material_name >> token;
if ( token == '{' ) {
FG_LOG( FG_TERRAIN, FG_INFO,
" Loading material " << material_name );
FGMaterial m;
in >> m;
@ -251,7 +249,7 @@ fgMATERIAL_MGR::load_lib ( void )
}
materials_loaded = true;
return(1);
return 1;
}

34
src/Scenery/tilemgr.cxx
View file

@ -413,33 +413,33 @@ static bool my_ssg_instersect_leaf( string s, ssgLeaf *leaf, sgMat4 m,
// traverse the triangle list for this leaf
for ( int i = 0; i < leaf->getNumTriangles(); ++i ) {
cout << s << "testing triangle = " << i << endl;
// cout << s << "testing triangle = " << i << endl;
leaf->getTriangle( i, &i1, &i2, &i3 );
// get triangle vertex coordinates
tmp = leaf->getVertex( i1 );
cout << s << "orig point 1 = " << tmp[0] << " " << tmp[1]
<< " " << tmp[2] << endl;
// cout << s << "orig point 1 = " << tmp[0] << " " << tmp[1]
// << " " << tmp[2] << endl;
sgXformPnt3( p1, tmp, m ) ;
tmp = leaf->getVertex( i2 );
cout << s << "orig point 2 = " << tmp[0] << " " << tmp[1]
<< " " << tmp[2] << endl;
// cout << s << "orig point 2 = " << tmp[0] << " " << tmp[1]
// << " " << tmp[2] << endl;
sgXformPnt3( p2, tmp, m ) ;
tmp = leaf->getVertex( i3 );
cout << s << "orig point 3 = " << tmp[0] << " " << tmp[1]
<< " " << tmp[2] << endl;
// cout << s << "orig point 3 = " << tmp[0] << " " << tmp[1]
// << " " << tmp[2] << endl;
sgXformPnt3( p3, tmp, m ) ;
cout << s << "point 1 = " << p1[0] << " " << p1[1] << " " << p1[2]
<< endl;
cout << s << "point 2 = " << p2[0] << " " << p2[1] << " " << p2[2]
<< endl;
cout << s << "point 3 = " << p3[0] << " " << p3[1] << " " << p3[2]
<< endl;
// cout << s << "point 1 = " << p1[0] << " " << p1[1] << " " << p1[2]
// << endl;
// cout << s << "point 2 = " << p2[0] << " " << p2[1] << " " << p2[2]
// << endl;
// cout << s << "point 3 = " << p3[0] << " " << p3[1] << " " << p3[2]
// << endl;
// calculate two edge vectors, and the face normal
sgSubVec3(v1, p2, p1);
@ -647,10 +647,10 @@ void FGTileMgr::my_ssg_los( string s, ssgBranch *branch, sgMat4 m,
sgVec3 center;
sgCopyVec3( center, bsphere->getCenter() );
sgXformPnt3( center, m ) ;
cout << s << "entity bounding sphere:" << endl;
cout << s << "center = " << center[0] << " "
<< center[1] << " " << center[2] << endl;
cout << s << "radius = " << bsphere->getRadius() << endl;
// cout << s << "entity bounding sphere:" << endl;
// cout << s << "center = " << center[0] << " "
// << center[1] << " " << center[2] << endl;
// cout << s << "radius = " << bsphere->getRadius() << endl;
double radius_sqd = bsphere->getRadius() * bsphere->getRadius();
if ( sgPointLineDistSquared( center, p, dir ) < radius_sqd ) {
// possible intersections