UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 17:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Closes #2832, SpineSprite.set_time_scale/get_time_scale

Browse Source
This commit is contained in:
Mario Zechner 2025-04-30 14:01:50 +02:00
parent 6654484a33
commit 2712cffc00
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ Ref<Animation> SpineAnimationTrack::create_animation(spine::Animation *animation
Ref<Animation> animation_ref; Ref<Animation> animation_ref;
INSTANTIATE(animation_ref); INSTANTIATE(animation_ref);
String name; String name;
name.parse_utf8(animation.getName().buffer()); name.parse_utf8(animation->getName().buffer());
animation_ref->set_name(name + (loop ? "" : "_looped")); animation_ref->set_name(name + (loop ? "" : "_looped"));
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
// animation_ref->set_loop(!loop); // animation_ref->set_loop(!loop);

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

@ -62,10 +62,9 @@ class GodotSpineTextureLoader : public spine::TextureLoader {
Array *textures; Array *textures;
Array *normal_maps; Array *normal_maps;
String normal_map_prefix; String normal_map_prefix;
bool is_importing;
public: public:
GodotSpineTextureLoader(Array *_textures, Array *_normal_maps, const String &normal_map_prefix, bool is_importing) : textures(_textures), normal_maps(_normal_maps), normal_map_prefix(normal_map_prefix), is_importing(is_importing) { GodotSpineTextureLoader(Array *_textures, Array *_normal_maps, const String &normal_map_prefix, bool is_importing) : textures(_textures), normal_maps(_normal_maps), normal_map_prefix(normal_map_prefix) {
} }
static bool fix_path(String &path) { static bool fix_path(String &path) {

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

@ -434,6 +434,9 @@ void SpineSprite::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_screen_material", "material"), &SpineSprite::set_screen_material); ClassDB::bind_method(D_METHOD("set_screen_material", "material"), &SpineSprite::set_screen_material);
ClassDB::bind_method(D_METHOD("get_screen_material"), &SpineSprite::get_screen_material); ClassDB::bind_method(D_METHOD("get_screen_material"), &SpineSprite::get_screen_material);
ClassDB::bind_method(D_METHOD("get_time_scale"), &SpineSprite::get_time_scale);
ClassDB::bind_method(D_METHOD("set_time_scale", "v"), &SpineSprite::set_time_scale);
ClassDB::bind_method(D_METHOD("set_debug_root", "v"), &SpineSprite::set_debug_root); ClassDB::bind_method(D_METHOD("set_debug_root", "v"), &SpineSprite::set_debug_root);
ClassDB::bind_method(D_METHOD("get_debug_root"), &SpineSprite::get_debug_root); ClassDB::bind_method(D_METHOD("get_debug_root"), &SpineSprite::get_debug_root);
ClassDB::bind_method(D_METHOD("set_debug_root_color", "v"), &SpineSprite::set_debug_root_color); ClassDB::bind_method(D_METHOD("set_debug_root_color", "v"), &SpineSprite::set_debug_root_color);
@ -509,7 +512,7 @@ void SpineSprite::_bind_methods() {
// Filled in in _get_property_list() // Filled in in _get_property_list()
} }
SpineSprite::SpineSprite() : update_mode(SpineConstant::UpdateMode_Process), preview_skin("Default"), preview_animation("-- Empty --"), preview_frame(false), preview_time(0), skeleton_clipper(nullptr), modified_bones(false) { SpineSprite::SpineSprite() : update_mode(SpineConstant::UpdateMode_Process), time_scale(1.0), preview_skin("Default"), preview_animation("-- Empty --"), preview_frame(false), preview_time(0), skeleton_clipper(nullptr), modified_bones(false) {
skeleton_clipper = new spine::SkeletonClipping(); skeleton_clipper = new spine::SkeletonClipping();
auto statics = SpineSpriteStatics::instance(); auto statics = SpineSpriteStatics::instance();
@ -817,12 +820,12 @@ void SpineSprite::update_skeleton(float delta) {
return; return;
emit_signal(SNAME("before_animation_state_update"), this); emit_signal(SNAME("before_animation_state_update"), this);
animation_state->update(delta); animation_state->update(delta * time_scale);
if (!is_visible_in_tree()) return; if (!is_visible_in_tree()) return;
emit_signal(SNAME("before_animation_state_apply"), this); emit_signal(SNAME("before_animation_state_apply"), this);
animation_state->apply(skeleton); animation_state->apply(skeleton);
emit_signal(SNAME("before_world_transforms_change"), this); emit_signal(SNAME("before_world_transforms_change"), this);
skeleton->update(delta); skeleton->update(delta * time_scale);
skeleton->update_world_transform(SpineConstant::Physics_Update); skeleton->update_world_transform(SpineConstant::Physics_Update);
modified_bones = false; modified_bones = false;
emit_signal(SNAME("world_transforms_changed"), this); emit_signal(SNAME("world_transforms_changed"), this);
@ -1401,6 +1404,14 @@ void SpineSprite::set_screen_material(Ref<Material> material) {
screen_material = material; screen_material = material;
} }
void SpineSprite::set_time_scale(float time_scale) {
this->time_scale = time_scale;
}
float SpineSprite::get_time_scale() {
return time_scale;
}
#ifndef SPINE_GODOT_EXTENSION #ifndef SPINE_GODOT_EXTENSION
// FIXME // FIXME
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

5
spine-godot/spine_godot/SpineSprite.h
View File

@ -141,6 +141,7 @@ protected:
Ref<SpineSkeleton> skeleton; Ref<SpineSkeleton> skeleton;
Ref<SpineAnimationState> animation_state; Ref<SpineAnimationState> animation_state;
SpineConstant::UpdateMode update_mode; SpineConstant::UpdateMode update_mode;
float time_scale;
String preview_skin; String preview_skin;
String preview_animation; String preview_animation;
@ -230,6 +231,10 @@ public:
void set_screen_material(Ref<Material> material); void set_screen_material(Ref<Material> material);
void set_time_scale(float time_scale);
float get_time_scale();
bool get_debug_root() { return debug_root; } bool get_debug_root() { return debug_root; }
void set_debug_root(bool root) { debug_root = root; } void set_debug_root(bool root) { debug_root = root; }