sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename EnumMap to EnumArray after nazarautils update

Browse Source
This commit is contained in:
SirLynix
2023-05-30 13:49:19 +02:00
parent cff918f6a3
commit 2886a2e0c0
27 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Utility/PixelFormat.hpp
View File

@@ -12,7 +12,7 @@
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <NazaraUtils/Bitset.hpp>
#include <NazaraUtils/EnumMap.hpp>
#include <NazaraUtils/EnumArray.hpp>
#include <array>
#include <functional>
@@ -89,9 +89,9 @@ namespace Nz
static bool Initialize();
static void Uninitialize();
static EnumMap<PixelFormat, EnumMap<PixelFormat, ConvertFunction>> s_convertFunctions;
static EnumMap<PixelFormat, EnumMap<PixelFlipping, FlipFunction>> s_flipFunctions;
static EnumMap<PixelFormat, PixelFormatDescription> s_pixelFormatInfos;
static EnumArray<PixelFormat, EnumArray<PixelFormat, ConvertFunction>> s_convertFunctions;
static EnumArray<PixelFormat, EnumArray<PixelFlipping, FlipFunction>> s_flipFunctions;
static EnumArray<PixelFormat, PixelFormatDescription> s_pixelFormatInfos;
};
}

4
include/Nazara/Utility/VertexDeclaration.hpp
View File

@@ -11,7 +11,7 @@
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <NazaraUtils/EnumMap.hpp>
#include <NazaraUtils/EnumArray.hpp>
#include <NazaraUtils/SparsePtr.hpp>
#include <array>
#include <vector>
@@ -78,7 +78,7 @@ namespace Nz
std::size_t m_stride;
VertexInputRate m_inputRate;
static EnumMap<VertexLayout, std::shared_ptr<VertexDeclaration>> s_declarations;
static EnumArray<VertexLayout, std::shared_ptr<VertexDeclaration>> s_declarations;
};
}