diff --git a/spine-godot/README.md b/spine-godot/README.md index d01a47d9d..ee9038925 100644 --- a/spine-godot/README.md +++ b/spine-godot/README.md @@ -25,8 +25,8 @@ spine-godot works with the latest stable Godot 3.3 release. It requires compilat To integrate spine-godot into your project: 1. Follow the [instructions on how to compilation of Godot](https://docs.godotengine.org/en/stable/development/compiling/index.html) -2. Copy the `spine-runtimes/spine-godot` folder into the folder `modules/spine-godot` in your Godot source tree. -3. Copy the `spine-cpp/spine-cpp`folder into the folder `modules/spine-godot/spine-cpp` in your Godot source tree. +2. Copy the `spine-runtimes/spine-godot/spine_godot` folder into the folder `modules/spine_godot` in your Godot source tree. +3. Copy the `spine-cpp/spine-cpp`folder into the folder `modules/spine_godot/spine-cpp` in your Godot source tree. 4. Compile Godot via scons for your platform as per the Godot documentation. The resulting Godot engine binary will include the spine-godot runtime. diff --git a/spine-godot/spine_godot/SpineAnimation.cpp b/spine-godot/spine_godot/SpineAnimation.cpp index a646460f1..7f0772f24 100644 --- a/spine-godot/spine_godot/SpineAnimation.cpp +++ b/spine-godot/spine_godot/SpineAnimation.cpp @@ -90,7 +90,7 @@ bool SpineAnimation::has_timeline(Array ids) { list.setSize(ids.size(), 0); for (size_t i = 0; i < list.size(); ++i) { - list[i] = ids[i]; + list[i] = (int64_t) ids[i]; } return animation->hasTimeline(list); } diff --git a/spine-godot/spine_godot/SpineAnimationState.cpp b/spine-godot/spine_godot/SpineAnimationState.cpp index 2d9f6c8f6..155a1d6d3 100644 --- a/spine-godot/spine_godot/SpineAnimationState.cpp +++ b/spine-godot/spine_godot/SpineAnimationState.cpp @@ -95,7 +95,7 @@ Ref SpineAnimationState::set_animation(const String &anim_name, auto skeleton_data = anim_state_data_res->get_skeleton(); auto anim = skeleton_data->find_animation(anim_name); if (!anim.is_valid() || anim->get_spine_object() == NULL) { - ERR_PRINT(String("Can not find animation: ") + anim_name) + ERR_PRINT(String("Can not find animation: ") + anim_name); return NULL; } auto entry = animation_state->setAnimation(track, anim->get_spine_object(), loop); @@ -108,7 +108,7 @@ Ref SpineAnimationState::add_animation(const String &anim_name, auto skeleton_data = anim_state_data_res->get_skeleton(); auto anim = skeleton_data->find_animation(anim_name); if (!anim.is_valid() || anim->get_spine_object() == NULL) { - ERR_PRINT(String("Can not find animation: ") + anim_name) + ERR_PRINT(String("Can not find animation: ") + anim_name); return NULL; } auto entry = animation_state->addAnimation(track, anim->get_spine_object(), loop, delay); diff --git a/spine-godot/spine_godot/SpineTimeline.cpp b/spine-godot/spine_godot/SpineTimeline.cpp index d2de60065..29561c595 100644 --- a/spine-godot/spine_godot/SpineTimeline.cpp +++ b/spine-godot/spine_godot/SpineTimeline.cpp @@ -92,7 +92,7 @@ Array SpineTimeline::getPropertyIds() { res.resize(ids.size()); for (size_t i = 0; i < res.size(); ++i) { - res[i] = ids[i]; + res[i] = (int64_t) ids[i]; } return res;