mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-12-25 17:59:24 +01:00
Allow data texture atlas pivots and offsets to be negative
This commit is contained in:
parent
72647a2edf
commit
b012c65990
4 changed files with 14 additions and 2 deletions
|
@ -23,6 +23,9 @@ Improvements
|
|||
- Close other dropdowns when opening a dropdown
|
||||
|
||||
### MLEM.Data
|
||||
Improvements
|
||||
- Allow data texture atlas pivots and offsets to be negative
|
||||
|
||||
Fixes
|
||||
- Fixed data texture atlases not allowing most characters in their region names
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ namespace MLEM.Data {
|
|||
var atlas = new DataTextureAtlas(texture);
|
||||
|
||||
// parse each texture region: "<names> loc <u> <v> <w> <h> [piv <px> <py>] [off <ox> <oy>]"
|
||||
foreach (Match match in Regex.Matches(text, @"(.+)\s+loc\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s*(?:piv\s+([0-9.]+)\s+([0-9.]+))?\s*(?:off\s+([0-9.]+)\s+([0-9.]+))?")) {
|
||||
foreach (Match match in Regex.Matches(text, @"(.+)\s+loc\s+([0-9+]+)\s+([0-9+]+)\s+([0-9+]+)\s+([0-9+]+)\s*(?:piv\s+([0-9.+-]+)\s+([0-9.+-]+))?\s*(?:off\s+([0-9.+-]+)\s+([0-9.+-]+))?")) {
|
||||
// offset
|
||||
var off = !match.Groups[8].Success ? Vector2.Zero : new Vector2(
|
||||
float.Parse(match.Groups[8].Value, CultureInfo.InvariantCulture),
|
||||
|
|
|
@ -9,6 +9,10 @@ piv 80 16
|
|||
Plant
|
||||
loc 96 0 16 32
|
||||
|
||||
TestRegionNegativePivot
|
||||
loc 0 32 +16 16
|
||||
piv -32 +46
|
||||
|
||||
LongTableUp
|
||||
loc 0 32 64 48
|
||||
piv 16 48
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace Tests {
|
|||
using var game = TestGame.Create();
|
||||
using var texture = new Texture2D(game.GraphicsDevice, 1, 1);
|
||||
var atlas = DataTextureAtlas.LoadAtlasData(new TextureRegion(texture), game.RawContent, "Texture.atlas");
|
||||
Assert.AreEqual(atlas.Regions.Count(), 7);
|
||||
Assert.AreEqual(atlas.Regions.Count(), 8);
|
||||
|
||||
// no added offset
|
||||
var table = atlas["LongTableUp"];
|
||||
|
@ -24,6 +24,11 @@ namespace Tests {
|
|||
var table2 = atlas["LongTableLeft"];
|
||||
Assert.AreEqual(table2.Area, new Rectangle(64, 32, 64, 48));
|
||||
Assert.AreEqual(table2.PivotPixels, new Vector2(112 - 64, 48 - 32));
|
||||
|
||||
// negative pivot
|
||||
var negativePivot = atlas["TestRegionNegativePivot"];
|
||||
Assert.AreEqual(negativePivot.Area, new Rectangle(0, 32, 16, 16));
|
||||
Assert.AreEqual(negativePivot.PivotPixels, new Vector2(-32, 46 - 32));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue