Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Scenery / mesh.c

diff --git a/Scenery/mesh.c b/Scenery/mesh.c
index c2535a32e9fca85f789fff90dacd296b9e3250ee..77cae1e24b36374f134f8a2c8b0e6f4c2234e272 100644 (file)
--- a/Scenery/mesh.c
+++ b/Scenery/mesh.c
@@ -38,16 +38,16 @@
 
 #include <GL/glut.h>
 
-#include "../Include/constants.h"
-#include "../Include/types.h"
-#include "../Math/fg_geodesy.h"
-#include "../Math/fg_random.h"
-#include "../Math/mat3.h"
-#include "../Math/polar.h"
+#include <Include/constants.h>
+#include <Include/types.h>
+#include <Math/fg_geodesy.h>
+#include <Math/fg_random.h>
+#include <Math/mat3.h>
+#include <Math/polar.h>
 
-#include "mesh.h"
-#include "common.h"
-#include "scenery.h"
+#include <Scenery/mesh.h>
+#include <Scenery/common.h>
+#include <Scenery/scenery.h>
 
 
 /* Temporary hack until we get the scenery management system running */
@@ -72,7 +72,7 @@ void mesh_init(struct MESH *m) {
 
 
 /* return a pointer to a new mesh structure (no data array allocated yet) */
-struct MESH *(new_mesh)() {
+struct MESH *(new_mesh)( void ) {
     struct MESH *mesh_ptr;
 
     mesh_ptr = (struct MESH *)malloc(sizeof(struct MESH));
@@ -227,7 +227,7 @@ double mesh_altitude(double lon, double lat) {
        
        /* printf("  zA = %.2f  zB = %.2f\n", zA, zB); */
 
-       if ( dx > EPSILON ) {
+       if ( dx > FG_EPSILON ) {
            elev = dy * (zB - zA) / dx + zA;
        } else {
            elev = zA;
@@ -259,7 +259,7 @@ double mesh_altitude(double lon, double lat) {
        /* printf("  zA = %.2f  zB = %.2f\n", zA, zB );
        printf("  xB - xA = %.2f\n", eg.col_step * dy / eg.row_step); */
 
-       if ( dy > EPSILON ) {
+       if ( dy > FG_EPSILON ) {
            elev = dx * (zB - zA) / dy    + zA;
        } else {
            elev = zA;
@@ -396,10 +396,21 @@ GLint mesh_to_OpenGL(struct MESH *m) {
 
 
 /* $Log$
-/* Revision 1.24  1997/12/15 23:54:59  curt
-/* Add xgl wrappers for debugging.
-/* Generate terrain normals on the fly.
+/* Revision 1.27  1998/01/19 19:27:15  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.26  1998/01/19 18:40:36  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.25  1998/01/07 03:31:27  curt
+ * Miscellaneous tweaks.
+ *
+ * Revision 1.24  1997/12/15 23:54:59  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
  * Revision 1.23  1997/10/30 12:38:44  curt
  * Working on new scenery subsystem.
  *