GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Code style cleanup

Browse Source 
#837
This commit is contained in:
Wojtek Figat
2022-11-29 08:41:52 +01:00
parent 3f3697fbfa
commit 9e1692e3e0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
View File

@@ -623,17 +623,17 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
sliceData.Mips.Resize(mipLevels);
}
bool bKeepAsIs = false;
bool keepAsIs = false;
if (!options.FlipY && options.Compress && type == ImageType::DDS && mipLevels == sourceMipLevels && DirectX::IsCompressed(sourceDxgiFormat) && !DirectX::IsSRGB(sourceDxgiFormat))
{
// Keep image in the current compressed format (artist choice) so we don't have to run the slow mipmap generation
bKeepAsIs = true;
keepAsIs = true;
targetDxgiFormat = sourceDxgiFormat;
targetFormat = ToPixelFormat(currentImage->GetMetadata().format);
}
// Decompress if texture is compressed (next steps need decompressed input data, for eg. mip maps generation or format changing)
if (!bKeepAsIs && DirectX::IsCompressed(sourceDxgiFormat))
if (!keepAsIs && DirectX::IsCompressed(sourceDxgiFormat))
{
auto& tmpImg = GET_TMP_IMG();
@@ -649,7 +649,7 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
}
// Fix sRGB problem
if (!bKeepAsIs && DirectX::IsSRGB(sourceDxgiFormat))
if (!keepAsIs && DirectX::IsSRGB(sourceDxgiFormat))
{
sourceDxgiFormat = ToDxgiFormat(PixelFormatExtensions::ToNonsRGB(ToPixelFormat(sourceDxgiFormat)));
((DirectX::TexMetadata&)currentImage->GetMetadata()).format = sourceDxgiFormat;
@@ -658,7 +658,7 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
}
// Remove alpha if source texture has it but output should not, valid for compressed output only (DirectX seams to use alpha to pre-multiply colors because BC1 format has no place for alpha)
if (!bKeepAsIs && DirectX::HasAlpha(sourceDxgiFormat) && options.Type == TextureFormatType::ColorRGB && options.Compress)
if (!keepAsIs && DirectX::HasAlpha(sourceDxgiFormat) && options.Type == TextureFormatType::ColorRGB && options.Compress)
{
auto& tmpImg = GET_TMP_IMG();
@@ -683,7 +683,7 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
}
// Check flip/rotate source image
if (!bKeepAsIs && options.FlipY)
if (!keepAsIs && options.FlipY)
{
auto& tmpImg = GET_TMP_IMG();
@@ -700,7 +700,7 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
}
// Generate mip maps chain
if (!bKeepAsIs && useMipLevels && options.GenerateMipMaps)
if (!keepAsIs && useMipLevels && options.GenerateMipMaps)
{
auto& tmpImg = GET_TMP_IMG();
@@ -723,7 +723,7 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
}
// Preserve mipmap alpha coverage (if requested)
if (!bKeepAsIs && DirectX::HasAlpha(currentImage->GetMetadata().format) && options.PreserveAlphaCoverage && useMipLevels)
if (!keepAsIs && DirectX::HasAlpha(currentImage->GetMetadata().format) && options.PreserveAlphaCoverage && useMipLevels)
{
auto& tmpImg = GET_TMP_IMG();
@@ -755,7 +755,7 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
ASSERT((int32)currentImage->GetMetadata().mipLevels >= mipLevels);
// Compress mip maps or convert image
if (!bKeepAsIs && targetDxgiFormat != sourceDxgiFormat)
if (!keepAsIs && targetDxgiFormat != sourceDxgiFormat)
{
auto& tmpImg = GET_TMP_IMG();