fly/flightgear
1
0
Fork 0
Code Activity

Capitalized subdirectory names.

Browse source
This commit is contained in:
curt 1997-06-21 17:12:38 +00:00
parent 0688c54540
commit 450a307fc2
18 changed files with 118 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Aircraft/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET = libaircraft.a TARGET = libAircraft.a
CFILES = aircraft.c CFILES = aircraft.c
HFILES = aircraft.h HFILES = aircraft.h
@ -61,12 +61,15 @@ clean:
aircraft.o: aircraft.c aircraft.h aircraft.o: aircraft.c aircraft.h
$(CC) $(CFLAGS) $(INCLUDES) -c aircraft.c $(CC) $(CFLAGS) $(INCLUDES) -c aircraft.c
aircraft.h: ../flight/flight.h ../controls/controls.h aircraft.h: ../Flight/flight.h ../Controls/controls.h
touch aircraft.h touch aircraft.h
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.3 1997/06/21 17:12:42 curt
# Capitalized subdirectory names.
#
# Revision 1.2 1997/05/23 15:40:29 curt # Revision 1.2 1997/05/23 15:40:29 curt
# Added GNU copyright headers. # Added GNU copyright headers.
# #

11
Aircraft/aircraft.h
View file

@ -27,8 +27,8 @@
#ifndef AIRCRAFT_H #ifndef AIRCRAFT_H
#define AIRCRAFT_H #define AIRCRAFT_H
#include "../flight/flight.h" #include "../Flight/flight.h"
#include "../controls/controls.h" #include "../Controls/controls.h"
/* Define a structure containing all the parameters for an aircraft */ /* Define a structure containing all the parameters for an aircraft */
@ -51,9 +51,12 @@ void aircraft_debug(int type);
/* $Log$ /* $Log$
/* Revision 1.2 1997/05/23 15:40:30 curt /* Revision 1.3 1997/06/21 17:12:42 curt
/* Added GNU copyright headers. /* Capitalized subdirectory names.
/* /*
* Revision 1.2 1997/05/23 15:40:30 curt
* Added GNU copyright headers.
*
* Revision 1.1 1997/05/16 15:58:25 curt * Revision 1.1 1997/05/16 15:58:25 curt
* Initial revision. * Initial revision.
* *

7
Controls/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET = libcontrols.a TARGET = libControls.a
CFILES = controls.c CFILES = controls.c
HFILES = controls.h HFILES = controls.h
@ -61,12 +61,15 @@ clean:
controls.h: ../limits.h controls.h: ../limits.h
touch controls.h touch controls.h
controls.o: controls.c controls.h ../aircraft/aircraft.h controls.o: controls.c controls.h ../Aircraft/aircraft.h
$(CC) $(CFLAGS) $(INCLUDES) -c controls.c $(CC) $(CFLAGS) $(INCLUDES) -c controls.c
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.4 1997/06/21 17:12:47 curt
# Capitalized subdirectory names.
#
# Revision 1.3 1997/05/31 19:16:27 curt # Revision 1.3 1997/05/31 19:16:27 curt
# Elevator trim added. # Elevator trim added.
# #

9
Controls/controls.c
View file

@ -25,7 +25,7 @@
#include "controls.h" #include "controls.h"
#include "../aircraft/aircraft.h" #include "../Aircraft/aircraft.h"
void fgControlsInit() { void fgControlsInit() {
@ -167,7 +167,10 @@ void fgThrottleSet(int engine, double pos) {
/* $Log$ /* $Log$
/* Revision 1.1 1997/05/31 19:24:04 curt /* Revision 1.2 1997/06/21 17:12:48 curt
/* Initial revision. /* Capitalized subdirectory names.
/* /*
* Revision 1.1 1997/05/31 19:24:04 curt
* Initial revision.
*
*/ */

7
FDM/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET=libflight.a TARGET=libFlight.a
CFILES = flight.c CFILES = flight.c
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
@ -57,7 +57,7 @@ clean:
# Secondary Targets # Secondary Targets
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
flight.h: slew/slew.h LaRCsim/ls_interface.h flight.h: Slew/slew.h LaRCsim/ls_interface.h
touch flight.h touch flight.h
flight.o: flight.c flight.h flight.o: flight.c flight.h
@ -66,6 +66,9 @@ flight.o: flight.c flight.h
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.4 1997/06/21 17:12:48 curt
# Capitalized subdirectory names.
#
# Revision 1.3 1997/05/29 02:32:25 curt # Revision 1.3 1997/05/29 02:32:25 curt
# Starting to build generic flight model interface. # Starting to build generic flight model interface.
# #

