Merge main

Internal/Utils/Utils.h

@@ -30,33 +30,65 @@ namespace Utils
 		return engine;
 	};
 
-	/**
-	 * Returns a secure random integral value between the minimum and maximum limits.
-	 */
-	template<typename T>
-	std::enable_if_t<std::is_integral_v<T>, T> Random(T tMin = std::numeric_limits<T>::min, T tMax = std::numeric_limits<T>::max)
-	{
-		using dist_t = std::uniform_int_distribution<T>;
-		static dist_t dist{ tMin, tMax };
+    // This would be a concept but MSVC doesnt seem to be doing too good with them right now.
+    template<typename T>
+    constexpr auto is_int_distribution_defined = std::is_same_v<T, short> || std::is_same_v<T, int> || std::is_same_v<T, long> || std::is_same_v<T, long long> ||
+        std::is_same_v<T, unsigned short> || std::is_same_v<T, unsigned int> || std::is_same_v<T, unsigned long> || std::is_same_v<T, unsigned long long>;
 
-		if (dist.min() != tMin || dist.max() != tMax)
-			dist.param(dist_t::param_type(tMin, tMax));
+    /**
+    * Returns a secure random integral value between the minimum and maximum limits.
+    */
+    template<typename T>
+    std::enable_if_t<std::is_integral_v<T>&& is_int_distribution_defined<T>, T> Random(T tMin = std::numeric_limits<T>::min(), T tMax = std::numeric_limits<T>::max())
+    {
+        using dist_t = std::uniform_int_distribution<T>;
+        static dist_t dist{ tMin, tMax };
 
-		return dist(GetRandomEngine());
-	};
+        if (dist.min() != tMin || dist.max() != tMax)
+            dist.param(typename dist_t::param_type{ tMin, tMax });
 
-	/**
-	 * Returns a secure random floating point value between the minimum and maximum limits.
-	 */
-	template<typename T>
-	std::enable_if_t<std::is_floating_point_v<T>, T> Random(T tMin = std::numeric_limits<T>::min, T tMax = std::numeric_limits<T>::max)
-	{
-		using dist_t = std::uniform_real_distribution<T>;
-		static dist_t dist{ tMin, tMax };
+        return dist(GetRandomEngine());
+    };
 
-		if (dist.min != tMin || dist.max != tMax)
-			dist.param(dist_t::param_type(tMin, tMax));
+    /**
+     * Returns a secure random integral value between the minimum and maximum limits.
+     */
+    template<typename T>
+    std::enable_if_t<std::is_integral_v<T> && !is_int_distribution_defined<T> && !std::is_same_v<T, bool>, T> Random(T tMin = std::numeric_limits<T>::min(), T tMax = std::numeric_limits<T>::max())
+    {
+        // "The result type generated by the generator. The effect is undefined if this is not one of short, int, long, long long, unsigned short, unsigned int, unsigned long, or unsigned long long."
+        // So we do this little hack to make it work properly for int8_t and uint8_t.
+        using dist_t = std::uniform_int_distribution<long long>;
+        static dist_t dist{ static_cast<long long>(tMin), static_cast<long long>(tMax) };
 
-		return dist(GetRandomEngine());
-	};
+        if (dist.min() != tMin || dist.max() != tMax)
+            dist.param(typename dist_t::param_type{ tMin, tMax });
+
+        return dist(GetRandomEngine());
+    };
+
+    /**
+     * Returns a secure random floating point value between the minimum and maximum limits.
+     */
+    template<typename T>
+    std::enable_if_t<std::is_floating_point_v<T>, T> Random(T tMin = std::numeric_limits<T>::min(), T tMax = std::numeric_limits<T>::max())
+    {
+        using dist_t = std::uniform_real_distribution<T>;
+        static dist_t dist{ tMin, tMax };
+
+        if (dist.min() != tMin || dist.max() != tMax)
+            dist.param(typename dist_t::param_type{ tMin, tMax });
+
+        return dist(GetRandomEngine());
+    };
+
+    /**
+     * Returns a secure random boolean.
+     */
+    template<typename T>
+    std::enable_if_t<std::is_same_v<bool, T>, T> Random(T tMin = std::numeric_limits<T>::min(), T tMax = std::numeric_limits<T>::max())
+    {
+        static std::uniform_int_distribution<short> dist{ static_cast<short>(0), static_cast<short>(1) };
+        return dist(GetRandomEngine()) == 1;
+    };
 }