From 2886a2e0c00ee570b95b9b8db571ed67ea9bcc32 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Tue, 30 May 2023 13:49:19 +0200 Subject: [PATCH] Rename EnumMap to EnumArray after nazarautils update --- include/Nazara/Audio/OpenALDevice.hpp | 6 +++--- include/Nazara/Core/HardwareInfo.hpp | 4 ++-- include/Nazara/Graphics/Graphics.hpp | 4 ++-- include/Nazara/Graphics/Material.hpp | 2 +- include/Nazara/Graphics/Sprite.hpp | 2 +- include/Nazara/Graphics/Sprite.inl | 2 +- include/Nazara/Math/Frustum.hpp | 6 +++--- include/Nazara/Math/Frustum.inl | 10 +++++----- include/Nazara/Math/OrientedBox.hpp | 4 ++-- include/Nazara/OpenGLRenderer/Wrapper/Context.hpp | 8 ++++---- include/Nazara/Platform/Cursor.hpp | 4 ++-- include/Nazara/Renderer/DebugDrawer.inl | 4 ++-- include/Nazara/Utility/PixelFormat.hpp | 8 ++++---- include/Nazara/Utility/VertexDeclaration.hpp | 4 ++-- include/Nazara/VulkanRenderer/Wrapper/Device.hpp | 4 ++-- src/Nazara/Core/AbstractLogger.cpp | 4 ++-- src/Nazara/Core/HardwareInfo.cpp | 4 ++-- src/Nazara/Core/StdLogger.cpp | 4 ++-- src/Nazara/Graphics/Tilemap.cpp | 2 +- src/Nazara/Network/Posix/SocketImpl.cpp | 6 +++--- src/Nazara/Network/Win32/SocketImpl.cpp | 6 +++--- src/Nazara/Platform/Cursor.cpp | 2 +- src/Nazara/Platform/SDL2/CursorImpl.cpp | 2 +- src/Nazara/Renderer/Renderer.cpp | 4 ++-- src/Nazara/Utility/PixelFormat.cpp | 6 +++--- src/Nazara/Utility/VertexDeclaration.cpp | 4 ++-- src/Nazara/VulkanRenderer/Wrapper/Device.cpp | 2 +- 27 files changed, 59 insertions(+), 59 deletions(-) diff --git a/include/Nazara/Audio/OpenALDevice.hpp b/include/Nazara/Audio/OpenALDevice.hpp index 7512f59e4..4de603ff7 100644 --- a/include/Nazara/Audio/OpenALDevice.hpp +++ b/include/Nazara/Audio/OpenALDevice.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -71,8 +71,8 @@ namespace Nz OpenALDevice& operator=(OpenALDevice&&) = delete; private: - EnumMap m_audioFormatValues; - EnumMap m_extensionStatus; + EnumArray m_audioFormatValues; + EnumArray m_extensionStatus; std::string m_renderer; std::string m_vendor; OpenALLibrary& m_library; diff --git a/include/Nazara/Core/HardwareInfo.hpp b/include/Nazara/Core/HardwareInfo.hpp index 9a56104ed..59c6b29bb 100644 --- a/include/Nazara/Core/HardwareInfo.hpp +++ b/include/Nazara/Core/HardwareInfo.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -43,7 +43,7 @@ namespace Nz void FetchMemoryInfo(); std::array m_cpuBrandString; - EnumMap m_cpuCapabilities; + EnumArray m_cpuCapabilities; ProcessorVendor m_cpuVendor; unsigned int m_cpuThreadCount; UInt64 m_systemTotalMemory; diff --git a/include/Nazara/Graphics/Graphics.hpp b/include/Nazara/Graphics/Graphics.hpp index 548671722..5a979b702 100644 --- a/include/Nazara/Graphics/Graphics.hpp +++ b/include/Nazara/Graphics/Graphics.hpp @@ -78,8 +78,8 @@ namespace Nz struct DefaultTextures { - EnumMap> depthTextures; - EnumMap> whiteTextures; + EnumArray> depthTextures; + EnumArray> whiteTextures; }; private: diff --git a/include/Nazara/Graphics/Material.hpp b/include/Nazara/Graphics/Material.hpp index dc4a28290..45e3c4ead 100644 --- a/include/Nazara/Graphics/Material.hpp +++ b/include/Nazara/Graphics/Material.hpp @@ -97,7 +97,7 @@ namespace Nz std::vector m_textures; std::vector m_uniformBlocks; mutable std::weak_ptr m_defaultInstance; - EnumMap m_engineShaderBindings; + EnumArray m_engineShaderBindings; MaterialSettings m_settings; ShaderReflection m_reflection; }; diff --git a/include/Nazara/Graphics/Sprite.hpp b/include/Nazara/Graphics/Sprite.hpp index c17e81f7a..9cbcd5bb5 100644 --- a/include/Nazara/Graphics/Sprite.hpp +++ b/include/Nazara/Graphics/Sprite.hpp @@ -50,7 +50,7 @@ namespace Nz private: inline void UpdateVertices(); - EnumMap m_cornerColor; + EnumArray m_cornerColor; std::array m_vertices; std::shared_ptr m_material; Color m_color; diff --git a/include/Nazara/Graphics/Sprite.inl b/include/Nazara/Graphics/Sprite.inl index efac2d719..c310adc9a 100644 --- a/include/Nazara/Graphics/Sprite.inl +++ b/include/Nazara/Graphics/Sprite.inl @@ -90,7 +90,7 @@ namespace Nz { VertexStruct_XYZ_Color_UV* vertices = m_vertices.data(); - EnumMap cornerExtent; + EnumArray cornerExtent; cornerExtent[RectCorner::LeftBottom] = Vector2f(0.f, 0.f); cornerExtent[RectCorner::RightBottom] = Vector2f(1.f, 0.f); cornerExtent[RectCorner::LeftTop] = Vector2f(0.f, 1.f); diff --git a/include/Nazara/Math/Frustum.hpp b/include/Nazara/Math/Frustum.hpp index dc23ab208..24226bfaf 100644 --- a/include/Nazara/Math/Frustum.hpp +++ b/include/Nazara/Math/Frustum.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -28,7 +28,7 @@ namespace Nz { public: Frustum() = default; - explicit Frustum(const EnumMap>& planes); + explicit Frustum(const EnumArray>& planes); template explicit Frustum(const Frustum& frustum); Frustum(const Frustum& frustum) = default; ~Frustum() = default; @@ -64,7 +64,7 @@ namespace Nz friend bool Unserialize(SerializationContext& context, Frustum* frustum, TypeTag>); private: - EnumMap> m_planes; + EnumArray> m_planes; }; using Frustumd = Frustum; diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index 15f58fae1..4c70e7cac 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ namespace Nz * \param planes Frustum of type U to convert to type T */ template - Frustum::Frustum(const EnumMap>& planes) : + Frustum::Frustum(const EnumArray>& planes) : m_planes(planes) { } @@ -419,7 +419,7 @@ namespace Nz Vector3 fc = eye + f * zFar; // Computing the frustum - EnumMap> corners; + EnumArray> corners; corners[BoxCorner::FarLeftBottom] = fc - u * farH - s * farW; corners[BoxCorner::FarLeftTop] = fc + u * farH - s * farW; corners[BoxCorner::FarRightTop] = fc + u * farH + s * farW; @@ -432,7 +432,7 @@ namespace Nz // Construction of frustum's planes - EnumMap> planes; + EnumArray> planes; planes[FrustumPlane::Bottom] = Plane(corners[BoxCorner::NearLeftBottom], corners[BoxCorner::NearRightBottom], corners[BoxCorner::FarRightBottom]); planes[FrustumPlane::Far] = Plane(corners[BoxCorner::FarRightTop], corners[BoxCorner::FarLeftTop], corners[BoxCorner::FarLeftBottom]); planes[FrustumPlane::Left] = Plane(corners[BoxCorner::NearLeftTop], corners[BoxCorner::NearLeftBottom], corners[BoxCorner::FarLeftBottom]); @@ -456,7 +456,7 @@ namespace Nz T plane[4]; T invLength; - EnumMap> planes; + EnumArray> planes; // Extract the numbers for the RIGHT plane plane[0] = viewProjMatrix[3] - viewProjMatrix[0]; diff --git a/include/Nazara/Math/OrientedBox.hpp b/include/Nazara/Math/OrientedBox.hpp index d99546304..6d019c018 100644 --- a/include/Nazara/Math/OrientedBox.hpp +++ b/include/Nazara/Math/OrientedBox.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace Nz @@ -54,7 +54,7 @@ namespace Nz Box localBox; private: - EnumMap> m_corners; + EnumArray> m_corners; }; using OrientedBoxd = OrientedBox; diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp index b87b68149..becf4c59c 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp +++ b/include/Nazara/OpenGLRenderer/Wrapper/Context.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -257,10 +257,10 @@ namespace Nz::GL struct TextureUnit { GLuint sampler = 0; - EnumMap textureTargets = { 0 }; + EnumArray textureTargets = { 0 }; }; - EnumMap bufferTargets = { 0 }; + EnumArray bufferTargets = { 0 }; std::vector storageUnits; std::vector uboUnits; std::vector imageUnits; @@ -275,7 +275,7 @@ namespace Nz::GL RenderStates renderStates; }; - EnumMap m_extensionStatus; + EnumArray m_extensionStatus; std::array m_originalFunctionPointer; mutable std::unique_ptr m_blitFramebuffers; std::unordered_set m_supportedExtensions; diff --git a/include/Nazara/Platform/Cursor.hpp b/include/Nazara/Platform/Cursor.hpp index 2d16c4d6b..8b9d56f21 100644 --- a/include/Nazara/Platform/Cursor.hpp +++ b/include/Nazara/Platform/Cursor.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace Nz @@ -54,7 +54,7 @@ namespace Nz SystemCursor m_systemCursor; std::unique_ptr m_impl; - static EnumMap> s_systemCursors; + static EnumArray> s_systemCursors; }; } diff --git a/include/Nazara/Renderer/DebugDrawer.inl b/include/Nazara/Renderer/DebugDrawer.inl index 3ef210905..90ba1a87d 100644 --- a/include/Nazara/Renderer/DebugDrawer.inl +++ b/include/Nazara/Renderer/DebugDrawer.inl @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include namespace Nz @@ -28,7 +28,7 @@ namespace Nz inline void DebugDrawer::DrawFrustum(const Frustumf& frustum, const Color& color) { - EnumMap corners; + EnumArray corners; for (auto&& [corner, pos] : corners.iter_kv()) pos = frustum.ComputeCorner(corner); diff --git a/include/Nazara/Utility/PixelFormat.hpp b/include/Nazara/Utility/PixelFormat.hpp index f335fc545..4f56257ec 100644 --- a/include/Nazara/Utility/PixelFormat.hpp +++ b/include/Nazara/Utility/PixelFormat.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -89,9 +89,9 @@ namespace Nz static bool Initialize(); static void Uninitialize(); - static EnumMap> s_convertFunctions; - static EnumMap> s_flipFunctions; - static EnumMap s_pixelFormatInfos; + static EnumArray> s_convertFunctions; + static EnumArray> s_flipFunctions; + static EnumArray s_pixelFormatInfos; }; } diff --git a/include/Nazara/Utility/VertexDeclaration.hpp b/include/Nazara/Utility/VertexDeclaration.hpp index fb32955e1..654461df0 100644 --- a/include/Nazara/Utility/VertexDeclaration.hpp +++ b/include/Nazara/Utility/VertexDeclaration.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,7 +78,7 @@ namespace Nz std::size_t m_stride; VertexInputRate m_inputRate; - static EnumMap> s_declarations; + static EnumArray> s_declarations; }; } diff --git a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp index 2049827a3..65823f489 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -113,7 +113,7 @@ namespace Nz std::vector m_queuesByFamily; Instance& m_instance; const Vk::PhysicalDevice* m_physicalDevice; - EnumMap m_defaultQueues; + EnumArray m_defaultQueues; VkAllocationCallbacks m_allocator; VkDevice m_device; VkResult m_lastErrorCode; diff --git a/src/Nazara/Core/AbstractLogger.cpp b/src/Nazara/Core/AbstractLogger.cpp index a41603a31..11d86f7d7 100644 --- a/src/Nazara/Core/AbstractLogger.cpp +++ b/src/Nazara/Core/AbstractLogger.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include @@ -12,7 +12,7 @@ namespace Nz { namespace NAZARA_ANONYMOUS_NAMESPACE { - constexpr EnumMap s_errorTypes = { + constexpr EnumArray s_errorTypes = { "Assert failed: ", // ErrorType::AssertFailed "Internal error: ", // ErrorType::Internal "Error: ", // ErrorType::Normal diff --git a/src/Nazara/Core/HardwareInfo.cpp b/src/Nazara/Core/HardwareInfo.cpp index ae5fe824b..be542c9ff 100644 --- a/src/Nazara/Core/HardwareInfo.cpp +++ b/src/Nazara/Core/HardwareInfo.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include @@ -24,7 +24,7 @@ namespace Nz { namespace NAZARA_ANONYMOUS_NAMESPACE { - constexpr EnumMap s_vendorNames { + constexpr EnumArray s_vendorNames { "ACRN", // ProcessorVendor::ACRN "Advanced Micro Devices", // ProcessorVendor::AMD "ao486", // ProcessorVendor::Ao486 diff --git a/src/Nazara/Core/StdLogger.cpp b/src/Nazara/Core/StdLogger.cpp index a103824b5..af44f2bb1 100644 --- a/src/Nazara/Core/StdLogger.cpp +++ b/src/Nazara/Core/StdLogger.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include @@ -12,7 +12,7 @@ namespace Nz { namespace NAZARA_ANONYMOUS_NAMESPACE { - constexpr EnumMap s_errorTypes = { + constexpr EnumArray s_errorTypes = { "Assert failed: ", // ErrorType::AssertFailed "Internal error: ", // ErrorType::Internal "Error: ", // ErrorType::Normal diff --git a/src/Nazara/Graphics/Tilemap.cpp b/src/Nazara/Graphics/Tilemap.cpp index 96b59c98b..90ad9a7b9 100644 --- a/src/Nazara/Graphics/Tilemap.cpp +++ b/src/Nazara/Graphics/Tilemap.cpp @@ -116,7 +116,7 @@ namespace Nz void Tilemap::UpdateVertices() const { - EnumMap cornerExtent; + EnumArray cornerExtent; cornerExtent[RectCorner::LeftBottom] = Vector2f(0.f, 0.f); cornerExtent[RectCorner::RightBottom] = Vector2f(1.f, 0.f); cornerExtent[RectCorner::LeftTop] = Vector2f(0.f, 1.f); diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp index 2ec025585..0eec8ae0c 100644 --- a/src/Nazara/Network/Posix/SocketImpl.cpp +++ b/src/Nazara/Network/Posix/SocketImpl.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -1018,7 +1018,7 @@ namespace Nz { NazaraAssert(protocol <= NetProtocol::Max, "Protocol has value out of enum"); - constexpr EnumMap addressFamily { + constexpr EnumArray addressFamily { AF_UNSPEC, //< NetProtocol::Any AF_INET, //< NetProtocol::IPv4 AF_INET6, //< NetProtocol::IPv6 @@ -1032,7 +1032,7 @@ namespace Nz { NazaraAssert(type <= SocketType::Max, "Socket type has value out of enum"); - constexpr EnumMap socketType { + constexpr EnumArray socketType { SOCK_RAW, //< SocketType::Raw SOCK_STREAM, //< SocketType::TCP SOCK_DGRAM, //< SocketType::UDP diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp index 229bd6b8f..101d003c2 100644 --- a/src/Nazara/Network/Win32/SocketImpl.cpp +++ b/src/Nazara/Network/Win32/SocketImpl.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include // Some compilers (older versions of MinGW) lack Mstcpip.h which defines some structs/defines @@ -1000,7 +1000,7 @@ namespace Nz { NazaraAssert(protocol <= NetProtocol::Max, "Protocol has value out of enum"); - constexpr EnumMap addressFamily { + constexpr EnumArray addressFamily { AF_UNSPEC, //< NetProtocol::Any AF_INET, //< NetProtocol::IPv4 AF_INET6, //< NetProtocol::IPv6 @@ -1014,7 +1014,7 @@ namespace Nz { NazaraAssert(type <= SocketType::Max, "Socket type has value out of enum"); - constexpr EnumMap socketType { + constexpr EnumArray socketType { SOCK_RAW, //< SocketType::Raw SOCK_STREAM, //< SocketType::TCP SOCK_DGRAM, //< SocketType::UDP diff --git a/src/Nazara/Platform/Cursor.cpp b/src/Nazara/Platform/Cursor.cpp index 10b10c65e..8bd5ebf37 100644 --- a/src/Nazara/Platform/Cursor.cpp +++ b/src/Nazara/Platform/Cursor.cpp @@ -88,5 +88,5 @@ namespace Nz cursor.reset(); } - EnumMap> Cursor::s_systemCursors; + EnumArray> Cursor::s_systemCursors; } diff --git a/src/Nazara/Platform/SDL2/CursorImpl.cpp b/src/Nazara/Platform/SDL2/CursorImpl.cpp index 9918aaec2..4b65246fc 100644 --- a/src/Nazara/Platform/SDL2/CursorImpl.cpp +++ b/src/Nazara/Platform/SDL2/CursorImpl.cpp @@ -12,7 +12,7 @@ namespace Nz { namespace NAZARA_ANONYMOUS_NAMESPACE { - constexpr EnumMap s_systemCursorIds = + constexpr EnumArray s_systemCursorIds = { SDL_SYSTEM_CURSOR_CROSSHAIR, // SystemCursor::Crosshair SDL_SYSTEM_CURSOR_ARROW, // SystemCursor::Default diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index 513cf31a5..eeb0fb562 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -117,7 +117,7 @@ namespace Nz #endif #else - constexpr EnumMap rendererPaths = { + constexpr EnumArray rendererPaths = { NazaraRendererPrefix "NazaraDirect3DRenderer" NazaraRendererDebugSuffix, // Direct3D NazaraRendererPrefix "NazaraMantleRenderer" NazaraRendererDebugSuffix, // Mantle NazaraRendererPrefix "NazaraMetalRenderer" NazaraRendererDebugSuffix, // Metal diff --git a/src/Nazara/Utility/PixelFormat.cpp b/src/Nazara/Utility/PixelFormat.cpp index aa11873b3..3631abb92 100644 --- a/src/Nazara/Utility/PixelFormat.cpp +++ b/src/Nazara/Utility/PixelFormat.cpp @@ -1835,7 +1835,7 @@ namespace Nz } } - EnumMap> PixelFormatInfo::s_convertFunctions; - EnumMap> PixelFormatInfo::s_flipFunctions; - EnumMap PixelFormatInfo::s_pixelFormatInfos; + EnumArray> PixelFormatInfo::s_convertFunctions; + EnumArray> PixelFormatInfo::s_flipFunctions; + EnumArray PixelFormatInfo::s_pixelFormatInfos; } diff --git a/src/Nazara/Utility/VertexDeclaration.cpp b/src/Nazara/Utility/VertexDeclaration.cpp index 372efe32f..3f5a242f2 100644 --- a/src/Nazara/Utility/VertexDeclaration.cpp +++ b/src/Nazara/Utility/VertexDeclaration.cpp @@ -16,7 +16,7 @@ namespace Nz { namespace NAZARA_ANONYMOUS_NAMESPACE { - constexpr EnumMap s_componentStride = { + constexpr EnumArray s_componentStride = { 4 * sizeof(float), // ComponentType::Color 1 * sizeof(double), // ComponentType::Double1 2 * sizeof(double), // ComponentType::Double2 @@ -349,5 +349,5 @@ namespace Nz s_declarations.fill(nullptr); } - EnumMap> VertexDeclaration::s_declarations; + EnumArray> VertexDeclaration::s_declarations; } diff --git a/src/Nazara/VulkanRenderer/Wrapper/Device.cpp b/src/Nazara/VulkanRenderer/Wrapper/Device.cpp index 3d52fd585..27a8b6ddd 100644 --- a/src/Nazara/VulkanRenderer/Wrapper/Device.cpp +++ b/src/Nazara/VulkanRenderer/Wrapper/Device.cpp @@ -28,7 +28,7 @@ namespace Nz { } - EnumMap commandPools; + EnumArray commandPools; VulkanDescriptorSetLayoutCache setLayoutCache; };