UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-14 19:11:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] Fixed compile error after merge of 3.7 branch to 3.8 caused changes to Slot.cs to vanish, since there was a major reordering of methods happening. Reintroduced changes of commit 9deb3be61c855e4dcd14d53751a9bfdd7d890cf4 for Slot.cs, fixing all compile errors again.

Browse Source
This commit is contained in:
Harald Csaszar 2019-04-02 20:19:34 +02:00
parent 9bb5a0d044
commit 4777009d79
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spine-csharp/src/Slot.cs
View File

@ -45,7 +45,7 @@ namespace Spine {
internal bool hasSecondColor;
internal Attachment attachment;
internal float attachmentTime;
internal ExposedList<float> attachmentVertices = new ExposedList<float>();
internal ExposedList<float> deform = new ExposedList<float>();
public Slot (SlotData data, Bone bone) {
if (data == null) throw new ArgumentNullException("data", "data cannot be null.");
@ -84,6 +84,7 @@ namespace Spine {
attachment = slot.attachment;
attachmentTime = slot.attachmentTime;
deform.AddRange(slot.deform);
}
/// <summary>The slot's setup pose data.</summary>
@ -122,13 +123,13 @@ namespace Spine {
get { return attachment; }
/// <summary>
/// Sets the slot's attachment and, if the attachment changed, resets <see cref="AttachmentTime"/> and clears
/// <see cref="AttachmentVertices">.</summary>
/// <see cref="Deform">.</summary>
/// <param name="value">May be null.</param>
set {
if (attachment == value) return;
attachment = value;
attachmentTime = bone.skeleton.time;
attachmentVertices.Clear(false);
deform.Clear(false);
}
}
@ -143,13 +144,13 @@ namespace Spine {
/// weighted mesh, the entries are an offset for each vertex which will be added to the mesh's local vertex positions.
/// <para />
/// See <see cref="VertexAttachment.ComputeWorldVertices(Slot, int, int, float[], int, int)"/> and <see cref="DeformTimeline"/>.</summary>
public ExposedList<float> AttachmentVertices {
public ExposedList<float> Deform {
get {
return attachmentVertices;
return deform;
}
set {
if (attachmentVertices == null) throw new ArgumentNullException("attachmentVertices", "attachmentVertices cannot be null.");
attachmentVertices = value;
if (deform == null) throw new ArgumentNullException("deform", "deform cannot be null.");
deform = value;
}
}