From 4b4aef9d3a0e92488b259bdcda8d38d100217903 Mon Sep 17 00:00:00 2001 From: curt Date: Sat, 2 May 1998 01:54:24 +0000 Subject: [PATCH] Converting to polar3d.h routines. --- AssemTris/Makefile.in | 4 ++-- DemRaw2ascii/Makefile.in | 4 ++-- FixNode/Makefile.in | 4 ++-- FixObj/Makefile.in | 4 ++-- SplitTris/Makefile.in | 4 ++-- SplitTris/splittris.c | 29 ++++++++++++++++++----------- Tri2obj/Makefile.in | 4 ++-- Tri2obj/tri2obj.c | 29 ++++++++++++++++++----------- 8 files changed, 48 insertions(+), 34 deletions(-) diff --git a/AssemTris/Makefile.in b/AssemTris/Makefile.in index e7bddf4dd..a66482ce8 100644 --- a/AssemTris/Makefile.in +++ b/AssemTris/Makefile.in @@ -344,8 +344,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ -# Revision 1.8 1998/04/28 01:24:01 curt -# Updates ... +# Revision 1.9 1998/05/02 01:54:24 curt +# Converting to polar3d.h routines. # # Revision 1.2 1998/04/14 02:25:59 curt # Code reorganizations. Added a Lib/ directory for more general libraries. diff --git a/DemRaw2ascii/Makefile.in b/DemRaw2ascii/Makefile.in index b0f93ab8b..c8a21b660 100644 --- a/DemRaw2ascii/Makefile.in +++ b/DemRaw2ascii/Makefile.in @@ -343,8 +343,8 @@ INCLUDES += #--------------------------------------------------------------------------- # $Log$ -# Revision 1.6 1998/04/28 01:24:08 curt -# Updates ... +# Revision 1.7 1998/05/02 01:54:34 curt +# Converting to polar3d.h routines. # # Revision 1.2 1998/04/24 00:44:04 curt # Added zlib support. diff --git a/FixNode/Makefile.in b/FixNode/Makefile.in index e36cfe0d8..9b90de5e2 100644 --- a/FixNode/Makefile.in +++ b/FixNode/Makefile.in @@ -371,8 +371,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ -# Revision 1.8 1998/04/28 01:24:10 curt -# Updates ... +# Revision 1.9 1998/05/02 01:54:35 curt +# Converting to polar3d.h routines. # # Revision 1.3 1998/04/18 04:02:54 curt # Added zlib support in placed and other misc. tweaks. diff --git a/FixObj/Makefile.in b/FixObj/Makefile.in index a1b855567..e86c771d5 100644 --- a/FixObj/Makefile.in +++ b/FixObj/Makefile.in @@ -347,8 +347,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ -# Revision 1.8 1998/04/28 01:24:12 curt -# Updates ... +# Revision 1.9 1998/05/02 01:54:36 curt +# Converting to polar3d.h routines. # # Revision 1.4 1998/04/24 00:44:05 curt # Added zlib support. diff --git a/SplitTris/Makefile.in b/SplitTris/Makefile.in index da4c6b09c..fdd82b9da 100644 --- a/SplitTris/Makefile.in +++ b/SplitTris/Makefile.in @@ -349,8 +349,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ -# Revision 1.8 1998/04/28 01:24:14 curt -# Updates ... +# Revision 1.9 1998/05/02 01:54:36 curt +# Converting to polar3d.h routines. # # Revision 1.4 1998/04/24 00:44:06 curt # Added zlib support. diff --git a/SplitTris/splittris.c b/SplitTris/splittris.c index c855c7525..c40000794 100644 --- a/SplitTris/splittris.c +++ b/SplitTris/splittris.c @@ -40,7 +40,7 @@ #include #include -#include +#include int nodecount, tricount; double xmin, xmax, ymin, ymax; @@ -49,15 +49,16 @@ static double nodes_orig[MAX_NODES][3]; static int tris[MAX_TRIS][3]; /* static int new_tris[MAX_TRIS][3]; */ -static struct fgCartesianPoint nodes_cart[MAX_NODES]; +static fgCartesianPoint3d nodes_cart[MAX_NODES]; struct fgBUCKET ne_index, nw_index, sw_index, se_index; struct fgBUCKET north_index, south_index, east_index, west_index; /* convert a geodetic point lon(arcsec), lat(arcsec), elev(meter) to * a cartesian point */ -struct fgCartesianPoint geod_to_cart(double geod[3]) { - struct fgCartesianPoint p; +fgCartesianPoint3d geod_to_cart(double geod[3]) { + fgCartesianPoint3d cp; + fgPolarPoint3d pp; double gc_lon, gc_lat, sl_radius; /* printf("A geodetic point is (%.2f, %.2f, %.2f)\n", @@ -69,17 +70,20 @@ struct fgCartesianPoint geod_to_cart(double geod[3]) { /* printf("A geocentric point is (%.2f, %.2f, %.2f)\n", gc_lon, gc_lat, sl_radius+geod[2]); */ - p = fgPolarToCart(gc_lon, gc_lat, sl_radius+geod[2]); + pp.lon = gc_lon; + pp.lat = gc_lat; + pp.radius = sl_radius+geod[2]; + cp = fgPolarToCart3d(pp); - /* printf("A cart point is (%.8f, %.8f, %.8f)\n", p.x, p.y, p.z); */ + /* printf("A cart point is (%.8f, %.8f, %.8f)\n", cp.x, cp.y, cp.z); */ - return(p); + return(cp); } /* given three points defining a triangle, calculate the normal */ -void calc_normal(struct fgCartesianPoint p1, struct fgCartesianPoint p2, - struct fgCartesianPoint p3, double normal[3]) +void calc_normal(fgCartesianPoint3d p1, fgCartesianPoint3d p2, + fgCartesianPoint3d p3, double normal[3]) { double v1[3], v2[3]; double temp; @@ -612,9 +616,12 @@ int main(int argc, char **argv) { /* $Log$ -/* Revision 1.9 1998/04/18 04:01:20 curt -/* Now use libMath rather than having local copies of math routines. +/* Revision 1.10 1998/05/02 01:54:37 curt +/* Converting to polar3d.h routines. /* + * Revision 1.9 1998/04/18 04:01:20 curt + * Now use libMath rather than having local copies of math routines. + * * Revision 1.8 1998/04/14 02:26:08 curt * Code reorganizations. Added a Lib/ directory for more general libraries. * diff --git a/Tri2obj/Makefile.in b/Tri2obj/Makefile.in index a11019a07..221a2f247 100644 --- a/Tri2obj/Makefile.in +++ b/Tri2obj/Makefile.in @@ -349,8 +349,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ -# Revision 1.8 1998/04/28 01:24:16 curt -# Updates ... +# Revision 1.9 1998/05/02 01:54:38 curt +# Converting to polar3d.h routines. # # Revision 1.4 1998/04/24 00:44:07 curt # Added zlib support. diff --git a/Tri2obj/tri2obj.c b/Tri2obj/tri2obj.c index 4b12310de..5c6390afe 100644 --- a/Tri2obj/tri2obj.c +++ b/Tri2obj/tri2obj.c @@ -38,12 +38,12 @@ #include #include -#include +#include int nodecount, tricount; int normalcount = 0; -static struct fgCartesianPoint nodes[MAX_NODES]; +static fgCartesianPoint3d nodes[MAX_NODES]; static int tris[MAX_TRIS][3]; static double normals[MAX_NODES][3]; @@ -54,8 +54,9 @@ struct fgBUCKET north_index, south_index, east_index, west_index; /* convert a geodetic point lon(arcsec), lat(arcsec), elev(meter) to * a cartesian point */ -struct fgCartesianPoint geod_to_cart(double geod[3]) { - struct fgCartesianPoint p; +fgCartesianPoint3d geod_to_cart(double geod[3]) { + fgCartesianPoint3d cp; + fgPolarPoint3d pp; double gc_lon, gc_lat, sl_radius; /* printf("A geodetic point is (%.2f, %.2f, %.2f)\n", @@ -67,17 +68,20 @@ struct fgCartesianPoint geod_to_cart(double geod[3]) { /* printf("A geocentric point is (%.2f, %.2f, %.2f)\n", gc_lon, gc_lat, sl_radius+geod[2]); */ - p = fgPolarToCart(gc_lon, gc_lat, sl_radius+geod[2]); + pp.lon = gc_lon; + pp.lat = gc_lat; + pp.radius = sl_radius+geod[2]; + cp = fgPolarToCart3d(pp); - /* printf("A cart point is (%.8f, %.8f, %.8f)\n", p.x, p.y, p.z); */ + /* printf("A cart point is (%.8f, %.8f, %.8f)\n", cp.x, cp.y, cp.z); */ - return(p); + return(cp); } /* given three points defining a triangle, calculate the normal */ -void calc_normal(struct fgCartesianPoint p1, struct fgCartesianPoint p2, - struct fgCartesianPoint p3, double normal[3]) +void calc_normal(fgCartesianPoint3d p1, fgCartesianPoint3d p2, + fgCartesianPoint3d p3, double normal[3]) { double v1[3], v2[3]; double temp; @@ -640,9 +644,12 @@ int main(int argc, char **argv) { /* $Log$ -/* Revision 1.14 1998/04/18 04:01:32 curt -/* Now use libMath rather than having local copies of math routines. +/* Revision 1.15 1998/05/02 01:54:39 curt +/* Converting to polar3d.h routines. /* + * 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. * -- 2.39.2