fly/flightgear
1
0
Fork 0
Code Activity

Incorporated sun, moon, and star positioning code contributed by Durk Talsma.

Browse source
This commit is contained in:
curt 1997-10-25 03:24:21 +00:00
parent 4c1650dd62
commit c158d4bfd2
6 changed files with 55 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Main/Makefile
View file

@ -70,9 +70,18 @@ GLUTkey.o:
GLTKkey.o: GLTKkey.o:
$(CC) $(CFLAGS) -c GLTKkey.c -o $@ $(CC) $(CFLAGS) -c GLTKkey.c -o $@
fg_init.o:
$(CC) $(CFLAGS) -c fg_init.c -o $@
views.o:
$(CC) $(CFLAGS) -c views.c -o $@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.34 1997/10/25 03:24:21 curt
# Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
#
# Revision 1.33 1997/09/04 02:17:35 curt # Revision 1.33 1997/09/04 02:17:35 curt
# Shufflin' stuff. # Shufflin' stuff.
# #

6
Main/depend
View file

@ -26,9 +26,11 @@ fg_init.o: fg_init.c fg_init.h views.h ../types.h ../Flight/flight.h \
../Cockpit/hud.h ../Cockpit/../Aircraft/aircraft.h \ ../Cockpit/hud.h ../Cockpit/../Aircraft/aircraft.h \
../Cockpit/../Flight/flight.h ../Cockpit/../Controls/controls.h \ ../Cockpit/../Flight/flight.h ../Cockpit/../Controls/controls.h \
../Joystick/joystick.h ../Math/fg_random.h ../Scenery/mesh.h \ ../Joystick/joystick.h ../Math/fg_random.h ../Scenery/mesh.h \
../Scenery/moon.h ../Scenery/orbits.h ../Scenery/../Time/fg_time.h \
../Scenery/../Time/../types.h ../Scenery/../Time/../Flight/flight.h \
../Scenery/scenery.h ../Scenery/../types.h ../Scenery/stars.h \ ../Scenery/scenery.h ../Scenery/../types.h ../Scenery/stars.h \
../Time/fg_time.h ../Time/../types.h ../Time/../Flight/flight.h \ ../Time/fg_time.h ../Time/sunpos.h ../Time/../types.h \
../Time/sunpos.h ../Weather/weather.h ../Weather/weather.h
views.o: views.c views.h ../types.h ../Flight/flight.h \ views.o: views.c views.h ../types.h ../Flight/flight.h \
../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \ ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
../Flight/LaRCsim/../flight.h ../Math/mat3.h ../constants.h \ ../Flight/LaRCsim/../flight.h ../Math/mat3.h ../constants.h \

15
Main/fg_init.c
View file

