clearer catastrophic error message, rather than assert()

[ardour.git] / libs / pbd / cartesian.cc

diff --git a/libs/pbd/cartesian.cc b/libs/pbd/cartesian.cc
index 196023f606a2636a9d5ec1e9685cbffbefba8374..3288f68e9859b72ad4dfe2a4650efc37318c927d 100644 (file)
--- a/libs/pbd/cartesian.cc
+++ b/libs/pbd/cartesian.cc
@@ -16,7 +16,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <iostream>
 #include <math.h>
 
 #include "pbd/cartesian.h"
@@ -24,27 +23,30 @@
 using namespace std;
 
 void
-PBD::azi_ele_to_cart (double azi, double ele, double& x, double& y, double& z)
+PBD::spherical_to_cartesian (double azi, double ele, double len, double& x, double& y, double& z)
 {
        /* convert from cylindrical coordinates in degrees to cartesian */
 
        static const double atorad = 2.0 * M_PI / 360.0 ;
 
-       x = cos (azi * atorad) * cos (ele * atorad);
-       y = sin (azi * atorad) * cos (ele * atorad);
-       z = sin (ele * atorad);
+        if (len == 0.0) {
+                len = 1.0;
+        }
+
+       x = len * cos (azi * atorad) * cos (ele * atorad);
+       y = len * sin (azi * atorad) * cos (ele * atorad);
+       z = len * sin (ele * atorad);
 }
 
-void 
-PBD::cart_to_azi_ele (double x, double y, double z, double& azimuth, double& elevation)
+void
+PBD::cartesian_to_spherical (double x, double y, double z, double& azimuth, double& elevation, double& length)
 {
-#if 1
        /* converts cartesian coordinates to cylindrical in degrees*/
 
         double rho, theta, phi;
 
         rho = sqrt (x*x + y*y + z*z);
-        phi = acos (1.0/rho);
+        //phi = acos (1.0 / rho);
         theta = atan2 (y, x);
 
         /* XXX for now, clamp phi to zero */
@@ -62,46 +64,7 @@ PBD::cart_to_azi_ele (double x, double y, double z, double& azimuth, double& ele
         } else {
                 elevation = 180.0 * (phi /  M_PI);
         }
-#else
-       /* converts cartesian coordinates to cylindrical in degrees*/
 
-       const double atorad = 2.0 * M_PI / 360.0;
-       double atan_y_per_x, atan_x_pl_y_per_z;
-       double distance;
-
-       if (x == 0.0) {
-               atan_y_per_x = M_PI / 2;
-       } else {
-               atan_y_per_x = atan2 (y,x);
-       }
-
-       if (y < 0.0) {
-               /* below x-axis: atan2 returns 0 .. -PI (negative) so convert to degrees and ADD to 180 */
-               azimuth = 180.0 + (atan_y_per_x / (M_PI/180.0) + 180.0);
-       } else {
-               /* above x-axis: atan2 returns 0 .. +PI so convert to degrees */
-               azimuth = atan_y_per_x / atorad;
-       }
-
-       distance = sqrt (x*x + y*y);
-
-       if (z == 0.0) {
-               atan_x_pl_y_per_z = 0.0;
-       } else {
-               atan_x_pl_y_per_z = atan2 (z,distance);
-       }
-
-       if (distance == 0.0) {
-               if (z < 0.0) {
-                       atan_x_pl_y_per_z = -M_PI/2.0;
-               } else if (z > 0.0) {
-                       atan_x_pl_y_per_z = M_PI/2.0;
-               }
-       }
-
-       elevation = atan_x_pl_y_per_z / atorad;
-
-       // distance = sqrtf (x*x + y*y + z*z);
-#endif
+        length = rho;
 }