birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed to use a new enum for handling the output types in case we need to expand custom handling in the future

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2022-02-02 11:21:06 -06:00
parent 578a19bf49
commit dd4ab4173d
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
+12 -9
View File
@@ -535,17 +535,20 @@ namespace ImageProcessingAtom
m_image->GetCompressOption().rgbWeight = m_input->m_presetSetting.GetColorWeight();
m_image->GetCompressOption().discardAlpha = m_input->m_presetSetting.m_discardAlpha;
// If the m_uncompressedAutoPick flag is set, then let the converter pick
// a pixel format that best matches the source input format
if (m_input->m_presetSetting.m_uncompressedAutoPick)
{
EPixelFormat sourceInputFormat = m_input->m_inputImage->GetPixelFormat();
m_image->ConvertFormat(sourceInputFormat);
}
// Otherwise, convert to the pixel format specified by the preset that was chosen
else
// Convert to a pixel format based on the desired handling
// The default behavior will choose the output format specified by the preset
switch (m_input->m_presetSetting.m_outputTypeHandling)
{
case PresetSettings::OutputTypeHandling::USE_INPUT_FORMAT_AND_BIT_DEPTH:
{
EPixelFormat sourceInputFormat = m_input->m_inputImage->GetPixelFormat();
m_image->ConvertFormat(sourceInputFormat);
}
break;
case PresetSettings::OutputTypeHandling::USE_SPECIFIED_OUTPUT_TYPE:
default:
m_image->ConvertFormat(m_input->m_presetSetting.m_pixelFormat);
break;
}
return true;