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

Added error check 

Also "fixed" some error messages


Former-commit-id: 15be3887949e9bafab49c3f4e16ffc732f352c65
This commit is contained in:
Lynix 2014-08-18 17:42:08 +02:00
parent 7266111834
commit ad0fa61cdf
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,13 +227,13 @@ bool NzImage::Create(nzImageType type, nzPixelFormat format, unsigned int width,
case nzImageType_1D:
if (height > 1)
{
NazaraError("1D textures must be 1 height");
NazaraError("1D textures must be 1 tall");
return false;
}
if (depth > 1)
{
NazaraError("1D textures must be 1 depth");
NazaraError("1D textures must be 1 deep");
return false;
}
break;
@ -242,7 +242,7 @@ bool NzImage::Create(nzImageType type, nzPixelFormat format, unsigned int width,
case nzImageType_2D:
if (depth > 1)
{
NazaraError("2D textures must be 1 depth");
NazaraError("2D textures must be 1 deep");
return false;
}
break;
@ -254,7 +254,7 @@ bool NzImage::Create(nzImageType type, nzPixelFormat format, unsigned int width,
case nzImageType_Cubemap:
if (depth > 1)
{
NazaraError("Cubemaps must be 1 depth");
NazaraError("Cubemaps must be 1 deep");
return false;
}
@ -883,6 +883,13 @@ bool NzImage::LoadCubemapFromImage(const NzImage& image, const NzCubemapParams&
NazaraError("Image must be valid");
return false;
}
nzImageType type = image.GetType();
if (type != nzImageType_2D)
{
NazaraError("Image type not handled (0x" + NzString::Number(type, 16) + ')');
return false;
}
#endif
unsigned int width = image.GetWidth();