X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbezier.hh;h=88ff5dbbbf6f2c9f69f6496a96383bfc7d996956;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=d69fc9819636bf8eb7e5582932e0d8ad29e0053b;hpb=472c212541034e95c30f5a1a6bc99d7f36f15b68;p=lilypond.git

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index d69fc98196..88ff5dbbbf 100644
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,75 +1,74 @@
 /*
-  bezier.hh -- declare Bezier and Bezier_bow
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1998 Jan Nieuwenhuizen <jan@digicash.com>
+  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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/>.
 */
 
 #ifndef BEZIER_HH
 #define BEZIER_HH
 
-#ifndef STANDALONE
-#include "lily-proto.hh"
-#endif
-
-#include "real.hh"
-#include "curve.hh"
+#include "interval.hh"
+#include "offset.hh"
+#include "polynomial.hh"
 
 /**
-  Simple bezier curve
- */
+   Simple bezier curve
+*/
 class Bezier
 {
 public:
-  Bezier ();
+  void assert_sanity () const;
+  void scale (Real x, Real y);
+  void reverse ();
+  void rotate (Real);
+  void translate (Offset);
+  void subdivide (Real, Bezier *, Bezier *) const;
+  Bezier extract (Real, Real) const;
 
-  /**
-  Calculate bezier curve into Offset (x,y) array.
-  */
-  void calc (int steps);
+  Real get_other_coordinate (Axis a, Real x) const;
+  vector<Real> get_other_coordinates (Axis a, Real x) const;
+  vector<Real> solve_point (Axis, Real coordinate) const;
+  Real minmax (Axis, Real, Real, Direction) const;
+  vector<Real> solve_derivative (Offset) const;
+  Interval extent (Axis) const;
+  Interval control_point_extent (Axis) const;
 
-  void set (Array<Offset> points);
+  Polynomial polynomial (Axis)const;
+  Offset curve_point (Real t) const;
+  Real slope_at_point (Real t) const;
+  Real curve_coordinate (Real t, Axis) const;
 
-  /**
-  Return y that goes with x by interpolation.
-  */
-  Real y (Real x);
+  static const int CONTROL_COUNT = 4;
 
-  Curve curve_;
-  Curve control_;
-};
+  /*
+    Bezier curves always have 4 control points. Making this into an
+    vector<> gives unnecessary overhead, and makes debugging a royal
+    pain.  */
 
-/**
-  Implement bow specific bezier curve
- */
-class Bezier_bow : public Bezier
-{
-public:
-  Bezier_bow (Paper_def* paper_l);
-
-  /**
-   Calculate bezier curve for bow from bow parameters.
-   */
-  void blow_fit ();
-  void calc ();
-  Real calc_f (Real height);
-  void calc_bezier ();
-  void calc_controls ();
-  void calc_default (Real h);
-  void calc_return (Real begin_alpha, Real end_alpha);
-  bool check_fit_bo ();
-  Real check_fit_f ();
-  void set (Array<Offset> points, int dir);
-  void transform ();
-  void transform_controls_back ();
-
-  Paper_def* paper_l_;
-  Curve encompass_;
-  int dir_;
-  Real alpha_;
-  Offset origin_;
-  Curve return_;
+  Offset control_[4];
 };
 
+void scale (vector<Offset> *array, Real xscale, Real yscale);
+void rotate (vector<Offset> *array, Real phi);
+void translate (vector<Offset> *array, Offset o);
+
+Bezier slur_shape (Real width, Real height_limit,
+                   Real height_proportion);
+Real slur_height (Real width, Real height_limit, Real height_proportion);
+void get_slur_indent_height (Real *indent, Real *height, Real width, Real h_inf, Real r_0);
 
 #endif // BEZIER_HH