fly/flightgear
1
0
Fork 0
Code Activity

Tweaks for verion 0.15 release.

Browse source
This commit is contained in:
curt 1997-12-10 01:19:42 +00:00
parent 330ff4ab53
commit 871ee408fa
5 changed files with 47 additions and 26 deletions

6
Main/Makefile
View file

@ -54,7 +54,8 @@ $(TARGET): $(OFILES) $(AFILES)
all: $(TARGET) all: $(TARGET)
clean: clean:
rm -f *.o $(TARGET) $(TARGET).exe lib*.a *.os2 *~ core rm -f *.o $(TARGET) $(TARGET).exe \
fg$(VERSION_MAJOR) fg$(VERSION_MAJOR).exe lib*.a *.os2 *~ core
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -81,6 +82,9 @@ views.o:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.36 1997/12/10 01:19:47 curt
# Tweaks for verion 0.15 release.
#
# Revision 1.35 1997/10/28 21:11:22 curt # Revision 1.35 1997/10/28 21:11:22 curt
# Organizational changes. # Organizational changes.
# #

35
Scenery/obj.c
View file

@ -229,17 +229,19 @@ GLint fgObjLoad(char *path) {
glEnd(); glEnd();
/* Draw normal vectors (for visually verifying normals)*/ /* Draw normal vectors (for visually verifying normals)*/
/* glBegin(GL_LINES); */ /*
/* glColor3f(0.0, 0.0, 0.0); */ glBegin(GL_LINES);
/* for ( i = 0; i < ncount; i++ ) { */ glColor3f(0.0, 0.0, 0.0);
/* glVertex3d(nodes[i][0] - ref.x, */ for ( i = 0; i < ncount; i++ ) {
/* nodes[i][1] - ref.y, */ glVertex3d(nodes[i][0] - ref.x,
/* nodes[i][2] - ref.z); */ nodes[i][1] - ref.y,
/* glVertex3d(nodes[i][0] - ref.x + 1000*normals[i][0], */ nodes[i][2] - ref.z);
/* nodes[i][1] - ref.y + 1000*normals[i][1], */ glVertex3d(nodes[i][0] - ref.x + 500*normals[i][0],
/* nodes[i][2] - ref.z + 1000*normals[i][2]); */ nodes[i][1] - ref.y + 500*normals[i][1],
/* } */ nodes[i][2] - ref.z + 500*normals[i][2]);
/* glEnd(); */ }
glEnd();
*/
glEndList(); glEndList();
@ -250,11 +252,14 @@ GLint fgObjLoad(char *path) {
/* $Log$ /* $Log$
/* Revision 1.7 1997/12/08 22:51:17 curt /* Revision 1.8 1997/12/10 01:19:51 curt
/* Enhanced to handle ccw and cw tri-stripe winding. This is a temporary /* Tweaks for verion 0.15 release.
/* admission of defeat. I will eventually go back and get all the stripes
/* wound the same way (ccw).
/* /*
* Revision 1.7 1997/12/08 22:51:17 curt
* Enhanced to handle ccw and cw tri-stripe winding. This is a temporary
* admission of defeat. I will eventually go back and get all the stripes
* wound the same way (ccw).
*
* Revision 1.6 1997/11/25 19:25:35 curt * Revision 1.6 1997/11/25 19:25:35 curt
* Changes to integrate Durk's moon/sun code updates + clean up. * Changes to integrate Durk's moon/sun code updates + clean up.
* *

18
Simulator/Makefile
View file

@ -77,21 +77,27 @@ scenery-zip:
zip -r scenery-$(VERSION).zip FlightGear/Scenery) zip -r scenery-$(VERSION).zip FlightGear/Scenery)
bin-tar: all bin-tar: all
cp GLUT/fg0 GLUT/runfg .. cp Main/fg-$(VERSION) runfg ..
$(LN) ../fg-$(VERSION) ../fg$(VERSION_MAJOR)
(cd ../..; \ (cd ../..; \
tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop FlightGear/fg0 \ tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop \
FlightGear/fg-$(VERSION) FlightGear/fg$(VERSION_MAJOR) \
FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks) FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
bin-zip: bin-zip:
cp GLUT/fg0.exe GLUT/runfg.bat GLUT/cygwin.dll .. cp Main/fg$(VERSION_MAJOR).exe Main/cygwin.dll runfg.bat ..
(cd ../..; \ (cd ../..; \
zip -r bin-$(VERSION).zip FlightGear/fgtop FlightGear/fg0.exe \ zip -r bin-$(VERSION).zip FlightGear/fgtop \
FlightGear/runfg.bat FlightGear/cygwin.dll FlightGear/COPYING \ FlightGear/fg$(VERSION_MAJOR).exe FlightGear/runfg.bat \
FlightGear/Docs FlightGear/Thanks) FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \
FlightGear/Thanks)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.30 1997/12/10 01:19:42 curt
# Tweaks for verion 0.15 release.
#
# Revision 1.29 1997/10/30 12:38:35 curt # Revision 1.29 1997/10/30 12:38:35 curt
# Working on new scenery subsystem. # Working on new scenery subsystem.
# #

5
Simulator/make.inc
View file

@ -30,7 +30,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
VERSION_MAJOR = 0 VERSION_MAJOR = 0
VERSION_MINOR = 15 VERSION_MINOR = 16
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
@ -131,6 +131,9 @@ FG_CFLAGS = $(GLOBAL_CFLAGS)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.21 1997/12/10 01:19:42 curt
# Tweaks for verion 0.15 release.
#
# Revision 1.20 1997/12/09 04:25:25 curt # Revision 1.20 1997/12/09 04:25:25 curt
# Working on adding a global lighting params structure. # Working on adding a global lighting params structure.
# #

9
Time/fg_time.c
View file

@ -233,7 +233,7 @@ void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
/* get current Unix calendar time (in seconds) */ /* get current Unix calendar time (in seconds) */
warp += 60; warp += 60;
/* warp = 0; */ /* warp = 0; */
t->cur_time = time(NULL) + (12) * 60 * 60; t->cur_time = time(NULL) + (0) * 60 * 60;
t->cur_time += warp; t->cur_time += warp;
printf("Current Unix calendar time = %ld warp = %ld\n", t->cur_time, warp); printf("Current Unix calendar time = %ld warp = %ld\n", t->cur_time, warp);
@ -285,9 +285,12 @@ void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
/* $Log$ /* $Log$
/* Revision 1.13 1997/12/09 05:11:56 curt /* Revision 1.14 1997/12/10 01:19:52 curt
/* Working on tweaking lighting. /* Tweaks for verion 0.15 release.
/* /*
* Revision 1.13 1997/12/09 05:11:56 curt
* Working on tweaking lighting.
*
* Revision 1.12 1997/12/09 04:25:37 curt * Revision 1.12 1997/12/09 04:25:37 curt
* Working on adding a global lighting params structure. * Working on adding a global lighting params structure.
* *