9
FDM/flight.h
View file

@ -28,7 +28,7 @@
#define FLIGHT_H #define FLIGHT_H
#include "slew/slew.h" #include "Slew/slew.h"
#include "LaRCsim/ls_interface.h" #include "LaRCsim/ls_interface.h"
@ -407,9 +407,12 @@ int fgFlightModelUpdate(int model, struct flight_params *f, int multiloop);
/* $Log$ /* $Log$
/* Revision 1.4 1997/05/29 22:39:57 curt /* Revision 1.5 1997/06/21 17:12:49 curt
/* Working on incorporating the LaRCsim flight model. /* Capitalized subdirectory names.
/* /*
* Revision 1.4 1997/05/29 22:39:57 curt
* Working on incorporating the LaRCsim flight model.
*
* Revision 1.3 1997/05/29 02:32:25 curt * Revision 1.3 1997/05/29 02:32:25 curt
* Starting to build generic flight model interface. * Starting to build generic flight model interface.
* *

5
LaRCsim/Makefile
View file

@ -11,7 +11,7 @@
TARGET = libLaRCsim.a TARGET = libLaRCsim.a
LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \ LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
ls_step.c ls_model.c default_model_routines.c ls_init.c ls_sync.c \ ls_step.c ls_model.c default_model_routines.c ls_init.c ls_sync.c
NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
@ -56,6 +56,9 @@ clean:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.3 1997/06/21 17:12:50 curt
# Capitalized subdirectory names.
#
# Revision 1.2 1997/06/17 16:52:02 curt # Revision 1.2 1997/06/17 16:52:02 curt
# Timer interval stuff now uses gettimeofday() instead of ftime() # Timer interval stuff now uses gettimeofday() instead of ftime()
# #

5
LaRCsim/ls_interface.c
View file

@ -236,7 +236,7 @@ $Original log: LaRCsim.c,v $
#include "ls_cockpit.h" #include "ls_cockpit.h"
#include "ls_interface.h" #include "ls_interface.h"
#include "../flight.h" #include "../flight.h"
#include "../../aircraft/aircraft.h" #include "../../Aircraft/aircraft.h"
/* global variable declarations */ /* global variable declarations */
@ -909,6 +909,9 @@ int fgLaRCsim_2_Flight (struct flight_params *f) {
/* Flight Gear Modification Log /* Flight Gear Modification Log
* *
* $Log$ * $Log$
* Revision 1.8 1997/06/21 17:12:50 curt
* Capitalized subdirectory names.
*
* Revision 1.7 1997/05/31 19:16:28 curt * Revision 1.7 1997/05/31 19:16:28 curt
* Elevator trim added. * Elevator trim added.
* *

10
Main/GLTKkey.c
View file

@ -63,6 +63,7 @@ GLenum GLTKkey(int k, GLenum mask) {
return GL_TRUE; return GL_TRUE;
case TK_s: case TK_s:
c->throttle[0] += 0.05; c->throttle[0] += 0.05;
return GL_TRUE;
case TK_ESCAPE: case TK_ESCAPE:
tkQuit(); tkQuit();
} }
@ -74,10 +75,13 @@ GLenum GLTKkey(int k, GLenum mask) {
/* $Log$ /* $Log$
/* Revision 1.2 1997/05/23 15:40:24 curt /* Revision 1.3 1997/06/21 17:12:52 curt
/* Added GNU copyright headers. /* Capitalized subdirectory names.
/* Fog now works!
/* /*
* Revision 1.2 1997/05/23 15:40:24 curt
* Added GNU copyright headers.
* Fog now works!
*
* Revision 1.1 1997/05/21 15:57:49 curt * Revision 1.1 1997/05/21 15:57:49 curt
* Renamed due to added GLUT support. * Renamed due to added GLUT support.
* *

9
Main/GLUTkey.c
View file

@ -30,7 +30,7 @@
#include <GL/glut.h> #include <GL/glut.h>
#include "GLUTkey.h" #include "GLUTkey.h"
#include "../aircraft/aircraft.h" #include "../Aircraft/aircraft.h"
extern double fogDensity; extern double fogDensity;
extern double goal_view_offset; extern double goal_view_offset;
@ -152,9 +152,12 @@ void GLUTspecialkey(int k, int x, int y) {
/* $Log$ /* $Log$
/* Revision 1.11 1997/06/18 04:10:31 curt /* Revision 1.12 1997/06/21 17:12:52 curt
/* A couple more runway tweaks ... /* Capitalized subdirectory names.
/* /*
* Revision 1.11 1997/06/18 04:10:31 curt
* A couple more runway tweaks ...
*
* Revision 1.10 1997/06/18 02:21:23 curt * Revision 1.10 1997/06/18 02:21:23 curt
* Hacked in a runway * Hacked in a runway
* *

20
Main/GLmain.c
View file

@ -37,10 +37,10 @@
#include "GLTKkey.h" #include "GLTKkey.h"
#endif #endif
#include "../aircraft/aircraft.h" #include "../Aircraft/aircraft.h"
#include "../scenery/scenery.h" #include "../Scenery/scenery.h"
#include "../mat3/mat3.h" #include "../mat3/mat3.h"
#include "../timer/fg_timer.h" #include "../Timer/fg_timer.h"
#define DEG_TO_RAD 0.017453292 #define DEG_TO_RAD 0.017453292
@ -336,14 +336,17 @@ GLint fgRunwayHack(double width, double length) {
static void fgSceneryDraw() { static void fgSceneryDraw() {
static float z = 32.35; static float z = 32.35;
glPushMatrix();
glCallList(terrain); glCallList(terrain);
/* z -= 0.01; */
printf("*** Drawing runway at %.2f\n", z); printf("*** Drawing runway at %.2f\n", z);
glTranslatef( -398391.28, 120070.41, z); glTranslatef( -398391.28, 120070.41, 32.35);
glRotatef(170.0, 0.0, 0.0, 1.0); glRotatef(170.0, 0.0, 0.0, 1.0);
glCallList(runway); glCallList(runway);
glPopMatrix();
} }
@ -534,9 +537,12 @@ int main( int argc, char *argv[] ) {
/* $Log$ /* $Log$
/* Revision 1.19 1997/06/18 04:10:31 curt /* Revision 1.20 1997/06/21 17:12:53 curt
/* A couple more runway tweaks ... /* Capitalized subdirectory names.
/* /*
* Revision 1.19 1997/06/18 04:10:31 curt
* A couple more runway tweaks ...
*
* Revision 1.18 1997/06/18 02:21:24 curt * Revision 1.18 1997/06/18 02:21:24 curt
* Hacked in a runway * Hacked in a runway
* *

23
Main/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET=proto TARGET=fgfs0
CC = gcc CC = gcc
@ -66,10 +66,10 @@ LIBS = $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
AFILES = ../aircraft/libaircraft.a ../controls/libcontrols.a \ AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
../flight/libflight.a ../flight/LaRCsim/libLaRCsim.a \ ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
../flight/slew/libslew.a ../mat3/libmat3.a ../scenery/libscenery.a \ ../Flight/Slew/libSlew.a ../mat3/libmat3.a ../Scenery/libScenery.a \
../timer/libtimer.a ../Timer/libTimer.a
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -89,22 +89,25 @@ clean:
# Secondary Targets # Secondary Targets
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GLmain.o: GLmain.c GLUTkey.h ../aircraft/aircraft.h ../scenery/scenery.h \ GLmain.o: GLmain.c GLUTkey.h ../Aircraft/aircraft.h ../Scenery/scenery.h \
../timer/fg_timer.h ../Timer/fg_timer.h
$(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
GLUTkey.o: GLUTkey.c GLUTkey.h ../aircraft/aircraft.h GLUTkey.o: GLUTkey.c GLUTkey.h ../Aircraft/aircraft.h
$(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
GLTKkey.o: GLTKkey.c GLTKkey.h ../aircraft/aircraft.h GLTKkey.o: GLTKkey.c GLTKkey.h ../Aircraft/aircraft.h
$(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
mesh2GL.o: mesh2GL.c ../scenery/mesh.h mesh2GL.o: mesh2GL.c ../Scenery/mesh.h
$(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.13 1997/06/21 17:12:54 curt
# Capitalized subdirectory names.
#
# Revision 1.12 1997/06/16 19:32:51 curt # Revision 1.12 1997/06/16 19:32:51 curt
# Starting to add general timer support. # Starting to add general timer support.
# #

9
Main/mesh2GL.c
View file

@ -31,7 +31,7 @@
#include "gltk.h" #include "gltk.h"
#endif #endif
#include "../scenery/mesh.h" #include "../Scenery/mesh.h"
#include "../mat3/mat3.h" #include "../mat3/mat3.h"
@ -108,9 +108,12 @@ GLint mesh2GL(struct mesh *m) {
/* $Log$ /* $Log$
/* Revision 1.20 1997/06/18 04:10:32 curt /* Revision 1.21 1997/06/21 17:12:54 curt
/* A couple more runway tweaks ... /* Capitalized subdirectory names.
/* /*
* Revision 1.20 1997/06/18 04:10:32 curt
* A couple more runway tweaks ...
*
* Revision 1.19 1997/06/18 02:21:24 curt * Revision 1.19 1997/06/18 02:21:24 curt
* Hacked in a runway * Hacked in a runway
* *

5
Scenery/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET = libscenery.a TARGET = libScenery.a
CFILES = scanner.c parser.c common.c mesh.c CFILES = scanner.c parser.c common.c mesh.c
HFILES = HFILES =
@ -89,6 +89,9 @@ mesh.o: mesh.c mesh.h common.h
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.6 1997/06/21 17:12:55 curt
# Capitalized subdirectory names.
#
# Revision 1.5 1997/05/31 19:16:29 curt # Revision 1.5 1997/05/31 19:16:29 curt
# Elevator trim added. # Elevator trim added.
# #

13
Simulator/Makefile
View file

@ -27,8 +27,8 @@
CC = gcc CC = gcc
SUBSUBDIRS = flight/LaRCsim flight/slew SUBSUBDIRS = Flight/LaRCsim Flight/Slew
SUBDIRS = aircraft controls flight mat3 scenery timer SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
MAIN = OpenGL MAIN = OpenGL
@ -51,8 +51,17 @@ clean:
done done
tar: clean
(cd ../..; \
tar cvf prototype-0.04.tar FlightGear/COPYING FlightGear/Docs \
FlightGear/Scenery/mesa-e.scn FlightGear/Src FlightGear/Thanks)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.7 1997/06/21 17:12:38 curt
# Capitalized subdirectory names.
#
# Revision 1.6 1997/06/16 19:32:50 curt # Revision 1.6 1997/06/16 19:32:50 curt
# Starting to add general timer support. # Starting to add general timer support.
# #

7
Slew/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET=libslew.a TARGET=libSlew.a
CFILES = slew.c CFILES = slew.c
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
@ -57,12 +57,15 @@ clean:
# Secondary Targets # Secondary Targets
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
slew.o: slew.c slew.h ../../aircraft/aircraft.h ../../controls/controls.h slew.o: slew.c slew.h ../../Aircraft/aircraft.h ../../Controls/controls.h
$(CC) $(CFLAGS) $(INCLUDES) -c slew.c $(CC) $(CFLAGS) $(INCLUDES) -c slew.c
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1997/06/21 17:12:51 curt
# Capitalized subdirectory names.
#
# Revision 1.1 1997/05/29 02:29:42 curt # Revision 1.1 1997/05/29 02:29:42 curt
# Moved to their own directory. # Moved to their own directory.
# #

11
Slew/slew.c
View file

@ -28,8 +28,8 @@
#include "slew.h" #include "slew.h"
#include "../flight.h" #include "../flight.h"
#include "../../aircraft/aircraft.h" #include "../../Aircraft/aircraft.h"
#include "../../controls/controls.h" #include "../../Controls/controls.h"
#ifndef M_PI #ifndef M_PI
@ -90,9 +90,12 @@ void fgSlewUpdate() {
/* $Log$ /* $Log$
/* Revision 1.3 1997/05/29 22:40:00 curt /* Revision 1.4 1997/06/21 17:12:51 curt
/* Working on incorporating the LaRCsim flight model. /* Capitalized subdirectory names.
/* /*
* Revision 1.3 1997/05/29 22:40:00 curt
* Working on incorporating the LaRCsim flight model.
*
* Revision 1.2 1997/05/29 12:30:19 curt * Revision 1.2 1997/05/29 12:30:19 curt
* Some initial mods to work better in a timer environment. * Some initial mods to work better in a timer environment.
* *

5
Time/Makefile
View file

@ -24,7 +24,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET = libtimer.a TARGET = libTimer.a
CFILES = fg_timer.c CFILES = fg_timer.c
HFILES = fg_timer.h HFILES = fg_timer.h
@ -64,6 +64,9 @@ fg_timer.o: fg_timer.c fg_timer.h
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1997/06/21 17:12:55 curt
# Capitalized subdirectory names.
#
# Revision 1.1 1997/06/16 19:24:19 curt # Revision 1.1 1997/06/16 19:24:19 curt
# Initial revision. # Initial revision.
# #