|
|
@@ -79,22 +79,21 @@ namespace Spine {
|
|
|
skeletonRenderer.PremultipliedAlpha = false;
|
|
|
skeletonRenderer.Effect = spineEffect;
|
|
|
|
|
|
- // String name = "spineboy";
|
|
|
- // String name = "goblins-mesh";
|
|
|
- // String name = "raptor";
|
|
|
- // String name = "tank";
|
|
|
- // String name = "coin";
|
|
|
- String name = "TwoColorTest";
|
|
|
+ // String name = "spineboy-ess";
|
|
|
+ // String name = "goblins-pro";
|
|
|
+ // String name = "raptor-pro";
|
|
|
+ // String name = "tank-pro";
|
|
|
+ String name = "coin-pro";
|
|
|
+ String atlasName = name.Replace("-pro", "").Replace("-ess", "");
|
|
|
bool binaryData = false;
|
|
|
|
|
|
- Atlas atlas = new Atlas(assetsFolder + name + ".atlas", new XnaTextureLoader(GraphicsDevice));
|
|
|
+ Atlas atlas = new Atlas(assetsFolder + atlasName + ".atlas", new XnaTextureLoader(GraphicsDevice));
|
|
|
|
|
|
float scale = 1;
|
|
|
- if (name == "spineboy") scale = 0.6f;
|
|
|
- if (name == "raptor") scale = 0.5f;
|
|
|
- if (name == "tank") scale = 0.3f;
|
|
|
- if (name == "coin") scale = 1;
|
|
|
- if (name == "TwoColorTest") scale = 0.5f;
|
|
|
+ if (name == "spineboy-ess") scale = 0.6f;
|
|
|
+ if (name == "raptor-pro") scale = 0.5f;
|
|
|
+ if (name == "tank-pro") scale = 0.3f;
|
|
|
+ if (name == "coin-pro") scale = 1;
|
|
|
|
|
|
SkeletonData skeletonData;
|
|
|
if (binaryData) {
|
|
|
@@ -107,13 +106,13 @@ namespace Spine {
|
|
|
skeletonData = json.ReadSkeletonData(assetsFolder + name + ".json");
|
|
|
}
|
|
|
skeleton = new Skeleton(skeletonData);
|
|
|
- if (name == "goblins-mesh") skeleton.SetSkin("goblin");
|
|
|
+ if (name == "goblins-pro") skeleton.SetSkin("goblin");
|
|
|
|
|
|
// Define mixing between animations.
|
|
|
AnimationStateData stateData = new AnimationStateData(skeleton.Data);
|
|
|
state = new AnimationState(stateData);
|
|
|
|
|
|
- if (name == "spineboy") {
|
|
|
+ if (name == "spineboy-ess") {
|
|
|
stateData.SetMix("run", "jump", 0.2f);
|
|
|
stateData.SetMix("jump", "run", 0.4f);
|
|
|
|
|
|
@@ -128,25 +127,22 @@ namespace Spine {
|
|
|
entry.End += End; // Event handling for queued animations.
|
|
|
state.AddAnimation(0, "run", true, 0);
|
|
|
}
|
|
|
- else if (name == "raptor") {
|
|
|
+ else if (name == "raptor-pro") {
|
|
|
state.SetAnimation(0, "walk", true);
|
|
|
state.AddAnimation(1, "gungrab", false, 2);
|
|
|
}
|
|
|
- else if (name == "coin") {
|
|
|
+ else if (name == "coin-pro") {
|
|
|
state.SetAnimation(0, "rotate", true);
|
|
|
}
|
|
|
- else if (name == "tank") {
|
|
|
+ else if (name == "tank-pro") {
|
|
|
state.SetAnimation(0, "drive", true);
|
|
|
- }
|
|
|
- else if (name == "TwoColorTest") {
|
|
|
- state.SetAnimation(0, "animation", true);
|
|
|
- }
|
|
|
+ }
|
|
|
else {
|
|
|
state.SetAnimation(0, "walk", true);
|
|
|
}
|
|
|
|
|
|
- skeleton.X = 400 + (name == "tank" ? 300: 0);
|
|
|
- skeleton.Y = 580 + (name == "TwoColorTest" ? -400 : 0);
|
|
|
+ skeleton.X = 400 + (name == "tank-pro" ? 300: 0);
|
|
|
+ skeleton.Y = GraphicsDevice.Viewport.Height;
|
|
|
skeleton.UpdateWorldTransform();
|
|
|
|
|
|
headSlot = skeleton.FindSlot("head");
|
badlogic