diff --git a/Source/OpenTK/Math/Box2.cs b/Source/OpenTK/Math/Box2.cs
index 4c54b622..a3dbf254 100644
--- a/Source/OpenTK/Math/Box2.cs
+++ b/Source/OpenTK/Math/Box2.cs
@@ -5,15 +5,13 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Runtime.InteropServices;
namespace OpenTK
{
- ///
- /// Defines a 2d box (rectangle).
- ///
- [StructLayout(LayoutKind.Sequential)]
+ ///
+ /// Defines a 2d box (rectangle).
+ ///
+ [StructLayout(LayoutKind.Sequential)]
public struct Box2
{
///
@@ -39,7 +37,7 @@ namespace OpenTK
///
/// Constructs a new Box2 with the specified dimensions.
///
- /// AnOpenTK.Vector2 describing the top-left corner of the Box2.
+ /// An OpenTK.Vector2 describing the top-left corner of the Box2.
/// An OpenTK.Vector2 describing the bottom-right corner of the Box2.
public Box2(Vector2 topLeft, Vector2 bottomRight)
{
@@ -77,6 +75,64 @@ namespace OpenTK
return new Box2(left, top, right, bottom);
}
+ ///
+ /// Creates a new Box2 with the specified dimensions.
+ ///
+ /// The position of the top boundary.
+ /// The position of the left boundary.
+ /// The width of the box.
+ /// The height of the box.
+ /// A new OpenTK.Box2 with the specfied dimensions.
+ public static Box2 FromDimensions(float left, float top, float width, float height)
+ {
+ return new Box2(left, top, left + width, top + height);
+ }
+
+ ///
+ /// Creates a new Box2 with the specified dimensions.
+ ///
+ /// The position of the top left corner.
+ /// The size of the box.
+ /// A new OpenTK.Box2 with the specfied dimensions.
+ public static Box2 FromDimensions(Vector2 position, Vector2 size)
+ {
+ return FromDimensions(position.X, position.Y, size.X, size.Y);
+ }
+
+ ///
+ /// Creates a new Box2 from the specified corners.
+ ///
+ /// One of the corners of the box.
+ /// The opposite corner of the box.
+ ///
+ public static Box2 FromCorners(Vector2 corner1, Vector2 corner2)
+ {
+ Box2 box;
+ if (corner1.X < corner2.X)
+ {
+ box.Left = corner1.X;
+ box.Right = corner2.X;
+ }
+ else
+ {
+ box.Left = corner2.X;
+ box.Right = corner1.X;
+ }
+
+ if (corner1.Y < corner2.Y)
+ {
+ box.Top = corner1.Y;
+ box.Bottom = corner2.Y;
+ }
+ else
+ {
+ box.Top = corner2.Y;
+ box.Bottom = corner1.Y;
+ }
+
+ return box;
+ }
+
///
/// Gets a float describing the width of the Box2 structure.
///
@@ -87,13 +143,76 @@ namespace OpenTK
///
public float Height { get { return (float)System.Math.Abs(Bottom - Top); } }
+ ///
+ /// Returns whether the box contains the specified point.
+ ///
+ /// The point to query.
+ /// Whether this box contains the point.
+ public bool Contains(Vector2 point)
+ {
+ return (point.X >= Left != point.X > Right) && (point.Y >= Top != point.Y > Bottom);
+ }
+
+ ///
+ /// Returns a Box2 translated by the given amount.
+ ///
+ ///
+ ///
+ public Box2 Translate(Vector2 point)
+ {
+ return new Box2(Left + point.X, Top + point.Y, Right + point.X, Bottom + point.Y);
+ }
+
+ ///
+ /// Equality comparator.
+ ///
+ public static bool operator ==(Box2 left, Box2 right)
+ {
+ return left.Bottom == right.Bottom && left.Top == right.Top &&
+ left.Left == right.Left && left.Right == right.Right;
+ }
+
+ ///
+ /// Inequality comparator.
+ ///
+ public static bool operator !=(Box2 left, Box2 right)
+ {
+ return !(left == right);
+ }
+
+ ///
+ /// Functional equality comparator.
+ ///
+ public bool Equals(Box2 other)
+ {
+ return this == other;
+ }
+
+ ///
+ /// Implements Object.Equals.
+ ///
+ public override bool Equals(object obj)
+ {
+ return obj is Box2 && Equals((Box2) obj);
+ }
+
+ ///
+ /// Gets the hash code for this Box2.
+ ///
+ ///
+ public override int GetHashCode()
+ {
+ return Left.GetHashCode() ^ Right.GetHashCode() ^ Top.GetHashCode() ^ Bottom.GetHashCode();
+ }
+
+ private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator;
///
/// Returns a describing the current instance.
///
///
public override string ToString()
{
- return String.Format("({0},{1})-({2},{3})", Left, Top, Right, Bottom);
+ return String.Format("({0}{4} {1}) - ({2}{4} {3})", Left, Top, Right, Bottom, listSeparator);
}
}
}