fly/flightgear
1
0
Fork 0
Code Activity

Moved fg_random routines from Util/ to Math/

Browse source
This commit is contained in:
curt 1997-07-30 16:12:38 +00:00
parent 417048636f
commit 1406e5ba8e
7 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Main/GLmain.c
View file

@ -44,10 +44,10 @@
#include "../Aircraft/aircraft.h" #include "../Aircraft/aircraft.h"
#include "../Scenery/mesh.h" #include "../Scenery/mesh.h"
#include "../Scenery/scenery.h" #include "../Scenery/scenery.h"
#include "../Math/fg_random.h"
#include "../Math/mat3.h" #include "../Math/mat3.h"
#include "../Math/polar.h" #include "../Math/polar.h"
#include "../Timer/fg_timer.h" #include "../Timer/fg_timer.h"
#include "../Utils/fg_random.h"
#include "../Weather/weather.h" #include "../Weather/weather.h"
@ -621,9 +621,12 @@ int printf (const char *format, ...) {
/* $Log$ /* $Log$
/* Revision 1.39 1997/07/21 14:45:01 curt /* Revision 1.40 1997/07/30 16:12:42 curt
/* Minor tweaks. /* Moved fg_random routines from Util/ to Math/
/* /*
* Revision 1.39 1997/07/21 14:45:01 curt
* Minor tweaks.
*
* Revision 1.38 1997/07/19 23:04:47 curt * Revision 1.38 1997/07/19 23:04:47 curt
* Added an initial weather section. * Added an initial weather section.
* *

5
Main/Makefile
View file

@ -32,7 +32,7 @@ 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 ../Math/libMath.a \ ../Flight/Slew/libSlew.a ../Math/libMath.a \
../Scenery/libScenery.a \ ../Scenery/libScenery.a \
../Timer/libTimer.a ../Utils/libUtils.a ../Weather/libWeather.a ../Timer/libTimer.a ../Weather/libWeather.a
include ../make.inc include ../make.inc
@ -76,6 +76,9 @@ mesh2GL.o:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.26 1997/07/30 16:12:42 curt
# Moved fg_random routines from Util/ to Math/
#
# Revision 1.25 1997/07/20 02:19:11 curt # Revision 1.25 1997/07/20 02:19:11 curt
# First stab at a system to generate os2 makefiles automatically. # First stab at a system to generate os2 makefiles automatically.
# #

8
Main/depend
View file

@ -17,9 +17,9 @@ GLmain.o: GLmain.c ../constants.h ../Aircraft/aircraft.h \
../Aircraft/../Flight/LaRCsim/../flight.h \ ../Aircraft/../Flight/LaRCsim/../flight.h \
../Aircraft/../Controls/controls.h \ ../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../limits.h ../Scenery/mesh.h \ ../Aircraft/../Controls/../limits.h ../Scenery/mesh.h \
../Scenery/scenery.h ../Math/mat3.h ../Math/polar.h \ ../Scenery/scenery.h ../Math/fg_random.h ../Math/mat3.h \
../Math/../types.h ../Timer/fg_timer.h ../Utils/fg_random.h \ ../Math/polar.h ../Math/../types.h ../Timer/fg_timer.h \
../Weather/weather.h ../Weather/weather.h
mesh2GL.o: mesh2GL.c ../constants.h ../Scenery/mesh.h \ mesh2GL.o: mesh2GL.c ../constants.h ../Scenery/mesh.h \
../Scenery/scenery.h ../Math/mat3.h ../Math/polar.h \ ../Scenery/scenery.h ../Math/fg_random.h ../Math/mat3.h \
../Math/../types.h ../Utils/fg_random.h ../Math/polar.h ../Math/../types.h

17
Main/mesh2GL.c
View file

@ -33,9 +33,9 @@
#include "../constants.h" #include "../constants.h"
#include "../Scenery/mesh.h" #include "../Scenery/mesh.h"
#include "../Scenery/scenery.h" #include "../Scenery/scenery.h"
#include "../Math/fg_random.h"
#include "../Math/mat3.h" #include "../Math/mat3.h"
#include "../Math/polar.h" #include "../Math/polar.h"
#include "../Utils/fg_random.h"
/* The following routine is a real hack used for testing puposes only /* The following routine is a real hack used for testing puposes only
@ -177,14 +177,6 @@ GLint mesh2GL(struct mesh *m) {
/* this will go, it's only here for testing/debugging */ /* this will go, it's only here for testing/debugging */
/*
for ( i = m->originy; i < m->originy + (m->row_step * iend); i += 120 ) {
for ( j = m->originx; j < m->originx + (m->col_step * jend); j += 120) {
mesh_make_test_object(j, i);
}
}
*/
for ( i = 0; i < 200; i++ ) { for ( i = 0; i < 200; i++ ) {
randx = fg_random() * 3600.0; randx = fg_random() * 3600.0;
randy = fg_random() * 3600.0; randy = fg_random() * 3600.0;
@ -200,9 +192,12 @@ GLint mesh2GL(struct mesh *m) {
/* $Log$ /* $Log$
/* Revision 1.39 1997/07/21 21:20:48 curt /* Revision 1.40 1997/07/30 16:12:43 curt
/* Twiddled with random object placement. /* Moved fg_random routines from Util/ to Math/
/* /*
* Revision 1.39 1997/07/21 21:20:48 curt
* Twiddled with random object placement.
*
* Revision 1.38 1997/07/21 14:45:02 curt * Revision 1.38 1997/07/21 14:45:02 curt
* Minor tweaks. * Minor tweaks.
* *

5
Simulator/Makefile
View file

@ -28,7 +28,7 @@ include make.inc
SUBSUBDIRS = Flight/LaRCsim Flight/Slew SUBSUBDIRS = Flight/LaRCsim Flight/Slew
SUBDIRS = Aircraft Controls Flight Math Scenery Timer Utils Weather SUBDIRS = Aircraft Controls Flight Math Scenery Timer Weather
MAIN = OpenGL MAIN = OpenGL
@ -71,6 +71,9 @@ zip: clean
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.21 1997/07/30 16:12:38 curt
# Moved fg_random routines from Util/ to Math/
#
# Revision 1.20 1997/07/20 02:19:09 curt # Revision 1.20 1997/07/20 02:19:09 curt
# First stab at a system to generate os2 makefiles automatically. # First stab at a system to generate os2 makefiles automatically.
# #

2
Weather/depend
View file

@ -3,4 +3,4 @@ weather.o: weather.c weather.h ../Aircraft/aircraft.h \
../Aircraft/../Flight/LaRCsim/ls_interface.h \ ../Aircraft/../Flight/LaRCsim/ls_interface.h \
../Aircraft/../Flight/LaRCsim/../flight.h \ ../Aircraft/../Flight/LaRCsim/../flight.h \
../Aircraft/../Controls/controls.h \ ../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../limits.h ../Utils/fg_random.h ../Aircraft/../Controls/../limits.h ../Math/fg_random.h

9
Weather/weather.c
View file

@ -26,7 +26,7 @@
#include "weather.h" #include "weather.h"
#include "../Aircraft/aircraft.h" #include "../Aircraft/aircraft.h"
#include "../Utils/fg_random.h" #include "../Math/fg_random.h"
/* Initialize the weather modeling subsystem */ /* Initialize the weather modeling subsystem */
@ -49,7 +49,10 @@ void fgWeatherUpdate(double lon, double lat, double alt) {
} }
/* $Log$ /* $Log$
/* Revision 1.1 1997/07/19 23:03:57 curt /* Revision 1.2 1997/07/30 16:12:44 curt
/* Initial revision. /* Moved fg_random routines from Util/ to Math/
/* /*
* Revision 1.1 1997/07/19 23:03:57 curt
* Initial revision.
*
*/ */