From 9c7b95ff300eb012962740d720a557c4ff3ec495 Mon Sep 17 00:00:00 2001 From: Fenrisul Date: Tue, 17 Feb 2015 18:22:51 -0800 Subject: [PATCH] SkeletonAnimator update Unity5 compatibility pass --- .../Scripts/BasicPlatformerController.cs.meta | 2 + .../Assets/Examples/Scripts/Chimera.cs.meta | 2 + .../Scripts/ConstrainedCamera.cs.meta | 2 + .../Examples/Scripts/DynamicSpineBone.cs.meta | 2 + .../Scripts/FootSoldierExample.cs.meta | 2 + .../Assets/Examples/Scripts/Goblins.cs.meta | 2 + .../Assets/Examples/Scripts/Raptor.cs.meta | 2 + .../Assets/Examples/Scripts/Spineboy.cs.meta | 2 + .../Examples/Scripts/SpineboyController.cs | 8 +-- .../Scripts/SpineboyController.cs.meta | 2 + .../Assets/spine-unity/AtlasAsset.cs.meta | 2 + .../spine-unity/AtlasRegionAttacher.cs.meta | 2 + .../Assets/spine-unity/BoneFollower.cs.meta | 2 + .../Assets/spine-unity/CustomSkin.cs.meta | 2 + .../Editor/AtlasAssetInspector.cs.meta | 2 + .../Editor/BoneFollowerInspector.cs.meta | 2 + .../Editor/GUI/icon-animation.png.meta | 6 ++ .../Editor/GUI/icon-animationRoot.png.meta | 6 ++ .../spine-unity/Editor/GUI/icon-bone.png.meta | 6 ++ .../Editor/GUI/icon-boneNib.png.meta | 6 ++ .../Editor/GUI/icon-boundingBox.png.meta | 6 ++ .../Editor/GUI/icon-constraintNib.png.meta | 6 ++ .../Editor/GUI/icon-event.png.meta | 6 ++ .../Editor/GUI/icon-hingeChain.png.meta | 6 ++ .../Editor/GUI/icon-image.png.meta | 6 ++ .../spine-unity/Editor/GUI/icon-mesh.png.meta | 6 ++ .../spine-unity/Editor/GUI/icon-null.png.meta | 6 ++ .../Editor/GUI/icon-poseBones.png.meta | 6 ++ .../Editor/GUI/icon-skeleton.png.meta | 6 ++ .../Editor/GUI/icon-skeletonUtility.png.meta | 6 ++ .../spine-unity/Editor/GUI/icon-skin.png.meta | 6 ++ .../Editor/GUI/icon-skinPlaceholder.png.meta | 6 ++ .../Editor/GUI/icon-skinsRoot.png.meta | 6 ++ .../spine-unity/Editor/GUI/icon-slot.png.meta | 6 ++ .../Editor/GUI/icon-slotRoot.png.meta | 6 ++ .../Editor/GUI/icon-spine.png.meta | 6 ++ .../Editor/GUI/icon-subMeshRenderer.png.meta | 6 ++ .../Editor/GUI/icon-warning.png.meta | 6 ++ .../Editor/GUI/icon-weights.png.meta | 6 ++ .../Assets/spine-unity/Editor/Menus.cs.meta | 2 + .../Editor/SkeletonAnimationInspector.cs.meta | 2 + .../Editor/SkeletonAnimatorInspector.cs | 9 +-- .../Editor/SkeletonAnimatorInspector.cs.meta | 2 + .../spine-unity/Editor/SkeletonBaker.cs | 66 ++++++++++++++++--- .../spine-unity/Editor/SkeletonBaker.cs.meta | 2 + .../Editor/SkeletonDataAssetInspector.cs | 10 +-- .../Editor/SkeletonDataAssetInspector.cs.meta | 2 + .../Editor/SkeletonRendererInspector.cs.meta | 2 + .../Editor/SpineAttributeDrawers.cs.meta | 2 + .../Editor/SpineEditorUtilities.cs.meta | 2 + .../spine-unity/Shaders/Bones.shader.meta | 2 + .../spine-unity/Shaders/HiddenPass.mat.meta | 2 + .../Shaders/HiddenPass.shader.meta | 2 + .../spine-unity/Shaders/Skeleton.shader.meta | 2 + .../Shaders/SkeletonLit.shader.meta | 2 + .../spine-unity/SkeletonAnimation.cs.meta | 2 + .../SkeletonAnimationInterface.cs.meta | 2 + .../Assets/spine-unity/SkeletonAnimator.cs | 45 ++++++++++++- .../spine-unity/SkeletonAnimator.cs.meta | 2 + .../spine-unity/SkeletonDataAsset.cs.meta | 2 + .../spine-unity/SkeletonExtensions.cs.meta | 2 + .../Assets/spine-unity/SkeletonRenderer.cs | 6 +- .../spine-unity/SkeletonRenderer.cs.meta | 2 + .../Editor/SkeletonUtilityBoneInspector.cs | 8 +-- .../SkeletonUtilityBoneInspector.cs.meta | 2 + .../Editor/SkeletonUtilityInspector.cs.meta | 2 + .../SkeletonUtility/SkeletonUtility.cs | 4 +- .../SkeletonUtility/SkeletonUtility.cs.meta | 2 + .../SkeletonUtilityBone.cs.meta | 2 + .../SkeletonUtilityConstraint.cs.meta | 2 + .../SkeletonUtilityEyeConstraint.cs.meta | 2 + .../SkeletonUtilityGroundConstraint.cs.meta | 2 + .../SkeletonUtilityKinematicShadow.cs | 6 +- .../SkeletonUtilityKinematicShadow.cs.meta | 2 + .../SkeletonUtilitySubmeshRenderer.cs | 8 +-- .../SkeletonUtilitySubmeshRenderer.cs.meta | 2 + .../spine-unity/SpineAttributes.cs.meta | 2 + 77 files changed, 354 insertions(+), 42 deletions(-) diff --git a/spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs.meta b/spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs.meta index 18fbb8ef4..6dc6752e8 100644 --- a/spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/Chimera.cs.meta b/spine-unity/Assets/Examples/Scripts/Chimera.cs.meta index ae5a4019f..d38c663e5 100644 --- a/spine-unity/Assets/Examples/Scripts/Chimera.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/Chimera.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs.meta b/spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs.meta index 127befb45..5aa1cd4d6 100644 --- a/spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/DynamicSpineBone.cs.meta b/spine-unity/Assets/Examples/Scripts/DynamicSpineBone.cs.meta index 6aac53582..bc05f26e6 100644 --- a/spine-unity/Assets/Examples/Scripts/DynamicSpineBone.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/DynamicSpineBone.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta b/spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta index c82e3bd15..d7028c915 100644 --- a/spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/Goblins.cs.meta b/spine-unity/Assets/Examples/Scripts/Goblins.cs.meta index 0a8ee7905..1f45bb9e9 100644 --- a/spine-unity/Assets/Examples/Scripts/Goblins.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/Goblins.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/Raptor.cs.meta b/spine-unity/Assets/Examples/Scripts/Raptor.cs.meta index 3738cf371..4f84770b9 100644 --- a/spine-unity/Assets/Examples/Scripts/Raptor.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/Raptor.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/Spineboy.cs.meta b/spine-unity/Assets/Examples/Scripts/Spineboy.cs.meta index 3e2eb3457..d1e17cf35 100644 --- a/spine-unity/Assets/Examples/Scripts/Spineboy.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/Spineboy.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Examples/Scripts/SpineboyController.cs b/spine-unity/Assets/Examples/Scripts/SpineboyController.cs index 064152df4..6e0b04a6a 100644 --- a/spine-unity/Assets/Examples/Scripts/SpineboyController.cs +++ b/spine-unity/Assets/Examples/Scripts/SpineboyController.cs @@ -68,13 +68,13 @@ public class SpineboyController : MonoBehaviour { if (absX > 0.7f) { SetAnimation(runAnimation, true); - rigidbody2D.velocity = new Vector2(runVelocity * Mathf.Sign(x), rigidbody2D.velocity.y); + GetComponent().velocity = new Vector2(runVelocity * Mathf.Sign(x), GetComponent().velocity.y); } else if (absX > 0) { SetAnimation(walkAnimation, true); - rigidbody2D.velocity = new Vector2(walkVelocity * Mathf.Sign(x), rigidbody2D.velocity.y); + GetComponent().velocity = new Vector2(walkVelocity * Mathf.Sign(x), GetComponent().velocity.y); } else { SetAnimation(idleAnimation, true); - rigidbody2D.velocity = new Vector2(0, rigidbody2D.velocity.y); + GetComponent().velocity = new Vector2(0, GetComponent().velocity.y); } } else { if (skeletonAnimation.state.GetCurrent(0).Animation.Name != hitAnimation) @@ -101,7 +101,7 @@ public class SpineboyController : MonoBehaviour { } else { skeletonAnimation.state.SetAnimation(0, hitAnimation, false); skeletonAnimation.state.AddAnimation(0, currentAnimation, true, 0); - rigidbody2D.velocity = new Vector2(0, rigidbody2D.velocity.y); + GetComponent().velocity = new Vector2(0, GetComponent().velocity.y); hit = true; } diff --git a/spine-unity/Assets/Examples/Scripts/SpineboyController.cs.meta b/spine-unity/Assets/Examples/Scripts/SpineboyController.cs.meta index 1007cc854..6ab4c9a3b 100644 --- a/spine-unity/Assets/Examples/Scripts/SpineboyController.cs.meta +++ b/spine-unity/Assets/Examples/Scripts/SpineboyController.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/AtlasAsset.cs.meta b/spine-unity/Assets/spine-unity/AtlasAsset.cs.meta index 8cd9bc105..079bc6a59 100644 --- a/spine-unity/Assets/spine-unity/AtlasAsset.cs.meta +++ b/spine-unity/Assets/spine-unity/AtlasAsset.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/AtlasRegionAttacher.cs.meta b/spine-unity/Assets/spine-unity/AtlasRegionAttacher.cs.meta index bbf8780fa..2b62bad2a 100644 --- a/spine-unity/Assets/spine-unity/AtlasRegionAttacher.cs.meta +++ b/spine-unity/Assets/spine-unity/AtlasRegionAttacher.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/BoneFollower.cs.meta b/spine-unity/Assets/spine-unity/BoneFollower.cs.meta index 29dabc13e..c5bb78cfc 100644 --- a/spine-unity/Assets/spine-unity/BoneFollower.cs.meta +++ b/spine-unity/Assets/spine-unity/BoneFollower.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/CustomSkin.cs.meta b/spine-unity/Assets/spine-unity/CustomSkin.cs.meta index 3a7ba7a9d..ade04ec0d 100644 --- a/spine-unity/Assets/spine-unity/CustomSkin.cs.meta +++ b/spine-unity/Assets/spine-unity/CustomSkin.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs.meta b/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs.meta index 898e53399..2f5962a13 100644 --- a/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/BoneFollowerInspector.cs.meta b/spine-unity/Assets/spine-unity/Editor/BoneFollowerInspector.cs.meta index a5cf9ae89..0448ccb60 100644 --- a/spine-unity/Assets/spine-unity/Editor/BoneFollowerInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/BoneFollowerInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-animation.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-animation.png.meta index 6d9bc41dd..dcf6806e2 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-animation.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-animation.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-animationRoot.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-animationRoot.png.meta index 4bcf433e8..1bbca1c8f 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-animationRoot.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-animationRoot.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-bone.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-bone.png.meta index 9c59ed87d..f0cbaeaa1 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-bone.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-bone.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-boneNib.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-boneNib.png.meta index 955598a84..a0b91bee0 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-boneNib.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-boneNib.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-boundingBox.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-boundingBox.png.meta index c90f54d3c..49c9ab374 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-boundingBox.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-boundingBox.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-constraintNib.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-constraintNib.png.meta index e7ab7aca3..a69272890 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-constraintNib.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-constraintNib.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-event.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-event.png.meta index 2ab786189..0bf19dba7 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-event.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-event.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-hingeChain.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-hingeChain.png.meta index 6f346e072..83eb12195 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-hingeChain.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-hingeChain.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-image.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-image.png.meta index 24d78a242..421c654a1 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-image.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-image.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-mesh.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-mesh.png.meta index a98b0e9c8..2b49d8b05 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-mesh.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-mesh.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-null.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-null.png.meta index a949f63a6..29da564a9 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-null.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-null.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-poseBones.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-poseBones.png.meta index c3748ea88..800466b42 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-poseBones.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-poseBones.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeleton.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeleton.png.meta index f607575fb..9c2a1a735 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeleton.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeleton.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeletonUtility.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeletonUtility.png.meta index 9d3c22794..3a77fd7fc 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeletonUtility.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skeletonUtility.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skin.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skin.png.meta index 3be7a6e69..364699a3f 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skin.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skin.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinPlaceholder.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinPlaceholder.png.meta index e6ebc95cc..92955a92e 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinPlaceholder.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinPlaceholder.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinsRoot.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinsRoot.png.meta index e332380e8..b8ce214ce 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinsRoot.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-skinsRoot.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-slot.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-slot.png.meta index 89224b580..66d52b051 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-slot.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-slot.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-slotRoot.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-slotRoot.png.meta index d85022986..3d9fdd737 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-slotRoot.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-slotRoot.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-spine.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-spine.png.meta index c0ec65ca2..811e17a60 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-spine.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-spine.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-subMeshRenderer.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-subMeshRenderer.png.meta index cbccad91c..fa3792831 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-subMeshRenderer.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-subMeshRenderer.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-warning.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-warning.png.meta index e32950ca4..87c616fcb 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-warning.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-warning.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/GUI/icon-weights.png.meta b/spine-unity/Assets/spine-unity/Editor/GUI/icon-weights.png.meta index 067337d4f..e25807b07 100644 --- a/spine-unity/Assets/spine-unity/Editor/GUI/icon-weights.png.meta +++ b/spine-unity/Assets/spine-unity/Editor/GUI/icon-weights.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 1024 @@ -30,6 +33,7 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -45,3 +49,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/Menus.cs.meta b/spine-unity/Assets/spine-unity/Editor/Menus.cs.meta index ab58e94aa..d33433fea 100644 --- a/spine-unity/Assets/spine-unity/Editor/Menus.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/Menus.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs.meta b/spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs.meta index 012f0375f..1ca794134 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs b/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs index 333ccefcd..e6eb7de8b 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs @@ -27,6 +27,11 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ + +/***************************************************************************** + * SkeletonAnimatorInspector created by Mitch Thompson + * Full irrevocable rights and permissions granted to Esoteric Software +*****************************************************************************/ using System; using UnityEditor; using UnityEngine; @@ -39,15 +44,11 @@ public class SkeletonAnimatorInspector : SkeletonRendererInspector { protected override void OnEnable () { base.OnEnable(); layerMixModes = serializedObject.FindProperty("layerMixModes"); - - - } protected override void gui () { base.gui(); - EditorGUILayout.PropertyField(layerMixModes, true); serializedObject.ApplyModifiedProperties(); diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta b/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta index 35b472565..9ef306e63 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs b/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs index 8eddefd85..74fcc2899 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs @@ -89,20 +89,32 @@ public static class SkeletonBaker { var skeletonData = skeletonDataAsset.GetSkeletonData(true); bool hasAnimations = bakeAnimations && skeletonData.Animations.Count > 0; +#if UNITY_5 + UnityEditor.Animations.AnimatorController controller = null; +#else UnityEditorInternal.AnimatorController controller = null; - +#endif if (hasAnimations) { string controllerPath = outputPath + "/" + skeletonDataAsset.skeletonJSON.name + " Controller.controller"; bool newAnimContainer = false; var runtimeController = AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController)); +#if UNITY_5 + if (runtimeController != null) { + controller = (UnityEditor.Animations.AnimatorController)runtimeController; + } else { + controller = UnityEditor.Animations.AnimatorController.CreateAnimatorControllerAtPath(controllerPath); + newAnimContainer = true; + } +#else if (runtimeController != null) { controller = (UnityEditorInternal.AnimatorController)runtimeController; } else { controller = UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath); newAnimContainer = true; } +#endif Dictionary existingClipTable = new Dictionary(); List unusedClipNames = new List(); @@ -147,7 +159,12 @@ public static class SkeletonBaker { unusedClipNames.Remove(clip.name); } else { AssetDatabase.AddObjectToAsset(clip, controller); - AnimatorController.AddAnimationClipToController(controller, clip); +#if UNITY_5_0 + controller.AddMotion(clip); +#else + UnityEditorInternal.AnimatorController.AddAnimationClipToController(controller, clip); +#endif + } } @@ -308,8 +325,8 @@ public static class SkeletonBaker { attachmentTransform.gameObject.AddComponent(); } - attachmentTransform.renderer.sharedMaterial = material; - attachmentTransform.renderer.sortingOrder = i; + attachmentTransform.GetComponent().sharedMaterial = material; + attachmentTransform.GetComponent().sortingOrder = i; if (attachmentName != slotData.AttachmentName) attachmentTransform.gameObject.SetActive(false); @@ -365,23 +382,40 @@ public static class SkeletonBaker { string controllerPath = dataPath.Replace("_SkeletonData", "_Controller").Replace(".asset", ".controller"); - - AnimatorController controller; +#if UNITY_5 + UnityEditor.Animations.AnimatorController controller; if (skeletonDataAsset.controller != null) { - controller = (AnimatorController)skeletonDataAsset.controller; + controller = (UnityEditor.Animations.AnimatorController)skeletonDataAsset.controller; } else { if (File.Exists(controllerPath)) { if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) { - controller = (AnimatorController)AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController)); + controller = (UnityEditor.Animations.AnimatorController)AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController)); } else { - controller = (AnimatorController)AnimatorController.CreateAnimatorControllerAtPath(controllerPath); + controller = (UnityEditor.Animations.AnimatorController)UnityEditor.Animations.AnimatorController.CreateAnimatorControllerAtPath(controllerPath); } } else { - controller = (AnimatorController)AnimatorController.CreateAnimatorControllerAtPath(controllerPath); + controller = (UnityEditor.Animations.AnimatorController)UnityEditor.Animations.AnimatorController.CreateAnimatorControllerAtPath(controllerPath); } } +#else + UnityEditorInternal.AnimatorController controller; + + if (skeletonDataAsset.controller != null) { + controller = (UnityEditorInternal.AnimatorController)skeletonDataAsset.controller; + } else { + if (File.Exists(controllerPath)) { + if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) { + controller = (UnityEditorInternal.AnimatorController)AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController)); + } else { + controller = (UnityEditorInternal.AnimatorController)UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath); + } + } else { + controller = (UnityEditorInternal.AnimatorController)UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath); + } + } +#endif skeletonDataAsset.controller = controller; EditorUtility.SetDirty(skeletonDataAsset); @@ -405,7 +439,11 @@ public static class SkeletonBaker { //generate new dummy clip AnimationClip newClip = new AnimationClip(); newClip.name = name; +#if UNITY_5 +#else AnimationUtility.SetAnimationType(newClip, ModelImporterAnimationType.Generic); +#endif + AssetDatabase.AddObjectToAsset(newClip, controller); clipTable.Add(name, newClip); } @@ -735,10 +773,14 @@ public static class SkeletonBaker { } static void SetAnimationSettings (AnimationClip clip, AnimationClipSettings settings) { +#if UNITY_5 + AnimationUtility.SetAnimationClipSettings(clip, settings); +#else MethodInfo methodInfo = typeof(AnimationUtility).GetMethod("SetAnimationClipSettings", BindingFlags.Static | BindingFlags.NonPublic); methodInfo.Invoke(null, new object[] { clip, settings }); EditorUtility.SetDirty(clip); +#endif } static AnimationClip ExtractAnimation (string name, SkeletonData skeletonData, Dictionary> slotLookup, bool bakeIK, SendMessageOptions eventOptions, AnimationClip clip = null) { @@ -753,7 +795,11 @@ public static class SkeletonBaker { AnimationUtility.SetAnimationEvents(clip, new AnimationEvent[0]); } +#if UNITY_5 + +#else AnimationUtility.SetAnimationType(clip, ModelImporterAnimationType.Generic); +#endif clip.name = name; diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs.meta b/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs.meta index f4b6fa1c6..1e73fe1df 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs b/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs index 8880a09e7..83bbef004 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs @@ -528,7 +528,7 @@ public class SkeletonDataAssetInspector : Editor { if (this.m_previewUtility == null) { this.m_lastTime = Time.realtimeSinceStartup; this.m_previewUtility = new PreviewRenderUtility(true); - this.m_previewUtility.m_Camera.isOrthoGraphic = true; + this.m_previewUtility.m_Camera.orthographic = true; this.m_previewUtility.m_Camera.orthographicSize = 1; this.m_previewUtility.m_Camera.cullingMask = -2147483648; this.m_previewUtility.m_Camera.nearClipPlane = 0.01f; @@ -554,7 +554,7 @@ public class SkeletonDataAssetInspector : Editor { m_skeletonData = m_skeletonAnimation.skeletonDataAsset.GetSkeletonData(true); - m_previewInstance.renderer.enabled = false; + m_previewInstance.GetComponent().enabled = false; m_initialized = true; AdjustCameraGoals(true); @@ -624,7 +624,7 @@ public class SkeletonDataAssetInspector : Editor { GameObject go = this.m_previewInstance; - Bounds bounds = go.renderer.bounds; + Bounds bounds = go.GetComponent().bounds; m_orthoGoal = bounds.size.y; m_posGoal = bounds.center + new Vector3(0, 0, -10); @@ -661,7 +661,7 @@ public class SkeletonDataAssetInspector : Editor { GameObject go = this.m_previewInstance; if (m_requireRefresh && go != null) { - go.renderer.enabled = true; + go.GetComponent().enabled = true; if (EditorApplication.isPlaying) { //do nothing @@ -683,7 +683,7 @@ public class SkeletonDataAssetInspector : Editor { } this.m_previewUtility.m_Camera.Render(); - go.renderer.enabled = false; + go.GetComponent().enabled = false; } diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta b/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta index fba64b6e3..5a602df97 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs.meta b/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs.meta index d32cc952c..d7791c681 100644 --- a/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs.meta b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs.meta index 69a87c913..901111a0b 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs.meta b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs.meta index 544e47769..858912afe 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs.meta +++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Shaders/Bones.shader.meta b/spine-unity/Assets/spine-unity/Shaders/Bones.shader.meta index d01814ef9..17117f38a 100644 --- a/spine-unity/Assets/spine-unity/Shaders/Bones.shader.meta +++ b/spine-unity/Assets/spine-unity/Shaders/Bones.shader.meta @@ -3,3 +3,5 @@ guid: 66988de88a15abd4e8846c6805485f57 ShaderImporter: defaultTextures: [] userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Shaders/HiddenPass.mat.meta b/spine-unity/Assets/spine-unity/Shaders/HiddenPass.mat.meta index ef267ef07..f9a2a315e 100644 --- a/spine-unity/Assets/spine-unity/Shaders/HiddenPass.mat.meta +++ b/spine-unity/Assets/spine-unity/Shaders/HiddenPass.mat.meta @@ -2,3 +2,5 @@ fileFormatVersion: 2 guid: 43227e5adadc6f24bb4bf74b92a56fb4 NativeFormatImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Shaders/HiddenPass.shader.meta b/spine-unity/Assets/spine-unity/Shaders/HiddenPass.shader.meta index bcc031d30..01ca4ed60 100644 --- a/spine-unity/Assets/spine-unity/Shaders/HiddenPass.shader.meta +++ b/spine-unity/Assets/spine-unity/Shaders/HiddenPass.shader.meta @@ -3,3 +3,5 @@ guid: 913475501bf19374c84390868a9d6d3d ShaderImporter: defaultTextures: [] userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Shaders/Skeleton.shader.meta b/spine-unity/Assets/spine-unity/Shaders/Skeleton.shader.meta index 753129e68..06c4b0c2a 100644 --- a/spine-unity/Assets/spine-unity/Shaders/Skeleton.shader.meta +++ b/spine-unity/Assets/spine-unity/Shaders/Skeleton.shader.meta @@ -3,3 +3,5 @@ guid: 1e8a610c9e01c3648bac42585e5fc676 ShaderImporter: defaultTextures: [] userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Shaders/SkeletonLit.shader.meta b/spine-unity/Assets/spine-unity/Shaders/SkeletonLit.shader.meta index a8444eec9..1d0a386de 100644 --- a/spine-unity/Assets/spine-unity/Shaders/SkeletonLit.shader.meta +++ b/spine-unity/Assets/spine-unity/Shaders/SkeletonLit.shader.meta @@ -3,3 +3,5 @@ guid: bd83c75f51f5e23498ae22ffcdfe92c3 ShaderImporter: defaultTextures: [] userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimation.cs.meta b/spine-unity/Assets/spine-unity/SkeletonAnimation.cs.meta index f497aa7e8..23ede7bd7 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimation.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonAnimation.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimationInterface.cs.meta b/spine-unity/Assets/spine-unity/SkeletonAnimationInterface.cs.meta index 6572a198f..68e421f69 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimationInterface.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonAnimationInterface.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs index 3b950c5e0..4adba2684 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs +++ b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs @@ -1,4 +1,38 @@ -using UnityEngine; +/****************************************************************************** + * Spine Runtimes Software License + * Version 2.1 + * + * Copyright (c) 2013, Esoteric Software + * All rights reserved. + * + * You are granted a perpetual, non-exclusive, non-sublicensable and + * non-transferable license to install, execute and perform the Spine Runtimes + * Software (the "Software") solely for internal use. Without the written + * permission of Esoteric Software (typically granted by licensing Spine), you + * may not (a) modify, translate, adapt or otherwise create derivative works, + * improvements of the Software or develop new applications using the Software + * or (b) remove, delete, alter or obscure any trademarks or any copyright, + * trademark, patent or other intellectual property or proprietary rights + * notices on or in the Software, including any copy thereof. Redistributions + * in binary or source form must include this license and terms. + * + * THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL ESOTERIC SOFTARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *****************************************************************************/ + +/***************************************************************************** + * SkeletonAnimator created by Mitch Thompson + * Full irrevocable rights and permissions granted to Esoteric Software +*****************************************************************************/ +using UnityEngine; using System.Collections; using System.Collections.Generic; using Spine; @@ -69,10 +103,15 @@ public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation { layerWeight = 1; var stateInfo = animator.GetCurrentAnimatorStateInfo(i); - var clipInfo = animator.GetCurrentAnimationClipState(i); var nextStateInfo = animator.GetNextAnimatorStateInfo(i); - var nextClipInfo = animator.GetNextAnimationClipState(i); +#if UNITY_5 + var clipInfo = animator.GetCurrentAnimatorClipInfo(i); + var nextClipInfo = animator.GetNextAnimatorClipInfo(i); +#else + var clipInfo = animator.GetCurrentAnimationClipState(i); + var nextClipInfo = animator.GetNextAnimationClipState(i); +#endif MixMode mode = layerMixModes[i]; if (mode == MixMode.AlwaysMix) { diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs.meta b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs.meta index 91dba98cc..ebd50dc41 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonDataAsset.cs.meta b/spine-unity/Assets/spine-unity/SkeletonDataAsset.cs.meta index db4f247d4..6c5a6e2fe 100644 --- a/spine-unity/Assets/spine-unity/SkeletonDataAsset.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonDataAsset.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonExtensions.cs.meta b/spine-unity/Assets/spine-unity/SkeletonExtensions.cs.meta index 427cdd10a..0ec145755 100644 --- a/spine-unity/Assets/spine-unity/SkeletonExtensions.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonExtensions.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs index d200de45c..7a099956e 100644 --- a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs +++ b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs @@ -76,8 +76,8 @@ public class SkeletonRenderer : MonoBehaviour { public virtual void Reset () { if (meshFilter != null) meshFilter.sharedMesh = null; - if (renderer != null) - renderer.sharedMaterial = null; + if (GetComponent() != null) + GetComponent().sharedMaterial = null; if (mesh1 != null) { if (Application.isPlaying) @@ -225,7 +225,7 @@ public class SkeletonRenderer : MonoBehaviour { submeshMaterials.CopyTo(sharedMaterials); else sharedMaterials = submeshMaterials.ToArray(); - renderer.sharedMaterials = sharedMaterials; + GetComponent().sharedMaterials = sharedMaterials; // Ensure mesh data is the right size. Vector3[] vertices = this.vertices; diff --git a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs.meta b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs.meta index fff56a22b..5230098d4 100644 --- a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs b/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs index a6950aa84..f8d6d7340 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs @@ -246,7 +246,7 @@ public class SkeletonUtilityBoneInspector : Editor { bool CanCreateHingeChain () { if (utilityBone == null) return false; - if (utilityBone.rigidbody != null) + if (utilityBone.GetComponent() != null) return false; if (utilityBone.bone != null && utilityBone.bone.Children.Count == 0) return false; @@ -266,7 +266,7 @@ public class SkeletonUtilityBoneInspector : Editor { AttachRigidbody(utilBone); } - utilityBone.rigidbody.isKinematic = true; + utilityBone.GetComponent().isKinematic = true; foreach (var utilBone in utilBoneArr) { if (utilBone == utilityBone) @@ -276,13 +276,13 @@ public class SkeletonUtilityBoneInspector : Editor { HingeJoint joint = utilBone.gameObject.AddComponent(); joint.axis = Vector3.forward; - joint.connectedBody = utilBone.transform.parent.rigidbody; + joint.connectedBody = utilBone.transform.parent.GetComponent(); joint.useLimits = true; JointLimits limits = new JointLimits(); limits.min = -20; limits.max = 20; joint.limits = limits; - utilBone.rigidbody.mass = utilBone.transform.parent.rigidbody.mass * 0.75f; + utilBone.GetComponent().mass = utilBone.transform.parent.GetComponent().mass * 0.75f; } } diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta index 340d6e2eb..81de4d605 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta index 7820cbd6d..44e13b142 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs index d880addb2..519c0e313 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs @@ -338,11 +338,11 @@ public class SkeletonUtility : MonoBehaviour { SkeletonUtilitySubmeshRenderer s = go.AddComponent(); s.sortingOrder = i * 10; s.submeshIndex = i; - s.Initialize(renderer); + s.Initialize(GetComponent()); s.Update(); } if (disablePrimaryRenderer) - renderer.enabled = false; + GetComponent().enabled = false; } } diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta index 7d3d7a44f..29f2fd705 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta index f66d45053..51537b4c8 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta index dad11e0a2..b78abdc12 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityEyeConstraint.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityEyeConstraint.cs.meta index 3e82746da..18e153cf2 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityEyeConstraint.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityEyeConstraint.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityGroundConstraint.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityGroundConstraint.cs.meta index 5d9e6920c..e5474edbc 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityGroundConstraint.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityGroundConstraint.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs index 86f96e942..a636792be 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs @@ -57,7 +57,7 @@ public class SkeletonUtilityKinematicShadow : MonoBehaviour { continue; foreach (var sb in shadowBones) { - if (sb.rigidbody == null) + if (sb.GetComponent() == null) continue; if (sb.boneName == b.boneName) { @@ -72,8 +72,8 @@ public class SkeletonUtilityKinematicShadow : MonoBehaviour { } void FixedUpdate () { - shadowRoot.rigidbody.MovePosition(transform.position); - shadowRoot.rigidbody.MoveRotation(transform.rotation); + shadowRoot.GetComponent().MovePosition(transform.position); + shadowRoot.GetComponent().MoveRotation(transform.rotation); foreach (var pair in shadowTable) { pair.Value.localPosition = pair.Key.localPosition; diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs.meta index 06bcb6f4a..2b071f36f 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs index fc8867e6b..40e3ffbc5 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs @@ -16,7 +16,7 @@ public class SkeletonUtilitySubmeshRenderer : MonoBehaviour { MeshFilter parentFilter; void Awake () { - cachedRenderer = renderer; + cachedRenderer = GetComponent(); sharedMaterials = cachedRenderer.sharedMaterials; filter = GetComponent(); @@ -53,13 +53,13 @@ public class SkeletonUtilitySubmeshRenderer : MonoBehaviour { } if (cachedRenderer == null) - cachedRenderer = renderer; + cachedRenderer = GetComponent(); if (mesh == null || submeshIndex > mesh.subMeshCount - 1) { cachedRenderer.enabled = false; return; } else { - renderer.enabled = true; + GetComponent().enabled = true; } bool changed = false; @@ -71,7 +71,7 @@ public class SkeletonUtilitySubmeshRenderer : MonoBehaviour { - for (int i = 0; i < renderer.sharedMaterials.Length; i++) { + for (int i = 0; i < GetComponent().sharedMaterials.Length; i++) { if (i == submeshIndex) continue; diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs.meta b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs.meta index 168ca8811..a58d557e9 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs.meta +++ b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs.meta @@ -10,3 +10,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/SpineAttributes.cs.meta b/spine-unity/Assets/spine-unity/SpineAttributes.cs.meta index fe4c14b95..00a5090b1 100644 --- a/spine-unity/Assets/spine-unity/SpineAttributes.cs.meta +++ b/spine-unity/Assets/spine-unity/SpineAttributes.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: