From 209ea9292599b294fe782ba43a4f3418849a65a3 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Tue, 5 Sep 2023 13:02:06 -0400 Subject: type-safe handle max value cleanup --- src/components.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/components.hpp') diff --git a/src/components.hpp b/src/components.hpp index 8f0d3a5..7f3c0bb 100644 --- a/src/components.hpp +++ b/src/components.hpp @@ -10,15 +10,15 @@ const uint64_t ECS_UNSET_VAL = 0xFFFFFFFFFFFFFFFF; -TypeSafeInt_H(EntityHandle, uint64_t, UINT64_MAX); -TypeSafeInt_H(GrBindsHandle, uint64_t, UINT64_MAX); -TypeSafeInt_H(InstanceHandle, uint64_t, UINT64_MAX); +TypeSafeInt_H(EntityHandle, uint64_t, ECS_UNSET_VAL); +TypeSafeInt_H(GrBindsHandle, uint64_t, ECS_UNSET_VAL); +TypeSafeInt_H(InstanceHandle, uint64_t, ECS_UNSET_VAL); struct Entity { - EntityHandle handle = EntityHandle{EntityHandle_T{ECS_UNSET_VAL}}; - EntityHandle parentHandle = EntityHandle{EntityHandle_T{ECS_UNSET_VAL}}; - GrBindsHandle grBindsHandle = GrBindsHandle{GrBindsHandle_T{ECS_UNSET_VAL}}; - InstanceHandle instanceHandle = InstanceHandle{InstanceHandle_T{ECS_UNSET_VAL}}; + EntityHandle handle = EntityHandle_MAX; + EntityHandle parentHandle = EntityHandle_MAX; + GrBindsHandle grBindsHandle = GrBindsHandle_MAX; + InstanceHandle instanceHandle = InstanceHandle_MAX; bool isMarkedForRemoval = false; }; @@ -34,7 +34,7 @@ struct InstPos { }; struct CompGrBinds { - GrBindsHandle grBindsHandle = GrBindsHandle{GrBindsHandle_T{ECS_UNSET_VAL}}; + GrBindsHandle grBindsHandle = GrBindsHandle_MAX; VkDeviceMemory deviceMemory = VK_NULL_HANDLE; VkBuffer vertexBuffer = VK_NULL_HANDLE; uint32_t vertexFirstBinding = 0; @@ -56,8 +56,8 @@ struct CompGrBinds { }; struct CompInstance { - GrBindsHandle grBindsHandle = GrBindsHandle{GrBindsHandle_T{ECS_UNSET_VAL}}; - InstanceHandle instanceHandle = InstanceHandle{InstanceHandle_T{ECS_UNSET_VAL}}; + GrBindsHandle grBindsHandle = GrBindsHandle_MAX; + InstanceHandle instanceHandle = InstanceHandle_MAX; uint64_t index = ECS_UNSET_VAL; InstPos *ptr = nullptr; }; -- cgit v1.2.3