Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-25 22:18:34 +01:00
Code Issues Projects Releases Wiki Activity

fixed tiled color parsing

Browse source
This commit is contained in:
Ellpeck 2020-04-30 21:15:28 +02:00
parent 17a5b3ec74
commit 422f0834b3
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MLEM.Extended/Tiled/TiledExtensions.cs
View file

@ -6,6 +6,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using MonoGame.Extended; using MonoGame.Extended;
using MonoGame.Extended.Tiled; using MonoGame.Extended.Tiled;
using ColorExtensions = MLEM.Extensions.ColorExtensions;
namespace MLEM.Extended.Tiled { namespace MLEM.Extended.Tiled {
public static class TiledExtensions { public static class TiledExtensions {
@ -23,7 +24,7 @@ namespace MLEM.Extended.Tiled {
} }
public static Color GetColor(this TiledMapProperties properties, string key) { public static Color GetColor(this TiledMapProperties properties, string key) {
return ColorHelper.FromHex(properties.Get(key)); return ColorExtensions.FromHex(properties.Get(key));
} }
public static float GetFloat(this TiledMapProperties properties, string key) { public static float GetFloat(this TiledMapProperties properties, string key) {

7
MLEM/Extensions/ColorExtensions.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Globalization;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
namespace MLEM.Extensions { namespace MLEM.Extensions {
@ -12,6 +13,12 @@ namespace MLEM.Extensions {
return new Color((int) (value >> 16 & 0xFF), (int) (value >> 8 & 0xFF), (int) (value >> 0 & 0xFF), (int) (value >> 24 & 0xFF)); return new Color((int) (value >> 16 & 0xFF), (int) (value >> 8 & 0xFF), (int) (value >> 0 & 0xFF), (int) (value >> 24 & 0xFF));
} }
public static Color FromHex(string value) {
if (value.StartsWith("#"))
value = value.Substring(1);
return FromHex(uint.Parse(value, NumberStyles.HexNumber));
}
public static Color CopyAlpha(this Color color, Color other) { public static Color CopyAlpha(this Color color, Color other) {
return color * (other.A / 255F); return color * (other.A / 255F);
} }