X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline.hh;h=5dadbacaf736f6503cf7e444c4bc448324556ad1;hb=8bfcd362b5beed8b7fd6905a2732e282cd1d5477;hp=31747b1d431cdc7c03411e026d076f81aa1ec3e2;hpb=9f114c6402fb7cf9c9bf0ea97ee7c16291c48193;p=lilypond.git diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh index 31747b1d43..5dadbacaf7 100644 --- a/lily/include/skyline.hh +++ b/lily/include/skyline.hh @@ -9,8 +9,7 @@ #ifndef SKYLINE_HH #define SKYLINE_HH -#include - +#include "lily-proto.hh" #include "axis.hh" #include "box.hh" #include "interval.hh" @@ -18,6 +17,8 @@ #include "std-vector.hh" #include "smobs.hh" +#include + struct Building { Real end_; @@ -47,16 +48,19 @@ private: list internal_build_skyline (list*, Real, Axis, Direction); DECLARE_SIMPLE_SMOBS(Skyline); + public: Skyline (); Skyline (Skyline const &src); Skyline (Direction sky); Skyline (vector const &bldgs, Real horizon_padding, Axis a, Direction sky); Skyline (Box const &b, Real horizon_padding, Axis a, Direction sky); + vector to_points (Axis) const; void merge (Skyline const &); void insert (Box const &, Real horizon_padding, Axis); void print () const; + void print_points () const; void raise (Real); void shift (Real); Real distance (Skyline const &) const;