X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline.hh;h=464bd580049ffc0816aed599a2b3595f2a918a99;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=be426185f0e15e0fa33e9808724601585b011c19;hpb=c4fd8507a0fe7b527fab21a772ba78194d030624;p=lilypond.git

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index be426185f0..bdb8be7813 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -1,16 +1,26 @@
 /*
-  skyline.hh -- declare Skyline class.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2014 Joe Neeman <joeneeman@gmail.com>
 
-  (c) 2006 Joe Neeman <joeneeman@gmail.com>
+  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 SKYLINE_HH
 #define SKYLINE_HH
 
-#include <list>
-
+#include "lily-proto.hh"
 #include "axis.hh"
 #include "box.hh"
 #include "interval.hh"
@@ -18,22 +28,25 @@
 #include "std-vector.hh"
 #include "smobs.hh"
 
+#include <list>
+
 struct Building
 {
-  Interval iv_;
-  Drul_array<Real> height_;
-
-  Real zero_height_;
+  Real start_;
+  Real end_;
+  Real y_intercept_;
   Real slope_;
 
-  void precompute (Real max_slope);
-  Building (Real start, Real start_height, Real end_height, Real end, Real max_slope);
+  void precompute (Real start, Real start_height, Real end_height, Real end);
+  Building (Real start, Real start_height, Real end_height, Real end);
+  Building (Box const &b, Axis a, Direction d);
   void print () const;
 
   Real height (Real x) const;
-  Real intersection (Building const &other) const;
-  void leading_part (Real chop, Real h);
-  bool obstructs (Building const &other) const;
+  Real intersection_x (Building const &other) const;
+  void leading_part (Real chop);
+  bool conceals (Building const &other, Real x) const;
+  Real shift_to_intersect (Real x, Real y) const;
 };
 
 class Skyline
@@ -41,31 +54,57 @@ class Skyline
 private:
   list<Building> buildings_;
   Direction sky_;
-  Real max_slope_;		// fixme: not part of skyline per se?
-  
-  void internal_merge_skyline (list<Building>*, list<Building>*,
-			       list<Building> *const result);
-  void internal_build_skyline (list<Building>*,
-			       list<Building> *const result);
-  bool is_legal_skyline () const;
-
-  DECLARE_SIMPLE_SMOBS(Skyline);
+
+  void internal_merge_skyline (list<Building> *, list<Building> *,
+                               list<Building> *result) const;
+  list<Building> internal_build_skyline (list<Building> *) const;
+  Real internal_distance (Skyline const &, Real horizon_padding, Real *touch_point) const;
+  Real internal_distance (Skyline const &, Real *touch_point) const;
+  void normalize ();
+
+  DECLARE_SIMPLE_SMOBS (Skyline);
+
 public:
   Skyline ();
-  Skyline (Skyline const &src);
   Skyline (Direction sky);
   Skyline (vector<Box> const &bldgs, Axis a, Direction sky);
-  Skyline (vector<Offset> const &points, Real max_slope, Direction sky);
-  vector<Offset> to_points () const;
+  Skyline (vector<Drul_array<Offset> > const &bldgs, Axis a, Direction sky);
+  Skyline (vector<Skyline_pair> const &skypairs, Direction sky);
+  Skyline (Box const &b, Axis a, Direction sky);
+
+  vector<Offset> to_points (Axis) const;
+  void deholify ();
   void merge (Skyline const &);
   void insert (Box const &, Axis);
   void print () const;
+  void print_points () const;
   void raise (Real);
-  Real distance (Skyline const &) const;
+  void shift (Real);
+  Real distance (Skyline const &, Real horizon_padding = 0) const;
+  Real touching_point (Skyline const &, Real horizon_padding = 0) const;
+  Real shift_to_avoid (Skyline const &other, Real, Direction d, Real horizon_padding = 0);
+  Real raise_to_avoid (Skyline const &other, Real, Direction d, Real horizon_padding = 0);
+  Drul_array<Real> shifts_to_avoid_intersection (Skyline const &, Real horizon_padding = 0) const;
+  Interval raises_to_avoid_intersection (Skyline const &, Real horizon_padding = 0) const;
   Real height (Real airplane) const;
   Real max_height () const;
+  Real max_height_position () const;
+  Real left () const;
+  Real right () const;
+  Direction direction () const;
   void set_minimum_height (Real height);
+  void clear ();
+  bool is_empty () const;
+  Skyline padded (Real horizon_padding) const;
+
+  DECLARE_SCHEME_CALLBACK (get_touching_point, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (get_distance, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (get_max_height, (SCM));
+  DECLARE_SCHEME_CALLBACK (get_max_height_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (get_height, (SCM, SCM));
 };
 
+extern bool debug_skylines;
+
 #endif /* SKYLINE_HH */