Simplify IdTracker to IdGenerator

* Do not bother caching previously used Ids, just a simple increment will do

src/Dynamo.hpp

@@ -40,7 +40,7 @@
 #include <Sound/Source.hpp>
 #include <Utils/Allocator.hpp>
 #include <Utils/Bits.hpp>
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 #include <Utils/Log.hpp>
 #include <Utils/Random.hpp>
 #include <Utils/RingBuffer.hpp>

src/Graphics/Material.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Graphics/Shader.hpp>
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 
 namespace Dynamo::Graphics {
     /**

src/Graphics/Mesh.hpp

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 
 namespace Dynamo::Graphics {
     /**

src/Graphics/Model.hpp

@@ -2,7 +2,7 @@
 
 #include <Graphics/Material.hpp>
 #include <Graphics/Mesh.hpp>
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 
 namespace Dynamo::Graphics {
     /**

src/Graphics/Shader.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 
 namespace Dynamo::Graphics {
     /**

src/Graphics/Vulkan/MeshSet.cpp

@@ -78,7 +78,7 @@ namespace Dynamo::Graphics::Vulkan {
         }
 
         // Register the allocation
-        Mesh mesh = _ids.generate();
+        Mesh mesh = IdGenerator<Mesh>::generate();
         _allocations.insert(mesh, allocation);
         return mesh;
     }
@@ -94,6 +94,5 @@ namespace Dynamo::Graphics::Vulkan {
             index_buffer.free(allocation.index_offset);
         }
         _allocations.remove(mesh);
-        _ids.discard(mesh);
     }
 } // namespace Dynamo::Graphics::Vulkan

src/Graphics/Vulkan/MeshSet.hpp

@@ -6,7 +6,7 @@
 
 #include <Graphics/Mesh.hpp>
 #include <Graphics/Vulkan/Buffer.hpp>
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 #include <Utils/SparseSet.hpp>
 
 namespace Dynamo::Graphics::Vulkan {
@@ -29,7 +29,6 @@ namespace Dynamo::Graphics::Vulkan {
      *
      */
     class MeshSet {
-        IdTracker<Mesh> _ids;
         SparseSet<Mesh, MeshAllocation> _allocations;
 
       public:

src/Graphics/Vulkan/ShaderSet.cpp

@@ -216,7 +216,7 @@ namespace Dynamo::Graphics::Vulkan {
         Log::info("");
 
         // Register the new shader
-        Shader shader = _ids.generate();
+        Shader shader = IdGenerator<Shader>::generate();
         _modules.insert(shader, module);
         return shader;
     }
@@ -227,7 +227,6 @@ namespace Dynamo::Graphics::Vulkan {
         ShaderModule &module = _modules.get(shader);
         vkDestroyShaderModule(_device, module.handle, nullptr);
         _modules.remove(shader);
-        _ids.discard(shader);
     }
 
     void ShaderSet::destroy() {
@@ -240,6 +239,5 @@ namespace Dynamo::Graphics::Vulkan {
             vkDestroyShaderModule(_device, module.handle, nullptr);
         }
         _modules.clear();
-        _ids.clear();
     }
 } // namespace Dynamo::Graphics::Vulkan

src/Graphics/Vulkan/ShaderSet.hpp

@@ -71,7 +71,6 @@ namespace Dynamo::Graphics::Vulkan {
      */
     class ShaderSet {
         VkDevice _device;
-        IdTracker<Shader> _ids;
         SparseSet<Shader, ShaderModule> _modules;
         std::unordered_map<DescriptorLayoutKey, VkDescriptorSetLayout, DescriptorLayoutKey::Hash> _descriptor_layouts;
 

src/Sound/Jukebox.hpp

@@ -4,7 +4,6 @@
 
 #include <portaudio.h>
 
-#include <Utils/IdTracker.hpp>
 #include <Utils/RingBuffer.hpp>
 
 #include <Sound/Buffer.hpp>

src/Sound/Listener.hpp

@@ -4,7 +4,6 @@
 
 #include <Math/Quaternion.hpp>
 #include <Math/Vec3.hpp>
-#include <Utils/IdTracker.hpp>
 #include <Utils/SparseSet.hpp>
 
 namespace Dynamo::Sound {

src/Utils/IdGenerator.hpp

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <cstdint>
+
+#define DYN_DEFINE_ID_TYPE(T) using T = struct T##_t *
+
+static_assert(sizeof(void *) == sizeof(uintptr_t), "Pointer and its integer mode must be same size.");
+
+namespace Dynamo {
+    /**
+     * @brief Generate typesafe handles.
+     *
+     * @tparam Id
+     */
+    template <typename Id>
+    class IdGenerator {
+        static inline uintptr_t _counter = 0;
+
+      public:
+        /**
+         * @brief Generate an id.
+         *
+         * @return Id
+         */
+        static inline Id generate() { return reinterpret_cast<Id>(_counter++); }
+
+        /**
+         * @brief Get the key of the id.
+         *
+         * @param id
+         * @return uintptr_t
+         */
+        static inline uintptr_t key(Id id) { return reinterpret_cast<uintptr_t>(id); }
+    };
+} // namespace Dynamo

src/Utils/SparseSet.hpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <Utils/IdTracker.hpp>
+#include <Utils/IdGenerator.hpp>
 #include <Utils/Log.hpp>
 
 namespace Dynamo {
@@ -41,7 +41,7 @@ namespace Dynamo {
          * @brief Contains indices to _dense and _pool
          *
          */
-        std::vector<int> _sparse;
+        std::vector<uintptr_t> _sparse;
 
       public:
         /**
@@ -66,14 +66,14 @@ namespace Dynamo {
          * @return int Index position of the value (-1 on failure).
          */
         inline int find(Id id) const {
-            unsigned key = IdTracker<Id>::get_index(id);
+            uintptr_t key = IdGenerator<Id>::key(id);
             if (key >= _sparse.size()) {
                 return -1;
             }
 
             // Verify that the sparse and dense arrays are correlated
-            int index = _sparse[key];
-            int dense_size = _dense.size();
+            uintptr_t index = _sparse[key];
+            uintptr_t dense_size = _dense.size();
             if (index == -1 || index >= dense_size || _dense[index] != id) {
                 return -1;
             }
@@ -101,7 +101,7 @@ namespace Dynamo {
         template <typename... Params>
         inline void insert(Id id, Params... args) {
             // Resize the sparse array or remove the existing item
-            unsigned key = IdTracker<Id>::get_index(id);
+            uintptr_t key = IdGenerator<Id>::key(id);
             if (key >= _sparse.size()) {
                 _sparse.resize((key + 1) * 2, -1);
             } else if (_sparse[key] != -1) {
@@ -127,20 +127,20 @@ namespace Dynamo {
          * @param id Unique identifier of the object to be removed.
          */
         inline void remove(Id id) {
-            unsigned key = IdTracker<Id>::get_index(id);
+            uintptr_t key = IdGenerator<Id>::key(id);
             if (key >= _sparse.size()) {
                 return;
             }
 
             // Verify that the sparse and dense arrays are correlated
-            int index = _sparse[key];
-            int dense_size = _dense.size();
+            uintptr_t index = _sparse[key];
+            uintptr_t dense_size = _dense.size();
             if (index == -1 || index >= dense_size || _dense[index] != id) {
                 return;
             }
 
             // Swap last element of dense and pool array to maintain contiguity
-            unsigned new_key = IdTracker<Id>::get_index(_dense.back());
+            uintptr_t new_key = IdGenerator<Id>::key(_dense.back());
             std::swap(_pool.back(), _pool[index]);
             _pool.pop_back();
 

tests/src/Utils/IdGenerator.cpp

@@ -0,0 +1,19 @@
+#include <Dynamo.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+DYN_DEFINE_ID_TYPE(Id_0);
+DYN_DEFINE_ID_TYPE(Id_1);
+
+TEST_CASE("IdGenerator generate", "[IdGenerator]") {
+    Id_0 a0 = Dynamo::IdGenerator<Id_0>::generate();
+    Id_0 b0 = Dynamo::IdGenerator<Id_0>::generate();
+
+    Id_1 a1 = Dynamo::IdGenerator<Id_1>::generate();
+    Id_1 b1 = Dynamo::IdGenerator<Id_1>::generate();
+
+    REQUIRE(Dynamo::IdGenerator<Id_0>::key(a0) == 0);
+    REQUIRE(Dynamo::IdGenerator<Id_0>::key(b0) == 1);
+
+    REQUIRE(Dynamo::IdGenerator<Id_1>::key(a1) == 0);
+    REQUIRE(Dynamo::IdGenerator<Id_1>::key(b1) == 1);
+}