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

4
include/Nazara/Graphics/Graphics.hpp
View File

@@ -78,8 +78,8 @@ namespace Nz
struct DefaultTextures
{
EnumMap<ImageType, std::shared_ptr<Texture>> depthTextures;
EnumMap<ImageType, std::shared_ptr<Texture>> whiteTextures;
EnumArray<ImageType, std::shared_ptr<Texture>> depthTextures;
EnumArray<ImageType, std::shared_ptr<Texture>> whiteTextures;
};
private:

2
include/Nazara/Graphics/Material.hpp
View File

@@ -97,7 +97,7 @@ namespace Nz
std::vector<TextureData> m_textures;
std::vector<UniformBlockData> m_uniformBlocks;
mutable std::weak_ptr<MaterialInstance> m_defaultInstance;
EnumMap<EngineShaderBinding, UInt32> m_engineShaderBindings;
EnumArray<EngineShaderBinding, UInt32> m_engineShaderBindings;
MaterialSettings m_settings;
ShaderReflection m_reflection;
};

2
include/Nazara/Graphics/Sprite.hpp
View File

@@ -50,7 +50,7 @@ namespace Nz
private:
inline void UpdateVertices();
EnumMap<RectCorner, Color> m_cornerColor;
EnumArray<RectCorner, Color> m_cornerColor;
std::array<VertexStruct_XYZ_Color_UV, 4> m_vertices;
std::shared_ptr<MaterialInstance> m_material;
Color m_color;

2
include/Nazara/Graphics/Sprite.inl
View File

@@ -90,7 +90,7 @@ namespace Nz
{
VertexStruct_XYZ_Color_UV* vertices = m_vertices.data();
EnumMap<RectCorner, Vector2f> cornerExtent;
EnumArray<RectCorner, Vector2f> 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);