From 3fd01cfac2c4b344830977b27bf7f516e297cd36 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 22 Jul 2013 20:36:50 +1200 Subject: [PATCH] Remove obsolete PSubPos and PSubVec. --- OpenRA.Game/OpenRA.Game.csproj | 2 - OpenRA.Game/PPos.cs | 1 - OpenRA.Game/PSubPos.cs | 72 --------- OpenRA.Game/PSubVec.cs | 98 ------------- OpenRA.Game/Sync.cs | 12 -- OpenRA.Game/Traits/Util.cs | 261 --------------------------------- 6 files changed, 446 deletions(-) delete mode 100644 OpenRA.Game/PSubPos.cs delete mode 100644 OpenRA.Game/PSubVec.cs diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 33fa3179dd..e16c3456d6 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -86,8 +86,6 @@ - - diff --git a/OpenRA.Game/PPos.cs b/OpenRA.Game/PPos.cs index 4a3f45b350..d965b5191e 100644 --- a/OpenRA.Game/PPos.cs +++ b/OpenRA.Game/PPos.cs @@ -77,7 +77,6 @@ namespace OpenRA public float2 ToFloat2() { return new float2(X, Y); } public int2 ToInt2() { return new int2(X, Y); } public CPos ToCPos() { return new CPos((int)(1f / Game.CellSize * X), (int)(1f / Game.CellSize * Y)); } - public PSubPos ToPSubPos() { return new PSubPos(X * PSubPos.PerPx, Y * PSubPos.PerPx); } public PPos Clamp(Rectangle r) { diff --git a/OpenRA.Game/PSubPos.cs b/OpenRA.Game/PSubPos.cs deleted file mode 100644 index 7bd193565a..0000000000 --- a/OpenRA.Game/PSubPos.cs +++ /dev/null @@ -1,72 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System; -using System.Drawing; - -namespace OpenRA -{ - /// - /// Sub-pixel coordinate position in the world (very fine). - /// - public struct PSubPos - { - public readonly int X, Y; - - public PSubPos(int x, int y) { X = x; Y = y; } - - public const int PerPx = 1024; - - public static readonly PSubPos Zero = new PSubPos(0, 0); - - public static explicit operator PSubPos(int2 a) { return new PSubPos(a.X, a.Y); } - - public static explicit operator PSubVec(PSubPos a) { return new PSubVec(a.X, a.Y); } - - public static PSubPos operator +(PSubPos a, PSubVec b) { return new PSubPos(a.X + b.X, a.Y + b.Y); } - public static PSubVec operator -(PSubPos a, PSubPos b) { return new PSubVec(a.X - b.X, a.Y - b.Y); } - public static PSubPos operator -(PSubPos a, PSubVec b) { return new PSubPos(a.X - b.X, a.Y - b.Y); } - - public static bool operator ==(PSubPos me, PSubPos other) { return (me.X == other.X && me.Y == other.Y); } - public static bool operator !=(PSubPos me, PSubPos other) { return !(me == other); } - - public static PSubPos Max(PSubPos a, PSubPos b) { return new PSubPos(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); } - public static PSubPos Min(PSubPos a, PSubPos b) { return new PSubPos(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); } - - public static PSubPos Lerp(PSubPos a, PSubPos b, int mul, int div) - { - return a + ((PSubVec)(b - a) * mul / div); - } - - public float2 ToFloat2() { return new float2(X, Y); } - public int2 ToInt2() { return new int2(X, Y); } - public PPos ToPPos() { return new PPos(X / PerPx, Y / PerPx); } - public CPos ToCPos() { return ToPPos().ToCPos(); } - - public PSubPos Clamp(Rectangle r) - { - return new PSubPos(Math.Min(r.Right, Math.Max(X, r.Left)), - Math.Min(r.Bottom, Math.Max(Y, r.Top))); - } - - public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); } - - public override bool Equals(object obj) - { - if (obj == null) - return false; - - PSubPos o = (PSubPos)obj; - return o == this; - } - - public override string ToString() { return "{0},{1}".F(X, Y); } - } -} diff --git a/OpenRA.Game/PSubVec.cs b/OpenRA.Game/PSubVec.cs deleted file mode 100644 index d461ec6333..0000000000 --- a/OpenRA.Game/PSubVec.cs +++ /dev/null @@ -1,98 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System; -using System.Drawing; - -namespace OpenRA -{ - /// - /// Sub-pixel coordinate vector (very fine) - /// - public struct PSubVec - { - public readonly int X, Y; - - public PSubVec(int x, int y) { X = x; Y = y; } - public PSubVec(Size p) { X = p.Width; Y = p.Height; } - - public static readonly PSubVec Zero = new PSubVec(0, 0); - public static PSubVec OneCell { get { return new PSubVec(Game.CellSize, Game.CellSize); } } - - public static explicit operator PSubVec(int2 a) { return new PSubVec(a.X, a.Y); } - public static explicit operator PSubVec(float2 a) { return new PSubVec((int)a.X, (int)a.Y); } - - public static PSubVec FromRadius(int r) { return new PSubVec(r, r); } - - public static PSubVec operator +(PSubVec a, PSubVec b) { return new PSubVec(a.X + b.X, a.Y + b.Y); } - public static PSubVec operator -(PSubVec a, PSubVec b) { return new PSubVec(a.X - b.X, a.Y - b.Y); } - public static PSubVec operator *(int a, PSubVec b) { return new PSubVec(a * b.X, a * b.Y); } - public static PSubVec operator *(PSubVec b, int a) { return new PSubVec(a * b.X, a * b.Y); } - public static PSubVec operator /(PSubVec a, int b) { return new PSubVec(a.X / b, a.Y / b); } - - public static PSubVec operator -(PSubVec a) { return new PSubVec(-a.X, -a.Y); } - - public static bool operator ==(PSubVec me, PSubVec other) { return (me.X == other.X && me.Y == other.Y); } - public static bool operator !=(PSubVec me, PSubVec other) { return !(me == other); } - - public static PSubVec Max(PSubVec a, PSubVec b) { return new PSubVec(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); } - public static PSubVec Min(PSubVec a, PSubVec b) { return new PSubVec(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); } - - public static int Dot(PSubVec a, PSubVec b) { return a.X * b.X + a.Y * b.Y; } - - public PSubVec Sign() { return new PSubVec(Math.Sign(X), Math.Sign(Y)); } - public PSubVec Abs() { return new PSubVec(Math.Abs(X), Math.Abs(Y)); } - public int LengthSquared { get { return X * X + Y * Y; } } - public int Length { get { return (int)Math.Sqrt(LengthSquared); } } - - public float2 ToFloat2() { return new float2(X, Y); } - public int2 ToInt2() { return new int2(X, Y); } - public PVecInt ToPVecInt() { return new PVecInt(X / PSubPos.PerPx, Y / PSubPos.PerPx); } - - public PSubVec Clamp(Rectangle r) - { - return new PSubVec( - Math.Min(r.Right, Math.Max(X, r.Left)), - Math.Min(r.Bottom, Math.Max(Y, r.Top)) - ); - } - - public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); } - - public override bool Equals(object obj) - { - if (obj == null) - return false; - - PSubVec o = (PSubVec)obj; - return o == this; - } - - public override string ToString() { return "{0},{1}".F(X, Y); } - } - - public static class PSubVecExtensions - { - /// - /// Scales the float2 vector up to a subpixel vector. - /// - /// - /// - public static PSubVec ToPSubVec(this float2 vec) - { - return new PSubVec((int)(vec.X * PSubPos.PerPx), (int)(vec.Y * PSubPos.PerPx)); - } - - public static PSubVec ToPSubVec(this PVecInt vec) - { - return new PSubVec((vec.X * PSubPos.PerPx), (vec.Y * PSubPos.PerPx)); - } - } -} diff --git a/OpenRA.Game/Sync.cs b/OpenRA.Game/Sync.cs index 94f5a3cb32..9029849e16 100755 --- a/OpenRA.Game/Sync.cs +++ b/OpenRA.Game/Sync.cs @@ -37,8 +37,6 @@ namespace OpenRA {typeof(CVec), ((Func)hash_CVec).Method}, {typeof(PPos), ((Func)hash_PPos).Method}, {typeof(PVecInt), ((Func)hash_PVecInt).Method}, - {typeof(PSubPos), ((Func)hash_PSubPos).Method}, - {typeof(PSubVec), ((Func)hash_PSubVec).Method}, {typeof(WRange), ((Func)hash).Method}, {typeof(WPos), ((Func)hash).Method}, {typeof(WVec), ((Func)hash).Method}, @@ -126,16 +124,6 @@ namespace OpenRA return ((i2.X * 5) ^ (i2.Y * 3)) / 4; } - public static int hash_PSubPos(PSubPos i2) - { - return ((i2.X * 5) ^ (i2.Y * 3)) / 4; - } - - public static int hash_PSubVec(PSubVec i2) - { - return ((i2.X * 5) ^ (i2.Y * 3)) / 4; - } - public static int hash_tdict(TypeDictionary d) { int ret = 0; diff --git a/OpenRA.Game/Traits/Util.cs b/OpenRA.Game/Traits/Util.cs index 874f84c73a..46b47613bd 100755 --- a/OpenRA.Game/Traits/Util.cs +++ b/OpenRA.Game/Traits/Util.cs @@ -222,266 +222,5 @@ namespace OpenRA.Traits new int2( 391, -1229 ), new int2( 199, -1305 ) }; - - - public static readonly PSubVec[] SubPxVector = - { - new PSubVec( 0, 1024 ), - new PSubVec( 25, 1023 ), - new PSubVec( 50, 1022 ), - new PSubVec( 75, 1021 ), - new PSubVec( 100, 1019 ), - new PSubVec( 125, 1016 ), - new PSubVec( 150, 1012 ), - new PSubVec( 175, 1008 ), - new PSubVec( 199, 1004 ), - new PSubVec( 224, 999 ), - new PSubVec( 248, 993 ), - new PSubVec( 273, 986 ), - new PSubVec( 297, 979 ), - new PSubVec( 321, 972 ), - new PSubVec( 344, 964 ), - new PSubVec( 368, 955 ), - new PSubVec( 391, 946 ), - new PSubVec( 414, 936 ), - new PSubVec( 437, 925 ), - new PSubVec( 460, 914 ), - new PSubVec( 482, 903 ), - new PSubVec( 504, 890 ), - new PSubVec( 526, 878 ), - new PSubVec( 547, 865 ), - new PSubVec( 568, 851 ), - new PSubVec( 589, 837 ), - new PSubVec( 609, 822 ), - new PSubVec( 629, 807 ), - new PSubVec( 649, 791 ), - new PSubVec( 668, 775 ), - new PSubVec( 687, 758 ), - new PSubVec( 706, 741 ), - new PSubVec( 724, 724 ), - new PSubVec( 741, 706 ), - new PSubVec( 758, 687 ), - new PSubVec( 775, 668 ), - new PSubVec( 791, 649 ), - new PSubVec( 807, 629 ), - new PSubVec( 822, 609 ), - new PSubVec( 837, 589 ), - new PSubVec( 851, 568 ), - new PSubVec( 865, 547 ), - new PSubVec( 878, 526 ), - new PSubVec( 890, 504 ), - new PSubVec( 903, 482 ), - new PSubVec( 914, 460 ), - new PSubVec( 925, 437 ), - new PSubVec( 936, 414 ), - new PSubVec( 946, 391 ), - new PSubVec( 955, 368 ), - new PSubVec( 964, 344 ), - new PSubVec( 972, 321 ), - new PSubVec( 979, 297 ), - new PSubVec( 986, 273 ), - new PSubVec( 993, 248 ), - new PSubVec( 999, 224 ), - new PSubVec( 1004, 199 ), - new PSubVec( 1008, 175 ), - new PSubVec( 1012, 150 ), - new PSubVec( 1016, 125 ), - new PSubVec( 1019, 100 ), - new PSubVec( 1021, 75 ), - new PSubVec( 1022, 50 ), - new PSubVec( 1023, 25 ), - new PSubVec( 1024, 0 ), - new PSubVec( 1023, -25 ), - new PSubVec( 1022, -50 ), - new PSubVec( 1021, -75 ), - new PSubVec( 1019, -100 ), - new PSubVec( 1016, -125 ), - new PSubVec( 1012, -150 ), - new PSubVec( 1008, -175 ), - new PSubVec( 1004, -199 ), - new PSubVec( 999, -224 ), - new PSubVec( 993, -248 ), - new PSubVec( 986, -273 ), - new PSubVec( 979, -297 ), - new PSubVec( 972, -321 ), - new PSubVec( 964, -344 ), - new PSubVec( 955, -368 ), - new PSubVec( 946, -391 ), - new PSubVec( 936, -414 ), - new PSubVec( 925, -437 ), - new PSubVec( 914, -460 ), - new PSubVec( 903, -482 ), - new PSubVec( 890, -504 ), - new PSubVec( 878, -526 ), - new PSubVec( 865, -547 ), - new PSubVec( 851, -568 ), - new PSubVec( 837, -589 ), - new PSubVec( 822, -609 ), - new PSubVec( 807, -629 ), - new PSubVec( 791, -649 ), - new PSubVec( 775, -668 ), - new PSubVec( 758, -687 ), - new PSubVec( 741, -706 ), - new PSubVec( 724, -724 ), - new PSubVec( 706, -741 ), - new PSubVec( 687, -758 ), - new PSubVec( 668, -775 ), - new PSubVec( 649, -791 ), - new PSubVec( 629, -807 ), - new PSubVec( 609, -822 ), - new PSubVec( 589, -837 ), - new PSubVec( 568, -851 ), - new PSubVec( 547, -865 ), - new PSubVec( 526, -878 ), - new PSubVec( 504, -890 ), - new PSubVec( 482, -903 ), - new PSubVec( 460, -914 ), - new PSubVec( 437, -925 ), - new PSubVec( 414, -936 ), - new PSubVec( 391, -946 ), - new PSubVec( 368, -955 ), - new PSubVec( 344, -964 ), - new PSubVec( 321, -972 ), - new PSubVec( 297, -979 ), - new PSubVec( 273, -986 ), - new PSubVec( 248, -993 ), - new PSubVec( 224, -999 ), - new PSubVec( 199, -1004 ), - new PSubVec( 175, -1008 ), - new PSubVec( 150, -1012 ), - new PSubVec( 125, -1016 ), - new PSubVec( 100, -1019 ), - new PSubVec( 75, -1021 ), - new PSubVec( 50, -1022 ), - new PSubVec( 25, -1023 ), - new PSubVec( 0, -1024 ), - new PSubVec( -25, -1023 ), - new PSubVec( -50, -1022 ), - new PSubVec( -75, -1021 ), - new PSubVec( -100, -1019 ), - new PSubVec( -125, -1016 ), - new PSubVec( -150, -1012 ), - new PSubVec( -175, -1008 ), - new PSubVec( -199, -1004 ), - new PSubVec( -224, -999 ), - new PSubVec( -248, -993 ), - new PSubVec( -273, -986 ), - new PSubVec( -297, -979 ), - new PSubVec( -321, -972 ), - new PSubVec( -344, -964 ), - new PSubVec( -368, -955 ), - new PSubVec( -391, -946 ), - new PSubVec( -414, -936 ), - new PSubVec( -437, -925 ), - new PSubVec( -460, -914 ), - new PSubVec( -482, -903 ), - new PSubVec( -504, -890 ), - new PSubVec( -526, -878 ), - new PSubVec( -547, -865 ), - new PSubVec( -568, -851 ), - new PSubVec( -589, -837 ), - new PSubVec( -609, -822 ), - new PSubVec( -629, -807 ), - new PSubVec( -649, -791 ), - new PSubVec( -668, -775 ), - new PSubVec( -687, -758 ), - new PSubVec( -706, -741 ), - new PSubVec( -724, -724 ), - new PSubVec( -741, -706 ), - new PSubVec( -758, -687 ), - new PSubVec( -775, -668 ), - new PSubVec( -791, -649 ), - new PSubVec( -807, -629 ), - new PSubVec( -822, -609 ), - new PSubVec( -837, -589 ), - new PSubVec( -851, -568 ), - new PSubVec( -865, -547 ), - new PSubVec( -878, -526 ), - new PSubVec( -890, -504 ), - new PSubVec( -903, -482 ), - new PSubVec( -914, -460 ), - new PSubVec( -925, -437 ), - new PSubVec( -936, -414 ), - new PSubVec( -946, -391 ), - new PSubVec( -955, -368 ), - new PSubVec( -964, -344 ), - new PSubVec( -972, -321 ), - new PSubVec( -979, -297 ), - new PSubVec( -986, -273 ), - new PSubVec( -993, -248 ), - new PSubVec( -999, -224 ), - new PSubVec( -1004, -199 ), - new PSubVec( -1008, -175 ), - new PSubVec( -1012, -150 ), - new PSubVec( -1016, -125 ), - new PSubVec( -1019, -100 ), - new PSubVec( -1021, -75 ), - new PSubVec( -1022, -50 ), - new PSubVec( -1023, -25 ), - new PSubVec( -1024, 0 ), - new PSubVec( -1023, 25 ), - new PSubVec( -1022, 50 ), - new PSubVec( -1021, 75 ), - new PSubVec( -1019, 100 ), - new PSubVec( -1016, 125 ), - new PSubVec( -1012, 150 ), - new PSubVec( -1008, 175 ), - new PSubVec( -1004, 199 ), - new PSubVec( -999, 224 ), - new PSubVec( -993, 248 ), - new PSubVec( -986, 273 ), - new PSubVec( -979, 297 ), - new PSubVec( -972, 321 ), - new PSubVec( -964, 344 ), - new PSubVec( -955, 368 ), - new PSubVec( -946, 391 ), - new PSubVec( -936, 414 ), - new PSubVec( -925, 437 ), - new PSubVec( -914, 460 ), - new PSubVec( -903, 482 ), - new PSubVec( -890, 504 ), - new PSubVec( -878, 526 ), - new PSubVec( -865, 547 ), - new PSubVec( -851, 568 ), - new PSubVec( -837, 589 ), - new PSubVec( -822, 609 ), - new PSubVec( -807, 629 ), - new PSubVec( -791, 649 ), - new PSubVec( -775, 668 ), - new PSubVec( -758, 687 ), - new PSubVec( -741, 706 ), - new PSubVec( -724, 724 ), - new PSubVec( -706, 741 ), - new PSubVec( -687, 758 ), - new PSubVec( -668, 775 ), - new PSubVec( -649, 791 ), - new PSubVec( -629, 807 ), - new PSubVec( -609, 822 ), - new PSubVec( -589, 837 ), - new PSubVec( -568, 851 ), - new PSubVec( -547, 865 ), - new PSubVec( -526, 878 ), - new PSubVec( -504, 890 ), - new PSubVec( -482, 903 ), - new PSubVec( -460, 914 ), - new PSubVec( -437, 925 ), - new PSubVec( -414, 936 ), - new PSubVec( -391, 946 ), - new PSubVec( -368, 955 ), - new PSubVec( -344, 964 ), - new PSubVec( -321, 972 ), - new PSubVec( -297, 979 ), - new PSubVec( -273, 986 ), - new PSubVec( -248, 993 ), - new PSubVec( -224, 999 ), - new PSubVec( -199, 1004 ), - new PSubVec( -175, 1008 ), - new PSubVec( -150, 1012 ), - new PSubVec( -125, 1016 ), - new PSubVec( -100, 1019 ), - new PSubVec( -75, 1021 ), - new PSubVec( -50, 1022 ), - new PSubVec( -25, 1023 ) - }; } }