godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

[Mono] Fix Color incorrect ordering of int export methods, added 64-bit

Browse Source 
[Mono] Fix Color incorrect ordering of int export methods, added 64-bit long export methods.
This commit is contained in:
Aaron Franke
2018-04-18 15:52:12 -05:00
parent e38051970c
commit e3368d692d
2 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
modules/mono/glue/cs_files/Color.cs
View File

@@ -293,28 +293,80 @@ namespace Godot
return res; return res;
} }
public int ToRgba32() public int ToAbgr32()
{ {
int c = (byte)(r * 255); int c = (byte)Math.Round(a * 255);
c <<= 8; c <<= 8;
c |= (byte)(g * 255); c |= (byte)Math.Round(b * 255);
c <<= 8; c <<= 8;
c |= (byte)(b * 255); c |= (byte)Math.Round(g * 255);
c <<= 8; c <<= 8;
c |= (byte)(a * 255); c |= (byte)Math.Round(r * 255);
return c;
}
public long ToAbgr64()
{
long c = (ushort)Math.Round(a * 65535);
c <<= 16;
c |= (ushort)Math.Round(b * 65535);
c <<= 16;
c |= (ushort)Math.Round(g * 65535);
c <<= 16;
c |= (ushort)Math.Round(r * 65535);
return c; return c;
} }
public int ToArgb32() public int ToArgb32()
{ {
int c = (byte)(a * 255); int c = (byte)Math.Round(a * 255);
c <<= 8; c <<= 8;
c |= (byte)(r * 255); c |= (byte)Math.Round(r * 255);
c <<= 8; c <<= 8;
c |= (byte)(g * 255); c |= (byte)Math.Round(g * 255);
c <<= 8; c <<= 8;
c |= (byte)(b * 255); c |= (byte)Math.Round(b * 255);
return c;
}
public long ToArgb64()
{
long c = (ushort)Math.Round(a * 65535);
c <<= 16;
c |= (ushort)Math.Round(r * 65535);
c <<= 16;
c |= (ushort)Math.Round(g * 65535);
c <<= 16;
c |= (ushort)Math.Round(b * 65535);
return c;
}
public int ToRgba32()
{
int c = (byte)Math.Round(r * 255);
c <<= 8;
c |= (byte)Math.Round(g * 255);
c <<= 8;
c |= (byte)Math.Round(b * 255);
c <<= 8;
c |= (byte)Math.Round(a * 255);
return c;
}
public long ToRgba64()
{
long c = (ushort)Math.Round(r * 65535);
c <<= 16;
c |= (ushort)Math.Round(g * 65535);
c <<= 16;
c |= (ushort)Math.Round(b * 65535);
c <<= 16;
c |= (ushort)Math.Round(a * 65535);
return c; return c;
} }
@@ -353,6 +405,17 @@ namespace Godot
r = (rgba & 0xFF) / 255.0f; r = (rgba & 0xFF) / 255.0f;
} }
public Color(long rgba)
{
a = (rgba & 0xFFFF) / 65535.0f;
rgba >>= 16;
b = (rgba & 0xFFFF) / 65535.0f;
rgba >>= 16;
g = (rgba & 0xFFFF) / 65535.0f;
rgba >>= 16;
r = (rgba & 0xFFFF) / 65535.0f;
}
private static int _parse_col(string str, int ofs) private static int _parse_col(string str, int ofs)
{ {
int ig = 0; int ig = 0;
@@ -392,7 +455,7 @@ namespace Godot
private String _to_hex(float val) private String _to_hex(float val)
{ {
var v = (int) Mathf.Clamp(val * 255.0f, 0, 255); int v = Mathf.RoundToInt(Mathf.Clamp(val * 255, 0, 255));
var ret = string.Empty; var ret = string.Empty;

2
modules/mono/glue/cs_files/VERSION.txt
View File

@@ -1 +1 @@
5 6