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

Fixed STB loader artefacts 

Former-commit-id: df4b7cef68efc9e67b968daaa71f578cea68e061
This commit is contained in:
Lynix 2013-05-25 10:08:13 +02:00
parent 810b45fbb7
commit 90bc3c342c
1 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Nazara/Utility/Loaders/STB/Loader.cpp
View File

@ -53,56 +53,18 @@ namespace
bool Load(NzImage* image, NzInputStream& stream, const NzImageParams& parameters) bool Load(NzImage* image, NzInputStream& stream, const NzImageParams& parameters)
{ {
static const nzPixelFormat formats[4] = // Je charge tout en RGBA8 et je converti ensuite via la méthode Convert
{ // Ceci à cause d'un bug de STB lorsqu'il s'agit de charger certaines images (ex: JPG) en "default"
nzPixelFormat_L8,
nzPixelFormat_LA8,
nzPixelFormat_RGB8,
nzPixelFormat_RGBA8
};
nzPixelFormat format;
int stbiFormat;
switch (parameters.loadFormat)
{
case nzPixelFormat_L8:
format = nzPixelFormat_L8;
stbiFormat = STBI_grey;
break;
case nzPixelFormat_LA8:
format = nzPixelFormat_LA8;
stbiFormat = STBI_grey_alpha;
break;
case nzPixelFormat_RGB8:
format = nzPixelFormat_RGB8;
stbiFormat = STBI_rgb;
break;
case nzPixelFormat_RGBA8:
format = nzPixelFormat_RGBA8;
stbiFormat = STBI_rgb_alpha;
break;
default:
format = nzPixelFormat_Undefined;
stbiFormat = STBI_default;
}
int width, height, bpp; int width, height, bpp;
nzUInt8* ptr = stbi_load_from_callbacks(&callbacks, &stream, &width, &height, &bpp, stbiFormat); nzUInt8* ptr = stbi_load_from_callbacks(&callbacks, &stream, &width, &height, &bpp, STBI_rgb_alpha);
if (!ptr) if (!ptr)
{ {
NazaraError("Failed to load image: " + NzString(stbi_failure_reason())); NazaraError("Failed to load image: " + NzString(stbi_failure_reason()));
return false; return false;
} }
if (format == nzPixelFormat_Undefined) if (!image->Create(nzImageType_2D, nzPixelFormat_RGBA8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
format = formats[bpp-1];
if (!image->Create(nzImageType_2D, format, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
{ {
NazaraError("Failed to create image"); NazaraError("Failed to create image");
stbi_image_free(ptr); stbi_image_free(ptr);
@ -111,10 +73,9 @@ namespace
} }
image->Update(ptr); image->Update(ptr);
stbi_image_free(ptr); stbi_image_free(ptr);
if (stbiFormat == STBI_default && parameters.loadFormat != nzPixelFormat_Undefined) if (parameters.loadFormat != nzPixelFormat_Undefined)
image->Convert(parameters.loadFormat); image->Convert(parameters.loadFormat);
return true; return true;