Skip to content

Commit

Permalink
[unity] Fixed compile errors introduced by removed FindSlotIndex and …
Browse files Browse the repository at this point in the history 
…FindBoneIndex methods. See commit dc9a6eb, see #1951.
  • Loading branch information
@HaraldCsaszar
HaraldCsaszar committed Sep 13, 2021
1 parent afa9a87 commit 8770e31
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 31 deletions.
2 changes: 1 addition & 1 deletion ...ity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipSystemExample.cs
View file
Expand Up @@ -67,7 +67,7 @@ public enum EquipType {
EquipHook howToEquip = equippables.Find(x => x.type == equipType);

var skeletonData = skeletonDataAsset.GetSkeletonData(true);
int slotIndex = skeletonData.FindSlotIndex(howToEquip.slot);
int slotIndex = skeletonData.FindSlot(howToEquip.slot).Index;
var attachment = GenerateAttachmentFromEquipAsset(asset, slotIndex, howToEquip.templateSkin, howToEquip.templateAttachment);
target.Equip(slotIndex, howToEquip.templateAttachment, attachment);
}
Expand Down
4 changes: 2 additions & 2 deletions spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs
View file
Expand Up @@ -91,7 +91,7 @@ public class MixAndMatch : MonoBehaviour {
// Step 1.4 Add the remapped clone to the new custom skin.

// Let's do this for the visor.
int visorSlotIndex = skeleton.FindSlotIndex(visorSlot); // You can access GetAttachment and SetAttachment via string, but caching the slotIndex is faster.
int visorSlotIndex = skeleton.Data.FindSlot(visorSlot).Index; // You can access GetAttachment and SetAttachment via string, but caching the slotIndex is faster.
Attachment templateAttachment = templateSkin.GetAttachment(visorSlotIndex, visorKey); // STEP 1.1

// Note: Each call to `GetRemappedClone()` with parameter `premultiplyAlpha` set to `true` creates
Expand All @@ -100,7 +100,7 @@ public class MixAndMatch : MonoBehaviour {
customSkin.SetAttachment(visorSlotIndex, visorKey, newAttachment); // STEP 1.4

// And now for the gun.
int gunSlotIndex = skeleton.FindSlotIndex(gunSlot);
int gunSlotIndex = skeleton.Data.FindSlot(gunSlot).Index;
Attachment templateGun = templateSkin.GetAttachment(gunSlotIndex, gunKey); // STEP 1.1
Attachment newGun = templateGun.GetRemappedClone(gunSprite, sourceMaterial, pivotShiftsMeshUVCoords: false); // STEP 1.2 - 1.3
if (newGun != null) customSkin.SetAttachment(gunSlotIndex, gunKey, newGun); // STEP 1.4
Expand Down
4 changes: 2 additions & 2 deletions spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs
View file
Expand Up @@ -93,7 +93,7 @@ public class MixAndMatchGraphic : MonoBehaviour {
// Step 1.4 Add the remapped clone to the new custom skin.

// Let's do this for the visor.
int visorSlotIndex = skeleton.FindSlotIndex(visorSlot); // You can access GetAttachment and SetAttachment via string, but caching the slotIndex is faster.
int visorSlotIndex = skeleton.Data.FindSlot(visorSlot).Index; // You can access GetAttachment and SetAttachment via string, but caching the slotIndex is faster.
Attachment baseAttachment = baseSkin.GetAttachment(visorSlotIndex, visorKey); // STEP 1.1

// Note: Each call to `GetRemappedClone()` with parameter `premultiplyAlpha` set to `true` creates
Expand All @@ -102,7 +102,7 @@ public class MixAndMatchGraphic : MonoBehaviour {
customSkin.SetAttachment(visorSlotIndex, visorKey, newAttachment); // STEP 1.4

// And now for the gun.
int gunSlotIndex = skeleton.FindSlotIndex(gunSlot);
int gunSlotIndex = skeleton.Data.FindSlot(gunSlot).Index;
Attachment baseGun = baseSkin.GetAttachment(gunSlotIndex, gunKey); // STEP 1.1
Attachment newGun = baseGun.GetRemappedClone(gunSprite, sourceMaterial); // STEP 1.2 - 1.3
if (newGun != null) customSkin.SetAttachment(gunSlotIndex, gunKey, newGun); // STEP 1.4
Expand Down
2 changes: 1 addition & 1 deletion spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs
View file
Expand Up @@ -170,7 +170,7 @@ public static class SpriteAttachmentExtensions {
public static RegionAttachment AddUnitySprite (this SkeletonData skeletonData, string slotName, Sprite sprite, string skinName, Shader shader, bool applyPMA, float rotation = 0f) {
RegionAttachment att = applyPMA ? sprite.ToRegionAttachmentPMAClone(shader, rotation: rotation) : sprite.ToRegionAttachment(new Material(shader), rotation);

var slotIndex = skeletonData.FindSlotIndex(slotName);
var slotIndex = skeletonData.FindSlot(slotName).Index;
Skin skin = skeletonData.DefaultSkin;
if (skinName != "")
skin = skeletonData.FindSkin(skinName);
Expand Down
4 changes: 2 additions & 2 deletions spine-unity/Assets/Spine Examples/Scripts/SpineboyFacialExpression.cs
View file
Expand Up @@ -60,11 +60,11 @@ public class SpineboyFacialExpression : MonoBehaviour {
eyeSlot = skeleton.FindSlot(eyeSlotName);
mouthSlot = skeleton.FindSlot(mouthSlotName);

int eyeSlotIndex = skeleton.FindSlotIndex(eyeSlotName);
int eyeSlotIndex = skeleton.Data.FindSlot(eyeSlotName).Index;
shockEye = skeleton.GetAttachment(eyeSlotIndex, shockEyeName);
normalEye = skeleton.GetAttachment(eyeSlotIndex, normalEyeName);

int mouthSlotIndex = skeleton.FindSlotIndex(mouthSlotName);
int mouthSlotIndex = skeleton.Data.FindSlot(mouthSlotName).Index;
shockMouth = skeleton.GetAttachment(mouthSlotIndex, shockMouthName);
normalMouth = skeleton.GetAttachment(mouthSlotIndex, normalMouthName);
}
Expand Down
6 changes: 3 additions & 3 deletions spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/PointFollowerInspector.cs
View file
Expand Up @@ -99,9 +99,9 @@ public class PointFollowerInspector : Editor {
if (currentSkin != skeleton.Data.DefaultSkin) DrawPointsInSkin(skeleton.Data.DefaultSkin, skeleton, skeletonTransform);
if (currentSkin != null) DrawPointsInSkin(currentSkin, skeleton, skeletonTransform);
} else {
int slotIndex = skeleton.FindSlotIndex(slotName.stringValue);
if (slotIndex >= 0) {
var slot = skeleton.Slots.Items[slotIndex];
Slot slot = skeleton.FindSlot(slotName.stringValue);
if (slot != null) {
int slotIndex = slot.Data.Index;
var point = skeleton.GetAttachment(slotIndex, pointAttachmentName.stringValue) as PointAttachment;
if (point != null) {
DrawPointAttachmentWithLabel(point, slot.Bone, skeletonTransform);
Expand Down
3 changes: 2 additions & 1 deletion spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs
View file
Expand Up @@ -360,7 +360,8 @@ public class SkeletonGraphicInspector : UnityEditor.Editor {
int lastSlot = skeleton.Slots.Count - 1;
if (skeleton != null) {
for (int i = 0, n = separatorSlotNames.arraySize; i < n; i++) {
int index = skeleton.FindSlotIndex(separatorSlotNames.GetArrayElementAtIndex(i).stringValue);
string slotName = separatorSlotNames.GetArrayElementAtIndex(i).stringValue;
int index = skeleton.Data.FindSlot(slotName).Index;
if (index == 0 || index == lastSlot) {
hasTerminalSlot = true;
break;
Expand Down
3 changes: 2 additions & 1 deletion spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererInspector.cs
View file
Expand Up @@ -482,7 +482,8 @@ public class SkeletonRendererInspector : UnityEditor.Editor {
int lastSlot = skeleton.Slots.Count - 1;
if (skeleton != null) {
for (int i = 0, n = separatorSlotNames.arraySize; i < n; i++) {
int index = skeleton.FindSlotIndex(separatorSlotNames.GetArrayElementAtIndex(i).stringValue);
string slotName = separatorSlotNames.GetArrayElementAtIndex(i).stringValue;
int index = skeleton.Data.FindSlot(slotName).Index;
if (index == 0 || index == lastSlot) {
hasTerminalSlot = true;
break;
Expand Down
2 changes: 1 addition & 1 deletion ...e-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs
View file
Expand Up @@ -95,7 +95,7 @@ public class SkeletonUtilityBoneInspector : UnityEditor.Editor {
Slot slot = skeletonUtility.Skeleton.Slots.Items[i];
if (slot.Bone == utilityBone.bone) {
var slotAttachments = new List<Skin.SkinEntry>();
int slotIndex = skeleton.FindSlotIndex(slot.Data.Name);
int slotIndex = skeleton.Data.FindSlot(slot.Data.Name).Index;
skin.GetAttachments(slotIndex, slotAttachments);

var boundingBoxes = new List<BoundingBoxAttachment>();
Expand Down
6 changes: 2 additions & 4 deletions spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs
View file
Expand Up @@ -764,17 +764,15 @@ public struct Pair {
if (bakeIK) {
foreach (IkConstraint i in skeleton.IkConstraints) {
foreach (Bone b in i.Bones) {
int index = skeleton.FindBoneIndex(b.Data.Name);
ignoreRotateTimelineIndexes.Add(index);
ignoreRotateTimelineIndexes.Add(b.Data.Index);
BakeBoneConstraints(b, animation, clip);
}
}
}

foreach (Bone b in skeleton.Bones) {
if (!b.Data.TransformMode.InheritsRotation()) {
int index = skeleton.FindBoneIndex(b.Data.Name);

int index = b.Data.Index;
if (ignoreRotateTimelineIndexes.Contains(index) == false) {
ignoreRotateTimelineIndexes.Add(index);
BakeBoneConstraints(b, animation, clip);
Expand Down
3 changes: 1 addition & 2 deletions spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs
View file
Expand Up @@ -118,13 +118,12 @@ public class BoundingBoxFollower : MonoBehaviour {
if (skeleton == null)
return;
slot = skeleton.FindSlot(slotName);
int slotIndex = skeleton.FindSlotIndex(slotName);

if (slot == null) {
if (BoundingBoxFollower.DebugMessages)
Debug.LogWarning(string.Format("Slot '{0}' not found for BoundingBoxFollower on '{1}'. (Previous colliders were disposed.)", slotName, this.gameObject.name));
return;
}
int slotIndex = slot.Data.Index;

int requiredCollidersCount = 0;
var colliders = GetComponents<PolygonCollider2D>();
Expand Down
3 changes: 1 addition & 2 deletions ...unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollowerGraphic.cs
View file
Expand Up @@ -118,13 +118,12 @@ public class BoundingBoxFollowerGraphic : MonoBehaviour {
if (skeleton == null)
return;
slot = skeleton.FindSlot(slotName);
int slotIndex = skeleton.FindSlotIndex(slotName);

if (slot == null) {
if (BoundingBoxFollowerGraphic.DebugMessages)
Debug.LogWarning(string.Format("Slot '{0}' not found for BoundingBoxFollowerGraphic on '{1}'. (Previous colliders were disposed.)", slotName, this.gameObject.name));
return;
}
int slotIndex = slot.Data.Index;

int requiredCollidersCount = 0;
var colliders = GetComponents<PolygonCollider2D>();
Expand Down
6 changes: 3 additions & 3 deletions spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/PointFollower.cs
View file
Expand Up @@ -92,9 +92,9 @@ public class PointFollower : MonoBehaviour, IHasSkeletonRenderer, IHasSkeletonCo
if (!string.IsNullOrEmpty(pointAttachmentName)) {
var skeleton = skeletonRenderer.Skeleton;

int slotIndex = skeleton.FindSlotIndex(slotName);
if (slotIndex >= 0) {
var slot = skeleton.slots.Items[slotIndex];
Slot slot = skeleton.FindSlot(slotName);
if (slot != null) {
int slotIndex = slot.Data.Index;
bone = slot.bone;
point = skeleton.GetAttachment(slotIndex, pointAttachmentName) as PointAttachment;
}
Expand Down
8 changes: 4 additions & 4 deletions spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs
View file
Expand Up @@ -151,10 +151,10 @@ public struct RootMotionInfo {

public void SetRootMotionBone (string name) {
var skeleton = skeletonComponent.Skeleton;
int index = skeleton.FindBoneIndex(name);
if (index >= 0) {
this.rootMotionBoneIndex = index;
this.rootMotionBone = skeleton.bones.Items[index];
Bone bone = skeleton.FindBone(name);
if (bone != null) {
this.rootMotionBoneIndex = bone.Data.Index;
this.rootMotionBone = bone;
} else {
Debug.Log("Bone named \"" + name + "\" could not be found.");
this.rootMotionBoneIndex = 0;
Expand Down
2 changes: 1 addition & 1 deletion spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtility.cs
View file
Expand Up @@ -53,7 +53,7 @@ public sealed class SkeletonUtility : MonoBehaviour {
return null;
}

var attachment = skin.GetAttachment(skeleton.FindSlotIndex(slotName), attachmentName);
var attachment = skin.GetAttachment(skeleton.Data.FindSlot(slotName).Index, attachmentName);
if (attachment == null) {
Debug.LogFormat("Attachment in slot '{0}' named '{1}' not found in skin '{2}'.", slotName, attachmentName, skin.name);
return null;
Expand Down
5 changes: 4 additions & 1 deletion spine-unity/Assets/Spine/Runtime/spine-unity/SpineAttributes.cs
View file
Expand Up @@ -252,7 +252,10 @@ public class SpineAttachment : SpineAttributeBase {

public static Spine.Attachment GetAttachment (string attachmentPath, Spine.SkeletonData skeletonData) {
var hierarchy = SpineAttachment.GetHierarchy(attachmentPath);
return string.IsNullOrEmpty(hierarchy.name) ? null : skeletonData.FindSkin(hierarchy.skin).GetAttachment(skeletonData.FindSlotIndex(hierarchy.slot), hierarchy.name);
return string.IsNullOrEmpty(hierarchy.name) ?
null :
skeletonData.FindSkin(hierarchy.skin).GetAttachment(
skeletonData.FindSlot(hierarchy.slot).Index, hierarchy.name);
}

public static Spine.Attachment GetAttachment (string attachmentPath, SkeletonDataAsset skeletonDataAsset) {
Expand Down

0 comments on commit 8770e31

Please sign in to comment.