diff --git a/.gitignore b/.gitignore index 2c115b29e..bb4d16eef 100644 --- a/.gitignore +++ b/.gitignore @@ -173,3 +173,4 @@ spine-godot/spine_godot/*.obj *.bc spine-godot/example/.godot spine-godot/example-v4/.godot +spine-cocos2dx/example/build-macos diff --git a/formatters/gradle/wrapper/gradle-wrapper.properties b/formatters/gradle/wrapper/gradle-wrapper.properties index f2e1eb1fd..e7fa36715 100644 --- a/formatters/gradle/wrapper/gradle-wrapper.properties +++ b/formatters/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip diff --git a/spine-cocos2dx/example/Classes/RaptorExample.h b/spine-cocos2dx/example/Classes/RaptorExample.h index d9fa61696..c8ca455d2 100644 --- a/spine-cocos2dx/example/Classes/RaptorExample.h +++ b/spine-cocos2dx/example/Classes/RaptorExample.h @@ -39,7 +39,7 @@ public: CREATE_FUNC(RaptorExample); - virtual bool init(); + virtual bool init(); private: spine::SkeletonAnimation *skeletonNode; diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp index d106952e5..e52e8fa35 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp @@ -161,12 +161,12 @@ void USpineSkeletonRendererComponent::Flush(int &Idx, TArray &Vertices, bool bShouldCreateCollision = false; if (bCreateCollision) { - UWorld* world = GetWorld(); + UWorld *world = GetWorld(); if (world && world->IsGameWorld()) { bShouldCreateCollision = true; } } - + GetBodySetup()->bGenerateMirroredCollision = GetComponentScale().X < 0 || GetComponentScale().Y < 0 || GetComponentScale().Z < 0; CreateMeshSection(Idx, Vertices, Indices, Normals, Uvs, Colors, TArray(), bShouldCreateCollision);