normalize indentation
This commit is contained in:
parent
9a923954f6
commit
1e81187aeb
2 changed files with 198 additions and 198 deletions
|
@ -8,10 +8,10 @@ using System;
|
|||
using System.Runtime.InteropServices;
|
||||
namespace OpenTK
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines a 2d box (rectangle).
|
||||
/// </summary>
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
/// <summary>
|
||||
/// Defines a 2d box (rectangle).
|
||||
/// </summary>
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct Box2
|
||||
{
|
||||
/// <summary>
|
||||
|
@ -75,62 +75,62 @@ namespace OpenTK
|
|||
return new Box2(left, top, right, bottom);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// Creates a new Box2 with the specified dimensions.
|
||||
/// </summary>
|
||||
/// <param name="top">The position of the top boundary.</param>
|
||||
/// <param name="left">The position of the left boundary.</param>
|
||||
/// <param name="width">The width of the box.</param>
|
||||
/// <param name="height">The height of the box.</param>
|
||||
/// <param name="width">The width of the box.</param>
|
||||
/// <param name="height">The height of the box.</param>
|
||||
/// <returns>A new OpenTK.Box2 with the specfied dimensions.</returns>
|
||||
public static Box2 FromDimensions(float left, float top, float width, float height)
|
||||
{
|
||||
return new Box2(left, top, left + width, top + height);
|
||||
}
|
||||
public static Box2 FromDimensions(float left, float top, float width, float height)
|
||||
{
|
||||
return new Box2(left, top, left + width, top + height);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// Creates a new Box2 with the specified dimensions.
|
||||
/// </summary>
|
||||
/// <param name="position">The position of the top left corner.</param>
|
||||
/// <param name="size">The size of the box.</param>
|
||||
/// <returns>A new OpenTK.Box2 with the specfied dimensions.</returns>
|
||||
public static Box2 FromDimensions(Vector2 position, Vector2 size)
|
||||
{
|
||||
return FromDimensions(position.X, position.Y, size.X, size.Y);
|
||||
}
|
||||
public static Box2 FromDimensions(Vector2 position, Vector2 size)
|
||||
{
|
||||
return FromDimensions(position.X, position.Y, size.X, size.Y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new Box2 from the specified corners.
|
||||
/// </summary>
|
||||
/// <param name="corner1">One of the corners of the box.</param>
|
||||
/// <param name="corner2">The opposite corner of the box.</param>
|
||||
/// <returns></returns>
|
||||
/// <summary>
|
||||
/// Creates a new Box2 from the specified corners.
|
||||
/// </summary>
|
||||
/// <param name="corner1">One of the corners of the box.</param>
|
||||
/// <param name="corner2">The opposite corner of the box.</param>
|
||||
/// <returns></returns>
|
||||
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;
|
||||
}
|
||||
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;
|
||||
}
|
||||
if (corner1.Y < corner2.Y)
|
||||
{
|
||||
box.Top = corner1.Y;
|
||||
box.Bottom = corner2.Y;
|
||||
}
|
||||
else
|
||||
{
|
||||
box.Top = corner2.Y;
|
||||
box.Bottom = corner1.Y;
|
||||
}
|
||||
|
||||
return box;
|
||||
return box;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -143,67 +143,67 @@ namespace OpenTK
|
|||
/// </summary>
|
||||
public float Height { get { return (float)System.Math.Abs(Bottom - Top); } }
|
||||
|
||||
/// <summary>
|
||||
/// Returns whether the box contains the specified point.
|
||||
/// </summary>
|
||||
/// <param name="point">The point to query.</param>
|
||||
/// <returns>Whether this box contains the point.</returns>
|
||||
public bool Contains(Vector2 point)
|
||||
{
|
||||
return (point.X >= Left != point.X > Right) && (point.Y >= Top != point.Y > Bottom);
|
||||
}
|
||||
/// <summary>
|
||||
/// Returns whether the box contains the specified point.
|
||||
/// </summary>
|
||||
/// <param name="point">The point to query.</param>
|
||||
/// <returns>Whether this box contains the point.</returns>
|
||||
public bool Contains(Vector2 point)
|
||||
{
|
||||
return (point.X >= Left != point.X > Right) && (point.Y >= Top != point.Y > Bottom);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns a Box2 translated by the given amount.
|
||||
/// </summary>
|
||||
/// <param name="point"></param>
|
||||
/// <returns></returns>
|
||||
public Box2 Translate(Vector2 point)
|
||||
{
|
||||
return new Box2(Left + point.X, Top + point.Y, Right + point.X, Bottom + point.Y);
|
||||
}
|
||||
/// <summary>
|
||||
/// Returns a Box2 translated by the given amount.
|
||||
/// </summary>
|
||||
/// <param name="point"></param>
|
||||
/// <returns></returns>
|
||||
public Box2 Translate(Vector2 point)
|
||||
{
|
||||
return new Box2(Left + point.X, Top + point.Y, Right + point.X, Bottom + point.Y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Equality comparator.
|
||||
/// </summary>
|
||||
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;
|
||||
}
|
||||
/// <summary>
|
||||
/// Equality comparator.
|
||||
/// </summary>
|
||||
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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Inequality comparator.
|
||||
/// </summary>
|
||||
public static bool operator !=(Box2 left, Box2 right)
|
||||
{
|
||||
return !(left == right);
|
||||
}
|
||||
/// <summary>
|
||||
/// Inequality comparator.
|
||||
/// </summary>
|
||||
public static bool operator !=(Box2 left, Box2 right)
|
||||
{
|
||||
return !(left == right);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Functional equality comparator.
|
||||
/// </summary>
|
||||
public bool Equals(Box2 other)
|
||||
{
|
||||
return this == other;
|
||||
}
|
||||
/// <summary>
|
||||
/// Functional equality comparator.
|
||||
/// </summary>
|
||||
public bool Equals(Box2 other)
|
||||
{
|
||||
return this == other;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Implements Object.Equals.
|
||||
/// </summary>
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return obj is Box2 && Equals((Box2) obj);
|
||||
}
|
||||
/// <summary>
|
||||
/// Implements Object.Equals.
|
||||
/// </summary>
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return obj is Box2 && Equals((Box2) obj);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the hash code for this Box2.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return Left.GetHashCode() ^ Right.GetHashCode() ^ Top.GetHashCode() ^ Bottom.GetHashCode();
|
||||
}
|
||||
/// <summary>
|
||||
/// Gets the hash code for this Box2.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return Left.GetHashCode() ^ Right.GetHashCode() ^ Top.GetHashCode() ^ Bottom.GetHashCode();
|
||||
}
|
||||
|
||||
private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator;
|
||||
/// <summary>
|
||||
|
|
|
@ -8,10 +8,10 @@ using System;
|
|||
using System.Runtime.InteropServices;
|
||||
namespace OpenTK
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines a 2d box (rectangle).
|
||||
/// </summary>
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
/// <summary>
|
||||
/// Defines a 2d box (rectangle).
|
||||
/// </summary>
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct Box2d
|
||||
{
|
||||
/// <summary>
|
||||
|
@ -75,62 +75,62 @@ namespace OpenTK
|
|||
return new Box2d(left, top, right, bottom);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// Creates a new Box2d with the specified dimensions.
|
||||
/// </summary>
|
||||
/// <param name="top">The position of the top boundary.</param>
|
||||
/// <param name="left">The position of the left boundary.</param>
|
||||
/// <param name="width">The width of the box.</param>
|
||||
/// <param name="height">The height of the box.</param>
|
||||
/// <param name="width">The width of the box.</param>
|
||||
/// <param name="height">The height of the box.</param>
|
||||
/// <returns>A new OpenTK.Box2d with the specfied dimensions.</returns>
|
||||
public static Box2d FromDimensions(double left, double top, double width, double height)
|
||||
{
|
||||
return new Box2d(left, top, left + width, top + height);
|
||||
}
|
||||
public static Box2d FromDimensions(double left, double top, double width, double height)
|
||||
{
|
||||
return new Box2d(left, top, left + width, top + height);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// Creates a new Box2d with the specified dimensions.
|
||||
/// </summary>
|
||||
/// <param name="position">The position of the top left corner.</param>
|
||||
/// <param name="size">The size of the box.</param>
|
||||
/// <returns>A new OpenTK.Box2d with the specfied dimensions.</returns>
|
||||
public static Box2d FromDimensions(Vector2d position, Vector2d size)
|
||||
{
|
||||
return FromDimensions(position.X, position.Y, size.X, size.Y);
|
||||
}
|
||||
public static Box2d FromDimensions(Vector2d position, Vector2d size)
|
||||
{
|
||||
return FromDimensions(position.X, position.Y, size.X, size.Y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new Box2d from the specified corners.
|
||||
/// </summary>
|
||||
/// <param name="corner1">One of the corners of the box.</param>
|
||||
/// <param name="corner2">The opposite corner of the box.</param>
|
||||
/// <returns></returns>
|
||||
/// <summary>
|
||||
/// Creates a new Box2d from the specified corners.
|
||||
/// </summary>
|
||||
/// <param name="corner1">One of the corners of the box.</param>
|
||||
/// <param name="corner2">The opposite corner of the box.</param>
|
||||
/// <returns></returns>
|
||||
public static Box2d FromCorners(Vector2d corner1, Vector2d corner2)
|
||||
{
|
||||
Box2d box;
|
||||
if (corner1.X < corner2.X)
|
||||
{
|
||||
box.Left = corner1.X;
|
||||
box.Right = corner2.X;
|
||||
}
|
||||
else
|
||||
{
|
||||
box.Left = corner2.X;
|
||||
box.Right = corner1.X;
|
||||
}
|
||||
Box2d 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;
|
||||
}
|
||||
if (corner1.Y < corner2.Y)
|
||||
{
|
||||
box.Top = corner1.Y;
|
||||
box.Bottom = corner2.Y;
|
||||
}
|
||||
else
|
||||
{
|
||||
box.Top = corner2.Y;
|
||||
box.Bottom = corner1.Y;
|
||||
}
|
||||
|
||||
return box;
|
||||
return box;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -143,67 +143,67 @@ namespace OpenTK
|
|||
/// </summary>
|
||||
public double Height { get { return (double)System.Math.Abs(Bottom - Top); } }
|
||||
|
||||
/// <summary>
|
||||
/// Returns whether the box contains the specified point.
|
||||
/// </summary>
|
||||
/// <param name="point">The point to query.</param>
|
||||
/// <returns>Whether this box contains the point.</returns>
|
||||
public bool Contains(Vector2d point)
|
||||
{
|
||||
return (point.X >= Left != point.X > Right) && (point.Y >= Top != point.Y > Bottom);
|
||||
}
|
||||
/// <summary>
|
||||
/// Returns whether the box contains the specified point.
|
||||
/// </summary>
|
||||
/// <param name="point">The point to query.</param>
|
||||
/// <returns>Whether this box contains the point.</returns>
|
||||
public bool Contains(Vector2d point)
|
||||
{
|
||||
return (point.X >= Left != point.X > Right) && (point.Y >= Top != point.Y > Bottom);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns a Box2d translated by the given amount.
|
||||
/// </summary>
|
||||
/// <param name="point"></param>
|
||||
/// <returns></returns>
|
||||
public Box2d Translate(Vector2d point)
|
||||
{
|
||||
return new Box2d(Left + point.X, Top + point.Y, Right + point.X, Bottom + point.Y);
|
||||
}
|
||||
/// <summary>
|
||||
/// Returns a Box2d translated by the given amount.
|
||||
/// </summary>
|
||||
/// <param name="point"></param>
|
||||
/// <returns></returns>
|
||||
public Box2d Translate(Vector2d point)
|
||||
{
|
||||
return new Box2d(Left + point.X, Top + point.Y, Right + point.X, Bottom + point.Y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Equality comparator.
|
||||
/// </summary>
|
||||
public static bool operator ==(Box2d left, Box2d right)
|
||||
{
|
||||
return left.Bottom == right.Bottom && left.Top == right.Top &&
|
||||
left.Left == right.Left && left.Right == right.Right;
|
||||
}
|
||||
/// <summary>
|
||||
/// Equality comparator.
|
||||
/// </summary>
|
||||
public static bool operator ==(Box2d left, Box2d right)
|
||||
{
|
||||
return left.Bottom == right.Bottom && left.Top == right.Top &&
|
||||
left.Left == right.Left && left.Right == right.Right;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Inequality comparator.
|
||||
/// </summary>
|
||||
public static bool operator !=(Box2d left, Box2d right)
|
||||
{
|
||||
return !(left == right);
|
||||
}
|
||||
/// <summary>
|
||||
/// Inequality comparator.
|
||||
/// </summary>
|
||||
public static bool operator !=(Box2d left, Box2d right)
|
||||
{
|
||||
return !(left == right);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Functional equality comparator.
|
||||
/// </summary>
|
||||
public bool Equals(Box2d other)
|
||||
{
|
||||
return this == other;
|
||||
}
|
||||
/// <summary>
|
||||
/// Functional equality comparator.
|
||||
/// </summary>
|
||||
public bool Equals(Box2d other)
|
||||
{
|
||||
return this == other;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Implements Object.Equals.
|
||||
/// </summary>
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return obj is Box2d && Equals((Box2d) obj);
|
||||
}
|
||||
/// <summary>
|
||||
/// Implements Object.Equals.
|
||||
/// </summary>
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return obj is Box2d && Equals((Box2d) obj);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the hash code for this Box2d.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return Left.GetHashCode() ^ Right.GetHashCode() ^ Top.GetHashCode() ^ Bottom.GetHashCode();
|
||||
}
|
||||
/// <summary>
|
||||
/// Gets the hash code for this Box2d.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return Left.GetHashCode() ^ Right.GetHashCode() ^ Top.GetHashCode() ^ Bottom.GetHashCode();
|
||||
}
|
||||
|
||||
private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator;
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in a new issue