mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-06 07:14:55 +08:00
Merge branch '3.8' into 4.0-beta
This commit is contained in:
commit
e5be13e3d6
@ -124,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");
|
||||
|
||||
@ -62,6 +62,10 @@ namespace Spine {
|
||||
private float zSpacing = 0.0f;
|
||||
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) {
|
||||
this.device = device;
|
||||
|
||||
@ -106,7 +110,7 @@ namespace Spine {
|
||||
for (int i = 0, n = drawOrder.Count; i < n; i++) {
|
||||
Slot slot = drawOrderItems[i];
|
||||
Attachment attachment = slot.Attachment;
|
||||
float attachmentZOffset = zSpacing * i;
|
||||
float attachmentZOffset = z + zSpacing * i;
|
||||
|
||||
float attachmentColorR, attachmentColorG, attachmentColorB, attachmentColorA;
|
||||
object textureObject = null;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user