stephenseo/EntityComponentMetaSystem
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix stored functions not being called in order

Browse source 
Manager::callForMatchingFunctions should now call all functions in the
order they were added.
This commit is contained in:
Stephen Seo 2018-11-22 14:28:31 +09:00
parent 8c462b83a1
commit 8f133acbc6
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/EC/Manager.hpp
View file

@ -784,7 +784,7 @@ namespace EC
private: private:
std::unordered_map<std::size_t, std::tuple< std::map<std::size_t, std::tuple<
BitsetType, BitsetType,
void*, void*,
std::function<void( std::function<void(

47
src/test/ECTest.cpp
View file

@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <mutex> #include <mutex>
#include <vector>
#include <EC/Meta/Meta.hpp> #include <EC/Meta/Meta.hpp>
#include <EC/EC.hpp> #include <EC/EC.hpp>
@ -1027,3 +1028,49 @@ TEST(EC, context)
EXPECT_EQ(999, manager.getEntityData<C0>(e1)->x); EXPECT_EQ(999, manager.getEntityData<C0>(e1)->x);
EXPECT_EQ(1999, manager.getEntityData<C0>(e1)->y); EXPECT_EQ(1999, manager.getEntityData<C0>(e1)->y);
} }
TEST(EC, FunctionStorageOrder)
{
EC::Manager<ListComponentsAll, ListTagsAll> manager;
auto e0 = manager.addEntity();
manager.addComponent<C0>(e0, 1, 2);
std::vector<int> v;
using C0TL = EC::Meta::TypeList<C0>;
manager.addForMatchingFunction<C0TL>(
[&v] (std::size_t /* id */, void* /* context */, C0* c) {
v.push_back(c->x);
v.push_back(c->y);
});
manager.addForMatchingFunction<C0TL>(
[] (std::size_t /* id */, void* /* context */, C0* c) {
c->x += 2;
c->y += 2;
});
manager.addForMatchingFunction<C0TL>(
[&v] (std::size_t /* id */, void* /* context */, C0* c) {
v.push_back(c->x);
v.push_back(c->y);
});
manager.addForMatchingFunction<C0TL>(
[] (std::size_t /* id */, void* /* context */, C0* c) {
c->x += 2;
c->y += 2;
});
manager.addForMatchingFunction<C0TL>(
[&v] (std::size_t /* id */, void* /* context */, C0* c) {
v.push_back(c->x);
v.push_back(c->y);
});
manager.callForMatchingFunctions();
EXPECT_EQ(1, v.at(0));
EXPECT_EQ(2, v.at(1));
EXPECT_EQ(3, v.at(2));
EXPECT_EQ(4, v.at(3));
EXPECT_EQ(5, v.at(4));
EXPECT_EQ(6, v.at(5));
}