fly/flightgear
1
0
Fork 0
Code Activity

Updates to BalloonSim init by Christian Mayer.

Browse source 
Removed old plib include line from the days when plib was rolled in with
  flight gear.
Texture handling tweaks contributed by David Megginson.
This commit is contained in:
curt 1999-10-20 22:18:54 +00:00
parent 0e48fe8ac4
commit aacffa37d6
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Main/Makefile.am
View file

@ -64,5 +64,4 @@ fgfs_LDADD = \
INCLUDES += \
-I$(top_builddir) \
-I$(top_builddir)/Lib \
-I$(top_builddir)/Lib/plib/include \
-I$(top_builddir)/Simulator

4
src/Main/fg_init.cxx
View file

@ -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;

14
src/Main/main.cxx
View file

@ -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] );