BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 00:11:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

added default animation mix, log errors

Browse Source
This commit is contained in:
andrey.zhirnov
2019-08-06 12:59:04 +03:00
parent d45685d4be
commit 5f469a8ac3
7 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
headers/enduro2d/high/components/spine_player.hpp
View File

@@ -21,16 +21,21 @@ namespace e2d
public:
spine_player() = default;
spine_player(const spine_model_asset::ptr& model);
spine_player& time_scale(float value) noexcept;
[[nodiscard]] float time_scale() const noexcept;
[[nodiscard]] bool has_animation(const str& name) const noexcept;
spine_player& set_animation(u32 track, const str& name, bool loop = false);
spine_player& set_animation(u32 track, const str& name, bool loop = false) noexcept;
spine_player& add_animation(u32 track, const str& name, bool loop, secf delay = secf(0.0f));
spine_player& add_animation(u32 track, const str& name, secf delay = secf(0.0f));
spine_player& add_animation(u32 track, const str& name, bool loop, secf delay = secf(0.0f)) noexcept;
spine_player& add_animation(u32 track, const str& name, secf delay = secf(0.0f)) noexcept;
spine_player& add_empty_animation(u32 track, secf duration, secf delay = secf(0.0f));
spine_player& add_empty_animation(u32 track, secf duration, secf delay = secf(0.0f)) noexcept;
spine_player& clear(u32 track);
spine_player& clear();
spine_player& clear(u32 track) noexcept;
spine_player& clear() noexcept;
const animation_ptr& animation() const noexcept;
const spine_model_asset::ptr& model() const noexcept;

6
headers/enduro2d/high/components/spine_renderer.hpp
View File

@@ -27,9 +27,9 @@ namespace e2d
spine_renderer() = default;
spine_renderer(const spine_model_asset::ptr& model);
spine_renderer& model(const spine_model_asset::ptr& value);
spine_renderer& skin(const str& value);
spine_renderer& attachment(const str& slot, const str& name);
spine_renderer& model(const spine_model_asset::ptr& value) noexcept;
spine_renderer& skin(const str& value) noexcept;
spine_renderer& attachment(const str& slot, const str& name) noexcept;
const skeleton_ptr& skeleton() const noexcept;
const clipping_ptr& clipper() const noexcept;

1
headers/enduro2d/high/spine_model.hpp
View File

@@ -40,6 +40,7 @@ namespace e2d
spine_model& set_atlas(atlas_ptr atlas, bool premultiplied_alpha);
spine_model& mix_animations(const str& from, const str& to, secf duration);
spine_model& set_default_mix(secf duration);
const atlas_ptr& atlas() const noexcept;
const animation_data_ptr& animation() const noexcept;

10
sources/enduro2d/high/assets/spine_model_asset.cpp
View File

