X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline.hh;h=26830b92c954062a029fc88892576c6e5e2031c0;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=ad5c43d963a422ae6cad1770bfa0e7b8d206e3e1;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index ad5c43d963..26830b92c9 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -1,40 +1,76 @@
-/*   
-  skyline.hh -- declare Skyline_entry and funcbs.
+/*
+  skyline.hh -- declare Skyline class.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef SKYLINE_HH
 #define SKYLINE_HH
 
-#include "array.hh"
+#include "lily-proto.hh"
+#include "axis.hh"
 #include "box.hh"
+#include "interval.hh"
+#include "direction.hh"
+#include "std-vector.hh"
+#include "smobs.hh"
 
-struct Skyline_entry
+#include <list>
+
+struct Building
 {
-  Interval width_;
-  Real height_;
-  Skyline_entry();
-  Skyline_entry (Interval, Real);
+  Real end_;
+  Real y_intercept_;
+  Real 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, Real horizon_padding, Axis a, Direction d);
+  void print () const;
+
+  Real height (Real x) const;
+  Real intersection_x (Building const &other) const;
+  void leading_part (Real chop);
+  bool conceals (Building const &other, Real x) const;
+  Building sloped_neighbour (Real start, Real horizon_padding, Direction d) const;
 };
 
+class Skyline
+{
+private:
+  list<Building> buildings_;
+  Direction sky_;
+  
+  void internal_merge_skyline (list<Building>*, list<Building>*,
+			       list<Building> *const result);
+  list<Building> internal_build_skyline (list<Box>*, Real, Axis, Direction);
 
+  DECLARE_SIMPLE_SMOBS(Skyline);
 
-void
-merge_skyline (Array<Skyline_entry> *a1, Array<Skyline_entry> const  & a2,
-	       Direction);
-void insert_extent_into_skyline (Array<Skyline_entry> *line, Box b, Axis line_axis,
-				 Direction d);
-Array<Skyline_entry>
-extents_to_skyline (Array<Box> const & extents, Axis a, Direction d);
-Array<Skyline_entry> empty_skyline (Direction d);
-void heighten_skyline (Array<Skyline_entry> *buildings, Real ground);
-Real
-skyline_meshing_distance (Array<Skyline_entry> const &buildings,
-			  Array<Skyline_entry> const &clouds);
+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 (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;
+  Real height (Real airplane) const;
+  Real max_height () const;
+  void set_minimum_height (Real height);
+  bool is_empty () const;
+};
 
+extern bool debug_skylines;
 
 #endif /* SKYLINE_HH */