Skip to content
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

flecs 4.0.3 #117

Merged
merged 8 commits into from
Dec 29, 2024
Merged

flecs 4.0.3 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2f4759
flecs 4.0.1
zpl-zak Aug 27, 2024
43cac16
wip
zpl-zak Aug 27, 2024
b675ff8
update flecs
zpl-zak Dec 29, 2024
256f461
Merge branch 'develop' into review/flecs-400-update
zpl-zak Dec 29, 2024
3cc0d9e
so many fixes to make flecs work
zpl-zak Dec 29, 2024
de96a09
Merge branch 'develop' into review/flecs-400-update
zpl-zak Dec 29, 2024
6605d63
Update instance.cpp
zpl-zak Dec 29, 2024
80dbd49
Update instance.cpp
zpl-zak Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion code/framework/src/integrations/server/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,14 @@ namespace Framework::Integrations::Server {
Logging::GetLogger(FRAMEWORK_INNER_SERVER)->debug("Disconnecting peer {}, reason: {}", guid.g, reason);

const auto e = _worldEngine->GetEntityByGUID(guid.g);

_worldEngine->GetWorld()->defer_begin();
if (e.is_valid()) {
if (_onPlayerDisconnectCallback)
_onPlayerDisconnectCallback(e, guid.g);

_worldEngine->RemoveEntity(e);
}
_worldEngine->GetWorld()->defer_end();

net->GetPeer()->CloseConnection(guid, true);
});
Expand Down
46 changes: 22 additions & 24 deletions code/framework/src/world/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,10 @@ namespace Framework::World {

flecs::entity ClientEngine::GetEntityByServerID(flecs::entity_t id) const {
flecs::entity ent = {};
_queryGetEntityByServerID.iter([&ent, id](flecs::iter it, Modules::Base::ServerID *rhs) {
for (size_t i = 0; i < it.count(); i++) {
if (id == rhs[i].id) {
ent = it.entity(i);
return;
}
_queryGetEntityByServerID.each([&ent, id](flecs::entity e, Modules::Base::ServerID& rhs) {
if (id == rhs.id) {
ent = e;
return;
}
});
return ent;
Expand All @@ -57,22 +55,27 @@ namespace Framework::World {
flecs::entity ClientEngine::CreateEntity(flecs::entity_t serverID) const {
const auto e = _world->entity();

const auto sid = e.get_mut<Modules::Base::ServerID>();
sid->id = serverID;
auto &sid = e.ensure<Modules::Base::ServerID>();
sid.id = serverID;
return e;
}

void ClientEngine::OnConnect(Networking::NetworkPeer *peer, float tickInterval) {
_networkPeer = peer;

_streamEntities = _world->system<Modules::Base::Transform, Modules::Base::Streamable>("StreamEntities").kind(flecs::PostUpdate).interval(tickInterval).iter([this](flecs::iter it, Modules::Base::Transform *tr, Modules::Base::Streamable *rs) {
_streamEntities = _world->system<Modules::Base::Transform, Modules::Base::Streamable>("StreamEntities").kind(flecs::PostUpdate).interval(tickInterval).run([this](flecs::iter &it) {
const auto myGUID = _networkPeer->GetPeer()->GetMyGUID();

for (size_t i = 0; i < it.count(); i++) {
const auto &es = &rs[i];
while (it.next()) {
const auto tr = it.field<Modules::Base::Transform>(0);
const auto rs = it.field<Modules::Base::Streamable>(1);

if (es->GetBaseEvents().updateProc && Framework::World::Engine::IsEntityOwner(it.entity(i), myGUID.g)) {
es->GetBaseEvents().updateProc(_networkPeer, (SLNet::UNASSIGNED_RAKNET_GUID).g, it.entity(i));
for (auto i : it) {
const auto &es = &rs[i];

if (es->GetBaseEvents().updateProc && Framework::World::Engine::IsEntityOwner(it.entity(i), myGUID.g)) {
es->GetBaseEvents().updateProc(_networkPeer, (SLNet::UNASSIGNED_RAKNET_GUID).g, it.entity(i));
}
}
}
});
Expand All @@ -87,19 +90,14 @@ namespace Framework::World {
}

_world->defer_begin();
_allStreamableEntities.iter([this](flecs::iter it, Modules::Base::Transform *tr, Modules::Base::Streamable *s) {
(void)tr;
(void)s;

for (size_t i = 0; i < it.count(); i++) {
if (_onEntityDestroyCallback) {
if (!_onEntityDestroyCallback(it.entity(i))) {
continue;
}
_allStreamableEntities.each([this](flecs::entity e, Modules::Base::Transform&, Modules::Base::Streamable&) {
if (_onEntityDestroyCallback) {
if (!_onEntityDestroyCallback(e)) {
return;
}

it.entity(i).destruct();
}

e.destruct();
});
_world->defer_end();

Expand Down
11 changes: 4 additions & 7 deletions code/framework/src/world/engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,12 @@ namespace Framework::World {

flecs::entity Engine::GetEntityByGUID(uint64_t guid) const {
flecs::entity ourEntity = {};
_findAllStreamerEntities.iter([&ourEntity, guid](flecs::iter &it, Modules::Base::Streamer *s) {
for (const auto i : it) {
if (s[i].guid == guid) {
ourEntity = it.entity(i);
return;
}
_findAllStreamerEntities.each([&ourEntity, guid](flecs::entity e, Modules::Base::Streamer &s) {
if (s.guid == guid) {
ourEntity = e;
return;
}
});

return ourEntity;
}

Expand Down
4 changes: 2 additions & 2 deletions code/framework/src/world/modules/base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ namespace Framework::World::Modules {
#endif
}

static void SetupServerEmitters(Streamable *streamable);
static void SetupClientEmitters(Streamable *streamable);
static void SetupServerEmitters(Streamable& streamable);
static void SetupClientEmitters(Streamable& streamable);
static void SetupServerReceivers(Framework::Networking::NetworkPeer *net, Framework::World::Engine *worldEngine);
static void SetupClientReceivers(Framework::Networking::NetworkPeer *net, Framework::World::ClientEngine *worldEngine, Framework::World::Archetypes::StreamingFactory *streamingFactory);
};
Expand Down
17 changes: 9 additions & 8 deletions code/framework/src/world/modules/modules_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
}

namespace Framework::World::Modules {
void Base::SetupServerEmitters(Streamable *streamable) {
streamable->events.spawnProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
void Base::SetupServerEmitters(Streamable& streamable) {
streamable.events.spawnProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
Framework::Networking::Messages::GameSyncEntitySpawn entitySpawn;
const auto tr = e.get<Framework::World::Modules::Base::Transform>();
if (tr)
Expand All @@ -37,23 +37,23 @@ namespace Framework::World::Modules {
return true;
};

streamable->events.despawnProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
streamable.events.despawnProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
CALL_CUSTOM_PROC(despawnProc);
Framework::Networking::Messages::GameSyncEntityDespawn entityDespawn;
entityDespawn.SetServerID(e.id());
peer->Send(entityDespawn, guid);
return true;
};

streamable->events.selfUpdateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
streamable.events.selfUpdateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
Framework::Networking::Messages::GameSyncEntitySelfUpdate entitySelfUpdate;
entitySelfUpdate.SetServerID(e.id());
peer->Send(entitySelfUpdate, guid);
CALL_CUSTOM_PROC(selfUpdateProc);
return true;
};

streamable->events.updateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
streamable.events.updateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
Framework::Networking::Messages::GameSyncEntityUpdate entityUpdate;
const auto tr = e.get<Framework::World::Modules::Base::Transform>();
const auto es = e.get<Framework::World::Modules::Base::Streamable>();
Expand All @@ -65,7 +65,7 @@ namespace Framework::World::Modules {
return true;
};

streamable->events.ownerUpdateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
streamable.events.ownerUpdateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
Framework::Networking::Messages::GameSyncEntityOwnerUpdate entityUpdate;
const auto tr = e.get<Framework::World::Modules::Base::Transform>();
const auto es = e.get<Framework::World::Modules::Base::Streamable>();
Expand All @@ -77,8 +77,8 @@ namespace Framework::World::Modules {
return true;
};
}
void Base::SetupClientEmitters(Streamable *streamable) {
streamable->events.updateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
void Base::SetupClientEmitters(Streamable& streamable) {
streamable.events.updateProc = [&](Framework::Networking::NetworkPeer *peer, uint64_t guid, flecs::entity e) {
Framework::Networking::Messages::GameSyncEntityUpdate entityUpdate;
const auto tr = e.get<Framework::World::Modules::Base::Transform>();
const auto sid = e.get<Framework::World::Modules::Base::ServerID>();
Expand Down Expand Up @@ -130,6 +130,7 @@ namespace Framework::World::Modules {
const auto e = worldEngine->CreateEntity(msg->GetServerID());
streamingFactory->SetupClient(e, SLNet::UNASSIGNED_RAKNET_GUID.g);

e.add<World::Modules::Base::Transform>();
const auto tr = e.get_mut<World::Modules::Base::Transform>();
*tr = msg->GetTransform();
});
Expand Down
Loading
Loading