switch cartesian/spherical function names and make them use length. still a tweak needed here

git-svn-id: svn://localhost/ardour2/branches/3.0@8952 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 15 insertions, 9 deletions

diff --git a/libs/pbd/cartesian.cc b/libs/pbd/cartesian.cc
index 196023f606..d15f9a3c27 100644
--- 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*/
 
diff --git a/libs/pbd/pbd/cartesian.h b/libs/pbd/pbd/cartesian.h
index afa4579465..ffc91c2fd6 100644
--- a/libs/pbd/pbd/cartesian.h
+++ b/libs/pbd/pbd/cartesian.h
@@ -24,8 +24,8 @@
 
 namespace PBD {
 
-void azi_ele_to_cart (double azi, double ele, double& x, double& y, double& z);
-void cart_to_azi_ele (double x, double y, double z, double& azi, double& ele);
+void spherical_to_cartesian (double azi, double ele, double len, double& x, double& y, double& z);
+void cartesian_to_spherical (double x, double y, double z, double& azi, double& ele, double& len);
         
 struct AngularVector;
 
@@ -91,12 +91,12 @@ struct AngularVector {
 	}
 
 	void cartesian (CartesianVector& c) const {
-		azi_ele_to_cart (azi, ele, c.x, c.y, c.z);
+		spherical_to_cartesian (azi, ele, length, c.x, c.y, c.z);
 	}
 };
 
 inline void CartesianVector::angular (AngularVector& a) const {
-	cart_to_azi_ele (x, y, z, a.azi, a.ele);
+	cartesian_to_spherical (x, y, z, a.azi, a.ele, a.length);
 }
 
 }