Skip to content

Commit

Permalink
Formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
badlogic committed Aug 19, 2024
1 parent f3ded1e commit f1956d9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions spine-c/spine-c/src/spine/Animation.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion spine-godot/spine_godot/SpineAnimationTrack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion spine-godot/spine_godot/SpineSprite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f1956d9

Please sign in to comment.