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

PixelFormat rename

Browse Source 
PixelFormatInfo => PixelFormatDescription
PixelFormat => PixelFormatInfo
PixelFormatType => PixelFormat
This commit is contained in:
Lynix
2020-04-10 14:19:36 +02:00
parent 87f1209327
commit 9507c56fc9
35 changed files with 582 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Nazara/Utility/Formats/DDSLoader.cpp
View File

@@ -84,7 +84,7 @@ namespace Nz
return nullptr;
// Then the format
PixelFormatType format;
PixelFormat format;
if (!IdentifyPixelFormat(header, headerDX10, &format))
return nullptr;
@@ -93,7 +93,7 @@ namespace Nz
// Read all mipmap levels
for (unsigned int i = 0; i < image->GetLevelCount(); i++)
{
std::size_t byteCount = PixelFormat::ComputeSize(format, width, height, depth);
std::size_t byteCount = PixelFormatInfo::ComputeSize(format, width, height, depth);
UInt8* ptr = image->GetPixels(0, 0, 0, i);
@@ -114,7 +114,7 @@ namespace Nz
}
if (parameters.loadFormat != PixelFormatType_Undefined)
if (parameters.loadFormat != PixelFormat_Undefined)
image->Convert(parameters.loadFormat);
return image;
@@ -163,11 +163,11 @@ namespace Nz
return true;
}
static bool IdentifyPixelFormat(const DDSHeader& header, const DDSHeaderDX10Ext& headerExt, PixelFormatType* format)
static bool IdentifyPixelFormat(const DDSHeader& header, const DDSHeaderDX10Ext& headerExt, PixelFormat* format)
{
if (header.format.flags & (DDPF_RGB | DDPF_ALPHA | DDPF_ALPHAPIXELS | DDPF_LUMINANCE))
{
PixelFormatInfo info(PixelFormatContent_ColorRGBA, header.format.bpp, PixelFormatSubType_Unsigned);
PixelFormatDescription info(PixelFormatContent_ColorRGBA, header.format.bpp, PixelFormatSubType_Unsigned);
if (header.format.flags & DDPF_RGB)
{
@@ -182,8 +182,8 @@ namespace Nz
if (header.format.flags & (DDPF_ALPHA | DDPF_ALPHAPIXELS))
info.alphaMask = header.format.alphaMask;
*format = PixelFormat::IdentifyFormat(info);
if (!PixelFormat::IsValid(*format))
*format = PixelFormatInfo::IdentifyFormat(info);
if (!PixelFormatInfo::IsValid(*format))
return false;
}
else if (header.format.flags & DDPF_FOURCC)
@@ -191,15 +191,15 @@ namespace Nz
switch (header.format.fourCC)
{
case D3DFMT_DXT1:
*format = PixelFormatType_DXT1;
*format = PixelFormat_DXT1;
break;
case D3DFMT_DXT3:
*format = PixelFormatType_DXT3;
*format = PixelFormat_DXT3;
break;
case D3DFMT_DXT5:
*format = PixelFormatType_DXT3;
*format = PixelFormat_DXT3;
break;
case D3DFMT_DX10:
@@ -207,30 +207,30 @@ namespace Nz
switch (headerExt.dxgiFormat)
{
case DXGI_FORMAT_R32G32B32A32_FLOAT:
*format = PixelFormatType_RGBA32F;
*format = PixelFormat_RGBA32F;
break;
case DXGI_FORMAT_R32G32B32A32_UINT:
*format = PixelFormatType_RGBA32UI;
*format = PixelFormat_RGBA32UI;
break;
case DXGI_FORMAT_R32G32B32A32_SINT:
*format = PixelFormatType_RGBA32I;
*format = PixelFormat_RGBA32I;
break;
case DXGI_FORMAT_R32G32B32_FLOAT:
*format = PixelFormatType_RGB32F;
*format = PixelFormat_RGB32F;
break;
case DXGI_FORMAT_R32G32B32_UINT:
//*format = PixelFormatType_RGB32U;
//*format = PixelFormat_RGB32U;
return false;
case DXGI_FORMAT_R32G32B32_SINT:
*format = PixelFormatType_RGB32I;
*format = PixelFormat_RGB32I;
break;
case DXGI_FORMAT_R16G16B16A16_SNORM:
case DXGI_FORMAT_R16G16B16A16_SINT:
case DXGI_FORMAT_R16G16B16A16_UINT:
*format = PixelFormatType_RGBA16I;
*format = PixelFormat_RGBA16I;
break;
case DXGI_FORMAT_R16G16B16A16_UNORM:
*format = PixelFormatType_RGBA16UI;
*format = PixelFormat_RGBA16UI;
break;
}
break;

2
src/Nazara/Utility/Formats/FreeTypeLoader.cpp
View File

@@ -201,7 +201,7 @@ namespace Nz
if (width > 0 && height > 0)
{
dst->image.Create(ImageType_2D, PixelFormatType_A8, width, height);
dst->image.Create(ImageType_2D, PixelFormat_A8, width, height);
UInt8* pixels = dst->image.GetPixels();
const UInt8* data = bitmap.buffer;

4
src/Nazara/Utility/Formats/PCXLoader.cpp
View File

@@ -92,7 +92,7 @@ namespace Nz
unsigned int height = header.ymax - header.ymin+1;
ImageRef image = Image::New();
if (!image->Create(ImageType_2D, PixelFormatType_RGB8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
if (!image->Create(ImageType_2D, PixelFormat_RGB8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
{
NazaraError("Failed to create image");
return nullptr;
@@ -333,7 +333,7 @@ namespace Nz
return nullptr;
}
if (parameters.loadFormat != PixelFormatType_Undefined)
if (parameters.loadFormat != PixelFormat_Undefined)
image->Convert(parameters.loadFormat);
return image;

4
src/Nazara/Utility/Formats/STBLoader.cpp
View File

@@ -74,7 +74,7 @@ namespace Nz
});
ImageRef image = Image::New();
if (!image->Create(ImageType_2D, PixelFormatType_RGBA8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
if (!image->Create(ImageType_2D, PixelFormat_RGBA8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
{
NazaraError("Failed to create image");
return nullptr;
@@ -84,7 +84,7 @@ namespace Nz
freeStbiImage.CallAndReset();
if (parameters.loadFormat != PixelFormatType_Undefined)
if (parameters.loadFormat != PixelFormat_Undefined)
image->Convert(parameters.loadFormat);
return image;

32
src/Nazara/Utility/Formats/STBSaver.cpp
View File

@@ -21,30 +21,30 @@ namespace Nz
{
switch (image.GetFormat())
{
case PixelFormatType_R32F:
case PixelFormat_R32F:
return 1;
case PixelFormatType_RG32F:
case PixelFormat_RG32F:
return 2;
case PixelFormatType_RGB32F:
case PixelFormat_RGB32F:
return 3;
case PixelFormatType_RGBA32F:
case PixelFormat_RGBA32F:
return 4;
default:
{
if (PixelFormat::HasAlpha(image.GetFormat()))
if (PixelFormatInfo::HasAlpha(image.GetFormat()))
{
if (!image.Convert(PixelFormatType_RGBA32F))
if (!image.Convert(PixelFormat_RGBA32F))
break;
return 4;
}
else
{
if (!image.Convert(PixelFormatType_RGB32F))
if (!image.Convert(PixelFormat_RGB32F))
break;
return 3;
@@ -59,32 +59,32 @@ namespace Nz
{
switch (image.GetFormat())
{
case PixelFormatType_L8:
case PixelFormatType_R8:
case PixelFormat_L8:
case PixelFormat_R8:
return 1;
case PixelFormatType_LA8:
case PixelFormatType_RG8:
case PixelFormat_LA8:
case PixelFormat_RG8:
return 2;
case PixelFormatType_RGB8:
case PixelFormat_RGB8:
return 3;
case PixelFormatType_RGBA8:
case PixelFormat_RGBA8:
return 4;
default:
{
if (PixelFormat::HasAlpha(image.GetFormat()))
if (PixelFormatInfo::HasAlpha(image.GetFormat()))
{
if (!image.Convert(PixelFormatType_RGBA8))
if (!image.Convert(PixelFormat_RGBA8))
break;
return 4;
}
else
{
if (!image.Convert(PixelFormatType_RGB8))
if (!image.Convert(PixelFormat_RGB8))
break;
return 3;