X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbox.hh;h=baa4ce0b7645791bd993f0a3b204d3f0a9c8f8e1;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=901987f1ad381d8ff83ec97fb9a5e5b3270ab77c;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/include/box.hh b/lily/include/box.hh index 901987f1ad..baa4ce0b76 100644 --- a/lily/include/box.hh +++ b/lily/include/box.hh @@ -1,5 +1,5 @@ /* - some 2D geometrical concepts + some 2D geometrical concepts */ #ifndef BOXES_HH @@ -7,21 +7,24 @@ #include "interval.hh" #include "offset.hh" +#include "smobs.hh" -struct Box +class Box { Interval interval_a_[NO_AXES]; - + DECLARE_SIMPLE_SMOBS (Box); +public: Interval &x () {return interval_a_[X_AXIS]; } Interval &y (){ return interval_a_[Y_AXIS]; } Interval x () const{ return interval_a_[X_AXIS]; } Interval y () const{return interval_a_[Y_AXIS]; } - Interval operator[] (Axis a) const; - Interval &operator[] (Axis a); + Interval operator [] (Axis a) const; + Interval &operator [] (Axis a); Offset center () const; - + void translate (Offset o); + /// smallest box enclosing #b# void set_empty (); void add_point (Offset); @@ -32,5 +35,4 @@ struct Box Box (Interval ix, Interval iy); }; - #endif