@ -38,6 +38,8 @@
#include "../Joystick/joystick.h" #include "../Joystick/joystick.h"
#include "../Math/fg_random.h" #include "../Math/fg_random.h"
#include "../Scenery/mesh.h" #include "../Scenery/mesh.h"
#include "../Scenery/moon.h"
#include "../Scenery/orbits.h"
#include "../Scenery/scenery.h" #include "../Scenery/scenery.h"
#include "../Scenery/stars.h" #include "../Scenery/stars.h"
#include "../Time/fg_time.h" #include "../Time/fg_time.h"
@ -174,6 +176,12 @@ void fgInitSubsystems( void ) {
exit( 1 ); exit( 1 );
} }
/* Initialize the orbital elements of sun, moon and mayor planets */
fgSolarSystemInit(*t);
/* Intialize the moon's position */
fgMoonInit();
/* Initialize the Stars subsystem */ /* Initialize the Stars subsystem */
fgStarsInit(); fgStarsInit();
@ -216,9 +224,12 @@ void fgInitSubsystems( void ) {
/* $Log$ /* $Log$
/* Revision 1.9 1997/09/23 00:29:39 curt /* Revision 1.10 1997/10/25 03:24:23 curt
/* Tweaks to get things to compile with gcc-win32. /* Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
/* /*
* Revision 1.9 1997/09/23 00:29:39 curt
* Tweaks to get things to compile with gcc-win32.
*
* Revision 1.8 1997/09/22 14:44:20 curt * Revision 1.8 1997/09/22 14:44:20 curt
* Continuing to try to align stars correctly. * Continuing to try to align stars correctly.
* *

9
Scenery/moon.h
View file

@ -35,8 +35,8 @@
void fgMoonInit(); void fgMoonInit();
/* Draw the Stars */ /* Draw the Stars */
void fgMoonRender(); void fgMoonRender();
struct CelestialCoord fgCalculateMoon(struct OrbElements Params, struct CelestialCoord fgCalculateMoon(struct OrbElements Params,
struct OrbElements sunParams, struct OrbElements sunParams,
struct fgTIME t); struct fgTIME t);
@ -48,7 +48,10 @@ extern struct OrbElements pltOrbElements[9];
/* $Log$ /* $Log$
/* Revision 1.1 1997/10/25 03:16:09 curt /* Revision 1.2 1997/10/25 03:24:23 curt
/* Initial revision of code contributed by Durk Talsma. /* Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
/* /*
* Revision 1.1 1997/10/25 03:16:09 curt
* Initial revision of code contributed by Durk Talsma.
*
*/ */

12
Scenery/scenery.c
View file

@ -34,8 +34,9 @@
#include "../general.h" #include "../general.h"
#include "scenery.h" #include "moon.h"
#include "parsevrml.h" #include "parsevrml.h"
#include "scenery.h"
#include "stars.h" #include "stars.h"
@ -89,10 +90,13 @@ void fgSceneryRender() {
/* $Log$ /* $Log$
/* Revision 1.20 1997/10/25 03:18:27 curt /* Revision 1.21 1997/10/25 03:24:24 curt
/* Incorporated sun, moon, and planet position and rendering code contributed /* Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
/* by Durk Talsma.
/* /*
* Revision 1.20 1997/10/25 03:18:27 curt
* Incorporated sun, moon, and planet position and rendering code contributed
* by Durk Talsma.
*
* Revision 1.19 1997/09/05 14:17:30 curt * Revision 1.19 1997/09/05 14:17:30 curt
* More tweaking with stars. * More tweaking with stars.
* *

27
Simulator/make.inc
View file

@ -98,28 +98,31 @@ GLOBAL_CFLAGS = -g -Wall -DVERSION=\"$(VERSION)\"
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Linux/Mesa with the GLUT toolkit # Linux/Mesa with the GLUT toolkit
# #
# INTERFACE_FLAGS = -DGLUT INTERFACE_FLAGS = -DGLUT
# INTERFACE_LIBS = -lglut INTERFACE_LIBS = -lglut
# INTERFACE_FILES = GLUTmain.c GLUTkey.c INTERFACE_FILES = GLUTmain.c GLUTkey.c
# MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL
# X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11
# GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS)
# FG_CFLAGS = $(GLOBAL_CFLAGS) FG_CFLAGS = $(GLOBAL_CFLAGS)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Cygnus Win32 (gcc based) with a static version of the GLUT toolkit # Cygnus Win32 (gcc based) with a static version of the GLUT toolkit
# #
INTERFACE_FLAGS = -DGLUT # INTERFACE_FLAGS = -DGLUT
INTERFACE_LIBS = ../Win32/libglut.a # INTERFACE_LIBS = ../Win32/libglut.a
INTERFACE_FILES = GLUTmain.c GLUTkey.c # INTERFACE_FILES = GLUTmain.c GLUTkey.c
GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32 # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND # FG_CFLAGS = $(GLOBAL_CFLAGS) -DWIN32 -DUSE_RAND
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.16 1997/10/25 03:24:21 curt
# Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
#
# Revision 1.15 1997/09/23 00:29:27 curt # Revision 1.15 1997/09/23 00:29:27 curt
# Tweaks to get things to compile with gcc-win32. # Tweaks to get things to compile with gcc-win32.
# #