diff --git a/OpenTK.dll b/OpenTK.dll index 34472c204..92b3c8e21 100644 Binary files a/OpenTK.dll and b/OpenTK.dll differ diff --git a/Utils/FastColour.cs b/Utils/FastColour.cs index a0812f370..f8ce5bde4 100644 --- a/Utils/FastColour.cs +++ b/Utils/FastColour.cs @@ -8,40 +8,40 @@ namespace ClassicalSharp { public byte A, R, G, B; - public FastColour( byte r, byte g, byte b, byte a ) { - A = a; - R = r; - G = g; - B = b; - } - - public FastColour( int r, int g, int b, int a ) { - A = (byte)a; - R = (byte)r; - G = (byte)g; - B = (byte)b; - } - - public FastColour( byte r, byte g, byte b ) { - A = 255; - R = r; - G = g; + public FastColour( byte r, byte g, byte b, byte a ) { + A = a; + R = r; + G = g; B = b; - } + } - public FastColour( int r, int g, int b ) { - A = 255; - R = (byte)r; - G = (byte)g; - B = (byte)b; - } + public FastColour( int r, int g, int b, int a ) { + A = (byte)a; + R = (byte)r; + G = (byte)g; + B = (byte)b; + } + + public FastColour( byte r, byte g, byte b ) { + A = 255; + R = r; + G = g; + B = b; + } + + public FastColour( int r, int g, int b ) { + A = 255; + R = (byte)r; + G = (byte)g; + B = (byte)b; + } - public FastColour( Color c ) { - A = c.A; - R = c.R; - G = c.G; - B = c.B; - } + public FastColour( Color c ) { + A = c.A; + R = c.R; + G = c.G; + B = c.B; + } public static FastColour Scale( FastColour value, float t ) { FastColour result = value; @@ -50,59 +50,59 @@ namespace ClassicalSharp { result.B = (byte)( value.B * t ); return result; } - - public Color ToColor() { - return Color.FromArgb( A, R, G, B ); - } - - public Color4 ToColor4() { - return new Color4( R, G, B, A ); - } - - public override string ToString() { - return R + ", " + G + ", " + B + " : " + A; + + public Color ToColor() { + return Color.FromArgb( A, R, G, B ); + } + + public Color4 ToColor4() { + return new Color4( R, G, B, A ); + } + + public override string ToString() { + return R + ", " + G + ", " + B + " : " + A; } public string ToRGBHexString() { return Utils.ToHexString( new byte[] { R, G, B } ); } - - public override bool Equals( object obj ) { + + public override bool Equals( object obj ) { return ( obj is FastColour ) && Equals( (FastColour)obj ); } - - public bool Equals( FastColour other ) { - return A == other.A && R == other.R && G == other.G && B == other.B; - } - - public override int GetHashCode() { - return A << 24 | R << 16 | G << 8 | B; + + public bool Equals( FastColour other ) { + return A == other.A && R == other.R && G == other.G && B == other.B; + } + + public override int GetHashCode() { + return A << 24 | R << 16 | G << 8 | B; } public static bool operator == ( FastColour left, FastColour right ) { return left.Equals( right ); } - + public static bool operator != ( FastColour left, FastColour right ) { return !left.Equals( right ); } - - public static implicit operator FastColour( Color col ) { - return new FastColour( col ); - } - - public static implicit operator Color( FastColour col ) { - return Color.FromArgb( col.A, col.R, col.G, col.B ); - } - - public static FastColour Red = new FastColour( 255, 0, 0 ); - public static FastColour Green = new FastColour( 0, 255, 0 ); - public static FastColour Blue = new FastColour( 0, 0, 255 ); - public static FastColour White = new FastColour( 255, 255, 255 ); - public static FastColour Black = new FastColour( 0, 0, 0 ); + + public static implicit operator FastColour( Color col ) { + return new FastColour( col ); + } + + public static implicit operator Color( FastColour col ) { + return Color.FromArgb( col.A, col.R, col.G, col.B ); + } + + public static FastColour Red = new FastColour( 255, 0, 0 ); + public static FastColour Green = new FastColour( 0, 255, 0 ); + public static FastColour Blue = new FastColour( 0, 0, 255 ); + public static FastColour White = new FastColour( 255, 255, 255 ); + public static FastColour Black = new FastColour( 0, 0, 0 ); - public static FastColour Yellow = new FastColour( 255, 255, 0 ); - public static FastColour Magenta = new FastColour( 255, 0, 255 ); - public static FastColour Cyan = new FastColour( 0, 255, 255 ); - } + public static FastColour Yellow = new FastColour( 255, 255, 0 ); + public static FastColour Magenta = new FastColour( 255, 0, 255 ); + public static FastColour Cyan = new FastColour( 0, 255, 255 ); + } }