fly/flightgear
1
0
Fork 0
Code Activity

Tweaks ...

Browse source
This commit is contained in:
curt 1998-08-24 20:11:39 +00:00
parent ac2c904dc6
commit aaa7174002
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Scenery/material.cxx
View file

@ -169,7 +169,10 @@ int fgMATERIAL_MGR::load_lib ( void ) {
// set the texture parameters for this texture // set the texture parameters for this texture
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ; xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ;
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ; xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ;
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
GL_LINEAR );
// xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
// GL_NEAREST_MIPMAP_NEAREST );
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
/* GL_LINEAR */ /* GL_LINEAR */
/* GL_NEAREST_MIPMAP_LINEAR */ /* GL_NEAREST_MIPMAP_LINEAR */
@ -300,6 +303,9 @@ fgMATERIAL_MGR::~fgMATERIAL_MGR ( void ) {
// $Log$ // $Log$
// Revision 1.13 1998/08/24 20:11:39 curt
// Tweaks ...
//
// Revision 1.12 1998/08/12 21:41:27 curt // Revision 1.12 1998/08/12 21:41:27 curt
// Need to negate the test for textures so that textures aren't loaded when // Need to negate the test for textures so that textures aren't loaded when
// they are disabled rather than visa versa ... :-) // they are disabled rather than visa versa ... :-)

11
Scenery/tile.cxx
View file

@ -288,14 +288,16 @@ int fgFRAGMENT::intersect( fgPoint3d *end0, fgPoint3d *end1, int side_flag,
// check to see if intersection point is in the bounding // check to see if intersection point is in the bounding
// cube of the face // cube of the face
#ifdef XTRA_DEBUG_STUFF
xmin = fg_min3 (p1[0], p2[0], p3[0]); xmin = fg_min3 (p1[0], p2[0], p3[0]);
xmax = fg_max3 (p1[0], p2[0], p3[0]); xmax = fg_max3 (p1[0], p2[0], p3[0]);
ymin = fg_min3 (p1[1], p2[1], p3[1]); ymin = fg_min3 (p1[1], p2[1], p3[1]);
ymax = fg_max3 (p1[1], p2[1], p3[1]); ymax = fg_max3 (p1[1], p2[1], p3[1]);
zmin = fg_min3 (p1[2], p2[2], p3[2]); zmin = fg_min3 (p1[2], p2[2], p3[2]);
zmax = fg_max3 (p1[2], p2[2], p3[2]); zmax = fg_max3 (p1[2], p2[2], p3[2]);
// printf("bounding cube = %.2f,%.2f,%.2f %.2f,%.2f,%.2f\n", printf("bounding cube = %.2f,%.2f,%.2f %.2f,%.2f,%.2f\n",
// xmin, ymin, zmin, xmax, ymax, zmax); xmin, ymin, zmin, xmax, ymax, zmax);
#endif
// punt if outside bouding cube // punt if outside bouding cube
if ( x < (xmin = fg_min3 (p1[0], p2[0], p3[0])) ) { if ( x < (xmin = fg_min3 (p1[0], p2[0], p3[0])) ) {
continue; continue;
@ -448,7 +450,10 @@ fgTILE::~fgTILE ( void ) {
// $Log$ // $Log$
// Revision 1.8 1998/08/22 14:49:58 curt // Revision 1.9 1998/08/24 20:11:39 curt
// Tweaks ...
//
// Revision 1.8 1998/08/22 14:49:58 curt
// Attempting to iron out seg faults and crashes. // Attempting to iron out seg faults and crashes.
// Did some shuffling to fix a initialization order problem between view // Did some shuffling to fix a initialization order problem between view
// position, scenery elevation. // position, scenery elevation.

7
Scenery/tilemgr.cxx
View file

@ -671,13 +671,18 @@ void fgTileMgrRender( void ) {
xglPopMatrix(); xglPopMatrix();
v->tris_rendered = total_faces;
fgPrintf( FG_TERRAIN, FG_DEBUG, "Rendered %d polygons this frame.\n", fgPrintf( FG_TERRAIN, FG_DEBUG, "Rendered %d polygons this frame.\n",
total_faces); total_faces);
} }
// $Log$ // $Log$
// Revision 1.30 1998/08/22 14:49:59 curt // Revision 1.31 1998/08/24 20:11:40 curt
// Tweaks ...
//
// Revision 1.30 1998/08/22 14:49:59 curt
// Attempting to iron out seg faults and crashes. // Attempting to iron out seg faults and crashes.
// Did some shuffling to fix a initialization order problem between view // Did some shuffling to fix a initialization order problem between view
// position, scenery elevation. // position, scenery elevation.