mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-11-22 20:58:34 +01:00
Fixed data texture atlases not allowing most characters in their region names
This commit is contained in:
parent
02b4626996
commit
72647a2edf
2 changed files with 6 additions and 2 deletions
|
@ -22,6 +22,10 @@ Improvements
|
||||||
- Allow elements to auto-adjust their size even when their children are aligned oddly
|
- Allow elements to auto-adjust their size even when their children are aligned oddly
|
||||||
- Close other dropdowns when opening a dropdown
|
- Close other dropdowns when opening a dropdown
|
||||||
|
|
||||||
|
### MLEM.Data
|
||||||
|
Fixes
|
||||||
|
- Fixed data texture atlases not allowing most characters in their region names
|
||||||
|
|
||||||
## 6.0.0
|
## 6.0.0
|
||||||
### MLEM
|
### MLEM
|
||||||
Additions
|
Additions
|
||||||
|
|
|
@ -86,7 +86,7 @@ namespace MLEM.Data {
|
||||||
var atlas = new DataTextureAtlas(texture);
|
var atlas = new DataTextureAtlas(texture);
|
||||||
|
|
||||||
// parse each texture region: "<names> loc <u> <v> <w> <h> [piv <px> <py>] [off <ox> <oy>]"
|
// parse each texture region: "<names> loc <u> <v> <w> <h> [piv <px> <py>] [off <ox> <oy>]"
|
||||||
foreach (Match match in Regex.Matches(text, @"(.+)\W+loc\W+([0-9]+)\W+([0-9]+)\W+([0-9]+)\W+([0-9]+)\W*(?:piv\W+([0-9.]+)\W+([0-9.]+))?\W*(?:off\W+([0-9.]+)\W+([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
|
// offset
|
||||||
var off = !match.Groups[8].Success ? Vector2.Zero : new Vector2(
|
var off = !match.Groups[8].Success ? Vector2.Zero : new Vector2(
|
||||||
float.Parse(match.Groups[8].Value, CultureInfo.InvariantCulture),
|
float.Parse(match.Groups[8].Value, CultureInfo.InvariantCulture),
|
||||||
|
@ -103,7 +103,7 @@ namespace MLEM.Data {
|
||||||
float.Parse(match.Groups[6].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.X),
|
float.Parse(match.Groups[6].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.X),
|
||||||
float.Parse(match.Groups[7].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.Y));
|
float.Parse(match.Groups[7].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.Y));
|
||||||
|
|
||||||
foreach (var name in Regex.Split(match.Groups[1].Value, @"\W")) {
|
foreach (var name in Regex.Split(match.Groups[1].Value, @"\s")) {
|
||||||
var trimmed = name.Trim();
|
var trimmed = name.Trim();
|
||||||
if (trimmed.Length <= 0)
|
if (trimmed.Length <= 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in a new issue