Now use libMath rather than having local copies of math routines.

[flightgear.git] / Tri2obj / tri2obj.c

diff --git a/Tri2obj/tri2obj.c b/Tri2obj/tri2obj.c
index ef71af3891be8fce7c230182d90f706ee0e1e009..4b12310de98b311cad46faecd695dd60050c53df 100644 (file)
--- a/Tri2obj/tri2obj.c
+++ b/Tri2obj/tri2obj.c
@@ -34,19 +34,19 @@
 
 #include <Include/fg_constants.h>
 #include <Include/fg_types.h>
+#include <Bucket/bucketutils.h>
+
 #include <Math/fg_geodesy.h>
 #include <Math/mat3.h>
 #include <Math/polar.h>
-#include <Scenery/bucketutils.h>
 
 
 int nodecount, tricount;
 int normalcount = 0;
-struct fgCartesianPoint nodes[MAX_NODES];
-int tris[MAX_TRIS][3];
-int new_tris[MAX_TRIS][3];
+static struct fgCartesianPoint nodes[MAX_NODES];
+static int tris[MAX_TRIS][3];
 
-float normals[MAX_NODES][3];
+static double normals[MAX_NODES][3];
 
 struct fgBUCKET my_index;
 struct fgBUCKET ne_index, nw_index, sw_index, se_index;
@@ -80,13 +80,13 @@ void calc_normal(struct fgCartesianPoint p1, struct fgCartesianPoint p2,
                 struct fgCartesianPoint p3, double normal[3])
 {
     double v1[3], v2[3];
-    float temp;
+    double temp;
 
     v1[0] = p2.x - p1.x; v1[1] = p2.y - p1.y; v1[2] = p2.z - p1.z;
     v2[0] = p3.x - p1.x; v2[1] = p3.y - p1.y; v2[2] = p3.z - p1.z;
 
     MAT3cross_product(normal, v1, v2);
-    MAT3_NORMALIZE_VEC(normal,temp);
+    MAT3_NORMALIZE_VEC(normal, temp);
 
 /*  printf("  Normal = %.2f %.2f %.2f\n", normal[0], normal[1], normal[2]); */
 }
@@ -363,8 +363,10 @@ void read_normals(FILE *fp) {
 
     while ( fgets(line, 250, fp) != NULL ) {
        if ( strncmp(line, "vn ", 3) == 0 ) {
-           sscanf(line, "vn %f %f %f\n", &normals[normalcount][0], 
-                  &normals[normalcount][1], &normals[normalcount][2]);
+           sscanf( line, "vn %lf %lf %lf\n", 
+                   &normals[normalcount][0], 
+                   &normals[normalcount][1], 
+                   &normals[normalcount][2] );
            /*
            printf("read_normals(%d) %.2f %.2f %.2f %s", normalcount, 
                   normals[normalcount][0], normals[normalcount][1], 
@@ -638,9 +640,24 @@ int main(int argc, char **argv) {
 
 
 /* $Log$
-/* Revision 1.9  1998/01/27 18:37:04  curt
-/* Lots of updates to get back in sync with changes made over in .../Src/
+/* Revision 1.14  1998/04/18 04:01:32  curt
+/* Now use libMath rather than having local copies of math routines.
 /*
+ * Revision 1.13  1998/04/14 02:26:11  curt
+ * Code reorganizations.  Added a Lib/ directory for more general libraries.
+ *
+ * Revision 1.12  1998/04/08 23:22:18  curt
+ * Adopted Gnu automake/autoconf system.
+ *
+ * Revision 1.11  1998/03/03 16:01:00  curt
+ * More c++ compile tweaks.
+ *
+ * Revision 1.10  1998/01/31 00:41:27  curt
+ * Made a few changes converting floats to doubles.
+ *
+ * Revision 1.9  1998/01/27 18:37:04  curt
+ * Lots of updates to get back in sync with changes made over in .../Src/
+ *
  * Revision 1.8  1998/01/17 01:25:39  curt
  * Added support for shared normals.
  *