release: 1.5.29

[lilypond.git] / lily / bezier.cc

diff --git a/lily/bezier.cc b/lily/bezier.cc
index 6b388e1d8ff47f7c0589b610e296df1f8864a390..6d22b1d6b68a441ba5e4356f9ade405209621bdf 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -3,10 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
+
+#include "config.h"
+#include "warn.hh"
+#include "libc-extension.hh"
 #include "bezier.hh"
 #include "polynomial.hh"
 
@@ -26,12 +30,13 @@ binomial_coefficient (Real over , int under)
 }
 
 void
-flip (Array<Offset>* arr_p, Axis a)
+scale (Array<Offset>* arr_p, Real x , Real y)
 {
-  // huh?
-  //  for (int i = c.size (); i--;)
   for (int i = 0; i < arr_p->size (); i++)
-    (*arr_p)[i][a] = - (*arr_p)[i][a];
+    {
+      (*arr_p)[i][X_AXIS] = x* (*arr_p)[i][X_AXIS];
+      (*arr_p)[i][Y_AXIS] = y* (*arr_p)[i][Y_AXIS];
+    }
 }
 
 void
@@ -53,19 +58,20 @@ translate (Array<Offset>* arr_p, Offset o)
 
   Formula of the bezier 3-spline
 
-  sum_{j=0}^3  (3 over j) z_j (1-t)^(3-j)  t^j
+  sum_{j=0}^3 (3 over j) z_j (1-t)^ (3-j)  t^j
  */
 
-Bezier::Bezier ()
-  : control_ (CONTROL_COUNT)
-{
-}
-
 Real
 Bezier::get_other_coordinate (Axis a,  Real x) const
 {
   Axis other = Axis ((a +1)%NO_AXES);
   Array<Real> ts = solve_point (a, x);
+
+  if (ts.size () == 0)
+    {
+      programming_error ("No solution found for Bezier intersection.");
+      return 0.0;
+    }
   
   Offset c = curve_point (ts[0]);
   assert (fabs (c[a] - x) < 1e-8);
@@ -78,7 +84,7 @@ Offset
 Bezier::curve_point (Real t)const
 {
   Real tj = 1;
-  Real one_min_tj =  (1-t)*(1-t)*(1-t);
+  Real one_min_tj = (1-t)* (1-t)* (1-t);
 
   Offset o;
   for (int j=0 ; j < 4; j++)
@@ -91,9 +97,10 @@ Bezier::curve_point (Real t)const
        one_min_tj /= (1-t);
     }
 
+#ifdef PARANOID
   assert (fabs (o[X_AXIS] - polynomial (X_AXIS).eval (t))< 1e-8);
   assert (fabs (o[Y_AXIS] - polynomial (Y_AXIS).eval (t))< 1e-8);
-
+#endif
   
   return o;
 }
@@ -108,7 +115,7 @@ Bezier::polynomial (Axis a)const
       p += control_[j][a]
        * Polynomial::power (j , Polynomial (0,1))*
        Polynomial::power (3 - j, Polynomial (1,-1))*
-       binomial_coefficient(3, j);
+       binomial_coefficient (3, j);
     }
 
   return p;
@@ -149,13 +156,16 @@ Bezier::solve_derivative (Offset deriv)const
 Array<Real> 
 Bezier::solve_point (Axis ax, Real coordinate) const
 {
-  Polynomial p(polynomial (ax));
+  Polynomial p (polynomial (ax));
   p.coefs_[0] -= coordinate;
   
   Array<Real> sol (p.solve ());
   return filter_solutions (sol);
 }
 
+/**
+   Compute the bounding box dimensions in direction of A.
+ */
 Interval
 Bezier::extent (Axis a)const
 {
@@ -174,22 +184,33 @@ Bezier::extent (Axis a)const
   return iv;
 }
 
+/**
+   Flip around axis A
+ */
+
 void
-Bezier::flip (Axis a)
+Bezier::scale (Real x, Real y)
 {
-  ::flip (&control_, a);
+  for (int i = CONTROL_COUNT; i--;)
+    {
+      control_[i][X_AXIS] = x * control_[i][X_AXIS];
+      control_[i][Y_AXIS] = y * control_[i][Y_AXIS];
+    }
 }
 
 void
 Bezier::rotate (Real phi)
 {
-  ::rotate (&control_, phi);
+  Offset rot (complex_exp (Offset (0, phi)));
+  for (int i = 0; i < CONTROL_COUNT; i++)
+    control_[i] = complex_multiply (rot, control_[i]);
 }
 
 void
 Bezier::translate (Offset o)
 {
-  ::translate (&control_, o);
+  for (int i = 0; i < CONTROL_COUNT; i++)
+    control_[i] += o;
 }
 
 void