Skip to content

using ecsact C++ core #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

using ecsact C++ core #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cd39be
using ecsact C++ core
zaucy Feb 6, 2023
4d468b5
using some non existant methods
zaucy Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions ecsact/entt/runtime.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <boost/mp11.hpp>
#include "ecsact/runtime/common.h"
#include "ecsact/runtime/definitions.h"
#include "ecsact/runtime/core.h"
#include "ecsact/runtime/core.hh"
#include "ecsact/lib.hh"
#include <entt/entt.hpp>
#include "ecsact/entt/detail/mp11_util.hh"
Expand Down Expand Up @@ -1041,15 +1041,12 @@ private:
}

void _apply_execution_options(
const ecsact_execution_options& options,
registry_info& info
ecsact::core::execution_options_view options,
registry_info& info
) {
using boost::mp11::mp_for_each;

for(int i = 0; options.add_components_length > i; ++i) {
const ecsact_entity_id& entity = options.add_components_entities[i];
const ecsact_component& comp = options.add_components[i];

for(auto&& [entity, comp] : options.add_components_pairs()) {
mp_for_each<typename package::components>([&]<typename C>(C) {
if constexpr(C::transient) {
return;
Expand All @@ -1072,10 +1069,7 @@ private:
});
}

for(int i = 0; options.update_components_length > i; ++i) {
const ecsact_entity_id& entity = options.update_components_entities[i];
const ecsact_component& comp = options.update_components[i];

for(auto&& [entity, comp] : options.update_components_pairs()) {
mp_for_each<typename package::components>([&]<typename C>(C) {
if constexpr(C::transient) {
return;
Expand All @@ -1095,10 +1089,7 @@ private:
});
}

for(int i = 0; options.remove_components_length > i; ++i) {
const ecsact_entity_id& entity = options.remove_components_entities[i];
ecsact_component_id component_id = options.remove_components[i];

for(auto&& [entity, component_id] : options.remove_components_pairs()) {
mp_for_each<typename package::components>([&]<typename C>(C) {
if constexpr(C::transient) {
return;
Expand Down Expand Up @@ -1196,9 +1187,9 @@ public:

if(execution_options_list != nullptr) {
for(int n = 0; execution_count > n; ++n) {
auto opts = execution_options_list[n];
for(auto act_idx = 0; opts.actions_length > act_idx; ++act_idx) {
auto& act = opts.actions[act_idx];
auto opts =
ecsact::core::execution_options_view(execution_options_list[n]);
for(auto& act : opts.actions()) {
exec_err = _validate_action(reg_id, act);
if(exec_err != ECSACT_EXEC_SYS_OK) {
return exec_err;
Expand Down
95 changes: 30 additions & 65 deletions runtime/test/runtime_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,20 +352,10 @@ TEST(Core, EventCollector) {
auto test_comp = ComponentA{};
test_comp.a = 10;

auto add_component_entities = std::array{entity};
auto add_components = std::array{
ecsact_component{
.component_id = ComponentA::id,
.component_data = &test_comp,
},
};

auto exec_options = ecsact_execution_options{};
exec_options.add_components_length = add_components.size();
exec_options.add_components_entities = add_component_entities.data();
exec_options.add_components = add_components.data();
auto exec_options = ecsact::core::execution_options{};
exec_options.add_component(entity, &test_comp);

ecsact_execute_systems(reg.id(), 1, &exec_options, &evc);
reg.execute_systems(std::array{exec_options}, &evc);

EXPECT_TRUE(event_happened) << "Init event did not happen";
event_happened = false;
Expand All @@ -379,20 +369,10 @@ TEST(Core, EventCollector) {
auto test_comp = ComponentA{};
test_comp.a = 42;

auto update_component_entities = std::array{entity};
auto update_components = std::array{
ecsact_component{
.component_id = ComponentA::id,
.component_data = &test_comp,
},
};

auto exec_options = ecsact_execution_options{};
exec_options.update_components_length = update_components.size();
exec_options.update_components_entities = update_component_entities.data();
exec_options.update_components = update_components.data();
auto exec_options = ecsact::core::execution_options{};
exec_options.update_component(entity, &test_comp);

ecsact_execute_systems(reg.id(), 1, &exec_options, &evc);
reg.execute_systems(std::array{exec_options}, &evc);

EXPECT_TRUE(event_happened) << "Update event did not happen";
event_happened = false;
Expand All @@ -403,15 +383,10 @@ TEST(Core, EventCollector) {
auto evc = ecsact_execution_events_collector{};
evc.remove_callback = callback;

auto remove_component_entities = std::array{entity};
auto remove_components = std::array{ComponentA::id};
auto exec_options = ecsact::core::execution_options{};
exec_options.remove_component<ComponentA>(entity);

auto exec_options = ecsact_execution_options{};
exec_options.remove_components_length = remove_components.size();
exec_options.remove_components_entities = remove_component_entities.data();
exec_options.remove_components = remove_components.data();

ecsact_execute_systems(reg.id(), 1, &exec_options, &evc);
reg.execute_systems(std::array{exec_options}, &evc);

EXPECT_TRUE(event_happened) << "Remove event did not happen";
event_happened = false;
Expand All @@ -420,18 +395,14 @@ TEST(Core, EventCollector) {

TEST(Core, ExecuteSystemsErrors) {
auto reg = ecsact::core::registry("ExecuteSystemsErrors");
auto options = ecsact_execution_options{};
auto test_action = runtime_test::AssocTestAction{
.assoc_entity = static_cast<ecsact_entity_id>(4000),
};
auto test_action_c = ecsact_action{
.action_id = runtime_test::AssocTestAction::id,
.action_data = &test_action,
};

options.actions_length = 1;
options.actions = &test_action_c;
auto exec_err = ecsact_execute_systems(reg.id(), 1, &options, nullptr);
auto exec_options = ecsact::core::execution_options{};
exec_options.push_action(&test_action);

auto exec_err = reg.execute_systems(std::array{exec_options}, nullptr);

EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_ERR_ACTION_ENTITY_INVALID);
}
Expand All @@ -444,14 +415,11 @@ TEST(Core, ExecuteSystemsAssocActionOk) {
auto test_action = runtime_test::AssocTestAction{
.assoc_entity = test_entity,
};
auto test_action_c = ecsact_action{
.action_id = runtime_test::AssocTestAction::id,
.action_data = &test_action,
};

options.actions_length = 1;
options.actions = &test_action_c;
auto exec_err = ecsact_execute_systems(reg.id(), 1, &options, nullptr);
auto exec_options = ecsact::core::execution_options{};
exec_options.push_action(&test_action);

auto exec_err = reg.execute_systems(std::array{exec_options}, nullptr);

EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_OK);
}
Expand All @@ -478,25 +446,22 @@ TEST(Core, AddAssocOk) {
auto test_entity2 = reg.create_entity();
reg.add_component<runtime_test::AddAssocTestTag>(test_entity2);

auto options = ecsact_execution_options{};
auto test_action = runtime_test::AssocTestAction{
.assoc_entity = test_entity2,
};
auto test_action_c = ecsact_action{
.action_id = runtime_test::AssocTestAction::id,
.action_data = &test_action,
};

options.actions_length = 1;
options.actions = &test_action_c;
auto exec_options = ecsact::core::execution_options{};
exec_options.push_action(&test_action);

AddAssocTest_ran = false;
AssocTestAction_ran = false;
auto exec_err = ecsact_execute_systems(reg.id(), 1, &options, nullptr);

auto exec_err = reg.execute_systems(std::array{exec_options}, nullptr);
EXPECT_TRUE(AddAssocTest_ran) << "AddAssocTest Impl Didn't Executed";
EXPECT_TRUE(AssocTestAction_ran) << "AssocTestAction Impl Didn't Executed";
EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_OK);

exec_err = ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
exec_err = reg.execute_systems(std::array{exec_options}, nullptr);
EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_OK);
}

Expand Down Expand Up @@ -537,15 +502,15 @@ TEST(Core, RemoveAssocOk) {
);

RemoveAssocTest_ran = false;
auto exec_err = ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
auto exec_err = reg.execute_systems();
EXPECT_TRUE(RemoveAssocTest_ran) << "RemoveAssocTest Impl Didn't Executed";
EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_OK);

ASSERT_FALSE(
reg.has_component<runtime_test::RemoveAssocTestComponent>(test_entity2)
);

exec_err = ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
exec_err = reg.execute_systems();
EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_OK);

reg.add_component(
Expand All @@ -555,7 +520,7 @@ TEST(Core, RemoveAssocOk) {
}
);

exec_err = ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
exec_err = reg.execute_systems();
EXPECT_EQ(exec_err, ECSACT_EXEC_SYS_OK);

ASSERT_FALSE(
Expand Down Expand Up @@ -653,7 +618,7 @@ TEST(Core, AssociationEntityCorrectness) {

attack_damage_exec_count = 0;
attack_damage_weakened_exec_count = 0;
ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
reg.execute_systems();
EXPECT_EQ(attack_damage_exec_count, all_target_entities.size());
EXPECT_EQ(attack_damage_weakened_exec_count, weakened_target_entities.size());

Expand All @@ -667,7 +632,7 @@ TEST(Core, AssociationEntityCorrectness) {

attack_damage_exec_count = 0;
attack_damage_weakened_exec_count = 0;
ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
reg.execute_systems();
EXPECT_EQ(attack_damage_exec_count, attacker_entities.size());
}
}
Expand Down Expand Up @@ -702,7 +667,7 @@ TEST(Core, DynamicSystemImpl) {
&runtime_test__OtherEntitySystem
);

auto exec_err = ecsact_execute_systems(reg.id(), 1, nullptr, nullptr);
auto exec_err = reg.execute_systems();
ASSERT_EQ(exec_err, ECSACT_EXEC_SYS_OK);

// Sanity check
Expand Down Expand Up @@ -739,7 +704,7 @@ TEST(Core, StaticSystemImpl) {
nullptr
);

ecsact_execute_systems(reg_id, 1, nullptr, nullptr);
reg.execute_systems();

comp_get = static_cast<const runtime_test::ComponentA*>(
ecsact_get_component(reg_id, entity, comp_id)
Expand Down