ATOM-16854 Texture Settings dialog box crashes in the Editor (#5777)
Changes include: -Fixed image preview issue which was trying to convert a compressed texture directly to QImage. -Fixed texture resolution display for cubemap in texture setting editor. -Sort the preset names in preset combo box -Fixed a crash when showing IBLSkybox preset info in texture setting editor Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
This commit is contained in:
@@ -21,16 +21,8 @@ namespace ImageProcessingAtom
|
||||
class ImageConvertOutput
|
||||
{
|
||||
public:
|
||||
enum OutputImageType
|
||||
{
|
||||
Base = 0, // Might contains alpha or not
|
||||
Alpha, // Separate alpha image
|
||||
Preview, // Combine base image with alpha if any, format RGBA8
|
||||
Count
|
||||
};
|
||||
|
||||
IImageObjectPtr GetOutputImage(OutputImageType type) const;
|
||||
void SetOutputImage(IImageObjectPtr image, OutputImageType type);
|
||||
IImageObjectPtr GetOutputImage() const;
|
||||
void SetOutputImage(IImageObjectPtr image);
|
||||
void SetReady(bool ready);
|
||||
bool IsReady() const;
|
||||
float GetProgress() const;
|
||||
@@ -38,7 +30,7 @@ namespace ImageProcessingAtom
|
||||
void Reset();
|
||||
|
||||
private:
|
||||
IImageObjectPtr m_outputImage[OutputImageType::Count];
|
||||
IImageObjectPtr m_outputImage;
|
||||
bool m_outputReady = false;
|
||||
float m_progress = 0.0f;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user