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

Commit missing files

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-24 21:07:17 +02:00
parent ba7c56ddfa
commit 7140e322c1
11 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Utility/Image.hpp
View File

@@ -10,6 +10,7 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Color.hpp>
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/Core/Resource.hpp>
#include <Nazara/Core/ResourceLoader.hpp>
#include <Nazara/Core/ResourceManager.hpp>
@@ -49,8 +50,9 @@ namespace Nz
Image();
Image(ImageType type, PixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, UInt8 levelCount = 1);
Image(const Image& image);
Image(SharedImage* sharedImage);
Image(const Image& image);
inline Image(Image&& image) noexcept;
~Image();
bool Convert(PixelFormat format);
@@ -104,6 +106,7 @@ namespace Nz
bool Update(const UInt8* pixels, const Rectui& rect, unsigned int z = 0, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0) override;
Image& operator=(const Image& image);
inline Image& operator=(Image&& image) noexcept;
static void Copy(UInt8* destination, const UInt8* source, PixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, unsigned int dstWidth = 0, unsigned int dstHeight = 0, unsigned int srcWidth = 0, unsigned int srcHeight = 0);
static UInt8 GetMaxLevel(unsigned int width, unsigned int height, unsigned int depth = 1);

11
include/Nazara/Utility/Image.inl
View File

@@ -8,6 +8,17 @@
namespace Nz
{
inline Image::Image(Image&& image) noexcept :
m_sharedImage(std::exchange(image.m_sharedImage, &emptyImage))
{
}
inline Image& Image::operator=(Image&& image) noexcept
{
std::swap(m_sharedImage, image.m_sharedImage);
return *this;
}
}
#include <Nazara/Utility/DebugOff.hpp>