generalize angleBetween

hurzl · hurzl · commit aaf9b25adcab · 2017-05-28T02:31:40.000+02:00
diff --git a/src/slicer/geometry.cpp b/src/slicer/geometry.cpp
@@ -220,50 +220,6 @@ void rotArcballTrans(Matrix4fT &matfT,  const Vector3d &axis, double angle)
   }
 }
 
-// // from V1 to V2
-// template< size_t M, typename T >
-// long double angleBetween(const vmml::vector< M, T > V1, const vmml::vector< M, T > V2 )
-// {
-//   long double dotproduct =  V1.dot(V2);
-//   long double length = V1.length() * V2.length();
-//   long double quot = dotproduct / length;
-//   if (quot > 1  && quot < 1.0001) quot = 1; // strange case where acos => NaN
-//   if (quot < -1 && quot > -1.0001) quot = -1;
-//   long double result = acosl( quot ); // 0 .. pi
-//   if (isleftof(T(), V2, V1))
-//       result = -result;
-//   return result;
-// }
-
-// from V1 to V2
-long double angleBetween(const Vector3d &V1, const Vector3d &V2)
-{
-  long double dotproduct =  V1.dot(V2);
-  long double length = sqrt(V1.squared_length() * V2.squared_length());
-  if (length==0) return 0;
-  long double quot = dotproduct / length;
-  if (quot > 1  && quot < 1.0001) quot = 1; // strange case where acos => NaN
-  if (quot < -1 && quot > -1.0001) quot = -1;
-  long double result = acosl( quot ); // 0 .. pi
-  if (isleftof(Vector3d(0,0,0), V2, V1))
-      result = -result;
-  return result;
-}
-
-long double angleBetween(const Vector2d &V1, const Vector2d &V2)
-{
-  long double dotproduct =  V1.dot(V2);
-  long double length = sqrt(V1.squared_length() * V2.squared_length());
-  if (length==0) return 0;
-  long double quot = dotproduct / length;
-  if (quot > 1  && quot < 1.0001) quot = 1;
-  if (quot < -1 && quot > -1.0001) quot = -1;
-  long double result = acosl( quot ); // 0 .. pi
-  if (isleftof(Vector2d(0,0), V2, V1))
-      result = -result;
-  return result;
-}
-
 // return A halfway rotated around center in direction of B
 Vector2d angle_bipartition(const Vector2d &center, const Vector2d &A, const Vector2d &B)
 {
@@ -272,7 +228,6 @@ Vector2d angle_bipartition(const Vector2d &center, const Vector2d &A, const Vect
 }
 
 
-
 // is B left of A wrt center?
 bool isleftof(const Vector2d &center, const Vector2d &A, const Vector2d &B)
 {
diff --git a/src/slicer/geometry.h b/src/slicer/geometry.h
@@ -44,17 +44,27 @@ void moveArcballTrans(Matrix4fT &matfT, const Vector3d &delta);
 void setArcballTrans(Matrix4fT &matfT, const Vector3d &trans);
 void rotArcballTrans(Matrix4fT &transform,  const Vector3d &axis, double angle);
 
-/* template< size_t M, typename T > */
-/* long double angleBetween(const vmml::vector< M, T > V1, const vmml::vector< M, T > V2 ); */
-long double angleBetween(const Vector3d &V1, const Vector3d &V2);
-long double angleBetween(const Vector2d &V1, const Vector2d &V2);
+bool isleftof(const Vector2d &center, const Vector2d &A, const Vector2d &B);
+bool isleftof(const Vector3d &center, const Vector3d &A, const Vector3d &B);
+
+template<size_t M>
+long double angleBetween(const vmml::vector<M, double> &V1, const vmml::vector<M, double> &V2) {
+  long double dotproduct =  V1.dot(V2);
+  long double length = sqrt(V1.squared_length() * V2.squared_length());
+  if (length==0) return 0;
+  long double quot = dotproduct / length;
+  if (quot > 1  && quot < 1.0001) quot = 1; // strange case where acos => NaN
+  if (quot < -1 && quot > -1.0001) quot = -1;
+  long double result = acosl( quot ); // 0 .. pi
+  if (isleftof(vmml::vector<M, double>(), V2, V1))
+      result = -result;
+  return result;
+}
+
 Vector2d angle_bipartition(const Vector2d &center, const Vector2d &A, const Vector2d &B);
 void center_perpendicular(const Vector2d &from, const Vector2d &to,
 			  Vector2d &p1, Vector2d &p2);
 
-bool isleftof(const Vector2d &center, const Vector2d &A, const Vector2d &B);
-bool isleftof(const Vector3d &center, const Vector3d &A, const Vector3d &B);
-
 Vector3d cross2d(const Vector2d &A, const Vector2d &B, double z=0);
 
 double point_segment_distance_Sq(const Vector2d &s1, const Vector2d &s2,
