UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1-beta' into 4.2-beta

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
Mario Zechner 2022-05-31 12:27:01 +02:00
commit 934034fce4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -173,3 +173,4 @@ spine-godot/spine_godot/*.obj
*.bc *.bc
spine-godot/example/.godot spine-godot/example/.godot
spine-godot/example-v4/.godot spine-godot/example-v4/.godot
spine-cocos2dx/example/build-macos

2
formatters/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

2
spine-cocos2dx/example/Classes/RaptorExample.h
View File

@ -39,7 +39,7 @@ public:
CREATE_FUNC(RaptorExample); CREATE_FUNC(RaptorExample);
virtual bool init(); virtual bool init();
private: private:
spine::SkeletonAnimation *skeletonNode; spine::SkeletonAnimation *skeletonNode;

4
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp
View File

@ -161,12 +161,12 @@ void USpineSkeletonRendererComponent::Flush(int &Idx, TArray<FVector> &Vertices,
bool bShouldCreateCollision = false; bool bShouldCreateCollision = false;
if (bCreateCollision) { if (bCreateCollision) {
UWorld* world = GetWorld(); UWorld *world = GetWorld();
if (world && world->IsGameWorld()) { if (world && world->IsGameWorld()) {
bShouldCreateCollision = true; bShouldCreateCollision = true;
} }
} }
GetBodySetup()->bGenerateMirroredCollision = GetComponentScale().X < 0 || GetComponentScale().Y < 0 || GetComponentScale().Z < 0; GetBodySetup()->bGenerateMirroredCollision = GetComponentScale().X < 0 || GetComponentScale().Y < 0 || GetComponentScale().Z < 0;
CreateMeshSection(Idx, Vertices, Indices, Normals, Uvs, Colors, TArray<FProcMeshTangent>(), bShouldCreateCollision); CreateMeshSection(Idx, Vertices, Indices, Normals, Uvs, Colors, TArray<FProcMeshTangent>(), bShouldCreateCollision);