UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[xna] Fixed a compile error in Atlas loading (in a non-Unity #if codebranch).

Browse Source
This commit is contained in:
Harald Csaszar 2021-05-27 19:39:18 +02:00
parent 1ffab53d97
commit 8bced33fc6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,10 @@ namespace Spine {
var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false); var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false);
using (var reader = new StreamReader(await file.OpenStreamForReadAsync().ConfigureAwait(false))) { using (var reader = new StreamReader(await file.OpenStreamForReadAsync().ConfigureAwait(false))) {
try { try {
Load(reader, Path.GetDirectoryName(path), textureLoader); Atlas atlas = new Atlas(reader, Path.GetDirectoryName(path), textureLoader);
this.pages = atlas.pages;
this.regions = atlas.regions;
this.textureLoader = atlas.textureLoader;
} catch (Exception ex) { } catch (Exception ex) {
throw new Exception("Error reading atlas file: " + path, ex); throw new Exception("Error reading atlas file: " + path, ex);
} }
@ -87,7 +90,10 @@ namespace Spine {
using (StreamReader reader = new StreamReader(path)) { using (StreamReader reader = new StreamReader(path)) {
#endif // WINDOWS_PHONE #endif // WINDOWS_PHONE
try { try {
Load(reader, Path.GetDirectoryName(path), textureLoader); Atlas atlas = new Atlas(reader, Path.GetDirectoryName(path), textureLoader);
this.pages = atlas.pages;
this.regions = atlas.regions;
this.textureLoader = atlas.textureLoader;
} catch (Exception ex) { } catch (Exception ex) {
throw new Exception("Error reading atlas file: " + path, ex); throw new Exception("Error reading atlas file: " + path, ex);
} }

2
spine-xna/example/src/ExampleGame.cs
View File

@ -103,7 +103,7 @@ namespace Spine {
name = "raptor-pro"; // we only have normalmaps for raptor name = "raptor-pro"; // we only have normalmaps for raptor
String atlasName = name.Replace("-pro", "").Replace("-ess", ""); String atlasName = name.Replace("-pro", "").Replace("-ess", "");
bool binaryData = false; bool binaryData = name.Contains("spineboy");
Atlas atlas; Atlas atlas;
if (!useNormalmapShader) { if (!useNormalmapShader) {