Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(753)

Unified Diff: lily/include/skyline.hh

Issue 5626052: Gets vertical skylines from grob stencils (Closed)
Patch Set: Run astyle on c++ files Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: lily/include/skyline.hh
diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 0715c545a635a7f6af70ea85e8520c0804506338..a93316d93577779a92d7ccaee47520c2fcddd89c 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -32,20 +32,22 @@
struct Building
{
+ Real start_;
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);
+ Building (Box const &b, 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;
+ Real shift_to_intersect (Real x, Real y) const;
+ Interval overlapping_shift_interval (Building const &other) const;
};
class Skyline
@@ -54,44 +56,58 @@ 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);
+ void internal_merge_skyline (list<Building> *, list<Building> *,
+ list<Building> *const 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 (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);
+ Skyline (vector<Box> const &bldgs, Axis a, Direction sky);
+ 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 &, Real horizon_padding, Axis);
+ void insert (Box const &, Axis);
void print () const;
void print_points () const;
void raise (Real);
void shift (Real);
+ void invert ();
Real distance (Skyline const &, Real horizon_padding = 0) const;
+ Real smallest_shift (Skyline const &, Direction d,
+ Real horizon_padding = 0,
+ Real vertical_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;
void set_minimum_height (Real height);
void clear ();
bool is_empty () const;
+ bool is_singleton () const;
+ Real left () const;
+ Real right () 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));
-
-protected:
- Real internal_distance (Skyline const &, Real horizon_padding, Real *touch_point) const;
};
extern bool debug_skylines;
« no previous file with comments | « lily/include/pango-font.hh ('k') | lily/include/skyline-pair.hh » ('j') | lily/skyline.cc » ('J')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b