fly/flightgear
1
0
Fork 0
Code Activity

Modifications to coordinate with recent changes in simgear.

Browse source
This commit is contained in:
curt 2001-05-15 22:30:39 +00:00
parent 5014a910bb
commit a0d50000ba
26 changed files with 83 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Cockpit/cockpit.cxx
View file

@ -30,7 +30,6 @@
#endif
#include <GL/glut.h>
// #include <simgear/xgl/xgl.h>
#include <stdlib.h>
#include <stdio.h>

2
src/GUI/apt_dlg.cxx
View file

@ -17,7 +17,7 @@
#include <Include/general.hxx>
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <Airports/simple.hxx>
#include <FDM/flight.hxx>

2
src/GUI/gui.cxx
View file

@ -39,7 +39,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#if defined(FX) && defined(XMESA)
# include <GL/xmesa.h>

2
src/GUI/mouse.cxx
View file

@ -39,7 +39,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#if defined(FX) && defined(XMESA)
# include <GL/xmesa.h>

2
src/GUI/net_dlg.cxx
View file

@ -36,7 +36,7 @@
#include <simgear/misc/sg_path.hxx>
#include <Include/general.hxx>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>

2
src/Main/keyboard.cxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h>
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#if defined(FX) && defined(XMESA)
#include <GL/xmesa.h>

2
src/Main/keyboard.hxx
View file

@ -39,7 +39,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
// Handle keyboard events

2
src/Main/main.cxx
View file

@ -35,7 +35,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <stdio.h>
#include <string.h>

76
src/Main/splash.cxx
View file

@ -35,7 +35,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <string.h>
@ -60,19 +60,19 @@ void fgSplashInit ( void ) {
SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" );
#ifdef GL_VERSION_1_1
xglGenTextures(1, &splash_texid);
xglBindTexture(GL_TEXTURE_2D, splash_texid);
glGenTextures(1, &splash_texid);
glBindTexture(GL_TEXTURE_2D, splash_texid);
#elif GL_EXT_texture_object
xglGenTexturesEXT(1, &splash_texid);
xglBindTextureEXT(GL_TEXTURE_2D, splash_texid);
glGenTexturesEXT(1, &splash_texid);
glBindTextureEXT(GL_TEXTURE_2D, splash_texid);
#else
# error port me
#endif
xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
// load in the texture data
int num = (int)(sg_random() * 4.0 + 1.0);
@ -99,7 +99,7 @@ void fgSplashInit ( void ) {
}
}
xglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB,
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB,
GL_UNSIGNED_BYTE, (GLvoid *)(splash_texbuf) );
}
@ -122,48 +122,48 @@ void fgSplashUpdate ( double progress ) {
ymax = ymin + ysize;
// first clear the screen;
xglClearColor(0.0, 0.0, 0.0, 1.0);
xglClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
// now draw the logo
xglMatrixMode(GL_PROJECTION);
xglPushMatrix();
xglLoadIdentity();
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
gluOrtho2D(0, fgGetInt("/sim/startup/xsize"),
0, fgGetInt("/sim/startup/ysize"));
xglMatrixMode(GL_MODELVIEW);
xglPushMatrix();
xglLoadIdentity();
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
xglDisable(GL_DEPTH_TEST);
xglDisable(GL_LIGHTING);
xglEnable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
glEnable(GL_TEXTURE_2D);
#ifdef GL_VERSION_1_1
xglBindTexture(GL_TEXTURE_2D, splash_texid);
glBindTexture(GL_TEXTURE_2D, splash_texid);
#elif GL_EXT_texture_object
xglBindTextureEXT(GL_TEXTURE_2D, splash_texid);
glBindTextureEXT(GL_TEXTURE_2D, splash_texid);
#else
# error port me
#endif
xglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
xglBegin(GL_POLYGON);
xglTexCoord2f(0.0, 0.0); glVertex2f(xmin, ymin);
xglTexCoord2f(1.0, 0.0); glVertex2f(xmax, ymin);
xglTexCoord2f(1.0, 1.0); glVertex2f(xmax, ymax);
xglTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax);
xglEnd();
glBegin(GL_POLYGON);
glTexCoord2f(0.0, 0.0); glVertex2f(xmin, ymin);
glTexCoord2f(1.0, 0.0); glVertex2f(xmax, ymin);
glTexCoord2f(1.0, 1.0); glVertex2f(xmax, ymax);
glTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax);
glEnd();
xglutSwapBuffers();
glutSwapBuffers();
xglEnable(GL_DEPTH_TEST);
xglEnable(GL_LIGHTING);
xglDisable(GL_TEXTURE_2D);
glEnable(GL_DEPTH_TEST);
glEnable(GL_LIGHTING);
glDisable(GL_TEXTURE_2D);
xglMatrixMode(GL_PROJECTION);
xglPopMatrix();
xglMatrixMode(GL_MODELVIEW);
xglPopMatrix();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
}

