Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-21 20:43:29 +01:00
Code Issues Projects Releases Wiki Activity

Fixed DataTextureAtlas creating unnamed entries if there are empty lines at the start or end of the atlas file

Browse source
This commit is contained in:
Ell 2024-11-16 20:24:28 +01:00
parent b0bf55842b
commit 3ab2466d32
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -47,6 +47,9 @@ Improvements
- **Use a binary tree algorithm for RuntimeTexturePacker to vastly increase packing speed** - **Use a binary tree algorithm for RuntimeTexturePacker to vastly increase packing speed**
- Made fields and methods in StaticJsonConverter protected to allow extending it - Made fields and methods in StaticJsonConverter protected to allow extending it
Fixes
- Fixed DataTextureAtlas creating unnamed entries if there are empty lines at the start or end of the atlas file
## 7.1.1 ## 7.1.1
### MLEM ### MLEM

2
MLEM.Data/DataTextureAtlas.cs
View file

@ -104,7 +104,7 @@ namespace MLEM.Data {
throw new ContentLoadException($"Couldn't load data texture atlas data from {info}", e); throw new ContentLoadException($"Couldn't load data texture atlas data from {info}", e);
} }
var atlas = new DataTextureAtlas(texture); var atlas = new DataTextureAtlas(texture);
var words = Regex.Split(text, @"\s+"); var words = Regex.Split(text.Trim(), @"\s+");
var namesOffsets = new List<(string, Vector2)>(); var namesOffsets = new List<(string, Vector2)>();
var customData = new Dictionary<string, string>(); var customData = new Dictionary<string, string>();

8
Tests/Content/Texture.atlas
View file

@ -1,3 +1,6 @@
SimpleDeskUp SimpleDeskUp
loc 0 0 48 32 loc 0 0 48 32
piv 16 16 piv 16 16
@ -13,6 +16,10 @@ TestRegionNegativePivot
loc 0 32 +16 16 loc 0 32 +16 16
piv -32 +46 piv -32 +46
DataTest DataTest
loc 0 0 16 16 loc 0 0 16 16
dat DataPoint1 ThisIsSomeData dat DataPoint1 ThisIsSomeData
@ -27,6 +34,7 @@ cpy Copy2 32 4
Copy3 from Copy3 from
LongTableUp off 2 4 LongTableUp off 2 4
LongTableRight LongTableDown LongTableLeft LongTableRight LongTableDown LongTableLeft
location 32 30 64 48 location 32 30 64 48
piv 80 46 piv 80 46