use the new spacing-interface stuff in staff-spacing

[lilypond.git] / lily / include / skyline.hh

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index bccac37238d1fbb7948027d92829732aeb87676b..5dadbacaf736f6503cf7e444c4bc448324556ad1 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -9,8 +9,7 @@
 #ifndef SKYLINE_HH
 #define SKYLINE_HH
 
-#include <list>
-
+#include "lily-proto.hh"
 #include "axis.hh"
 #include "box.hh"
 #include "interval.hh"
@@ -18,15 +17,15 @@
 #include "std-vector.hh"
 #include "smobs.hh"
 
+#include <list>
+
 struct Building
 {
-  Interval iv_;
-  Drul_array<Real> height_;
-
+  Real end_;
   Real y_intercept_;
   Real slope_;
 
-  void precompute ();
+  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, Real horizon_padding, Axis a, Direction d);
   void print () const;
@@ -34,15 +33,8 @@ struct Building
   Real height (Real x) const;
   Real intersection_x (Building const &other) const;
   void leading_part (Real chop);
-  bool conceals_beginning (Building const &other) const;
-  bool conceals (Building const &other) const;
-  bool sane () const;
-  Building sloped_neighbour (Real horizon_padding, Direction d) const;
-
-  bool operator< (Building const &other)
-  {
-    return iv_[LEFT] < other.iv_[LEFT];
-  }
+  bool conceals (Building const &other, Real x) const;
+  Building sloped_neighbour (Real start, Real horizon_padding, Direction d) const;
 };
 
 class Skyline
@@ -53,19 +45,22 @@ private:
   
   void internal_merge_skyline (list<Building>*, list<Building>*,
                               list<Building> *const result);
-  list<Building> internal_build_skyline (list<Building>*);
+  list<Building> internal_build_skyline (list<Box>*, Real, Axis, Direction);
 
   DECLARE_SIMPLE_SMOBS(Skyline);
+
 public:
   Skyline ();
   Skyline (Skyline const &src);
   Skyline (Direction sky);
   Skyline (vector<Box> const &bldgs, Real horizon_padding, Axis a, Direction sky);
   Skyline (Box const &b, Real horizon_padding, Axis a, Direction sky);
-  vector<Offset> to_points () const;
+  
+  vector<Offset> 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;