ソースを参照

[unity] Deprecated Modules/SlotBlendModes/SlotBlendModes component. Changed it's namespace from Spine.Unity.Modules to Spine.Unity.Deprecated. Lots of files and components moved to new directories for restructuring cleanup.

Harald Csaszar 6 年 前
コミット
59746ccbf6
94 ファイル変更52 行追加13 行削除
  1. 16 0
      CHANGELOG.md
  2. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier.meta
  3. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs
  4. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs.meta
  5. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.txt
  6. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.txt.meta
  7. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/Default Match All Animations.asset
  8. 0 0
      spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/Default Match All Animations.asset.meta
  9. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost.meta
  10. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/Shaders.meta
  11. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader
  12. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader.meta
  13. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs
  14. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs.meta
  15. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs
  16. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs.meta
  17. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs
  18. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs.meta
  19. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules.meta
  20. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs
  21. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs.meta
  22. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs
  23. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs.meta
  24. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs
  25. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs.meta
  26. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs
  27. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs.meta
  28. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs
  29. 0 0
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs.meta
  30. 3 1
      spine-unity/Assets/Spine/Editor/spine-unity/Modules/SlotBlendModes/Editor/SlotBlendModesEditor.cs
  31. 2 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following.meta
  32. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollower.cs
  33. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollower.cs.meta
  34. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs
  35. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs.meta
  36. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs
  37. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs.meta
  38. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/PointFollower.cs
  39. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/PointFollower.cs.meta
  40. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs
  41. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs.meta
  42. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator.meta
  43. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs
  44. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs.meta
  45. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs
  46. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs.meta
  47. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.txt
  48. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.txt.meta
  49. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials.meta
  50. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs
  51. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs.meta
  52. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.txt
  53. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.txt.meta
  54. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility.meta
  55. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtility.cs
  56. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtility.cs.meta
  57. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityBone.cs
  58. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityBone.cs.meta
  59. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityConstraint.cs
  60. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityConstraint.cs.meta
  61. 2 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated.meta
  62. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated/SlotBlendModes.meta
  63. 9 1
      spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated/SlotBlendModes/SlotBlendModes.cs
  64. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated/SlotBlendModes/SlotBlendModes.cs.meta
  65. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials.meta
  66. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat
  67. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat.meta
  68. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat
  69. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat.meta
  70. 0 5
      spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ragdoll.meta
  71. 2 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic.meta
  72. 9 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets.meta
  73. 9 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials.meta
  74. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/BlendModeMaterialsAsset.cs
  75. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/BlendModeMaterialsAsset.cs.meta
  76. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/Default BlendModeMaterials.asset
  77. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/Default BlendModeMaterials.asset.meta
  78. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAAdditive.mat
  79. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAAdditive.mat.meta
  80. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAMultiply.mat
  81. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAMultiply.mat.meta
  82. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAScreen.mat
  83. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAScreen.mat.meta
  84. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs
  85. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs.meta
  86. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/SkeletonExtensions.cs
  87. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/SkeletonExtensions.cs.meta
  88. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions.meta
  89. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineAnimationComplete.cs
  90. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineAnimationComplete.cs.meta
  91. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineEvent.cs
  92. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineEvent.cs.meta
  93. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineTrackEntryEnd.cs
  94. 0 0
      spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineTrackEntryEnd.cs.meta

+ 16 - 0
CHANGELOG.md

@@ -151,12 +151,28 @@
     * **Restrictions** As all Spine shaders, the LWRP shaders **do not support `Premultiply alpha` (PMA) atlas textures in Linear color space**. Please export your atlas textures as `straight alpha` textures with disabled `Premultiply alpha` setting when using Linear color space. You can check the current color space via `Project Settings - Player - Other Settings - Color Space.`.
     * **Example:** You can find an example scene in the package under `com.esotericsoftware.spine.lwrp-shaders-3.8/Examples/LWRP Shaders.unity` that demonstrates usage of the LWRP shaders.
 
+* **Removed / Deprecated**
+  * Deprecated `Modules/SlotBlendModes/SlotBlendModes` component. Changed namespace from `Spine.Unity.Modules` to `Spine.Unity.Deprecated`. Moved to `Deprecated/SlotBlendModes`.
+
 * **Restructuring (Non-Breaking)**
   
   Note: The following changes will most likely not affect users of the Spine-Unity runtime as the API remains unchanged and no references are invalidated.
   * Removed duplicates of `.cginc` files in `Modules/Shaders/Sprite` that were also present in the `Modules/Shaders/Sprite/CGIncludes` directory.
   * Moved shaders from `Modules/Shaders` to `Shaders` directory.
   * Moved shaders from `Modules/SkeletonGraphic/Shaders` to `Shaders/SkeletonGraphic`.
