From 4267b78a4d04be6e10c19063dadcde2504924a47 Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 8 Jul 1998 14:54:52 +0000 Subject: [PATCH] renamed *.[ch] to *.[ch]xx --- Tri2obj/{tri2obj.c => tri2obj.cxx} | 25 ++++++++++++++----------- Tri2obj/{tri2obj.h => tri2obj.hxx} | 7 +++++-- 2 files changed, 19 insertions(+), 13 deletions(-) rename Tri2obj/{tri2obj.c => tri2obj.cxx} (97%) rename Tri2obj/{tri2obj.h => tri2obj.hxx} (92%) diff --git a/Tri2obj/tri2obj.c b/Tri2obj/tri2obj.cxx similarity index 97% rename from Tri2obj/tri2obj.c rename to Tri2obj/tri2obj.cxx index f5a1a09f1..732da5c03 100644 --- a/Tri2obj/tri2obj.c +++ b/Tri2obj/tri2obj.cxx @@ -30,7 +30,7 @@ #include /* for stat() */ #include /* for stat() */ -#include "tri2obj.h" +#include "tri2obj.hxx" #include #include @@ -38,12 +38,12 @@ #include #include -#include +#include int nodecount, tricount; int normalcount = 0; -static fgCartesianPoint3d nodes[MAX_NODES]; +static fgPoint3d nodes[MAX_NODES]; static int tris[MAX_TRIS][3]; static double normals[MAX_NODES][3]; @@ -54,9 +54,9 @@ fgBUCKET north_index, south_index, east_index, west_index; /* convert a geodetic point lon(arcsec), lat(arcsec), elev(meter) to * a cartesian point */ -fgCartesianPoint3d geod_to_cart(double geod[3]) { - fgCartesianPoint3d cp; - fgPolarPoint3d pp; +fgPoint3d geod_to_cart(double geod[3]) { + fgPoint3d cp; + fgPoint3d pp; double gc_lon, gc_lat, sl_radius; /* printf("A geodetic point is (%.2f, %.2f, %.2f)\n", @@ -70,7 +70,7 @@ fgCartesianPoint3d geod_to_cart(double geod[3]) { pp.lon = gc_lon; pp.lat = gc_lat; - pp.radius = sl_radius+geod[2]; + pp.radius = sl_radius + geod[2]; cp = fgPolarToCart3d(pp); /* printf("A cart point is (%.8f, %.8f, %.8f)\n", cp.x, cp.y, cp.z); */ @@ -80,8 +80,8 @@ fgCartesianPoint3d geod_to_cart(double geod[3]) { /* given three points defining a triangle, calculate the normal */ -void calc_normal(fgCartesianPoint3d p1, fgCartesianPoint3d p2, - fgCartesianPoint3d p3, double normal[3]) +void calc_normal(fgPoint3d p1, fgPoint3d p2, + fgPoint3d p3, double normal[3]) { double v1[3], v2[3]; double temp; @@ -644,9 +644,12 @@ int main(int argc, char **argv) { /* $Log$ -/* Revision 1.17 1998/07/04 00:56:40 curt -/* typedef'd struct fgBUCKET. +/* Revision 1.1 1998/07/08 14:54:53 curt +/* renamed *.[ch] to *.[ch]xx /* + * Revision 1.17 1998/07/04 00:56:40 curt + * typedef'd struct fgBUCKET. + * * Revision 1.16 1998/05/23 15:20:41 curt * Output more digits after the decimal place. * diff --git a/Tri2obj/tri2obj.h b/Tri2obj/tri2obj.hxx similarity index 92% rename from Tri2obj/tri2obj.h rename to Tri2obj/tri2obj.hxx index e53ae1d0d..c7a54d159 100644 --- a/Tri2obj/tri2obj.h +++ b/Tri2obj/tri2obj.hxx @@ -44,9 +44,12 @@ void triload(char *basename, char *basepath); /* $Log$ -/* Revision 1.5 1998/03/03 16:01:00 curt -/* More c++ compile tweaks. +/* Revision 1.1 1998/07/08 14:54:54 curt +/* renamed *.[ch] to *.[ch]xx /* + * Revision 1.5 1998/03/03 16:01:00 curt + * More c++ compile tweaks. + * * Revision 1.4 1998/01/17 01:25:40 curt * Added support for shared normals. * -- 2.39.2