1
0
Fork 0

Misc. tweaks.

This commit is contained in:
curt 1998-01-21 21:11:33 +00:00
parent 1cafa70c04
commit 08210bfc08
7 changed files with 45 additions and 20 deletions

View file

@ -44,7 +44,7 @@ include $(FG_ROOT_SRC)/commondefs
# Rule for TARGET
#---------------------------------------------------------------------------
$(TARGET): $(OBJECTS)
$(TARGET): $(OBJECTS) $(FG_ROOT_LIB)/stamp_libs
$(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(LDLIBS)
$(LN) -sf $(TARGET) fg$(FG_VERSION_MAJOR)
@ -52,6 +52,9 @@ include $(COMMONRULES)
#---------------------------------------------------------------------------
# $Log$
# Revision 1.42 1998/01/21 21:11:34 curt
# Misc. tweaks.
#
# Revision 1.41 1998/01/19 19:27:08 curt
# Merged in make system changes from Bob Kuehne <rpk@sgi.com>
# This should simplify things tremendously.

View file

@ -116,16 +116,28 @@ void fgInitSubsystems( void ) {
FG_Altitude = FG_Runway_altitude + 3.758099;
/* Initial Position at (SEZ) SEDONA airport */
FG_Longitude = -111.7884614 * DEG_TO_RAD;
FG_Latitude = 34.8486289 * DEG_TO_RAD;
FG_Runway_altitude = 4827;
/* FG_Longitude = -111.774176 * DEG_TO_RAD; */
/* FG_Latitude = 34.834343 * DEG_TO_RAD; */
/* FG_Runway_altitude = 4827; */
/* FG_Altitude = FG_Runway_altitude + 3.758099; */
/* Initial Position SE of (SEZ) SEDONA airport */
/* FG_Longitude = -111.724176 * DEG_TO_RAD; */
/* FG_Latitude = 34.744343 * DEG_TO_RAD; */
/* FG_Runway_altitude = 7427; */
/* FG_Altitude = FG_Runway_altitude + 3.758099; */
/* Initial Position at (HSP) Hot Springs, VA */
FG_Longitude = (-79.8338964 /*+ 0.02*/) * DEG_TO_RAD;
FG_Latitude = ( 37.9514564 /*+ 0.05*/) * DEG_TO_RAD;
FG_Runway_altitude = (792 /*+ 1500*/);
FG_Altitude = FG_Runway_altitude + 3.758099;
/* Initial Position at (ANE) Anoka County airport */
FG_Longitude = -93.2113889 * DEG_TO_RAD;
FG_Latitude = 45.145 * DEG_TO_RAD;
FG_Runway_altitude = 912;
FG_Altitude = FG_Runway_altitude + 3.758099;
/* FG_Longitude = -93.2113889 * DEG_TO_RAD; */
/* FG_Latitude = 45.145 * DEG_TO_RAD; */
/* FG_Runway_altitude = 912; */
/* FG_Altitude = FG_Runway_altitude + 3.758099; */
/* Initial Position north of the city of Globe */
/* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
@ -150,7 +162,7 @@ void fgInitSubsystems( void ) {
/* FG_Latitude = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
printf("Initial position is: (%.4f, %.4f, %.2f)\n",
printf("Initial position is: (%.4f, %.4f, %.2f)\n",
FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG,
FG_Altitude * FEET_TO_METER);
@ -287,10 +299,13 @@ void fgInitSubsystems( void ) {
/* $Log$
/* Revision 1.32 1998/01/19 19:27:08 curt
/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
/* This should simplify things tremendously.
/* Revision 1.33 1998/01/21 21:11:34 curt
/* Misc. tweaks.
/*
* Revision 1.32 1998/01/19 19:27:08 curt
* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
* This should simplify things tremendously.
*
* Revision 1.31 1998/01/19 18:40:32 curt
* Tons of little changes to clean up the code and to remove fatal errors
* when building with the c++ compiler.

View file

@ -37,6 +37,10 @@ Reto Koradi <kor@mol.biol.ethz.ch> http://www.mol.biol.ethz.ch/~kor
Helped me get on track with setting up fog effects.
Bob Kuehne <rpk@sgi.com>
Redid the Makefile system so it is simpler and more robust.
Eric Mitchell <mitchell@mars.ark.com>
Contributed some topnotch scenery textures.

View file

@ -13,8 +13,8 @@ FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
# Choose your weapons
#---------------------------------------------------------------------------
CC = g++
CXX = g++
CC = gcc
CXX = gcc
LD = ld
AR = ar
RANLIB = ranlib

View file

@ -9,6 +9,7 @@ $(ARLIBRARY): $(OBJECTS)
$(RANLIB) $(ARLIBRARY)
echo $(VPATH)
$(MV) $(ARLIBRARY) $(FG_ROOT_LIB)
touch $(FG_ROOT_LIB)/stamp_libs
$(LDLIBTARGET): $(OBJECTS)
$(LD) -o $(LDLIBRARY) $(LDFLAGS) $(OBJECTS)

View file

@ -26,7 +26,7 @@
ARLIBRARY = libTime.a
TARGETS = $(ARLIBRARY)
CFILES = event.c fg_time.c fg_timer.c scheduler.c sunpos.c
CFILES = event.c fg_time.c fg_timer.c sunpos.c
CXXFILES =
LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)

View file

@ -55,8 +55,7 @@ void fgTimeInit(struct fgTIME *t) {
printf("Initializing Time\n");
t->gst_diff = -9999.0;
t->warp = 0;
t->warp = 0 * 3600;
t->warp = (0) * 3600;
t->warp_delta = 0;
}
@ -300,10 +299,13 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
/* $Log$
/* Revision 1.29 1998/01/19 19:27:20 curt
/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
/* This should simplify things tremendously.
/* Revision 1.30 1998/01/21 21:11:35 curt
/* Misc. tweaks.
/*
* Revision 1.29 1998/01/19 19:27:20 curt
* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
* This should simplify things tremendously.
*
* Revision 1.28 1998/01/19 18:35:49 curt
* Minor tweaks and fixes for cygwin32.
*