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

rewrite update systems logic to features and events

Browse Source
This commit is contained in:
Matvey Cherevko
2019-10-19 08:53:53 +07:00
parent f7db4a45d8
commit 3ce725c440
19 changed files with 250 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
samples/sources/sample_03/sample_03.cpp
View File

@@ -13,10 +13,13 @@ namespace
v3f axis;
};
class game_system final : public ecs::system {
class game_system final : public systems::update_system {
public:
void process(ecs::registry& owner) override {
E2D_UNUSED(owner);
void process(
ecs::registry& owner,
const systems::update_event& event) override
{
E2D_UNUSED(owner, event);
const keyboard& k = the<input>().keyboard();
if ( k.is_key_just_released(keyboard_key::f12) ) {
@@ -33,9 +36,13 @@ namespace
}
};
class camera_system final : public ecs::system {
class camera_system final : public systems::render_system {
public:
void process(ecs::registry& owner) override {
void process(
ecs::registry& owner,
const systems::render_event& event) override
{
E2D_UNUSED(event);
owner.for_joined_components<camera>(
[](const ecs::const_entity&, camera& cam){
if ( !cam.target() ) {
@@ -48,18 +55,20 @@ namespace
}
};
class rotator_system final : public ecs::system {
class rotator_system final : public systems::update_system {
public:
void process(ecs::registry& owner) override {
const f32 time = the<engine>().time();
void process(
ecs::registry& owner,
const systems::update_event& event) override
{
owner.for_joined_components<rotator, actor>(
[&time](const ecs::const_entity&, const rotator& rot, actor& act){
const node_iptr node = act.node();
if ( node ) {
const q4f q = math::make_quat_from_axis_angle(make_rad(time), rot.axis);
node->rotation(q);
}
});
[&event](const ecs::const_entity&, const rotator& rot, actor& act){
const node_iptr node = act.node();
if ( node ) {
const q4f q = math::make_quat_from_axis_angle(make_rad(event.time), rot.axis);
node->rotation(q);
}
});
}
};
@@ -154,9 +163,10 @@ namespace
bool create_systems() {
ecs::registry_filler(the<world>().registry())
.system<game_system>(world::priority_update)
.system<rotator_system>(world::priority_update)
.system<camera_system>(world::priority_pre_render);
.feature<struct game_feature>(ecs::feature()
.add_system<game_system>()
.add_system<rotator_system>()
.add_system<camera_system>());
return true;
}
};

22
samples/sources/sample_04/sample_04.cpp
View File

@@ -9,10 +9,13 @@ using namespace e2d;
namespace
{
class game_system final : public ecs::system {
class game_system final : public systems::update_system {
public:
void process(ecs::registry& owner) override {
E2D_UNUSED(owner);
void process(
ecs::registry& owner,
const systems::update_event& event) override
{
E2D_UNUSED(owner, event);
const keyboard& k = the<input>().keyboard();
if ( k.is_key_just_released(keyboard_key::f12) ) {
@@ -29,9 +32,13 @@ namespace
}
};
class camera_system final : public ecs::system {
class camera_system final : public systems::render_system {
public:
void process(ecs::registry& owner) override {
void process(
ecs::registry& owner,
const systems::render_event& event) override
{
E2D_UNUSED(event);
owner.for_joined_components<camera>(
[](const ecs::const_entity&, camera& cam){
if ( !cam.target() ) {
@@ -61,8 +68,9 @@ namespace
bool create_systems() {
ecs::registry_filler(the<world>().registry())
.system<game_system>(world::priority_update)
.system<camera_system>(world::priority_pre_render);
.feature<struct game_feature>(ecs::feature()
.add_system<game_system>()
.add_system<camera_system>());
return true;
}
};

22
samples/sources/sample_06/sample_06.cpp
View File

@@ -9,10 +9,13 @@ using namespace e2d;
namespace
{
class game_system final : public ecs::system {
class game_system final : public systems::update_system {
public:
void process(ecs::registry& owner) override {
E2D_UNUSED(owner);
void process(
ecs::registry& owner,
const systems::update_event& event) override
{
E2D_UNUSED(owner, event);
const keyboard& k = the<input>().keyboard();
if ( k.is_key_just_released(keyboard_key::f12) ) {
@@ -68,9 +71,13 @@ namespace
}
};
class camera_system final : public ecs::system {
class camera_system final : public systems::render_system {
public:
void process(ecs::registry& owner) override {
void process(
ecs::registry& owner,
const systems::render_event& event) override
{
E2D_UNUSED(event);
owner.for_joined_components<camera>(
[](const ecs::const_entity&, camera& cam){
if ( !cam.target() ) {
@@ -100,8 +107,9 @@ namespace
bool create_systems() {
ecs::registry_filler(the<world>().registry())
.system<game_system>(world::priority_update)
.system<camera_system>(world::priority_pre_render);
.feature<struct game_feature>(ecs::feature()
.add_system<game_system>()
.add_system<camera_system>());
return true;
}
};