@@ -32,6 +32,7 @@ namespace
"scale" : { "type" : "number" },
"atlas" : { "$ref" : "#/common_definitions/address" },
"premultiplied_alpha" : { "type" : "boolean" },
"default_mix" : { "type" : "number" },
"mix_animations" : { "$ref": "#/definitions/spine_animation_mix_array" }
},
"definitions" : {
@@ -193,6 +194,15 @@ namespace
content.set_atlas(atlas, pma);
content.set_skeleton(skeleton);
secf default_mix(0.0f);
if ( root.HasMember("default_mix") ) {
if ( json_utils::try_parse_value(root["default_mix"], default_mix.value) ) {
content.set_default_mix(default_mix);
} else {
the<debug>().error("SPINE: Incorrect formating of 'default_mix' property");
}
}
if ( root.HasMember("mix_animations") ) {
const auto& mix_animations_json = root["mix_animations"];
if ( !parse_mix_animations(mix_animations_json, content) ) {

37
sources/enduro2d/high/components/spine_player.cpp
View File

@@ -26,7 +26,28 @@ namespace e2d
spAnimationState_dispose);
}
spine_player& spine_player::set_animation(u32 track, const str& name, bool loop) {
spine_player& spine_player::time_scale(float value) noexcept {
E2D_ASSERT(animation_);
animation_->timeScale = value;
return *this;
}
float spine_player::time_scale() const noexcept {
E2D_ASSERT(animation_);
return animation_->timeScale;
}
bool spine_player::has_animation(const str& name) const noexcept {
if ( !model_ ) {
return false;
}
spAnimation* anim = spSkeletonData_findAnimation(
model_->content().skeleton().operator->(),
name.c_str());
return anim != nullptr;
}
spine_player& spine_player::set_animation(u32 track, const str& name, bool loop) noexcept {
E2D_ASSERT(model_ && animation_);
E2D_ASSERT(track < max_track_count);
spAnimation* anim = spSkeletonData_findAnimation(
@@ -34,18 +55,18 @@ namespace e2d
name.c_str());
if ( !anim ) {
E2D_ASSERT(false); // TODO: exception?
the<debug>().error("SPINE_PLAYER: animation '%0' is not found", name);
return *this;
}
spAnimationState_setAnimation(animation_.get(), track, anim, loop);
return *this;
}
spine_player& spine_player::add_animation(u32 track, const str& name, secf delay) {
spine_player& spine_player::add_animation(u32 track, const str& name, secf delay) noexcept {
return add_animation(track, name, false, delay);
}
spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) {
spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) noexcept {
E2D_ASSERT(model_ && animation_);
E2D_ASSERT(track < max_track_count);
spAnimation* anim = spSkeletonData_findAnimation(
@@ -53,28 +74,28 @@ namespace e2d
name.c_str());
if ( !anim ) {
E2D_ASSERT(false); // TODO: exception?
the<debug>().error("SPINE_PLAYER: animation '%0' is not found", name);
return *this;
}
spAnimationState_addAnimation(animation_.get(), track, anim, loop, delay.value);
return *this;
}
spine_player& spine_player::add_empty_animation(u32 track, secf duration, secf delay) {
spine_player& spine_player::add_empty_animation(u32 track, secf duration, secf delay) noexcept {
E2D_ASSERT(animation_);
E2D_ASSERT(track < max_track_count);
spAnimationState_addEmptyAnimation(animation_.get(), track, duration.value, delay.value);
return *this;
}
spine_player& spine_player::clear(u32 track) {
spine_player& spine_player::clear(u32 track) noexcept {
E2D_ASSERT(animation_);
E2D_ASSERT(track < max_track_count);
spAnimationState_clearTrack(animation_.get(), track);
return *this;
}
spine_player& spine_player::clear() {
spine_player& spine_player::clear() noexcept {
E2D_ASSERT(animation_);
spAnimationState_clearTracks(animation_.get());
return *this;

10
sources/enduro2d/high/components/spine_renderer.cpp
View File

@@ -15,7 +15,7 @@ namespace e2d
this->model(model);
}
spine_renderer& spine_renderer::model(const spine_model_asset::ptr& value) {
spine_renderer& spine_renderer::model(const spine_model_asset::ptr& value) noexcept {
E2D_ASSERT(value);
E2D_ASSERT(value->content().skeleton());
E2D_ASSERT(value->content().atlas());
@@ -26,15 +26,17 @@ namespace e2d
return *this;
}
spine_renderer& spine_renderer::skin(const str& value) {
spine_renderer& spine_renderer::skin(const str& value) noexcept {
spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
return *this;
}
spine_renderer& spine_renderer::attachment(const str& slot, const str& name) {
spine_renderer& spine_renderer::attachment(const str& slot, const str& name) noexcept {
E2D_ASSERT(!slot.empty());
E2D_ASSERT(!name.empty());
spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()); // TODO: check result
if ( !spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()) ) {
the<debug>().error("SPINE_RENDERER: can't set attachment '%0' to slot '%1'", name, slot);
}
return *this;
}

6
sources/enduro2d/high/spine_model.cpp
View File

@@ -86,6 +86,12 @@ namespace e2d
spAnimationStateData_setMixByName(animation_.get(), from.c_str(), to.c_str(), duration.value);
return *this;
}
spine_model& spine_model::set_default_mix(secf duration) {
E2D_ASSERT(animation_);
animation_->defaultMix = duration.value;
return *this;
}
const spine_model::atlas_ptr& spine_model::atlas() const noexcept {
return atlas_;