From cc75d822ef822d07b649c1e8fd33db4e82da0769 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 8 Jul 1998 14:36:29 +0000
Subject: [PATCH] Changed name of EQUATORIAL_RADIUS_KM and RESQ_KM to "M" since
 they were in meters anyways.

Unified fgCartesianPoint3d and fgPolarPoint3d in a single struct called
fgPoint3d.
---
 fg_constants.h | 21 ++++++++++++++-------
 fg_types.h     | 28 +++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/fg_constants.h b/fg_constants.h
index f75af8753..e934b44f5 100644
--- a/fg_constants.h
+++ b/fg_constants.h
@@ -69,10 +69,10 @@
 
 /* Value of earth radius from [8] */
 #define EQUATORIAL_RADIUS_FT 20925650.    /* ft */
-#define EQUATORIAL_RADIUS_KM 6378138.12   /* meter */
+#define EQUATORIAL_RADIUS_M   6378138.12  /* meter */
 /* Radius squared */
 #define RESQ_FT 437882827922500.          /* ft */
-#define RESQ_KM 40680645877797.1344       /* meter */
+#define RESQ_M   40680645877797.1344      /* meter */
 
 /* Value of earth flattening parameter from ref [8] 
  *
@@ -145,12 +145,19 @@
 
 
 /* $Log$
-/* Revision 1.6  1998/07/03 14:36:11  curt
-/* Added conversion constants to fg_constants.h to assist with converting
-/*   between various world units and coordinate systems.
-/* Added gl vendor/renderer/version info to general structure.  Initialized
-/*   in fg_init.cxx
+/* Revision 1.7  1998/07/08 14:36:29  curt
+/* Changed name of EQUATORIAL_RADIUS_KM and RESQ_KM to "M" since they were
+/* in meters anyways.
 /*
+/* Unified fgCartesianPoint3d and fgPolarPoint3d in a single struct called
+/* fgPoint3d.
+/*
+ * Revision 1.6  1998/07/03 14:36:11  curt
+ * Added conversion constants to fg_constants.h to assist with converting
+ *   between various world units and coordinate systems.
+ * Added gl vendor/renderer/version info to general structure.  Initialized
+ *   in fg_init.cxx
+ *
  * Revision 1.5  1998/05/17 16:56:47  curt
  * Re-organized PI related constants.
  *
diff --git a/fg_types.h b/fg_types.h
index f57746a13..6b389a037 100644
--- a/fg_types.h
+++ b/fg_types.h
@@ -30,14 +30,25 @@
 
 /* A simple 3d cartesian point */
 typedef struct {
-    double x, y, z;
-} fgCartesianPoint3d;
+    union {
+	double x;
+	double lon;
+    };
+    union {
+	double y;
+	double lat;
+    };
+    union {
+	double z;
+	double radius;
+    };
+} fgPoint3d;
 
 
 /* A simple 3d polar point */
 typedef struct {
     double lon, lat, radius;
-} fgPolarPoint3d;
+} fgPolarPoint3dOld;
 
 
 /* A simple geodetic point */
@@ -50,9 +61,16 @@ typedef struct {
 
 
 /* $Log$
-/* Revision 1.3  1998/05/02 01:48:39  curt
-/* typedef-ified fgCartesianPoint3d
+/* Revision 1.4  1998/07/08 14:36:29  curt
+/* Changed name of EQUATORIAL_RADIUS_KM and RESQ_KM to "M" since they were
+/* in meters anyways.
 /*
+/* Unified fgCartesianPoint3d and fgPolarPoint3d in a single struct called
+/* fgPoint3d.
+/*
+ * Revision 1.3  1998/05/02 01:48:39  curt
+ * typedef-ified fgCartesianPoint3d
+ *
  * Revision 1.2  1998/04/08 23:35:33  curt
  * Tweaks to Gnu automake/autoconf system.
  *