UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Read new atlas format that has width and height for each page.

Browse Source
This commit is contained in:
NathanSweet 2014-05-05 15:07:53 +02:00
parent d4e9923385
commit 83be769cc5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spine-csharp/src/Atlas.cs
View File

@ -104,7 +104,12 @@ namespace Spine {
page = new AtlasPage(); page = new AtlasPage();
page.name = line; page.name = line;
page.format = (Format)Enum.Parse(typeof(Format), readValue(reader), false); if (readTuple(reader, tuple) == 2) { // size is only optional for an atlas packed with an old TexturePacker.
page.width = int.Parse(tuple[0]);
page.height = int.Parse(tuple[1]);
readTuple(reader, tuple);
}
page.format = (Format)Enum.Parse(typeof(Format), tuple[0], false);
readTuple(reader, tuple); readTuple(reader, tuple);
page.minFilter = (TextureFilter)Enum.Parse(typeof(TextureFilter), tuple[0], false); page.minFilter = (TextureFilter)Enum.Parse(typeof(TextureFilter), tuple[0], false);
@ -186,7 +191,7 @@ namespace Spine {
return line.Substring(colon + 1).Trim(); return line.Substring(colon + 1).Trim();
} }
/// <summary>Returns the number of tuple values read (2 or 4).</summary> /// <summary>Returns the number of tuple values read (1, 2 or 4).</summary>
static int readTuple (TextReader reader, String[] tuple) { static int readTuple (TextReader reader, String[] tuple) {
String line = reader.ReadLine(); String line = reader.ReadLine();
int colon = line.IndexOf(':'); int colon = line.IndexOf(':');
@ -194,10 +199,7 @@ namespace Spine {
int i = 0, lastMatch = colon + 1; int i = 0, lastMatch = colon + 1;
for (; i < 3; i++) { for (; i < 3; i++) {
int comma = line.IndexOf(',', lastMatch); int comma = line.IndexOf(',', lastMatch);
if (comma == -1) { if (comma == -1) break;
if (i == 0) throw new Exception("Invalid line: " + line);
break;
}
tuple[i] = line.Substring(lastMatch, comma - lastMatch).Trim(); tuple[i] = line.Substring(lastMatch, comma - lastMatch).Trim();
lastMatch = comma + 1; lastMatch = comma + 1;
} }