diff --git a/.gitignore b/.gitignore index b1b0e9d8d..8de21a3f3 100644 --- a/.gitignore +++ b/.gitignore @@ -167,3 +167,4 @@ spine-cocos2dx/example/build-win spine-godot/godot spine-godot/spine_godot/__pycache__ spine-godot/spine_godot/spine-cpp +spine-godot/godot-copy diff --git a/spine-godot/custom.py b/spine-godot/godot/custom.py similarity index 100% rename from spine-godot/custom.py rename to spine-godot/godot/custom.py diff --git a/spine-godot/spine_godot/GodotSpineExtension.cpp b/spine-godot/godot/modules/spine_godot/GodotSpineExtension.cpp similarity index 100% rename from spine-godot/spine_godot/GodotSpineExtension.cpp rename to spine-godot/godot/modules/spine_godot/GodotSpineExtension.cpp diff --git a/spine-godot/spine_godot/GodotSpineExtension.h b/spine-godot/godot/modules/spine_godot/GodotSpineExtension.h similarity index 100% rename from spine-godot/spine_godot/GodotSpineExtension.h rename to spine-godot/godot/modules/spine_godot/GodotSpineExtension.h diff --git a/spine-godot/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.cpp b/spine-godot/godot/modules/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.cpp similarity index 100% rename from spine-godot/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.cpp rename to spine-godot/godot/modules/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.cpp diff --git a/spine-godot/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.h b/spine-godot/godot/modules/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.h similarity index 100% rename from spine-godot/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.h rename to spine-godot/godot/modules/spine_godot/ResourceFormatLoaderSpineSkeletonJsonData.h diff --git a/spine-godot/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.cpp b/spine-godot/godot/modules/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.cpp similarity index 100% rename from spine-godot/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.cpp rename to spine-godot/godot/modules/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.cpp diff --git a/spine-godot/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.h b/spine-godot/godot/modules/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.h similarity index 100% rename from spine-godot/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.h rename to spine-godot/godot/modules/spine_godot/ResourceFormatSaverSpineSkeletonJsonData.h diff --git a/spine-godot/spine_godot/SCsub b/spine-godot/godot/modules/spine_godot/SCsub similarity index 100% rename from spine-godot/spine_godot/SCsub rename to spine-godot/godot/modules/spine_godot/SCsub diff --git a/spine-godot/spine_godot/SpineAnimation.cpp b/spine-godot/godot/modules/spine_godot/SpineAnimation.cpp similarity index 100% rename from spine-godot/spine_godot/SpineAnimation.cpp rename to spine-godot/godot/modules/spine_godot/SpineAnimation.cpp diff --git a/spine-godot/spine_godot/SpineAnimation.h b/spine-godot/godot/modules/spine_godot/SpineAnimation.h similarity index 100% rename from spine-godot/spine_godot/SpineAnimation.h rename to spine-godot/godot/modules/spine_godot/SpineAnimation.h diff --git a/spine-godot/spine_godot/SpineAnimationState.cpp b/spine-godot/godot/modules/spine_godot/SpineAnimationState.cpp similarity index 100% rename from spine-godot/spine_godot/SpineAnimationState.cpp rename to spine-godot/godot/modules/spine_godot/SpineAnimationState.cpp diff --git a/spine-godot/spine_godot/SpineAnimationState.h b/spine-godot/godot/modules/spine_godot/SpineAnimationState.h similarity index 100% rename from spine-godot/spine_godot/SpineAnimationState.h rename to spine-godot/godot/modules/spine_godot/SpineAnimationState.h diff --git a/spine-godot/spine_godot/SpineAnimationStateDataResource.cpp b/spine-godot/godot/modules/spine_godot/SpineAnimationStateDataResource.cpp similarity index 100% rename from spine-godot/spine_godot/SpineAnimationStateDataResource.cpp rename to spine-godot/godot/modules/spine_godot/SpineAnimationStateDataResource.cpp diff --git a/spine-godot/spine_godot/SpineAnimationStateDataResource.h b/spine-godot/godot/modules/spine_godot/SpineAnimationStateDataResource.h similarity index 100% rename from spine-godot/spine_godot/SpineAnimationStateDataResource.h rename to spine-godot/godot/modules/spine_godot/SpineAnimationStateDataResource.h diff --git a/spine-godot/spine_godot/SpineAtlasResource.cpp b/spine-godot/godot/modules/spine_godot/SpineAtlasResource.cpp similarity index 100% rename from spine-godot/spine_godot/SpineAtlasResource.cpp rename to spine-godot/godot/modules/spine_godot/SpineAtlasResource.cpp diff --git a/spine-godot/spine_godot/SpineAtlasResource.h b/spine-godot/godot/modules/spine_godot/SpineAtlasResource.h similarity index 100% rename from spine-godot/spine_godot/SpineAtlasResource.h rename to spine-godot/godot/modules/spine_godot/SpineAtlasResource.h diff --git a/spine-godot/spine_godot/SpineAttachment.cpp b/spine-godot/godot/modules/spine_godot/SpineAttachment.cpp similarity index 100% rename from spine-godot/spine_godot/SpineAttachment.cpp rename to spine-godot/godot/modules/spine_godot/SpineAttachment.cpp diff --git a/spine-godot/spine_godot/SpineAttachment.h b/spine-godot/godot/modules/spine_godot/SpineAttachment.h similarity index 100% rename from spine-godot/spine_godot/SpineAttachment.h rename to spine-godot/godot/modules/spine_godot/SpineAttachment.h diff --git a/spine-godot/spine_godot/SpineBone.cpp b/spine-godot/godot/modules/spine_godot/SpineBone.cpp similarity index 100% rename from spine-godot/spine_godot/SpineBone.cpp rename to spine-godot/godot/modules/spine_godot/SpineBone.cpp diff --git a/spine-godot/spine_godot/SpineBone.h b/spine-godot/godot/modules/spine_godot/SpineBone.h similarity index 100% rename from spine-godot/spine_godot/SpineBone.h rename to spine-godot/godot/modules/spine_godot/SpineBone.h diff --git a/spine-godot/spine_godot/SpineBoneData.cpp b/spine-godot/godot/modules/spine_godot/SpineBoneData.cpp similarity index 100% rename from spine-godot/spine_godot/SpineBoneData.cpp rename to spine-godot/godot/modules/spine_godot/SpineBoneData.cpp diff --git a/spine-godot/spine_godot/SpineBoneData.h b/spine-godot/godot/modules/spine_godot/SpineBoneData.h similarity index 100% rename from spine-godot/spine_godot/SpineBoneData.h rename to spine-godot/godot/modules/spine_godot/SpineBoneData.h diff --git a/spine-godot/spine_godot/SpineCollisionShapeProxy.cpp b/spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.cpp similarity index 100% rename from spine-godot/spine_godot/SpineCollisionShapeProxy.cpp rename to spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.cpp diff --git a/spine-godot/spine_godot/SpineCollisionShapeProxy.h b/spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.h similarity index 100% rename from spine-godot/spine_godot/SpineCollisionShapeProxy.h rename to spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.h diff --git a/spine-godot/spine_godot/SpineConstant.cpp b/spine-godot/godot/modules/spine_godot/SpineConstant.cpp similarity index 100% rename from spine-godot/spine_godot/SpineConstant.cpp rename to spine-godot/godot/modules/spine_godot/SpineConstant.cpp diff --git a/spine-godot/spine_godot/SpineConstant.h b/spine-godot/godot/modules/spine_godot/SpineConstant.h similarity index 100% rename from spine-godot/spine_godot/SpineConstant.h rename to spine-godot/godot/modules/spine_godot/SpineConstant.h diff --git a/spine-godot/spine_godot/SpineConstraintData.cpp b/spine-godot/godot/modules/spine_godot/SpineConstraintData.cpp similarity index 100% rename from spine-godot/spine_godot/SpineConstraintData.cpp rename to spine-godot/godot/modules/spine_godot/SpineConstraintData.cpp diff --git a/spine-godot/spine_godot/SpineConstraintData.h b/spine-godot/godot/modules/spine_godot/SpineConstraintData.h similarity index 100% rename from spine-godot/spine_godot/SpineConstraintData.h rename to spine-godot/godot/modules/spine_godot/SpineConstraintData.h diff --git a/spine-godot/spine_godot/SpineEvent.cpp b/spine-godot/godot/modules/spine_godot/SpineEvent.cpp similarity index 100% rename from spine-godot/spine_godot/SpineEvent.cpp rename to spine-godot/godot/modules/spine_godot/SpineEvent.cpp diff --git a/spine-godot/spine_godot/SpineEvent.h b/spine-godot/godot/modules/spine_godot/SpineEvent.h similarity index 100% rename from spine-godot/spine_godot/SpineEvent.h rename to spine-godot/godot/modules/spine_godot/SpineEvent.h diff --git a/spine-godot/spine_godot/SpineEventData.cpp b/spine-godot/godot/modules/spine_godot/SpineEventData.cpp similarity index 100% rename from spine-godot/spine_godot/SpineEventData.cpp rename to spine-godot/godot/modules/spine_godot/SpineEventData.cpp diff --git a/spine-godot/spine_godot/SpineEventData.h b/spine-godot/godot/modules/spine_godot/SpineEventData.h similarity index 100% rename from spine-godot/spine_godot/SpineEventData.h rename to spine-godot/godot/modules/spine_godot/SpineEventData.h diff --git a/spine-godot/spine_godot/SpineIkConstraint.cpp b/spine-godot/godot/modules/spine_godot/SpineIkConstraint.cpp similarity index 100% rename from spine-godot/spine_godot/SpineIkConstraint.cpp rename to spine-godot/godot/modules/spine_godot/SpineIkConstraint.cpp diff --git a/spine-godot/spine_godot/SpineIkConstraint.h b/spine-godot/godot/modules/spine_godot/SpineIkConstraint.h similarity index 100% rename from spine-godot/spine_godot/SpineIkConstraint.h rename to spine-godot/godot/modules/spine_godot/SpineIkConstraint.h diff --git a/spine-godot/spine_godot/SpineIkConstraintData.cpp b/spine-godot/godot/modules/spine_godot/SpineIkConstraintData.cpp similarity index 100% rename from spine-godot/spine_godot/SpineIkConstraintData.cpp rename to spine-godot/godot/modules/spine_godot/SpineIkConstraintData.cpp diff --git a/spine-godot/spine_godot/SpineIkConstraintData.h b/spine-godot/godot/modules/spine_godot/SpineIkConstraintData.h similarity index 100% rename from spine-godot/spine_godot/SpineIkConstraintData.h rename to spine-godot/godot/modules/spine_godot/SpineIkConstraintData.h diff --git a/spine-godot/spine_godot/SpinePathConstraint.cpp b/spine-godot/godot/modules/spine_godot/SpinePathConstraint.cpp similarity index 100% rename from spine-godot/spine_godot/SpinePathConstraint.cpp rename to spine-godot/godot/modules/spine_godot/SpinePathConstraint.cpp diff --git a/spine-godot/spine_godot/SpinePathConstraint.h b/spine-godot/godot/modules/spine_godot/SpinePathConstraint.h similarity index 100% rename from spine-godot/spine_godot/SpinePathConstraint.h rename to spine-godot/godot/modules/spine_godot/SpinePathConstraint.h diff --git a/spine-godot/spine_godot/SpinePathConstraintData.cpp b/spine-godot/godot/modules/spine_godot/SpinePathConstraintData.cpp similarity index 100% rename from spine-godot/spine_godot/SpinePathConstraintData.cpp rename to spine-godot/godot/modules/spine_godot/SpinePathConstraintData.cpp diff --git a/spine-godot/spine_godot/SpinePathConstraintData.h b/spine-godot/godot/modules/spine_godot/SpinePathConstraintData.h similarity index 100% rename from spine-godot/spine_godot/SpinePathConstraintData.h rename to spine-godot/godot/modules/spine_godot/SpinePathConstraintData.h diff --git a/spine-godot/spine_godot/SpineRendererObject.h b/spine-godot/godot/modules/spine_godot/SpineRendererObject.h similarity index 100% rename from spine-godot/spine_godot/SpineRendererObject.h rename to spine-godot/godot/modules/spine_godot/SpineRendererObject.h diff --git a/spine-godot/spine_godot/SpineRuntimeEditorPlugin.cpp b/spine-godot/godot/modules/spine_godot/SpineRuntimeEditorPlugin.cpp similarity index 100% rename from spine-godot/spine_godot/SpineRuntimeEditorPlugin.cpp rename to spine-godot/godot/modules/spine_godot/SpineRuntimeEditorPlugin.cpp diff --git a/spine-godot/spine_godot/SpineRuntimeEditorPlugin.h b/spine-godot/godot/modules/spine_godot/SpineRuntimeEditorPlugin.h similarity index 100% rename from spine-godot/spine_godot/SpineRuntimeEditorPlugin.h rename to spine-godot/godot/modules/spine_godot/SpineRuntimeEditorPlugin.h diff --git a/spine-godot/spine_godot/SpineSkeleton.cpp b/spine-godot/godot/modules/spine_godot/SpineSkeleton.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSkeleton.cpp rename to spine-godot/godot/modules/spine_godot/SpineSkeleton.cpp diff --git a/spine-godot/spine_godot/SpineSkeleton.h b/spine-godot/godot/modules/spine_godot/SpineSkeleton.h similarity index 100% rename from spine-godot/spine_godot/SpineSkeleton.h rename to spine-godot/godot/modules/spine_godot/SpineSkeleton.h diff --git a/spine-godot/spine_godot/SpineSkeletonDataResource.cpp b/spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSkeletonDataResource.cpp rename to spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.cpp diff --git a/spine-godot/spine_godot/SpineSkeletonDataResource.h b/spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.h similarity index 100% rename from spine-godot/spine_godot/SpineSkeletonDataResource.h rename to spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.h diff --git a/spine-godot/spine_godot/SpineSkeletonJsonDataResource.cpp b/spine-godot/godot/modules/spine_godot/SpineSkeletonJsonDataResource.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSkeletonJsonDataResource.cpp rename to spine-godot/godot/modules/spine_godot/SpineSkeletonJsonDataResource.cpp diff --git a/spine-godot/spine_godot/SpineSkeletonJsonDataResource.h b/spine-godot/godot/modules/spine_godot/SpineSkeletonJsonDataResource.h similarity index 100% rename from spine-godot/spine_godot/SpineSkeletonJsonDataResource.h rename to spine-godot/godot/modules/spine_godot/SpineSkeletonJsonDataResource.h diff --git a/spine-godot/spine_godot/SpineSkin.cpp b/spine-godot/godot/modules/spine_godot/SpineSkin.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSkin.cpp rename to spine-godot/godot/modules/spine_godot/SpineSkin.cpp diff --git a/spine-godot/spine_godot/SpineSkin.h b/spine-godot/godot/modules/spine_godot/SpineSkin.h similarity index 100% rename from spine-godot/spine_godot/SpineSkin.h rename to spine-godot/godot/modules/spine_godot/SpineSkin.h diff --git a/spine-godot/spine_godot/SpineSkinAttachmentMapEntries.cpp b/spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSkinAttachmentMapEntries.cpp rename to spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.cpp diff --git a/spine-godot/spine_godot/SpineSkinAttachmentMapEntries.h b/spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.h similarity index 100% rename from spine-godot/spine_godot/SpineSkinAttachmentMapEntries.h rename to spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.h diff --git a/spine-godot/spine_godot/SpineSlot.cpp b/spine-godot/godot/modules/spine_godot/SpineSlot.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSlot.cpp rename to spine-godot/godot/modules/spine_godot/SpineSlot.cpp diff --git a/spine-godot/spine_godot/SpineSlot.h b/spine-godot/godot/modules/spine_godot/SpineSlot.h similarity index 100% rename from spine-godot/spine_godot/SpineSlot.h rename to spine-godot/godot/modules/spine_godot/SpineSlot.h diff --git a/spine-godot/spine_godot/SpineSlotData.cpp b/spine-godot/godot/modules/spine_godot/SpineSlotData.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSlotData.cpp rename to spine-godot/godot/modules/spine_godot/SpineSlotData.cpp diff --git a/spine-godot/spine_godot/SpineSlotData.h b/spine-godot/godot/modules/spine_godot/SpineSlotData.h similarity index 100% rename from spine-godot/spine_godot/SpineSlotData.h rename to spine-godot/godot/modules/spine_godot/SpineSlotData.h diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/godot/modules/spine_godot/SpineSprite.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSprite.cpp rename to spine-godot/godot/modules/spine_godot/SpineSprite.cpp diff --git a/spine-godot/spine_godot/SpineSprite.h b/spine-godot/godot/modules/spine_godot/SpineSprite.h similarity index 100% rename from spine-godot/spine_godot/SpineSprite.h rename to spine-godot/godot/modules/spine_godot/SpineSprite.h diff --git a/spine-godot/spine_godot/SpineSpriteAnimateDialog.cpp b/spine-godot/godot/modules/spine_godot/SpineSpriteAnimateDialog.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSpriteAnimateDialog.cpp rename to spine-godot/godot/modules/spine_godot/SpineSpriteAnimateDialog.cpp diff --git a/spine-godot/spine_godot/SpineSpriteAnimateDialog.h b/spine-godot/godot/modules/spine_godot/SpineSpriteAnimateDialog.h similarity index 100% rename from spine-godot/spine_godot/SpineSpriteAnimateDialog.h rename to spine-godot/godot/modules/spine_godot/SpineSpriteAnimateDialog.h diff --git a/spine-godot/spine_godot/SpineSpriteMeshInstance2D.cpp b/spine-godot/godot/modules/spine_godot/SpineSpriteMeshInstance2D.cpp similarity index 100% rename from spine-godot/spine_godot/SpineSpriteMeshInstance2D.cpp rename to spine-godot/godot/modules/spine_godot/SpineSpriteMeshInstance2D.cpp diff --git a/spine-godot/spine_godot/SpineSpriteMeshInstance2D.h b/spine-godot/godot/modules/spine_godot/SpineSpriteMeshInstance2D.h similarity index 100% rename from spine-godot/spine_godot/SpineSpriteMeshInstance2D.h rename to spine-godot/godot/modules/spine_godot/SpineSpriteMeshInstance2D.h diff --git a/spine-godot/spine_godot/SpineTimeline.cpp b/spine-godot/godot/modules/spine_godot/SpineTimeline.cpp similarity index 100% rename from spine-godot/spine_godot/SpineTimeline.cpp rename to spine-godot/godot/modules/spine_godot/SpineTimeline.cpp diff --git a/spine-godot/spine_godot/SpineTimeline.h b/spine-godot/godot/modules/spine_godot/SpineTimeline.h similarity index 100% rename from spine-godot/spine_godot/SpineTimeline.h rename to spine-godot/godot/modules/spine_godot/SpineTimeline.h diff --git a/spine-godot/spine_godot/SpineTrackEntry.cpp b/spine-godot/godot/modules/spine_godot/SpineTrackEntry.cpp similarity index 100% rename from spine-godot/spine_godot/SpineTrackEntry.cpp rename to spine-godot/godot/modules/spine_godot/SpineTrackEntry.cpp diff --git a/spine-godot/spine_godot/SpineTrackEntry.h b/spine-godot/godot/modules/spine_godot/SpineTrackEntry.h similarity index 100% rename from spine-godot/spine_godot/SpineTrackEntry.h rename to spine-godot/godot/modules/spine_godot/SpineTrackEntry.h diff --git a/spine-godot/spine_godot/SpineTransformConstraint.cpp b/spine-godot/godot/modules/spine_godot/SpineTransformConstraint.cpp similarity index 100% rename from spine-godot/spine_godot/SpineTransformConstraint.cpp rename to spine-godot/godot/modules/spine_godot/SpineTransformConstraint.cpp diff --git a/spine-godot/spine_godot/SpineTransformConstraint.h b/spine-godot/godot/modules/spine_godot/SpineTransformConstraint.h similarity index 100% rename from spine-godot/spine_godot/SpineTransformConstraint.h rename to spine-godot/godot/modules/spine_godot/SpineTransformConstraint.h diff --git a/spine-godot/spine_godot/SpineTransformConstraintData.cpp b/spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.cpp similarity index 100% rename from spine-godot/spine_godot/SpineTransformConstraintData.cpp rename to spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.cpp diff --git a/spine-godot/spine_godot/SpineTransformConstraintData.h b/spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.h similarity index 100% rename from spine-godot/spine_godot/SpineTransformConstraintData.h rename to spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.h diff --git a/spine-godot/spine_godot/config.py b/spine-godot/godot/modules/spine_godot/config.py similarity index 100% rename from spine-godot/spine_godot/config.py rename to spine-godot/godot/modules/spine_godot/config.py diff --git a/spine-godot/spine_godot/register_types.cpp b/spine-godot/godot/modules/spine_godot/register_types.cpp similarity index 100% rename from spine-godot/spine_godot/register_types.cpp rename to spine-godot/godot/modules/spine_godot/register_types.cpp diff --git a/spine-godot/spine_godot/register_types.h b/spine-godot/godot/modules/spine_godot/register_types.h similarity index 100% rename from spine-godot/spine_godot/register_types.h rename to spine-godot/godot/modules/spine_godot/register_types.h diff --git a/spine-godot/setup.sh b/spine-godot/setup.sh index e78c64151..539910b31 100755 --- a/spine-godot/setup.sh +++ b/spine-godot/setup.sh @@ -1,11 +1,10 @@ #!/bin/bash set -e -rm -rf godot -cp -r ../spine-cpp/spine-cpp spine_godot -git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable -cp custom.py godot +cp -r ../spine-cpp/spine-cpp godot/modules/spine_godot +git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable godot-copy +rm -rf godot-copy/.git +cp -r godot-copy/* godot cp -r .idea godot -ln -s $(pwd)/spine_godot godot/modules/spine_godot pushd godot scons target=debug --jobs=$(sysctl -n hw.logicalcpu) popd \ No newline at end of file