X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline.hh;h=0715c545a635a7f6af70ea85e8520c0804506338;hb=faf3ecd73ed2b708b4a1bc8c1150767359a73bdf;hp=85b58e27e97b1a54dde8d95c75076da74206ea1e;hpb=99bb6d948373592d482c1517a12f9fdcb74bffc4;p=lilypond.git

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 85b58e27e9..0715c545a6 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -1,41 +1,100 @@
 /*
-  skyline.hh -- declare Skyline_entry and funcbs.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2012 Joe Neeman <joeneeman@gmail.com>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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 "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"
+
+#include <list>
+
+struct Building
+{
+  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;
+};
 
-struct Skyline_entry
+class Skyline
 {
-  Interval width_;
-  Real height_;
-  Skyline_entry ();
-  Skyline_entry (Interval, Real);
+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);
+
+public:
+  Skyline ();
+  Skyline (Skyline const &src);
+  Skyline (Skyline const &src, Real horizon_padding, Axis a);
+  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 &, Real horizon_padding = 0) const;
+  Real touching_point (Skyline const &, Real horizon_padding = 0) const;
+  Real height (Real airplane) const;
+  Real max_height () const;
+  Real max_height_position () const;
+  void set_minimum_height (Real height);
+  void clear ();
+  bool is_empty () 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));
+
+protected:
+  Real internal_distance (Skyline const &, Real horizon_padding, Real *touch_point) const;
 };
 
-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);
-
-Real
-skyline_height (Array<Skyline_entry> const &buildings,
-		Real airplane, Direction sky_dir);
+extern bool debug_skylines;
 
 #endif /* SKYLINE_HH */