Update to flecs 4.1.5 (#188)

Author: CrosRoad95

code/framework/src/integrations/client/instance.cpp

@@ -362,7 +362,7 @@ namespace Framework::Integrations::Client {
                 return;
             }
 
-            const auto tr = e.get_mut<Framework::World::Modules::Base::Transform>();
+            const auto tr = e.try_get_mut<Framework::World::Modules::Base::Transform>();
             *tr           = msg->GetTransform();
         });
         net->SetOnPlayerDisconnectedCallback([this](SLNet::Packet *packet, Framework::Networking::Messages::DisconnectionReason reasonId) {

code/framework/src/integrations/client/instance.h

@@ -33,7 +33,7 @@
 
 #include <input/input.h>
 
-#include <flecs/flecs.h>
+#include <flecs/distr/flecs.h>
 
 namespace Framework::Integrations::Client {
     using NetworkConnectionFinalizedCallback = fu2::function<void(flecs::entity, float) const>;

code/framework/src/integrations/shared/modules/mod.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <flecs/flecs.h>
+#include <flecs/distr/flecs.h>
 #include <string>
 
 namespace Framework::Integrations::Shared::Modules {

code/framework/src/networking/messages/client_connection_finalized.h

@@ -12,7 +12,7 @@
 
 #include <BitStream.h>
 
-#include <flecs/flecs.h>
+#include <flecs/distr/flecs.h>
 
 namespace Framework::Networking::Messages {
     class ClientConnectionFinalized final: public IMessage {

code/framework/src/networking/messages/client_initialise_player.h

@@ -12,7 +12,7 @@
 
 #include <BitStream.h>
 
-#include <flecs/flecs.h>
+#include <flecs/distr/flecs.h>
 
 namespace Framework::Networking::Messages {
     class ClientInitPlayer final: public IMessage {

code/framework/src/networking/messages/client_kick.h

@@ -12,7 +12,7 @@
 
 #include <BitStream.h>
 
-#include <flecs/flecs.h>
+#include <flecs/distr/flecs.h>
 
 namespace Framework::Networking::Messages {
     class ClientKick final: public IMessage {

code/framework/src/networking/network_server.cpp

@@ -89,7 +89,7 @@ namespace Framework::Networking {
         const auto streamers = world->FindVisibleStreamers(ent);
 
         for (const auto &streamer_ent : streamers) {
-            const auto streamer = streamer_ent.get<World::Modules::Base::Streamer>();
+            const auto streamer = streamer_ent.try_get<World::Modules::Base::Streamer>();
             if (streamer->guid != guid.g && guid.g != SLNet::UNASSIGNED_RAKNET_GUID.g) {
                 continue;
             }

code/framework/src/world/client.cpp

@@ -46,7 +46,7 @@ namespace Framework::World {
             return 0;
         }
 
-        if(const auto serverID = entity.get<Modules::Base::ServerID>())
+        if(const auto serverID = entity.try_get<Modules::Base::ServerID>())
             return serverID->id;
         return 0;
     }
@@ -115,7 +115,7 @@ namespace Framework::World {
             if (!e.is_alive()) {
                 return;
             }
-            const auto tr = e.get_mut<World::Modules::Base::Transform>();
+            const auto tr = e.try_get_mut<World::Modules::Base::Transform>();
             *tr           = msg->GetTransform();
         });
         net->RegisterGameRPC<RPC::SetFrame>([this](SLNet::RakNetGUID guid, RPC::SetFrame *msg) {
@@ -126,7 +126,7 @@ namespace Framework::World {
             if (!e.is_alive()) {
                 return;
             }
-            const auto fr = e.get_mut<World::Modules::Base::Frame>();
+            const auto fr = e.try_get_mut<World::Modules::Base::Frame>();
             *fr           = msg->GetFrame();
         });
     }
@@ -136,10 +136,10 @@ namespace Framework::World {
             return;
         }
 
-        auto tr = entity.get_mut<Modules::Base::Transform>();
+        auto tr = entity.try_get_mut<Modules::Base::Transform>();
         *tr     = rhs;
 
-        const auto str = entity.get_mut<Modules::Base::Streamable>();
+        const auto str = entity.try_get_mut<Modules::Base::Streamable>();
         if (str->modEvents.updateTransformProc) {
             str->modEvents.updateTransformProc(entity);
         }

code/framework/src/world/client.h

@@ -10,7 +10,7 @@
 
 #include "engine.h"
 
-#include <flecs/flecs.h>
+#include <flecs/distr/flecs.h>
 
 #include <function2.hpp>
 

code/framework/src/world/engine.cpp

@@ -34,20 +34,20 @@ namespace Framework::World {
     }
 
     bool Engine::IsEntityOwner(flecs::entity e, uint64_t guid) {
-        const auto es = e.get<Framework::World::Modules::Base::Streamable>();
+        const auto es = e.try_get<Framework::World::Modules::Base::Streamable>();
         if (!es) {
             return false;
         }
         return (es->owner == guid);
     }
 
     void Engine::WakeEntity(flecs::entity e) {
-        if (!e.get<Framework::World::Modules::Base::TickRateRegulator>()) {
+        if (!e.has<Framework::World::Modules::Base::TickRateRegulator>()) {
             return;
         }
-        const auto tr = e.get_mut<Framework::World::Modules::Base::TickRateRegulator>();
+        const auto tr = e.try_get_mut<Framework::World::Modules::Base::TickRateRegulator>();
         tr->lastGenID--;
-        const auto es      = e.get_mut<Framework::World::Modules::Base::Streamable>();
+        const auto es      = e.try_get_mut<Framework::World::Modules::Base::Streamable>();
         es->updateInterval = es->defaultUpdateInterval;
     }