4
src/Navaids/fix.hxx
View file

@ -25,6 +25,10 @@
#define _FG_FIX_HXX
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/compiler.h>
#include <simgear/misc/sgstream.hxx>

4
src/Navaids/fixlist.cxx
View file

@ -21,6 +21,10 @@
// $Id$
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/math/sg_geodesy.hxx>

4
src/Navaids/ilslist.cxx
View file

@ -21,6 +21,10 @@
// $Id$
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/math/sg_geodesy.hxx>

4
src/Navaids/mkrbeacons.hxx
View file

@ -25,6 +25,10 @@
#define _FG_MKRBEACON_HXX
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/compiler.h>
#include <simgear/misc/sg_path.hxx>

4
src/Navaids/navlist.cxx
View file

@ -21,6 +21,10 @@
// $Id$
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/math/sg_geodesy.hxx>

2
src/Objects/matlib.cxx
View file

@ -34,7 +34,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <simgear/compiler.h>

2
src/Objects/matlib.hxx
View file

@ -40,7 +40,7 @@
#include <simgear/compiler.h>
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include STL_STRING // Standard C++ string library
#include <map> // STL associative "array"

2
src/Scenery/hitlist.cxx
View file

@ -10,11 +10,11 @@
#include <math.h>
#include <GL/glut.h>
#include <GL/gl.h>
#include <simgear/constants.h>
#include <simgear/sg_inlines.h>
#include <simgear/math/vector.hxx>
#include <simgear/xgl/xgl.h>
#include "hitlist.hxx"

2
src/Scenery/newcache.cxx
View file

@ -30,7 +30,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <plib/ssg.h> // plib include

2
src/Scenery/scenery.cxx
View file

@ -30,7 +30,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <stdio.h>
#include <string.h>

4
src/Scenery/tileentry.cxx
View file

@ -21,6 +21,10 @@
// $Id$
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/compiler.h>
#ifdef SG_MATH_EXCEPTION_CLASH

2
src/Scenery/tileentry.hxx
View file

@ -38,7 +38,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <simgear/compiler.h>

2
src/Time/light.cxx
View file

@ -31,7 +31,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <simgear/compiler.h>

2
src/Time/light.hxx
View file

@ -39,7 +39,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <plib/sg.h> // plib include

2
src/Weather/weather.cxx
View file

@ -30,7 +30,7 @@
#endif
#include <GL/glut.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#include <math.h>

2
src/Weather/weather.hxx
View file

@ -27,7 +27,7 @@
#include <simgear/compiler.h>
#include <simgear/xgl/xgl.h>
#include <GL/gl.h>
#ifdef SG_HAVE_STD_INCLUDES
# include <cmath>

4
src/WeatherCM/FGWeatherParse.h
View file

@ -61,6 +61,10 @@ HISTORY
/****************************************************************************/
/* INCLUDES */
/****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <simgear/compiler.h>
#include <vector>