UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 09:08:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Mario Zechner 2024-08-19 14:01:33 +02:00
parent f3ded1ed1a
commit f1956d9496
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-c/spine-c/src/spine/Animation.c
View File

@ -2163,10 +2163,10 @@ void _spInheritTimeline_apply(spTimeline *timeline, spSkeleton *skeleton, float
float *frames = self->super.frames->items;
if (!bone->active) return;
if (direction == SP_MIX_DIRECTION_OUT) {
if (blend == SP_MIX_BLEND_SETUP) bone->inherit = bone->data->inherit;
return;
}
if (direction == SP_MIX_DIRECTION_OUT) {
if (blend == SP_MIX_BLEND_SETUP) bone->inherit = bone->data->inherit;
return;
}
if (time < frames[0]) {
if (blend == SP_MIX_BLEND_SETUP || blend == SP_MIX_BLEND_FIRST) bone->inherit = bone->data->inherit;

8
spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp
View File

@ -67,10 +67,10 @@ void InheritTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vect
Bone *bone = skeleton.getBones()[_boneIndex];
if (!bone->isActive()) return;
if (direction == MixDirection_Out) {
if (blend == MixBlend_Setup) bone->setInherit(bone->_data.getInherit());
return;
}
if (direction == MixDirection_Out) {
if (blend == MixBlend_Setup) bone->setInherit(bone->_data.getInherit());
return;
}
if (time < _frames[0]) {
if (blend == MixBlend_Setup || blend == MixBlend_First) bone->_inherit = bone->_data.getInherit();

2
spine-godot/spine_godot/SpineAnimationTrack.cpp
View File

@ -182,7 +182,7 @@ void SpineAnimationTrack::setup_animation_player() {
#if VERSION_MAJOR > 3
List<StringName> animation_libraries;
animation_player->get_animation_library_list(&animation_libraries);
for (auto iter = animation_libraries.front(); iter; iter = iter->next()) {
for (auto iter = animation_libraries.front(); iter; iter = iter->next()) {
animation_player->remove_animation_library(iter->get());
}
#else

3
spine-godot/spine_godot/SpineSprite.cpp
View File

@ -60,7 +60,8 @@ else
#endif
#endif
Ref<CanvasItemMaterial> SpineSprite::default_materials[4] = {};
Ref<CanvasItemMaterial>
SpineSprite::default_materials[4] = {};
static int sprite_count = 0;
static spine::Vector<unsigned short> quad_indices;
static spine::Vector<float> scratch_vertices;