+  * Moved components from `SkeletonGraphic` to `Components` and `Components/Following` except for `SkeletonGraphicMirror` which was moved to `Spine Examples/Scripts/Sample Components`.
+  * Moved `BoneFollower`, `BoneFollowerGraphic` and `PointFollower` from `Components` directory to `Components/Following`.
+  * Moved `BoundingBoxFollower` component from `Modules/BoundingBoxFollower` to `Components/Following`.
+  * Moved `Modules/SkeletonRenderSeparator` directory to `Components/SkeletonRenderSeparator`.
+  * Moved `Modules/CustomMaterials` directory to `Components/SkeletonRendererCustomMaterials`.
+  * Moved `Asset Types/BlendModeMaterialsAsset.cs` class, `Shaders/BlendModes/Default BlendModeMaterials.asset` and materials from `Shaders/BlendModes` to `SkeletonDataModifierAssets/BlendModeMaterials` directory.
+  * Moved `Modules/Ghost` directory to `Spine Examples/Scripts/Sample Components/Ghost`.
+  * Moved `Modules/SkeletonUtility Modules` directory to `Spine Examples/Scripts/Sample Components/SkeletonUtility Modules`.
+  * Moved `Modules/AnimationMatchModifier` directory to `Spine Examples/Scripts/MecanimAnimationMatchModifier`.
+  * Moved `SkeletonRagdoll` and `SkeletonRagdoll2D` components from `Modules/Ragdoll` directory to `Spine Examples/Scripts/Sample Components/SkeletonUtility Modules`.
+  * Moved `AttachmentTools.cs` to `Utility` directory.
+  * Moved `SkeletonExtensions.cs` to `Utility` directory.
+  * Moved `Modules/YieldInstructions` directory to `Utility/YieldInstructions`.
   
 ### XNA/MonoGame
 * Updated to latest MonoGame version 3.7.1

+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier.meta → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/AnimationMatchModifierAsset.cs → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/AnimationMatchModifierAsset.cs.meta → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/AnimationMatchModifierAsset.txt → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.txt


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/AnimationMatchModifierAsset.txt.meta → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.txt.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/Default Match All Animations.asset → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/Default Match All Animations.asset


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/Default Match All Animations.asset.meta → spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/Default Match All Animations.asset.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/Shaders.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/Shaders.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/Shaders/Spine-Special-Skeleton-Ghost.shader.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/SkeletonGhost.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/SkeletonGhost.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/SkeletonGhostRenderer.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ghost/SkeletonGhostRenderer.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/SkeletonGraphicMirror.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/SkeletonGraphicMirror.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ragdoll/SkeletonRagdoll2D.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ragdoll/SkeletonRagdoll2D.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs.meta


+ 3 - 1
spine-unity/Assets/Spine/Editor/spine-unity/Modules/SlotBlendModes/Editor/SlotBlendModesEditor.cs

@@ -29,11 +29,13 @@
 
 using UnityEngine;
 using UnityEditor;
