X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Foffset.hh;h=98f400ed9d1b257953b1337edc7042ae316a4978;hb=c496b95fc4c1d0bda1098945f53c513e56060881;hp=03685c1a1a2e19e6582d8dea80f7a8b5b4127a24;hpb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;p=lilypond.git

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 03685c1a1a..98f400ed9d 100644
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,120 +1,145 @@
 /*
   offset.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2005 Han-Wen Nienhuys
 */
 
 #ifndef OFFSET_HH
 #define OFFSET_HH
 
-#include "real.hh"
 #include "axes.hh"
+#include "string.hh"
+
+Offset complex_multiply (Offset, Offset);
+Offset complex_divide (Offset, Offset);
+Offset complex_exp (Offset);
+
+
+/*
+
+This is a mixture a 2D vector. Sometimes it can
+also be convenient to think of 2D vectors as complex numbers
+(ie. x + i y). The naming of some methods reflects that.
 
-/** 2d vector
-    should change to Complex
 */
-struct Offset {
+class Offset 
+{
 public:
-
   Real coordinate_a_[NO_AXES];
     
-  Real &y() { return coordinate_a_[Y_AXIS]; }
-  Real &x() { return coordinate_a_[X_AXIS]; }
-  Real y() const { return coordinate_a_[Y_AXIS]; }
-  Real x() const { return coordinate_a_[X_AXIS]; }
-    
-  Real &operator[](Axis i) {
+  Real &operator[] (Axis i) 
+  {
     return coordinate_a_[i];
   }
-  Real operator[](Axis i) const{
+
+  Real operator[] (Axis i) const
+  {
     return coordinate_a_[i];
   }
     
-  Offset& operator+=(Offset o) {
-    x()+=o.x ();
-    y()+=o.y ();
+  Offset& operator+= (Offset o) 
+  {
+    (*this)[X_AXIS] += o[X_AXIS];
+    (*this)[Y_AXIS] += o[Y_AXIS];
     return *this;
   }
-  Offset operator - () const {
+
+  Offset operator - () const 
+  {
     Offset o = *this;
-    o.x () = - o.x ();
-    o.y () = - o.y ();
-    return *this;
+    
+    o[X_AXIS]  = - o[X_AXIS];
+    o[Y_AXIS]  = - o[Y_AXIS];
+    return o;
   }
-  Offset& operator-=(Offset o) {
-    x()-=o.x ();
-    y()-=o.y ();
+
+  Offset& operator-= (Offset o) 
+  {
+    (*this)[X_AXIS] -= o[X_AXIS];
+    (*this)[Y_AXIS] -= o[Y_AXIS];
+
     return *this;
   }
   
-  Offset &scale (Offset o) {
-    x()*=o.x ();
-    y()*=o.y ();
+  Offset &scale (Offset o) 
+  {
+    (*this)[X_AXIS] *= o[X_AXIS];
+    (*this)[Y_AXIS] *= o[Y_AXIS];
+
     return *this;
   }
-  Offset &operator *=(Real a) {
-    y() *= a;
-    x() *= a;
+
+  Offset &operator *= (Real a) 
+  {
+    (*this)[X_AXIS] *= a;
+    (*this)[Y_AXIS] *= a;
+
     return *this;
   }
       
-  Offset (Real ix , Real iy) {
-    x()=ix;
-    y()=iy;
+  Offset (Real ix , Real iy) 
+  {
+    coordinate_a_[X_AXIS] =ix;
+    coordinate_a_[Y_AXIS] =iy;    
   }
-  Offset() {
-    x()=0.0;
-    y()=0.0;
+
+  Offset () 
+  {
+    coordinate_a_[X_AXIS] = coordinate_a_[Y_AXIS]= 0.0;
   }
-#ifndef STANDALONE
-  String str () const;
-#endif
 
-  void mirror (Axis);
-  Real  arg () const;
+  String to_string () const;
+
+  Offset& mirror (Axis a)
+  {
+    coordinate_a_[a] = - coordinate_a_[a];
+    return *this;
+  }
+  
+  Real arg () const;
   Real length () const;
-};
 
-Offset complex_multiply (Offset, Offset);
-Offset complex_exp (Offset);
+  Offset operator *= (Offset z2) 
+  {
+    *this = complex_multiply (*this, z2);
+    return *this;
+  }
 
+};
 
-inline Offset
-operator* (Offset z1, Offset z2)
-{
-  return complex_multiply (z1,z2);
-}
+IMPLEMENT_ARITHMETIC_OPERATOR (Offset, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Offset, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Offset, *);
 
 inline Offset
-operator+ (Offset o1, Offset const& o2)
+operator* (Real o1, Offset o2)
 {
-  o1 += o2;
-  return o1;
+  o2 *= o1;
+  return o2;
 }
 
 inline Offset
-operator- (Offset o1, Offset const& o2)
+operator* (Offset o1, Real o2)
 {
-  o1 -= o2;
+  o1 *= o2;
   return o1;
 }
 
-
 inline Offset
-operator* (Real o1, Offset o2)
+mirror (Offset o, Axis a)
 {
-  o2 *= o1;
-  return o2;
+  o.mirror (a);
+  return o;
 }
 
-inline Offset
-operator* (Offset o1, Real o2)
+inline
+Real
+dot_product  (Offset o1, Offset o2)
 {
-  o1 *= o2;
-  return o1;
+  return o1[X_AXIS] * o2[X_AXIS] + o1[Y_AXIS] * o2[Y_AXIS];
 }
 
 
-#endif // OFFSET_HH
+#endif /* OFFSET_HH */