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

[csharp] Fix SkeletonBinary/SkeletonJson for Unity-WSA.

Browse Source
This commit is contained in:
pharan 2016-11-28 19:04:08 +08:00
parent da0578ae64
commit 1aa8f56f9b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-csharp/src/SkeletonBinary.cs
View File

@ -93,14 +93,13 @@ namespace Spine {
#if WINDOWS_PHONE #if WINDOWS_PHONE
using (var input = new BufferedStream(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) { using (var input = new BufferedStream(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) {
#else #else
using (var input = new BufferedStream(new FileStream(path, FileMode.Open))) { using (var input = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read)) {
#endif // WINDOWS_PHONE #endif
SkeletonData skeletonData = ReadSkeletonData(input); SkeletonData skeletonData = ReadSkeletonData(input);
skeletonData.name = Path.GetFileNameWithoutExtension(path); skeletonData.name = Path.GetFileNameWithoutExtension(path);
return skeletonData; return skeletonData;
} }
} }
#endif // WINDOWS_STOREAPP #endif // WINDOWS_STOREAPP
public static readonly TransformMode[] TransformModeValues = { public static readonly TransformMode[] TransformModeValues = {

11
spine-csharp/src/SkeletonJson.cs
View File

@ -58,7 +58,7 @@ namespace Spine {
Scale = 1; Scale = 1;
} }
#if !(IS_UNITY) && WINDOWS_STOREAPP #if !IS_UNITY && WINDOWS_STOREAPP
private async Task<SkeletonData> ReadFile(string path) { private async Task<SkeletonData> ReadFile(string path) {
var folder = Windows.ApplicationModel.Package.Current.InstalledLocation; var folder = Windows.ApplicationModel.Package.Current.InstalledLocation;
var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false); var file = await folder.GetFileAsync(path).AsTask().ConfigureAwait(false);
@ -75,17 +75,16 @@ namespace Spine {
#else #else
public SkeletonData ReadSkeletonData (String path) { public SkeletonData ReadSkeletonData (String path) {
#if WINDOWS_PHONE #if WINDOWS_PHONE
Stream stream = Microsoft.Xna.Framework.TitleContainer.OpenStream(path); using (var reader = new StreamReader(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) {
using (StreamReader reader = new StreamReader(stream)) {
#else #else
using (var reader = new StreamReader(path)) { using (var reader = new StreamReader(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))) {
#endif // WINDOWS_PHONE #endif
SkeletonData skeletonData = ReadSkeletonData(reader); SkeletonData skeletonData = ReadSkeletonData(reader);
skeletonData.name = Path.GetFileNameWithoutExtension(path); skeletonData.name = Path.GetFileNameWithoutExtension(path);
return skeletonData; return skeletonData;
} }
} }
#endif // WINDOWS_STOREAPP #endif
public SkeletonData ReadSkeletonData (TextReader reader) { public SkeletonData ReadSkeletonData (TextReader reader) {
if (reader == null) throw new ArgumentNullException("reader", "reader cannot be null."); if (reader == null) throw new ArgumentNullException("reader", "reader cannot be null.");