X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Foffset.hh;h=5ca7e0e68c637130c2c9fe7e42b8d90503b97d77;hb=bf898a6f737ebdd6a749ea0a14d1056a3566a10e;hp=cc22f84da6b43431123c6a93b0c9388bb29fd16b;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index cc22f84da6..5ca7e0e68c 100644
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -1,89 +1,115 @@
 /*
   offset.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
 #ifndef OFFSET_HH
 #define OFFSET_HH
 
+#include "axis.hh"
+#include "std-string.hh"
+#include "string.hh"
 #include "real.hh"
-#include "axes.hh"
-#include "arithmetic-operator.hh"
-
-struct Offset;
 
+class Offset;
 Offset complex_multiply (Offset, Offset);
 Offset complex_divide (Offset, Offset);
 Offset complex_exp (Offset);
 
-
-/** 2d vector
-    should change to Complex
+/*
+  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.
 */
-struct Offset {
+class Offset
+{
 public:
   Real coordinate_a_[NO_AXES];
-    
-  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) {
- (*this)[X_AXIS] += o[X_AXIS];
- (*this)[Y_AXIS] += o[Y_AXIS];
+
+  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_AXIS]  = - o[X_AXIS];
-    o[Y_AXIS]  = - o[Y_AXIS];
+
+    o[X_AXIS] = -o[X_AXIS];
+    o[Y_AXIS] = -o[Y_AXIS];
     return o;
   }
-  Offset& operator-= (Offset o) {
- (*this)[X_AXIS] -= o[X_AXIS];
- (*this)[Y_AXIS] -= o[Y_AXIS];
+
+  Offset &operator -= (Offset o)
+  {
+    (*this)[X_AXIS] -= o[X_AXIS];
+    (*this)[Y_AXIS] -= o[Y_AXIS];
 
     return *this;
   }
-  
-  Offset &scale (Offset o) {
- (*this)[X_AXIS] *= o[X_AXIS];
- (*this)[Y_AXIS] *= o[Y_AXIS];
+
+  Offset &scale (Offset o)
+  {
+    (*this)[X_AXIS] *= o[X_AXIS];
+    (*this)[Y_AXIS] *= o[Y_AXIS];
 
     return *this;
   }
-  Offset &operator *= (Real a) {
- (*this)[X_AXIS] *= a;
- (*this)[Y_AXIS] *= a;
 
+  Offset &operator /= (Real a)
+  {
+    (*this) *= 1/a;
     return *this;
   }
-      
-  Offset (Real ix , Real iy) {
-    coordinate_a_[X_AXIS] =ix;
-    coordinate_a_[Y_AXIS] =iy;    
+
+  Offset &operator *= (Real a)
+  {
+    (*this)[X_AXIS] *= a;
+    (*this)[Y_AXIS] *= a;
+
+    return *this;
   }
-  Offset () {
-    coordinate_a_[X_AXIS]=
-      coordinate_a_[Y_AXIS]=
-      0.0;
+
+  Offset (Real ix, Real iy)
+  {
+    coordinate_a_[X_AXIS] = ix;
+    coordinate_a_[Y_AXIS] = iy;
   }
 
-  String string () const;
+  Offset ()
+  {
+    coordinate_a_[X_AXIS] = coordinate_a_[Y_AXIS] = 0.0;
+  }
 
-  void mirror (Axis);
-  Real  arg () const;
-  Real length () const;
-  Offset operator *= (Offset z2) {
-    *this = complex_multiply (*this,z2);
+  Std_string to_string () const;
+
+  Offset &mirror (Axis a)
+  {
+    coordinate_a_[a] = -coordinate_a_[a];
     return *this;
   }
 
+  Real arg () const;
+  Real length () const;
+  bool is_sane () const;
+  Offset operator *= (Offset z2)
+  {
+    *this = complex_multiply (*this, z2);
+    return *this;
+  }
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Offset, +);
@@ -91,20 +117,39 @@ IMPLEMENT_ARITHMETIC_OPERATOR (Offset, -);
 IMPLEMENT_ARITHMETIC_OPERATOR (Offset, *);
 
 inline Offset
-operator* (Real o1, Offset o2)
+operator * (Real o1, Offset o2)
 {
   o2 *= o1;
   return o2;
 }
 
 inline Offset
-operator* (Offset o1, Real o2)
+operator / (Offset o1, Real a)
+{
+  o1 /= a;
+  return o1;
+}
+
+inline Offset
+operator * (Offset o1, Real o2)
 {
   o1 *= o2;
   return o1;
 }
 
+inline Offset
+mirror (Offset o, Axis a)
+{
+  o.mirror (a);
+  return o;
+}
 
-#endif // OFFSET_HH
+inline
+Real
+dot_product (Offset o1, Offset o2)
+{
+  return o1[X_AXIS] * o2[X_AXIS] + o1[Y_AXIS] * o2[Y_AXIS];
+}
 
+#endif /* OFFSET_HH */