Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-01-08 22:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename object ID method to match existing

Browse Source
This commit is contained in:
jadebenn 2024-12-17 00:57:25 -06:00
parent b9e4aa5344
commit ae4d9c4bcb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dECS/Core.h
View File

@ -41,7 +41,7 @@ namespace dECS {
using StorageConstructor = std::function<std::unique_ptr<IStorage>()>; using StorageConstructor = std::function<std::unique_ptr<IStorage>()>;
[[nodiscard]] [[nodiscard]]
constexpr LWOOBJID Id() const noexcept { constexpr LWOOBJID GetObjectID() const noexcept {
return m_Id; return m_Id;
} }

10
tests/dECSTests/TestECS.cpp
View File

@ -17,20 +17,20 @@ TEST(ECSTest, IncrementEntityIdsSingleThread) {
auto w = World{}; auto w = World{};
auto ea = w.MakeEntity(); auto ea = w.MakeEntity();
ASSERT_EQ(ea.Id(), 1); ASSERT_EQ(ea.GetObjectID(), 1);
auto eb = w.MakeEntity(); auto eb = w.MakeEntity();
ASSERT_EQ(eb.Id(), 2); ASSERT_EQ(eb.GetObjectID(), 2);
auto ec = w.MakeEntity(); auto ec = w.MakeEntity();
ASSERT_EQ(ec.Id(), 3); ASSERT_EQ(ec.GetObjectID(), 3);
} }
// Test adding and getting components // Test adding and getting components
TEST(ECSTest, MakeOneEntityAndAddComponents) { TEST(ECSTest, MakeOneEntityAndAddComponents) {
auto w = World{}; auto w = World{};
auto e = w.MakeEntity(); auto e = w.MakeEntity();
ASSERT_EQ(e.Id(), 1); ASSERT_EQ(e.GetObjectID(), 1);
// add component // add component
auto* const testCompPtr = e.AddComponent<TestComponent>(); auto* const testCompPtr = e.AddComponent<TestComponent>();
@ -54,7 +54,7 @@ TEST(ECSTest, WorldScope) {
{ {
auto w = World{}; auto w = World{};
e.emplace(w.MakeEntity()); e.emplace(w.MakeEntity());
ASSERT_EQ(e->Id(), 1); ASSERT_EQ(e->GetObjectID(), 1);
// add component within scope // add component within scope
auto* const cPtr = e->AddComponent<TestComponent>(); auto* const cPtr = e->AddComponent<TestComponent>();