Merge pull request #1234 from richardeakin/rect_moveULTo

RectT::moveULTo(), getMoveULTo()
cinder · Dec 20, 2015 · dd16254 · dd16254
2 parents fda4f63 + 4289de5
commit dd16254
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/include/cinder/Rect.h b/include/cinder/Rect.h
@@ -56,8 +56,14 @@ class RectT {
 	void		clipBy( const RectT &clip );
 	RectT		getClipBy( const RectT &clip ) const;
 	Area		getInteriorArea() const;
+	//! Translates the RectT by \a off
 	void		offset( const Vec2T &offset );
-	RectT		getOffset( const Vec2T &off ) const { RectT result( *this ); result.offset( off ); return result; }
+	//! Returns a copy of the RectT translated by \a off
+	RectT		getOffset( const Vec2T &off ) const;
+	//! Translates the RectT so that its upper-left corner is \a newUL
+	void		moveULTo( const Vec2T &newUL );
+	//! Returns a copy of the RectT translated so that its upper-left corner is \a newUL
+	RectT		getMoveULTo( const Vec2T &newUL ) const;
 	void		inflate( const Vec2T &amount );
 	RectT		inflated( const Vec2T &amount ) const;
 	//! Translates the rectangle so that its center is at \a center

diff --git a/src/cinder/Rect.cpp b/src/cinder/Rect.cpp
@@ -117,6 +117,26 @@ void RectT<T>::offset( const Vec2T &offset )
 	y2 += offset.y;
 }
 
+template<typename T>
+RectT<T> RectT<T>::getOffset( const Vec2T &off ) const
+{
+	RectT result( *this ); result.offset( off ); return result;
+}
+
+template<typename T>
+void RectT<T>::moveULTo( const Vec2T &newUL )
+{
+	set( newUL.x, newUL.y, newUL.x + getWidth(), newUL.y + getHeight() );
+}
+
+template<typename T>
+RectT<T> RectT<T>::getMoveULTo( const Vec2T &newUL ) const
+{
+	RectT result( *this );
+	result.moveULTo( newUL );
+	return result;
+}
+
 template<typename T>
 void RectT<T>::inflate( const Vec2T &amount )
 {