chore(deps): use the unreleased version of EnTT

EndstoneMC · Jun 13, 2024 · 3f31a54 · 3f31a54
1 parent 52c0ec0
commit 3f31a54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,10 @@ add_compile_definitions(ENTT_PACKED_PAGE=128)
 find_package(Boost CONFIG REQUIRED)
 find_package(concurrentqueue CONFIG REQUIRED)
 find_package(cpptrace CONFIG REQUIRED)
-find_package(EnTT CONFIG REQUIRED)
+#find_package(EnTT CONFIG REQUIRED)
+include(FetchContent)
+FetchContent_Declare(EnTT URL https://github.com/skypjack/entt/archive/41aab920b083aa424ac1d27666ce287eeaff6ceb.tar.gz)
+FetchContent_MakeAvailable(EnTT)
 find_package(expected-lite REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 find_package(funchook CONFIG REQUIRED)

diff --git a/conanfile.py b/conanfile.py
@@ -107,7 +107,7 @@ def requirements(self):
         self.requires("boost/1.85.0")
         self.requires("concurrentqueue/1.0.4")
         self.requires("cpptrace/0.5.2")
-        self.requires("entt/3.13.0")
+        # self.requires("entt/3.13.0")
         self.requires("expected-lite/0.6.3")
         self.requires("fmt/[>=10.1.1]", transitive_headers=True, transitive_libs=True)
         self.requires("funchook/1.1.3")

diff --git a/include/bedrock/entity/entity_registry.h b/include/bedrock/entity/entity_registry.h
@@ -57,5 +57,5 @@ class EntityRegistry : public std::enable_shared_from_this<EntityRegistry> {
 
     std::string name_;                         // +16
     entt::basic_registry<EntityId> registry_;  // +48
-    std::uint32_t id_;                         // +336
+    std::uint32_t id_;                         // +352
 };