renamed mat3 directory to Math so we could add other math related routines.
This commit is contained in:
curt
parent
78b2574624
commit
37a2b12501
6 changed files with 29 additions and 18 deletions
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include "../Aircraft/aircraft.h"
|
||||
#include "../Scenery/scenery.h"
|
||||
#include "../mat3/mat3.h"
|
||||
#include "../Math/mat3.h"
|
||||
#include "../Timer/fg_timer.h"
|
||||
|
||||
|
||||
|
|
@ -580,9 +580,12 @@ int main( int argc, char *argv[] ) {
|
|||
|
||||
|
||||
/* $Log$
|
||||
/* Revision 1.25 1997/06/29 21:19:17 curt
|
||||
/* Working on scenery management system.
|
||||
/* Revision 1.26 1997/07/05 20:43:34 curt
|
||||
/* renamed mat3 directory to Math so we could add other math related routines.
|
||||
/*
|
||||
* Revision 1.25 1997/06/29 21:19:17 curt
|
||||
* Working on scenery management system.
|
||||
*
|
||||
* Revision 1.24 1997/06/26 22:14:53 curt
|
||||
* Beginning work on a scenery management system.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
|
|||
OFILES = $(CFILES:.c=.o)
|
||||
AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
|
||||
../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
|
||||
../Flight/Slew/libSlew.a ../mat3/libmat3.a \
|
||||
../Flight/Slew/libSlew.a ../Math/libMath.a \
|
||||
../Scenery/libScenery.a \
|
||||
../Timer/libTimer.a
|
||||
|
||||
|
|
@ -76,6 +76,9 @@ mesh2GL.o:
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.21 1997/07/05 20:43:34 curt
|
||||
# renamed mat3 directory to Math so we could add other math related routines.
|
||||
#
|
||||
# Revision 1.20 1997/06/29 21:19:17 curt
|
||||
# Working on scenery management system.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ GLmain.o: GLmain.c ../Aircraft/aircraft.h \
|
|||
../Aircraft/../Flight/LaRCsim/../flight.h \
|
||||
../Aircraft/../Controls/controls.h \
|
||||
../Aircraft/../Controls/../limits.h ../Scenery/scenery.h \
|
||||
../mat3/mat3.h ../Timer/fg_timer.h
|
||||
mesh2GL.o: mesh2GL.c ../Scenery/mesh.h ../mat3/mat3.h
|
||||
../Math/mat3.h ../Timer/fg_timer.h
|
||||
mesh2GL.o: mesh2GL.c ../Scenery/mesh.h ../Math/mat3.h
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include <GL/glut.h>
|
||||
|
||||
#include "../Scenery/mesh.h"
|
||||
#include "../mat3/mat3.h"
|
||||
#include "../Math/mat3.h"
|
||||
|
||||
|
||||
/* walk through mesh and make ogl calls */
|
||||
|
|
@ -105,9 +105,12 @@ GLint mesh2GL(struct mesh *m) {
|
|||
|
||||
|
||||
/* $Log$
|
||||
/* Revision 1.23 1997/07/03 00:51:14 curt
|
||||
/* Playing with terrain color.
|
||||
/* Revision 1.24 1997/07/05 20:43:35 curt
|
||||
/* renamed mat3 directory to Math so we could add other math related routines.
|
||||
/*
|
||||
* Revision 1.23 1997/07/03 00:51:14 curt
|
||||
* Playing with terrain color.
|
||||
*
|
||||
* Revision 1.22 1997/06/29 21:19:17 curt
|
||||
* Working on scenery management system.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ include make.inc
|
|||
|
||||
|
||||
SUBSUBDIRS = Flight/LaRCsim Flight/Slew
|
||||
SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
|
||||
SUBDIRS = Aircraft Controls Flight Math Scenery Timer
|
||||
MAIN = OpenGL
|
||||
|
||||
|
||||
|
|
@ -58,6 +58,9 @@ tar: clean
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.15 1997/07/05 20:43:27 curt
|
||||
# renamed mat3 directory to Math so we could add other math related routines.
|
||||
#
|
||||
# Revision 1.14 1997/06/29 21:19:16 curt
|
||||
# Working on scenery management system.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -27,20 +27,18 @@
|
|||
include make.inc
|
||||
|
||||
|
||||
SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn Scenery/ParseVRML
|
||||
SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
|
||||
SUBSUBDIRS = Flight/LaRCsim Flight/Slew
|
||||
SUBDIRS = Aircraft Controls Flight Math Scenery Timer
|
||||
MAIN = OpenGL
|
||||
|
||||
|
||||
all:
|
||||
$(MAKE) -C Flight/LaRCsim
|
||||
$(MAKE) -C Flight/Slew
|
||||
$(MAKE) -C Scenery/ParseScn
|
||||
$(MAKE) -C Scenery/ParseVRML
|
||||
$(MAKE) -C Aircraft
|
||||
$(MAKE) -C Controls
|
||||
$(MAKE) -C Flight
|
||||
$(MAKE) -C mat3
|
||||
$(MAKE) -C Math
|
||||
$(MAKE) -C Scenery
|
||||
$(MAKE) -C Timer
|
||||
$(MAKE) -C OpenGL
|
||||
|
|
@ -55,12 +53,10 @@ clean:
|
|||
-rm -f *~
|
||||
$(MAKE) -C Flight/LaRCsim clean
|
||||
$(MAKE) -C Flight/Slew clean
|
||||
$(MAKE) -C Scenery/ParseScn clean
|
||||
$(MAKE) -C Scenery/ParseVRML clean
|
||||
$(MAKE) -C Aircraft clean
|
||||
$(MAKE) -C Controls clean
|
||||
$(MAKE) -C Flight clean
|
||||
$(MAKE) -C mat3 clean
|
||||
$(MAKE) -C Math clean
|
||||
$(MAKE) -C Scenery clean
|
||||
$(MAKE) -C Timer clean
|
||||
$(MAKE) -C OpenGL clean
|
||||
|
|
@ -73,6 +69,9 @@ tar: clean
|
|||
|
||||
#---------------------------------------------------------------------------
|
||||
# $Log$
|
||||
# Revision 1.2 1997/07/05 20:43:27 curt
|
||||
# renamed mat3 directory to Math so we could add other math related routines.
|
||||
#
|
||||
# Revision 1.1 1997/07/04 00:17:21 curt
|
||||
# Initial revision.
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in a new issue