X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbezier.hh;h=681c8c1816450f23bd4b075dbc8551a1ee0b848e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ea8c1ed00de0a24900d4f418af06ab93f5b470bf;hpb=95de6911a5cd1f90dfcd72ec798f089f6522f50f;p=lilypond.git diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index ea8c1ed00d..681c8c1816 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -1,77 +1,74 @@ /* - bezier.hh -- declare Bezier and Bezier_bow + This file is part of LilyPond, the GNU music typesetter. - (c) 1998 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen + + 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 . */ #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 get_other_coordinates (Axis a, Real x) const; + vector solve_point (Axis, Real coordinate) const; + Real minmax (Axis, Real, Real, Direction) const; + vector solve_derivative (Offset) const; + Interval extent (Axis) const; + Interval control_point_extent (Axis) const; - void set (Array 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 (); - bool calc_clipping (); - void calc_controls (); - void calc_default (Real h); - void calc_return (Real begin_alpha, Real end_alpha); - void calc_tangent_controls (); - bool check_fit_bo (); - Real check_fit_f (); - void set (Array points, int dir); - void transform (); - void transform_back (); - - Paper_def* paper_l_; - Curve encompass_; - int dir_; - Real alpha_; - Offset origin_; - Curve return_; + Offset control_[4]; }; +void scale (vector *array, Real xscale, Real yscale); +void rotate (vector *array, Real phi); +void translate (vector *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