X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=78c3eeffc3aef9c479cbf13a51dcf7148c557ba1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=ba1fee0075bdc80fda3dad0ea32771d58bd5d0ac;hpb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index ba1fee0075..78c3eeffc3 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -1,31 +1,64 @@
 /*
-  offset.cc -- implement Offset
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <math.h>
 
-#include "string.hh"
 #include "offset.hh"
 
-
-String
-Offset::str () const
+#ifndef STANDALONE
+string
+Offset::to_string () const
 {
-  String s;
-  s = String("(") + coordinate_a_[X_AXIS] + ", " + coordinate_a_[Y_AXIS] + ")";
+  string s;
+  s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+      + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
+#endif
 
+/*
+  free bsd fix by John Galbraith
+*/
 
 Offset
 complex_multiply (Offset z1, Offset z2)
 {
   Offset z;
-  z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS];
-  z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] - z1[Y_AXIS] * z2[X_AXIS];
+  if (!isinf (z2[Y_AXIS]))
+    {
+      z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS] * z2[Y_AXIS];
+      z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS];
+    }
+  return z;
+}
+
+Offset
+complex_conjugate (Offset o)
+{
+  o[Y_AXIS] = -o[Y_AXIS];
+  return o;
+}
+
+Offset
+complex_divide (Offset z1, Offset z2)
+{
+  z2 = complex_conjugate (z2);
+  Offset z = complex_multiply (z1, z2);
+  z *= 1 / z2.length ();
   return z;
 }
 
@@ -34,28 +67,52 @@ complex_exp (Offset o)
 {
   Real s = sin (o[Y_AXIS]);
   Real c = cos (o[Y_AXIS]);
-  
+
   Real r = exp (o[X_AXIS]);
 
-  return Offset(r*c, r*s);
+  return Offset (r * c, r * s);
 }
 
 Real
 Offset::arg () const
 {
-  return atan2 (y (), x());
+  return atan2 (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }
 
+Real
+Offset::angle_degrees () const
+{
+  return arg () * 180 / M_PI;
+}
 /**
    euclidian vector length / complex modulus
- */
+*/
 Real
 Offset::length () const
 {
-  return sqrt (sqr (x()) + sqr (y()));
+  return sqrt (sqr (coordinate_a_[X_AXIS])
+               + sqr (coordinate_a_[Y_AXIS]));
+}
+
+bool
+Offset::is_sane () const
+{
+  return !isnan (coordinate_a_[X_AXIS])
+         && !isnan (coordinate_a_ [Y_AXIS])
+         && !isinf (coordinate_a_[X_AXIS])
+         && !isinf (coordinate_a_[Y_AXIS]);
 }
-void
-Offset::mirror (Axis a)
+
+Offset
+Offset::direction () const
+{
+  Offset d = *this;
+  d /= length ();
+  return d;
+}
+
+Offset
+Offset::swapped () const
 {
-  coordinate_a_[a] = - coordinate_a_[a];
+  return Offset (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }