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

send spine events from script_system

Browse Source
This commit is contained in:
Matvey Cherevko
2019-11-02 03:55:14 +07:00
parent 1fc8d3ff77
commit eec94458c7
2 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headers/enduro2d/high/systems/script_system.hpp
View File

@@ -13,7 +13,7 @@ namespace e2d
class script_system final
: public ecs::system<
systems::update_event,
ecs::after<systems::frame_finalize_event>> {
ecs::before<systems::update_event>> {
public:
script_system();
~script_system() noexcept;
@@ -24,7 +24,7 @@ namespace e2d
void process(
ecs::registry& owner,
const ecs::after<systems::frame_finalize_event>& event) override;
const ecs::before<systems::update_event>& trigger) override;
private:
class internal_state;
std::unique_ptr<internal_state> state_;

55
sources/enduro2d/high/systems/script_system.cpp
View File

@@ -10,6 +10,11 @@
#include <enduro2d/high/luasol.hpp>
#include <enduro2d/high/world.hpp>
#include <enduro2d/high/components/actor.hpp>
#include <enduro2d/high/components/behaviour.hpp>
#include <enduro2d/high/components/disabled.hpp>
#include <enduro2d/high/components/spine_player_evt.hpp>
namespace
{
using namespace e2d;
@@ -28,6 +33,35 @@ namespace
e2d_table["luasol"] = &the<luasol>();
e2d_table["world"] = &the<world>();
}
void process_spine_player_events(ecs::registry& owner) {
systems::for_extracted_components<spine_player_evt, behaviour, actor>(owner,
[](ecs::entity e, const spine_player_evt& spe, behaviour& b, actor& a){
if ( !a.node() || !a.node()->owner() ) {
return;
}
for ( const spine_player_evt::event& evt : spe.events() ) {
behaviours::call_result r = behaviours::call_result::success;
std::visit(utils::overloaded {
[&b,&a,&r](const spine_player_evt::custom_evt& e){
r = behaviours::call_meta_method(
b, "on_event", a.node()->owner(), "spine_player.custom_evt", e);
},
[&b,&a,&r](const spine_player_evt::end_evt& e){
r = behaviours::call_meta_method(
b, "on_event", a.node()->owner(), "spine_player.end_evt", e);
},
[&b,&a,&r](const spine_player_evt::complete_evt& e){
r = behaviours::call_meta_method(
b, "on_event", a.node()->owner(), "spine_player.complete_evt", e);
}
}, evt);
if ( r == behaviours::call_result::failed ) {
e.assign_component<disabled<behaviour>>();
}
}
}, !ecs::exists<disabled<behaviour>>());
}
}
namespace e2d
@@ -47,11 +81,20 @@ namespace e2d
~internal_state() noexcept = default;
void update_process(ecs::registry& owner) {
E2D_UNUSED(owner);
systems::for_extracted_components<behaviour, actor>(owner,
[](ecs::entity e, behaviour& b, actor& a){
if ( !a.node() || !a.node()->owner() ) {
return;
}
const auto result = behaviours::call_meta_method(b, "on_update", a.node()->owner());
if ( result == behaviours::call_result::failed ) {
e.assign_component<disabled<behaviour>>();
}
}, !ecs::exists<disabled<behaviour>>());
}
void finalize_process(ecs::registry& owner) {
E2D_UNUSED(owner);
void process_events(ecs::registry& owner) {
process_spine_player_events(owner);
}
};
@@ -73,9 +116,9 @@ namespace e2d
void script_system::process(
ecs::registry& owner,
const ecs::after<systems::frame_finalize_event>& event)
const ecs::before<systems::update_event>& trigger)
{
E2D_UNUSED(event);
state_->finalize_process(owner);
E2D_UNUSED(trigger);
state_->process_events(owner);
}
}