Moved fg_random routines from Util/ to Math/

diff --git a/Main/GLmain.c b/Main/GLmain.c
index eff6ef5723dce28db89e4e3dbad3d89d74abce56..9da31b1eadd9a417df7f5b478162ca299f106428 100644 (file)
--- a/Main/GLmain.c
+++ b/Main/GLmain.c
@@ -44,10 +44,10 @@
 #include "../Aircraft/aircraft.h"
 #include "../Scenery/mesh.h"
 #include "../Scenery/scenery.h"
+#include "../Math/fg_random.h"
 #include "../Math/mat3.h"
 #include "../Math/polar.h"
 #include "../Timer/fg_timer.h"
-#include "../Utils/fg_random.h"
 #include "../Weather/weather.h"
 
 
@@ -621,9 +621,12 @@ int printf (const char *format, ...) {
 
 
 /* $Log$
-/* Revision 1.39  1997/07/21 14:45:01  curt
-/* Minor tweaks.
+/* Revision 1.40  1997/07/30 16:12:42  curt
+/* 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
  * Added an initial weather section.
  *

diff --git a/Main/Makefile b/Main/Makefile
index a0bb6e9076efe2052a0e271e070f2a1e56ab21a6..4d072da7b5f2fc00832b38d4b2dbf4f082ed7bd4 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -32,7 +32,7 @@ AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
        ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
        ../Flight/Slew/libSlew.a ../Math/libMath.a \
        ../Scenery/libScenery.a \
-       ../Timer/libTimer.a ../Utils/libUtils.a ../Weather/libWeather.a
+       ../Timer/libTimer.a ../Weather/libWeather.a
 
 
 include ../make.inc
@@ -76,6 +76,9 @@ mesh2GL.o:
 
 #---------------------------------------------------------------------------
 # $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
 # First stab at a system to generate os2 makefiles automatically.
 #

diff --git a/Main/depend b/Main/depend
index 4f8139b3475d098c7aaa15b64e5ca201e58688de..a7b028cfdb1586bd7a1d08568d1165f58be1a3c9 100644 (file)
--- a/Main/depend
+++ b/Main/depend
@@ -17,9 +17,9 @@ GLmain.o: GLmain.c ../constants.h ../Aircraft/aircraft.h \
  ../Aircraft/../Flight/LaRCsim/../flight.h \
  ../Aircraft/../Controls/controls.h \
  ../Aircraft/../Controls/../limits.h ../Scenery/mesh.h \
- ../Scenery/scenery.h ../Math/mat3.h ../Math/polar.h \
- ../Math/../types.h ../Timer/fg_timer.h ../Utils/fg_random.h \
+ ../Scenery/scenery.h ../Math/fg_random.h ../Math/mat3.h \
+ ../Math/polar.h ../Math/../types.h ../Timer/fg_timer.h \
  ../Weather/weather.h
 mesh2GL.o: mesh2GL.c ../constants.h ../Scenery/mesh.h \
- ../Scenery/scenery.h ../Math/mat3.h ../Math/polar.h \
- ../Math/../types.h ../Utils/fg_random.h
+ ../Scenery/scenery.h ../Math/fg_random.h ../Math/mat3.h \
+ ../Math/polar.h ../Math/../types.h

diff --git a/Main/mesh2GL.c b/Main/mesh2GL.c
index a5d297e33d1f8f96f4d03591e3720699c9001a63..36f3bf1449d8df370585499f39f92f4df2533d17 100644 (file)
--- a/Main/mesh2GL.c
+++ b/Main/mesh2GL.c
@@ -33,9 +33,9 @@
 #include "../constants.h"
 #include "../Scenery/mesh.h"
 #include "../Scenery/scenery.h"
+#include "../Math/fg_random.h"
 #include "../Math/mat3.h"
 #include "../Math/polar.h"
-#include "../Utils/fg_random.h"
 
 
 /* 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 */
 
-    /*
-    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++ ) {
        randx = fg_random() * 3600.0;
        randy = fg_random() * 3600.0;
@@ -200,9 +192,12 @@ GLint mesh2GL(struct mesh *m) {
 
 
 /* $Log$
-/* Revision 1.39  1997/07/21 21:20:48  curt
-/* Twiddled with random object placement.
+/* Revision 1.40  1997/07/30 16:12:43  curt
+/* 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
  * Minor tweaks.
  *

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 676c7c1b44a83523dd66511d4b9ebbd2efb4ee70..0ab10174389f93fec6b10d082e1fa5e56f02baf5 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -28,7 +28,7 @@ include make.inc
 
 
 SUBSUBDIRS = Flight/LaRCsim Flight/Slew
-SUBDIRS = Aircraft Controls Flight Math Scenery Timer Utils Weather
+SUBDIRS = Aircraft Controls Flight Math Scenery Timer Weather
 MAIN = OpenGL
 
 
@@ -71,6 +71,9 @@ zip: clean
 
 #---------------------------------------------------------------------------
 # $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
 # First stab at a system to generate os2 makefiles automatically.
 #

diff --git a/Weather/depend b/Weather/depend
index de8ba383197faffd1960fb1a527dcfcf91450835..d94f0760f3603a5be8713365bedc07f74cad79dc 100644 (file)
--- a/Weather/depend
+++ b/Weather/depend
@@ -3,4 +3,4 @@ weather.o: weather.c weather.h ../Aircraft/aircraft.h \
  ../Aircraft/../Flight/LaRCsim/ls_interface.h \
  ../Aircraft/../Flight/LaRCsim/../flight.h \
  ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../limits.h ../Utils/fg_random.h
+ ../Aircraft/../Controls/../limits.h ../Math/fg_random.h

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