-using Spine.Unity.Modules;
+using Spine.Unity.Deprecated;
+using System;
 
 namespace Spine.Unity.Editor {
 	using Editor = UnityEditor.Editor;
 
+	[Obsolete("The spine-unity 3.7 runtime introduced SkeletonDataModifierAssets BlendModeMaterials which replaced SlotBlendModes. Will be removed in spine-unity 3.9.", false)]
 	public class SlotBlendModesEditor : Editor {
 		
 		[MenuItem("CONTEXT/SkeletonRenderer/Add Slot Blend Modes Component")]

+ 2 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AttachmentTools.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: f601b524e4da4704a9e0f6b7e05d6ca6
+guid: b0fd98019ca00c74f929c6d1f7ee3544
 folderAsset: yes
-timeCreated: 1478437840
+timeCreated: 1563290418
 licenseType: Free
 DefaultImporter:
   userData: 

+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Components/BoneFollower.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollower.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Components/BoneFollower.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollower.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/BoneFollowerGraphic.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/BoneFollowerGraphic.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/BoundingBoxFollower/BoundingBoxFollower.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/BoundingBoxFollower/BoundingBoxFollower.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Components/PointFollower.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/PointFollower.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Components/PointFollower.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/PointFollower.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator/SkeletonPartsRenderer.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator/SkeletonPartsRenderer.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator/SkeletonRenderSeparator.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator/SkeletonRenderSeparator.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator/SkeletonRenderSeparator.txt → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.txt


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonRenderSeparator/SkeletonRenderSeparator.txt.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.txt.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/CustomMaterials.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/CustomMaterials/SkeletonRendererCustomMaterials.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/CustomMaterials/SkeletonRendererCustomMaterials.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/CustomMaterials/SkeletonRendererCustomMaterials.txt → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.txt


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/CustomMaterials/SkeletonRendererCustomMaterials.txt.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.txt.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtility.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtility.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityBone.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityBone.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityConstraint.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityConstraint.cs.meta


+ 2 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/BoundingBoxFollower.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 86b1ae3ec8681c646aea49654969b73c
+guid: 04817e31b917de6489f349dd332d7468
 folderAsset: yes
-timeCreated: 1455492474
+timeCreated: 1563295668
 licenseType: Free
 DefaultImporter:
   userData: 

+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SlotBlendModes.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated/SlotBlendModes.meta


+ 9 - 1
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SlotBlendModes/SlotBlendModes.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated/SlotBlendModes/SlotBlendModes.cs

@@ -29,9 +29,17 @@
 
 using System.Collections.Generic;
 using UnityEngine;
+using System;
 
-namespace Spine.Unity.Modules {
+namespace Spine.Unity.Deprecated {
 
+	/// <summary>
+	/// Deprecated. The spine-unity 3.7 runtime introduced SkeletonDataModifierAssets BlendModeMaterials which replaced SlotBlendModes. See the
+	/// <see href="http://esotericsoftware.com/spine-unity-skeletondatamodifierassets#BlendModeMaterials">SkeletonDataModifierAssets BlendModeMaterials documentation page</see> and
+	/// <see href="http://esotericsoftware.com/forum/Slot-blending-not-work-11281">this forum thread</see> for further information.
+	/// This class will be removed in the spine-unity 3.9 runtime.
+	/// </summary>
+	[Obsolete("The spine-unity 3.7 runtime introduced SkeletonDataModifierAssets BlendModeMaterials which replaced SlotBlendModes. Will be removed in spine-unity 3.9.", false)]
 	[DisallowMultipleComponent]
 	public class SlotBlendModes : MonoBehaviour {
 

+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SlotBlendModes/SlotBlendModes.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Deprecated/SlotBlendModes/SlotBlendModes.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Materials.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicDefault.mat → spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicDefault.mat.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicTintBlack.mat → spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicTintBlack.mat.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat.meta


+ 0 - 5
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Ragdoll.meta

@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: 90af663b37d994841b7ac03ae30fe2a9
-folderAsset: yes
-DefaultImporter:
-  userData: 

+ 2 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 6338355ec521d6848bb8ef1e10272b3e
+guid: 7a42d52714848d64f8ff99dddb93500e
 folderAsset: yes
-timeCreated: 1455493504
+timeCreated: 1563289150
 licenseType: Free
 DefaultImporter:
   userData: 

+ 9 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5d7322e83d799d849bea71dbd6f1c24e
+folderAsset: yes
+timeCreated: 1563297885
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 16fbcfb5e341ff44bb99593fff04539d
+folderAsset: yes
+timeCreated: 1563298958
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/BlendModeMaterialsAsset.cs → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/BlendModeMaterialsAsset.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/BlendModeMaterialsAsset.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/BlendModeMaterialsAsset.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Default BlendModeMaterials.asset → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/Default BlendModeMaterials.asset


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Default BlendModeMaterials.asset.meta → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/Default BlendModeMaterials.asset.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAAdditive.mat → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAAdditive.mat


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAAdditive.mat.meta → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAAdditive.mat.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAMultiply.mat → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAMultiply.mat


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAMultiply.mat.meta → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAMultiply.mat.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAScreen.mat → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAScreen.mat


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAScreen.mat.meta → spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonDataModifierAssets/BlendModeMaterials/SkeletonPMAScreen.mat.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AttachmentTools/AttachmentTools.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AttachmentTools/AttachmentTools.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonExtensions.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/SkeletonExtensions.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonExtensions.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/SkeletonExtensions.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions/WaitForSpineAnimationComplete.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineAnimationComplete.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions/WaitForSpineAnimationComplete.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineAnimationComplete.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions/WaitForSpineEvent.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineEvent.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions/WaitForSpineEvent.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineEvent.cs.meta


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions/WaitForSpineTrackEntryEnd.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineTrackEntryEnd.cs


+ 0 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/YieldInstructions/WaitForSpineTrackEntryEnd.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Utility/YieldInstructions/WaitForSpineTrackEntryEnd.cs.meta