diff --git a/spine-xna/example/data/raptor_normals.png b/spine-xna/example/data/raptor_normals.png new file mode 100644 index 000000000..81dd933c6 Binary files /dev/null and b/spine-xna/example/data/raptor_normals.png differ diff --git a/spine-xna/example/spine-xna-example.csproj b/spine-xna/example/spine-xna-example.csproj index 70102e75f..bcf4fde66 100644 --- a/spine-xna/example/spine-xna-example.csproj +++ b/spine-xna/example/spine-xna-example.csproj @@ -125,6 +125,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -142,9 +145,6 @@ PreserveNewest - - PreserveNewest - @@ -195,12 +195,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -210,9 +204,6 @@ PreserveNewest - - PreserveNewest - diff --git a/spine-xna/example/src/ExampleGame.cs b/spine-xna/example/src/ExampleGame.cs index 1f1480f55..9c42ed311 100644 --- a/spine-xna/example/src/ExampleGame.cs +++ b/spine-xna/example/src/ExampleGame.cs @@ -95,15 +95,14 @@ namespace Spine { skeletonDebugRenderer.DisableAll(); skeletonDebugRenderer.DrawClipping = true; - // String name = "spineboy-ess"; - // String name = "goblins-pro"; + // String name = "spineboy-pro"; String name = "raptor-pro"; // String name = "tank-pro"; //String name = "coin-pro"; if (useNormalmapShader) name = "raptor-pro"; // we only have normalmaps for raptor String atlasName = name.Replace("-pro", "").Replace("-ess", ""); - if (name == "goblins-pro") atlasName = "goblins-mesh"; + bool binaryData = false; Atlas atlas; @@ -115,7 +114,7 @@ namespace Spine { loadMultipleTextureLayers: true, textureSuffixes: new string[] { "", "_normals" })); } float scale = 1; - if (name == "spineboy-ess") scale = 0.6f; + if (name == "spineboy-pro") scale = 0.6f; if (name == "raptor-pro") scale = 0.5f; if (name == "tank-pro") scale = 0.3f; if (name == "coin-pro") scale = 1; @@ -125,7 +124,8 @@ namespace Spine { SkeletonBinary binary = new SkeletonBinary(atlas); binary.Scale = scale; skeletonData = binary.ReadSkeletonData(assetsFolder + name + ".skel"); - } else { + } + else { SkeletonJson json = new SkeletonJson(atlas); json.Scale = scale; skeletonData = json.ReadSkeletonData(assetsFolder + name + ".json"); @@ -137,7 +137,7 @@ namespace Spine { AnimationStateData stateData = new AnimationStateData(skeleton.Data); state = new AnimationState(stateData); - if (name == "spineboy-ess") { + if (name == "spineboy-pro") { skeleton.SetAttachment("head-bb", "head"); stateData.SetMix("run", "jump", 0.2f);