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

Minor fixes

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-06-04 18:02:28 +02:00
parent 8fe11711a3
commit 4b3b595a99
15 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,8 @@
#include <Nazara/Core/Bitset.hpp>
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <array>
#include <functional>
#include <map>
///TODO: Permettre la conversion automatique entre les formats via des renseignements de bits et de type pour chaque format.
/// Ce serait plus lent que la conversion spécialisée (qui ne disparaîtra donc pas) mais ça permettrait au moteur de faire la conversion
@@ -87,9 +87,9 @@ namespace Nz
static bool Initialize();
static void Uninitialize();
static PixelFormatDescription s_pixelFormatInfos[PixelFormatCount];
static ConvertFunction s_convertFunctions[PixelFormatCount][PixelFormatCount];
static std::map<PixelFormat, FlipFunction> s_flipFunctions[PixelFlippingCount];
static std::array<std::array<ConvertFunction, PixelFormatCount>, PixelFormatCount> s_convertFunctions;
static std::array<std::array<PixelFormatInfo::FlipFunction, PixelFlippingCount>, PixelFormatCount> s_flipFunctions;
static std::array<PixelFormatDescription, PixelFormatCount> s_pixelFormatInfos;
};
}

2
include/Nazara/Utility/PixelFormat.inl
View File

@@ -269,7 +269,7 @@ namespace Nz
inline void PixelFormatInfo::SetFlipFunction(PixelFlipping flipping, PixelFormat format, FlipFunction func)
{
s_flipFunctions[UnderlyingCast(flipping)][format] = func;
s_flipFunctions[UnderlyingCast(flipping)][UnderlyingCast(format)] = func;
}
}