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

Merge branch '3.8' into 4.0-beta

Browse Source
This commit is contained in:
Harald Csaszar 2020-11-19 20:09:57 +01:00
commit e5be13e3d6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,8 @@ namespace Spine {
SkeletonBinary binary = new SkeletonBinary(atlas); SkeletonBinary binary = new SkeletonBinary(atlas);
binary.Scale = scale; binary.Scale = scale;
skeletonData = binary.ReadSkeletonData(assetsFolder + name + ".skel"); skeletonData = binary.ReadSkeletonData(assetsFolder + name + ".skel");
} else { }
else {
SkeletonJson json = new SkeletonJson(atlas); SkeletonJson json = new SkeletonJson(atlas);
json.Scale = scale; json.Scale = scale;
skeletonData = json.ReadSkeletonData(assetsFolder + name + ".json"); skeletonData = json.ReadSkeletonData(assetsFolder + name + ".json");

6
spine-xna/src/SkeletonRenderer.cs
View File

@ -62,6 +62,10 @@ namespace Spine {
private float zSpacing = 0.0f; private float zSpacing = 0.0f;
public float ZSpacing { get { return zSpacing; } set { zSpacing = value; } } public float ZSpacing { get { return zSpacing; } set { zSpacing = value; } }
/// <summary>A Z position offset added at each vertex.</summary>
private float z = 0.0f;
public float Z { get { return z; } set { z = value; } }
public SkeletonRenderer (GraphicsDevice device) { public SkeletonRenderer (GraphicsDevice device) {
this.device = device; this.device = device;
@ -106,7 +110,7 @@ namespace Spine {
for (int i = 0, n = drawOrder.Count; i < n; i++) { for (int i = 0, n = drawOrder.Count; i < n; i++) {
Slot slot = drawOrderItems[i]; Slot slot = drawOrderItems[i];
Attachment attachment = slot.Attachment; Attachment attachment = slot.Attachment;
float attachmentZOffset = zSpacing * i; float attachmentZOffset = z + zSpacing * i;
float attachmentColorR, attachmentColorG, attachmentColorB, attachmentColorA; float attachmentColorR, attachmentColorG, attachmentColorB, attachmentColorA;
object textureObject = null; object textureObject = null;