epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5163 from Mailaender/prettify-trait-documentation

Browse Source 
Beautified the trait documentation
This commit is contained in:
Paul Chote
2014-05-02 21:32:24 +12:00
parent b05297d350 589c7642d1
commit 097d6ad47c
4 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Primitives/float2.cs
View File

@@ -89,7 +89,7 @@ namespace OpenRA
public static float Dot(float2 a, float2 b) { return a.X * b.X + a.Y * b.Y; }
public float2 Round() { return new float2((float)Math.Round(X), (float)Math.Round(Y)); }
public override string ToString() { return "({0},{1})".F(X, Y); }
public override string ToString() { return "{0},{1}".F(X, Y); }
public int2 ToInt2() { return new int2((int)X, (int)Y); }
public static float2 Max(float2 a, float2 b) { return new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }

8
OpenRA.Game/Primitives/int2.cs
View File

@@ -60,14 +60,14 @@ namespace OpenRA
return (uint)((orig & 0xff000000) >> 24) | ((orig & 0x00ff0000) >> 8) | ((orig & 0x0000ff00) << 8) | ((orig & 0x000000ff) << 24);
}
public static int Lerp( int a, int b, int mul, int div )
public static int Lerp(int a, int b, int mul, int div)
{
return a + ( b - a ) * mul / div;
return a + (b - a) * mul / div;
}
public static int2 Lerp( int2 a, int2 b, int mul, int div )
public static int2 Lerp(int2 a, int2 b, int mul, int div)
{
return a + ( b - a ) * mul / div;
return a + (b - a) * mul / div;
}
public int2 Clamp(Rectangle r)