add a new name for the region-layering-editor-action that tells us we were started...

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

diff --git a/libs/pbd/cartesian.cc b/libs/pbd/cartesian.cc
index 196023f606a2636a9d5ec1e9685cbffbefba8374..d15f9a3c27365023f16d2cac36b9d59aa7c0da8d 100644 (file)
--- a/libs/pbd/cartesian.cc
+++ b/libs/pbd/cartesian.cc
@@ -24,19 +24,23 @@
 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 ;
+        
+        if (len == 0.0) {
+                len = 1.0;
+        }
 
-       x = cos (azi * atorad) * cos (ele * atorad);
-       y = sin (azi * atorad) * cos (ele * atorad);
-       z = sin (ele * atorad);
+       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)
+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*/
@@ -62,6 +66,8 @@ PBD::cart_to_azi_ele (double x, double y, double z, double& azimuth, double& ele
         } else {
                 elevation = 180.0 * (phi /  M_PI);
         }
+        
+        length = rho;
 #else
        /* converts cartesian coordinates to cylindrical in degrees*/