From: curt Date: Wed, 20 Oct 1999 22:18:54 +0000 (+0000) Subject: Updates to BalloonSim init by Christian Mayer. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aacffa37d68b5707af625c9a2934176ebcf8dafd;p=flightgear.git Updates to BalloonSim init by Christian Mayer. Removed old plib include line from the days when plib was rolled in with flight gear. Texture handling tweaks contributed by David Megginson. --- diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 5fac9633a..4dd37291f 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -64,5 +64,4 @@ fgfs_LDADD = \ INCLUDES += \ -I$(top_builddir) \ -I$(top_builddir)/Lib \ - -I$(top_builddir)/Lib/plib/include \ -I$(top_builddir)/Simulator diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index 84a7d693b..8d24d47d9 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -434,10 +434,10 @@ bool fgInitSubsystems( void ) { FG_LOG(FG_GENERAL, FG_INFO, "Creating LocalWeatherDatabase"); FGLocalWeatherDatabase::theFGLocalWeatherDatabase = new FGLocalWeatherDatabase( - Point3D( current_aircraft.fdm_state->get_Latitude(), + current_aircraft.fdm_state->get_Latitude(), current_aircraft.fdm_state->get_Longitude(), current_aircraft.fdm_state->get_Altitude() - * FEET_TO_METER) ); + * FEET_TO_METER ); WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase; diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 18aa9120f..93964355d 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -343,7 +343,18 @@ void fgRenderFrame( void ) { xglLightfv( GL_LIGHT0, GL_AMBIENT, l->scene_ambient ); xglLightfv( GL_LIGHT0, GL_DIFFUSE, l->scene_diffuse ); // xglLightfv(GL_LIGHT0, GL_SPECULAR, white ); - + + // texture parameters + xglEnable( GL_TEXTURE_2D ); + xglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ; + xglHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ; + // set base color (I don't think this is doing anything here) + // xglMaterialfv (GL_FRONT, GL_AMBIENT, white); + // (GL_FRONT, GL_DIFFUSE, white); + // xglMaterialfv (GL_FRONT, GL_SPECULAR, white); + // xglMaterialfv (GL_FRONT, GL_SHININESS, mat_shininess); + +#if 0 if ( current_options.get_textures() ) { // texture parameters xglEnable( GL_TEXTURE_2D ); @@ -361,6 +372,7 @@ void fgRenderFrame( void ) { // xglMaterialfv (GL_FRONT, GL_AMBIENT, white); // xglMaterialfv (GL_FRONT, GL_DIFFUSE, white); } +#endif sgVec3 sunpos; sgSetVec3( sunpos, l->sun_vec[0], l->sun_vec[1], l->sun_vec[2] );