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

Utility/Image: Add LoadFaceFromImage

This commit is contained in:
SirLynix 2023-05-12 19:14:44 +02:00
parent e1d38abc04
commit 383e905b3f
2 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ namespace Nz
// LoadFace // LoadFace
bool LoadFaceFromFile(CubemapFace face, const std::filesystem::path& filePath, const ImageParams& params = ImageParams()); bool LoadFaceFromFile(CubemapFace face, const std::filesystem::path& filePath, const ImageParams& params = ImageParams());
bool LoadFaceFromImage(CubemapFace face, const Image& image);
bool LoadFaceFromMemory(CubemapFace face, const void* data, std::size_t size, const ImageParams& params = ImageParams()); bool LoadFaceFromMemory(CubemapFace face, const void* data, std::size_t size, const ImageParams& params = ImageParams());
bool LoadFaceFromStream(CubemapFace face, Stream& stream, const ImageParams& params = ImageParams()); bool LoadFaceFromStream(CubemapFace face, Stream& stream, const ImageParams& params = ImageParams());

66
src/Nazara/Utility/Image.cpp
View File

@ -1080,8 +1080,6 @@ namespace Nz
bool Image::LoadFaceFromFile(CubemapFace face, const std::filesystem::path& filePath, const ImageParams& params) bool Image::LoadFaceFromFile(CubemapFace face, const std::filesystem::path& filePath, const ImageParams& params)
{ {
NazaraAssert(IsValid() && IsCubemap(), "Texture must be a valid cubemap");
std::shared_ptr<Image> image = Image::LoadFromFile(filePath, params); std::shared_ptr<Image> image = Image::LoadFromFile(filePath, params);
if (!image) if (!image)
{ {
@ -1089,27 +1087,35 @@ namespace Nz
return false; return false;
} }
if (!image->Convert(GetFormat())) return LoadFaceFromImage(face, *image);
{ }
NazaraError("Failed to convert image to texture format");
return false; bool Image::LoadFaceFromImage(CubemapFace face, const Image& image)
} {
NazaraAssert(IsValid() && IsCubemap(), "Image must be a valid cubemap");
unsigned int faceSize = GetWidth(); unsigned int faceSize = GetWidth();
if (image->GetWidth() != faceSize || image->GetHeight() != faceSize) if (image.GetWidth() != faceSize || image.GetHeight() != faceSize)
{ {
NazaraError("Image size must match texture face size"); NazaraError("Image size must match cubemap face size");
return false; return false;
} }
Copy(*image, Boxui(0, 0, 0, faceSize, faceSize, 1), Vector3ui(0, 0, UnderlyingCast(face))); // Image is based on COW, no useless copy will be made
return true; Image convertedImage(image);
if (!convertedImage.Convert(GetFormat()))
{
NazaraError("Failed to convert image to cubemap format");
return false;
}
Copy(convertedImage, Boxui(0, 0, 0, faceSize, faceSize, 1), Vector3ui(0, 0, UnderlyingCast(face)));
return false;
} }
bool Image::LoadFaceFromMemory(CubemapFace face, const void* data, std::size_t size, const ImageParams& params) bool Image::LoadFaceFromMemory(CubemapFace face, const void* data, std::size_t size, const ImageParams& params)
{ {
NazaraAssert(IsValid() && IsCubemap(), "Texture must be a valid cubemap");
std::shared_ptr<Image> image = Image::LoadFromMemory(data, size, params); std::shared_ptr<Image> image = Image::LoadFromMemory(data, size, params);
if (!image) if (!image)
{ {
@ -1117,27 +1123,11 @@ namespace Nz
return false; return false;
} }
if (!image->Convert(GetFormat())) return LoadFaceFromImage(face, *image);
{
NazaraError("Failed to convert image to texture format");
return false;
}
unsigned int faceSize = GetWidth();
if (image->GetWidth() != faceSize || image->GetHeight() != faceSize)
{
NazaraError("Image size must match texture face size");
return false;
}
Copy(*image, Boxui(0, 0, 0, faceSize, faceSize, 1), Vector3ui(0, 0, UnderlyingCast(face)));
return true;
} }
bool Image::LoadFaceFromStream(CubemapFace face, Stream& stream, const ImageParams& params) bool Image::LoadFaceFromStream(CubemapFace face, Stream& stream, const ImageParams& params)
{ {
NazaraAssert(IsValid() && IsCubemap(), "Texture must be a valid cubemap");
std::shared_ptr<Image> image = Image::LoadFromStream(stream, params); std::shared_ptr<Image> image = Image::LoadFromStream(stream, params);
if (!image) if (!image)
{ {
@ -1145,21 +1135,7 @@ namespace Nz
return false; return false;
} }
if (!image->Convert(GetFormat())) return LoadFaceFromImage(face, *image);;
{
NazaraError("Failed to convert image to texture format");
return false;
}
unsigned int faceSize = GetWidth();
if (image->GetWidth() != faceSize || image->GetHeight() != faceSize)
{
NazaraError("Image size must match texture face size");
return false;
}
Copy(*image, Boxui(0, 0, 0, faceSize, faceSize, 1), Vector3ui(0, 0, UnderlyingCast(face)));
return true;
} }
bool Image::SaveToFile(const std::filesystem::path& filePath, const ImageParams& params) bool Image::SaveToFile(const std::filesystem::path& filePath, const ImageParams& params)