fly/flightgear
1
0
Fork 0
Code Activity

First stab at sky dome actually starting to look reasonable. :-)

Browse source
This commit is contained in:
curt 1997-12-18 23:32:28 +00:00
parent a26c9b75ee
commit 8b50eb1149
6 changed files with 105 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Main/GLUTmain.c
View file

@ -221,7 +221,7 @@ static void fgUpdateVisuals( void ) {
/* update view volume parameters */ /* update view volume parameters */
fgUpdateViewParams(); fgUpdateViewParams();
xglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); xglClear( /* GL_COLOR_BUFFER_BIT | */ GL_DEPTH_BUFFER_BIT );
/* Tell GL we are switching to model view parameters */ /* Tell GL we are switching to model view parameters */
xglMatrixMode(GL_MODELVIEW); xglMatrixMode(GL_MODELVIEW);
@ -230,15 +230,15 @@ static void fgUpdateVisuals( void ) {
/* draw sky */ /* draw sky */
fgSkyRender(); fgSkyRender();
/* draw astronomical objects */
/* fgAstroRender(); */
/* draw scenery */ /* draw scenery */
fgSceneryRender(); fgSceneryRender();
/* draw astronomical objects */
fgAstroRender();
/* display HUD */ /* display HUD */
if( show_hud ) /* if( show_hud )
fgCockpitUpdate(); fgCockpitUpdate(); */
#ifdef GLUT #ifdef GLUT
xglutSwapBuffers(); xglutSwapBuffers();
@ -484,7 +484,7 @@ static void fgReshape( int width, int height ) {
fgUpdateViewParams(); fgUpdateViewParams();
xglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); /* xglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); */
} }
@ -569,9 +569,12 @@ int main( int argc, char *argv[] ) {
/* $Log$ /* $Log$
/* Revision 1.34 1997/12/17 23:13:34 curt /* Revision 1.35 1997/12/18 23:32:32 curt
/* Began working on rendering a sky. /* First stab at sky dome actually starting to look reasonable. :-)
/* /*
* Revision 1.34 1997/12/17 23:13:34 curt
* Began working on rendering a sky.
*
* Revision 1.33 1997/12/15 23:54:45 curt * Revision 1.33 1997/12/15 23:54:45 curt
* Add xgl wrappers for debugging. * Add xgl wrappers for debugging.
* Generate terrain normals on the fly. * Generate terrain normals on the fly.

9
Main/fg_init.c
View file

@ -171,11 +171,13 @@ void fgInitSubsystems( void ) {
fgWeatherInit(); fgWeatherInit();
/* Initialize the Cockpit subsystem */ /* Initialize the Cockpit subsystem */
/*
if( fgCockpitInit( current_aircraft ) == NULL ) if( fgCockpitInit( current_aircraft ) == NULL )
{ {
printf( "Error in Cockpit initialization!\n" ); printf( "Error in Cockpit initialization!\n" );
exit( 1 ); exit( 1 );
} }
*/
/* Initialize Astronomical Objects */ /* Initialize Astronomical Objects */
fgAstroInit(); fgAstroInit();
@ -222,9 +224,12 @@ void fgInitSubsystems( void ) {
/* $Log$ /* $Log$
/* Revision 1.19 1997/12/17 23:13:36 curt /* Revision 1.20 1997/12/18 23:32:33 curt
/* Began working on rendering a sky. /* First stab at sky dome actually starting to look reasonable. :-)
/* /*
* Revision 1.19 1997/12/17 23:13:36 curt
* Began working on rendering a sky.
*
* Revision 1.18 1997/12/15 23:54:49 curt * Revision 1.18 1997/12/15 23:54:49 curt
* Add xgl wrappers for debugging. * Add xgl wrappers for debugging.
* Generate terrain normals on the fly. * Generate terrain normals on the fly.

11
Scenery/astro.c
View file

@ -91,7 +91,7 @@ void fgAstroRender() {
xglDisable( GL_FOG ); xglDisable( GL_FOG );
/* set the sun position */ /* set the sun position */
xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec_inv ); /* xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec_inv ); */
xglPushMatrix(); xglPushMatrix();
@ -122,10 +122,13 @@ void fgAstroRender() {
/* $Log$ /* $Log$
/* Revision 1.8 1997/12/15 23:54:57 curt /* Revision 1.9 1997/12/18 23:32:35 curt
/* Add xgl wrappers for debugging. /* First stab at sky dome actually starting to look reasonable. :-)
/* Generate terrain normals on the fly.
/* /*
* Revision 1.8 1997/12/15 23:54:57 curt
* Add xgl wrappers for debugging.
* Generate terrain normals on the fly.
*
* Revision 1.7 1997/12/15 20:59:09 curt * Revision 1.7 1997/12/15 20:59:09 curt
* Misc. tweaks. * Misc. tweaks.
* *

9
Scenery/obj.c
View file

@ -316,6 +316,8 @@ GLint fgObjLoad(char *path) {
xglEnd(); xglEnd();
*/ */
xglFrontFace ( GL_CCW );
xglEndList(); xglEndList();
fclose(f); fclose(f);
@ -325,9 +327,12 @@ GLint fgObjLoad(char *path) {
/* $Log$ /* $Log$
/* Revision 1.12 1997/12/17 23:13:47 curt /* Revision 1.13 1997/12/18 23:32:36 curt
/* Began working on rendering the sky. /* First stab at sky dome actually starting to look reasonable. :-)
/* /*
* Revision 1.12 1997/12/17 23:13:47 curt
* Began working on rendering the sky.
*
* Revision 1.11 1997/12/15 23:55:01 curt * Revision 1.11 1997/12/15 23:55:01 curt
* Add xgl wrappers for debugging. * Add xgl wrappers for debugging.
* Generate terrain normals on the fly. * Generate terrain normals on the fly.

96
Scenery/sky.c
View file

@ -46,20 +46,20 @@
#include "../Flight/flight.h" #include "../Flight/flight.h"
#include "../Include/constants.h" #include "../Include/constants.h"
#include "../Main/views.h" #include "../Main/views.h"
#include "../Math/fg_random.h"
/* /*
#include "../Include/general.h" #include "../Include/general.h"
*/ */
/* in meters of course */ /* in meters of course */
#define INNER_RADIUS 50000.0 #define INNER_RADIUS 50000.0
#define INNER_ELEV 8000.0 /* was 20000 */ #define INNER_ELEV 20000.0
#define MIDDLE_RADIUS 70000.0 #define MIDDLE_RADIUS 70000.0
#define MIDDLE_ELEV 10000.0 #define MIDDLE_ELEV 4000.0
#define OUTER_RADIUS 80000.0 #define OUTER_RADIUS 80000.0
#define OUTER_ELEV 0.0 #define OUTER_ELEV 0.0
static GLint sky; /* sky display list */
static float sky_center[12][3]; static float sky_center[12][3];
static float sky_middle[12][3]; static float sky_middle[12][3];
static float sky_outer[12][3]; static float sky_outer[12][3];
@ -67,18 +67,13 @@ static float sky_outer[12][3];
/* (Re)generate the display list */ /* (Re)generate the display list */
void fgSkyInit() { void fgSkyInit() {
struct fgLIGHT *l; struct fgLIGHT *l;
static int dl_exists = 0;
float theta; float theta;
int i; int i;
l = &cur_light_params; l = &cur_light_params;
if ( dl_exists ) { printf("Generating the sky dome vertices.\n");
xglDeleteLists(sky, 1);
} else {
dl_exists = 1;
/* first time through, calculate sky vertices */
for ( i = 0; i < 12; i++ ) { for ( i = 0; i < 12; i++ ) {
theta = (i * 30.0) * DEG_TO_RAD; theta = (i * 30.0) * DEG_TO_RAD;
@ -100,56 +95,21 @@ void fgSkyInit() {
} }
} }
printf("Creating the sky\n");
sky = xglGenLists(1);
xglNewList(sky, GL_COMPILE );
/* xglMaterialfv(GL_FRONT, GL_AMBIENT, l->scene_clear);
xglMaterialfv(GL_FRONT, GL_DIFFUSE, moon_color); */
/* Draw inner section */
xglBegin( GL_TRIANGLE_FAN );
xglColor3f(0.0, 0.0, 1.0);
xglVertex3f(0.0, 0.0, INNER_ELEV);
xglColor3f(0.2, 0.2, 1.0);
for ( i = 0; i < 12; i++ ) {
xglVertex3fv( sky_center[i] );
}
xglVertex3fv( sky_center[0] );
xglEnd();
xglEndList();
}
/* Draw the Sky */ /* Draw the Sky */
void fgSkyRender() { void fgSkyRender() {
struct fgFLIGHT *f; struct fgFLIGHT *f;
struct fgVIEW *v; struct fgVIEW *v;
/*
struct fgLIGHT *l;
struct fgTIME *t;
int i; int i;
*/
f = &current_aircraft.flight; f = &current_aircraft.flight;
v = &current_view; v = &current_view;
/*
l = &cur_light_params;
t = &cur_time_params;
*/
/* FG_PI_2 + 0.1 is about 6 degrees after sundown and before sunrise */
/* t->sun_angle = 3.0; */ /* to force stars to be drawn (for testing) */
printf("Rendering the sky.\n"); printf("Rendering the sky.\n");
xglDisable( GL_LIGHTING ); xglDisable( GL_LIGHTING );
xglDisable( GL_CULL_FACE );
xglShadeModel( GL_SMOOTH );
xglPushMatrix(); xglPushMatrix();
@ -158,23 +118,61 @@ void fgSkyRender() {
/* printf(" Translated to %.2f %.2f %.2f\n", /* printf(" Translated to %.2f %.2f %.2f\n",
v->cur_zero_elev.x, v->cur_zero_elev.y, v->cur_zero_elev.z ); */ v->cur_zero_elev.x, v->cur_zero_elev.y, v->cur_zero_elev.z ); */
/* Rotate to proper orientation */
printf(" lon = %.2f lat = %.2f\n", FG_Longitude * RAD_TO_DEG, printf(" lon = %.2f lat = %.2f\n", FG_Longitude * RAD_TO_DEG,
FG_Latitude * RAD_TO_DEG); FG_Latitude * RAD_TO_DEG);
xglRotatef( FG_Longitude * RAD_TO_DEG, 0.0, 0.0, 1.0 ); xglRotatef( FG_Longitude * RAD_TO_DEG, 0.0, 0.0, 1.0 );
xglRotatef( 90.0 - FG_Latitude * RAD_TO_DEG, 0.0, 1.0, 0.0 ); xglRotatef( 90.0 - FG_Latitude * RAD_TO_DEG, 0.0, 1.0, 0.0 );
xglCallList( sky ); /* xglMaterialfv(GL_FRONT, GL_AMBIENT, l->scene_clear);
xglMaterialfv(GL_FRONT, GL_DIFFUSE, moon_color); */
/* Draw inner/center section of sky*/
xglBegin( GL_TRIANGLE_FAN );
xglColor4f(0.0, 0.0, 1.0, 1.0);
xglVertex3f(0.0, 0.0, INNER_ELEV);
xglColor4f(0.2, 0.2, 0.8, 1.0);
for ( i = 0; i < 12; i++ ) {
xglVertex3fv( sky_center[i] );
}
xglVertex3fv( sky_center[0] );
xglEnd();
/* Draw the middle ring */
xglBegin( GL_TRIANGLE_STRIP );
for ( i = 0; i < 12; i++ ) {
xglVertex3fv( sky_middle[i] );
xglVertex3fv( sky_center[i] );
}
xglVertex3fv( sky_middle[0] );
xglVertex3fv( sky_center[0] );
xglEnd();
/* Draw the outer ring */
xglBegin( GL_TRIANGLE_STRIP );
for ( i = 0; i < 12; i++ ) {
xglVertex3fv( sky_outer[i] );
xglVertex3fv( sky_middle[i] );
}
xglVertex3fv( sky_outer[0] );
xglVertex3fv( sky_middle[0] );
xglEnd();
xglPopMatrix(); xglPopMatrix();
xglShadeModel( GL_FLAT );
xglEnable( GL_CULL_FACE );
xglEnable( GL_LIGHTING ); xglEnable( GL_LIGHTING );
} }
/* $Log$ /* $Log$
/* Revision 1.2 1997/12/18 04:07:03 curt /* Revision 1.3 1997/12/18 23:32:36 curt
/* Worked on properly translating and positioning the sky dome. /* First stab at sky dome actually starting to look reasonable. :-)
/* /*
* Revision 1.2 1997/12/18 04:07:03 curt
* Worked on properly translating and positioning the sky dome.
*
* Revision 1.1 1997/12/17 23:14:30 curt * Revision 1.1 1997/12/17 23:14:30 curt
* Initial revision. * Initial revision.
* Begin work on rendering the sky. (Rather than just using a clear screen.) * Begin work on rendering the sky. (Rather than just using a clear screen.)

12
Simulator/Makefile
View file

@ -78,25 +78,29 @@ scenery-zip:
zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery) zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery)
bin-tar: all bin-tar: all
cp Main/fg-$(FG_VERSION) runfg .. cp Main/fg-$(FG_VERSION) README runfg ..
$(RM) -f ../fg$(FG_VERSION_MAJOR) $(RM) -f ../fg$(FG_VERSION_MAJOR)
$(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR) $(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR)
(cd ../..; \ (cd ../..; \
$(TAR) cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \ $(TAR) cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \ FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \
FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks) FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/README \
FlightGear/Thanks)
bin-zip: bin-zip:
cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll runfg.bat .. cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll README runfg.bat ..
(cd ../..; \ (cd ../..; \
zip -r bin-$(FG_VERSION).zip FlightGear/fgtop \ zip -r bin-$(FG_VERSION).zip FlightGear/fgtop \
FlightGear/fg$(FG_VERSION_MAJOR).exe FlightGear/runfg.bat \ FlightGear/fg$(FG_VERSION_MAJOR).exe FlightGear/runfg.bat \
FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \ FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \
FlightGear/Thanks) FlightGear/README FlightGear/Thanks)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.34 1997/12/18 23:32:28 curt
# First stab at sky dome actually starting to look reasonable. :-)
#
# Revision 1.33 1997/12/17 23:13:17 curt # Revision 1.33 1997/12/17 23:13:17 curt
# Changes and tweaks to go to version 0.19 (Plus tweaks to Solaris support) # Changes and tweaks to go to version 0.19 (Plus tweaks to Solaris support)
# #