From 771c52691547b4c1017b6ff2d753ba61a7362333 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 31 May 2022 12:26:05 +0200 Subject: [PATCH] Formatting pass. --- .gitignore | 1 + spine-c/spine-c/src/spine/SkeletonJson.c | 4 ++-- spine-cocos2dx/example/Classes/RaptorExample.h | 2 +- .../SpinePlugin/Private/SpineSkeletonRendererComponent.cpp | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 81d8a4436..ada74354c 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,4 @@ spine-cocos2dx/example-v4/build-macos spine-cocos2dx/example/build-ios spine-cocos2dx/example/proj.android/app/.cxx spine-cocos2dx/example/build-win +spine-cocos2dx/example/build-macos diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c index 9175f3f85..c0a0aa8fd 100644 --- a/spine-c/spine-c/src/spine/SkeletonJson.c +++ b/spine-c/spine-c/src/spine/SkeletonJson.c @@ -953,8 +953,8 @@ spSkeletonData *spSkeletonJson_readSkeletonDataFile(spSkeletonJson *self, const static int string_starts_with(const char *str, const char *needle) { int lenStr, lenNeedle, i; if (!str) return 0; - lenStr = (int)strlen(str); - lenNeedle = (int)strlen(needle); + lenStr = (int) strlen(str); + lenNeedle = (int) strlen(needle); if (lenStr < lenNeedle) return 0; for (i = 0; i < lenNeedle; i++) { if (str[i] != needle[i]) return 0; 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);