From 64a6ae4034352a25201277b4903327e520abbd90 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 16 Jul 2019 21:25:20 +0200 Subject: [PATCH] [unity] Renamed editor script `PointFollowerEditor` to `PointFollowerInspector`. Editor scripts moved accordingly to previous commit 59746cc: "Lots of files and components moved to new directories for restructuring cleanup". --- CHANGELOG.md | 2 ++ .../SkeletonUtility Modules}/Editor.meta | 4 ++-- .../Editor/SkeletonRagdoll2DInspector.cs | 0 .../Editor/SkeletonRagdoll2DInspector.cs.meta | 0 .../Editor/SkeletonRagdollInspector.cs | 0 .../Editor/SkeletonRagdollInspector.cs.meta | 0 .../{Modules/Ragdoll.meta => Editor/Asset Types.meta} | 4 ++-- .../{ => Asset Types}/AnimationReferenceAssetEditor.cs | 0 .../AnimationReferenceAssetEditor.cs.meta | 0 .../{ => Asset Types}/SkeletonDataAssetInspector.cs | 0 .../{ => Asset Types}/SkeletonDataAssetInspector.cs.meta | 0 .../Editor/{ => Asset Types}/SpineAtlasAssetInspector.cs | 0 .../{ => Asset Types}/SpineAtlasAssetInspector.cs.meta | 0 .../BoundingBoxFollower.meta => Editor/Components.meta} | 4 ++-- .../Components}/BoneFollowerGraphicInspector.cs | 0 .../Components}/BoneFollowerGraphicInspector.cs.meta | 0 .../Editor/{ => Components}/BoneFollowerInspector.cs | 0 .../{ => Components}/BoneFollowerInspector.cs.meta | 0 .../Components}/BoundingBoxFollowerInspector.cs | 0 .../Components}/BoundingBoxFollowerInspector.cs.meta | 0 .../PointFollowerInspector.cs} | 2 +- .../PointFollowerInspector.cs.meta} | 0 .../{ => Components}/SkeletonAnimationInspector.cs | 0 .../{ => Components}/SkeletonAnimationInspector.cs.meta | 0 .../Components}/SkeletonGraphicInspector.cs | 0 .../Components}/SkeletonGraphicInspector.cs.meta | 0 .../Editor/{ => Components}/SkeletonMecanimInspector.cs | 0 .../{ => Components}/SkeletonMecanimInspector.cs.meta | 0 .../SkeletonRendererCustomMaterialsInspector.cs | 0 .../SkeletonRendererCustomMaterialsInspector.cs.meta | 0 .../Editor/{ => Components}/SkeletonRendererInspector.cs | 0 .../{ => Components}/SkeletonRendererInspector.cs.meta | 0 .../Components}/SkeletonUtilityBoneInspector.cs | 0 .../Components}/SkeletonUtilityBoneInspector.cs.meta | 0 .../Components}/SkeletonUtilityInspector.cs | 0 .../Components}/SkeletonUtilityInspector.cs.meta | 0 .../Editor/spine-unity/{Modules => Editor}/Shaders.meta | 0 .../Editor => Editor/Shaders}/SpineSpriteShaderGUI.cs | 0 .../Shaders}/SpineSpriteShaderGUI.cs.meta | 0 .../Editor.meta => Editor/Utility.meta} | 4 ++-- .../{ => Utility}/AssetDatabaseAvailabilityDetector.cs | 0 .../AssetDatabaseAvailabilityDetector.cs.meta | 0 .../Editor/{ => Utility}/SpineEditorUtilities.cs | 0 .../Editor/{ => Utility}/SpineEditorUtilities.cs.meta | 0 .../Editor/{ => Utility}/SpineInspectorUtility.cs | 0 .../Editor/{ => Utility}/SpineInspectorUtility.cs.meta | 0 .../Editor/{ => Utility}/SpineMaskUtilities.cs | 0 .../Editor/{ => Utility}/SpineMaskUtilities.cs.meta | 0 .../CustomMaterials.meta => Editor/Windows.meta} | 4 ++-- .../spine-unity/Editor/{ => Windows}/SkeletonBaker.cs | 0 .../Editor/{ => Windows}/SkeletonBaker.cs.meta | 0 .../Editor/{ => Windows}/SkeletonBakingWindow.cs | 0 .../Editor/{ => Windows}/SkeletonBakingWindow.cs.meta | 0 .../Editor/{ => Windows}/SkeletonDebugWindow.cs | 0 .../Editor/{ => Windows}/SkeletonDebugWindow.cs.meta | 0 .../spine-unity/Editor/{ => Windows}/SpinePreferences.cs | 0 .../Editor/{ => Windows}/SpinePreferences.cs.meta | 0 .../spine-unity/Modules/CustomMaterials/Editor.meta | 7 ------- .../Spine/Editor/spine-unity/Modules/Ragdoll/Editor.meta | 5 ----- .../Spine/Editor/spine-unity/Modules/Shaders/Sprite.meta | 9 --------- 60 files changed, 13 insertions(+), 32 deletions(-) rename spine-unity/Assets/{Spine/Editor/spine-unity/Modules/Shaders/Sprite => Spine Examples/Scripts/Sample Components/SkeletonUtility Modules}/Editor.meta (67%) rename spine-unity/Assets/{Spine/Editor/spine-unity/Modules/Ragdoll => Spine Examples/Scripts/Sample Components/SkeletonUtility Modules}/Editor/SkeletonRagdoll2DInspector.cs (100%) rename spine-unity/Assets/{Spine/Editor/spine-unity/Modules/Ragdoll => Spine Examples/Scripts/Sample Components/SkeletonUtility Modules}/Editor/SkeletonRagdoll2DInspector.cs.meta (100%) rename spine-unity/Assets/{Spine/Editor/spine-unity/Modules/Ragdoll => Spine Examples/Scripts/Sample Components/SkeletonUtility Modules}/Editor/SkeletonRagdollInspector.cs (100%) rename spine-unity/Assets/{Spine/Editor/spine-unity/Modules/Ragdoll => Spine Examples/Scripts/Sample Components/SkeletonUtility Modules}/Editor/SkeletonRagdollInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/Ragdoll.meta => Editor/Asset Types.meta} (67%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Asset Types}/AnimationReferenceAssetEditor.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Asset Types}/AnimationReferenceAssetEditor.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Asset Types}/SkeletonDataAssetInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Asset Types}/SkeletonDataAssetInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Asset Types}/SpineAtlasAssetInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Asset Types}/SpineAtlasAssetInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/BoundingBoxFollower.meta => Editor/Components.meta} (67%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/SkeletonGraphic/Editor => Editor/Components}/BoneFollowerGraphicInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/SkeletonGraphic/Editor => Editor/Components}/BoneFollowerGraphicInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/BoneFollowerInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/BoneFollowerInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/BoundingBoxFollower/Editor => Editor/Components}/BoundingBoxFollowerInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/BoundingBoxFollower/Editor => Editor/Components}/BoundingBoxFollowerInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{PointFollowerEditor.cs => Components/PointFollowerInspector.cs} (99%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{PointFollowerEditor.cs.meta => Components/PointFollowerInspector.cs.meta} (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/SkeletonAnimationInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/SkeletonAnimationInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/SkeletonGraphic/Editor => Editor/Components}/SkeletonGraphicInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/SkeletonGraphic/Editor => Editor/Components}/SkeletonGraphicInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/SkeletonMecanimInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/SkeletonMecanimInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/CustomMaterials/Editor => Editor/Components}/SkeletonRendererCustomMaterialsInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/CustomMaterials/Editor => Editor/Components}/SkeletonRendererCustomMaterialsInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/SkeletonRendererInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Components}/SkeletonRendererInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{SkeletonUtility/Editor => Editor/Components}/SkeletonUtilityBoneInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{SkeletonUtility/Editor => Editor/Components}/SkeletonUtilityBoneInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{SkeletonUtility/Editor => Editor/Components}/SkeletonUtilityInspector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{SkeletonUtility/Editor => Editor/Components}/SkeletonUtilityInspector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules => Editor}/Shaders.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/Shaders/Sprite/Editor => Editor/Shaders}/SpineSpriteShaderGUI.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/Shaders/Sprite/Editor => Editor/Shaders}/SpineSpriteShaderGUI.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/BoundingBoxFollower/Editor.meta => Editor/Utility.meta} (67%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/AssetDatabaseAvailabilityDetector.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/AssetDatabaseAvailabilityDetector.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/SpineEditorUtilities.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/SpineEditorUtilities.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/SpineInspectorUtility.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/SpineInspectorUtility.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/SpineMaskUtilities.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Utility}/SpineMaskUtilities.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/{Modules/CustomMaterials.meta => Editor/Windows.meta} (67%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SkeletonBaker.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SkeletonBaker.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SkeletonBakingWindow.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SkeletonBakingWindow.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SkeletonDebugWindow.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SkeletonDebugWindow.cs.meta (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SpinePreferences.cs (100%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{ => Windows}/SpinePreferences.cs.meta (100%) delete mode 100644 spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor.meta delete mode 100644 spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor.meta delete mode 100644 spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite.meta diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c4d13ee..5388c5c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -173,6 +173,8 @@ * Moved `AttachmentTools.cs` to `Utility` directory. * Moved `SkeletonExtensions.cs` to `Utility` directory. * Moved `Modules/YieldInstructions` directory to `Utility/YieldInstructions`. + * Moved corresponding editor scripts of the above components to restructured directories as well. + * Renamed inspector editor class `PointFollowerEditor` to `PointFollowerInspector` for consistency reasons. ### XNA/MonoGame * Updated to latest MonoGame version 3.7.1 diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor.meta b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor.meta similarity index 67% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor.meta rename to spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor.meta index c34b55854..7035b9477 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor.meta +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 7bebbafa671002646b3a7267b32a0d60 +guid: c2b000c4fc21b39418c2b27dd66e237f folderAsset: yes -timeCreated: 1479419399 +timeCreated: 1563304075 licenseType: Free DefaultImporter: userData: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdoll2DInspector.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdoll2DInspector.cs rename to spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdoll2DInspector.cs.meta b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdoll2DInspector.cs.meta rename to spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdollInspector.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdollInspector.cs rename to spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdollInspector.cs.meta b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor/SkeletonRagdollInspector.cs.meta rename to spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types.meta similarity index 67% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types.meta index 194252b11..5ce846be1 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll.meta +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a5ca7a6f2b7e25646ad2f5776178bf78 +guid: eb646ac6e394e534b80d5cac61478488 folderAsset: yes -timeCreated: 1527569438 +timeCreated: 1563305058 licenseType: Free DefaultImporter: userData: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/AnimationReferenceAssetEditor.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/AnimationReferenceAssetEditor.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/AnimationReferenceAssetEditor.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/AnimationReferenceAssetEditor.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/AnimationReferenceAssetEditor.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDataAssetInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDataAssetInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineAtlasAssetInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineAtlasAssetInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineAtlasAssetInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineAtlasAssetInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components.meta similarity index 67% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components.meta index f8a738b09..a6574b215 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower.meta +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6351693f94cbf774182d4b3f2a756a43 +guid: 0134640f881c8d24d812a6f9af9d0761 folderAsset: yes -timeCreated: 1527569401 +timeCreated: 1563304704 licenseType: Free DefaultImporter: userData: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/BoneFollowerGraphicInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerGraphicInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/BoneFollowerGraphicInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerGraphicInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/BoneFollowerGraphicInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerGraphicInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/BoneFollowerGraphicInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerGraphicInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/BoneFollowerInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/BoneFollowerInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/BoneFollowerInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/BoneFollowerInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoneFollowerInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoundingBoxFollowerInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoundingBoxFollowerInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoundingBoxFollowerInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/BoundingBoxFollowerInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/PointFollowerEditor.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/PointFollowerInspector.cs similarity index 99% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/PointFollowerEditor.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/PointFollowerInspector.cs index 6d08bf6d3..03e14683d 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/PointFollowerEditor.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/PointFollowerInspector.cs @@ -37,7 +37,7 @@ namespace Spine.Unity.Editor { using Event = UnityEngine.Event; [CustomEditor(typeof(PointFollower)), CanEditMultipleObjects] - public class PointFollowerEditor : Editor { + public class PointFollowerInspector : Editor { SerializedProperty slotName, pointAttachmentName, skeletonRenderer, followZPosition, followBoneRotation, followSkeletonFlip; PointFollower targetPointFollower; bool needsReset; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/PointFollowerEditor.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/PointFollowerInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/PointFollowerEditor.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/PointFollowerInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimationInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimationInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimationInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimationInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonMecanimInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonMecanimInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonMecanimInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonMecanimInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor/SkeletonRendererCustomMaterialsInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor/SkeletonRendererCustomMaterialsInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor/SkeletonRendererCustomMaterialsInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor/SkeletonRendererCustomMaterialsInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityInspector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityInspector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Shaders.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Shaders.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Shaders/SpineSpriteShaderGUI.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Shaders/SpineSpriteShaderGUI.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Shaders/SpineSpriteShaderGUI.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Shaders/SpineSpriteShaderGUI.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility.meta similarity index 67% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility.meta index 76ca150c2..b46de85a9 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/BoundingBoxFollower/Editor.meta +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: b7f013ad20f0af34e913e21b44466777 +guid: 33c080d1c093a2c45b6c72c17a557067 folderAsset: yes -timeCreated: 1455492480 +timeCreated: 1563304704 licenseType: Free DefaultImporter: userData: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/AssetDatabaseAvailabilityDetector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetDatabaseAvailabilityDetector.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/AssetDatabaseAvailabilityDetector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetDatabaseAvailabilityDetector.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/AssetDatabaseAvailabilityDetector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetDatabaseAvailabilityDetector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/AssetDatabaseAvailabilityDetector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetDatabaseAvailabilityDetector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineInspectorUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineInspectorUtility.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineInspectorUtility.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineInspectorUtility.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineInspectorUtility.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineInspectorUtility.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineInspectorUtility.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineInspectorUtility.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineMaskUtilities.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineMaskUtilities.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineMaskUtilities.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineMaskUtilities.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows.meta similarity index 67% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows.meta index 7499980e3..ee5bf8b22 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials.meta +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ffde24e0e567a61418f76218f8cffb4c +guid: b6badf2758b1ea44e8c5ec62ef338e22 folderAsset: yes -timeCreated: 1527569418 +timeCreated: 1563305058 licenseType: Free DefaultImporter: userData: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBaker.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBaker.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBaker.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBaker.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBakingWindow.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBakingWindow.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBakingWindow.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBakingWindow.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDebugWindow.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDebugWindow.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDebugWindow.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonDebugWindow.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpinePreferences.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpinePreferences.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpinePreferences.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpinePreferences.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor.meta deleted file mode 100644 index 6b6e2f6d3..000000000 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/CustomMaterials/Editor.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 99abd7478ddde384cbf86f2ecd396900 -folderAsset: yes -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor.meta deleted file mode 100644 index 6cac463d2..000000000 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Ragdoll/Editor.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 7220dc1e8d545e849a2eb63e8633349b -folderAsset: yes -DefaultImporter: - userData: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite.meta deleted file mode 100644 index 6550f0405..000000000 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f9ef69c370f1b0f4db091a85df7f2c96 -folderAsset: yes -timeCreated: 1527569612 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: