Check component count for right click pixel value in texture viewer

This commit is contained in:
Steve Karolewics
2019-07-12 13:58:11 +01:00
committed by Baldur Karlsson
parent d4d21ce736
commit 70e3499ea1
+22 -15
View File
@@ -949,29 +949,36 @@ void TextureViewer::UI_UpdateStatusText()
}
else
{
// Restrict the number of components displayed to the component count of the resource format
if(uintTex)
{
statusText += QFormatStr("%1, %2, %3, %4")
.arg(Formatter::Format(val.uintValue[0]))
.arg(Formatter::Format(val.uintValue[1]))
.arg(Formatter::Format(val.uintValue[2]))
.arg(Formatter::Format(val.uintValue[3]));
statusText += QFormatStr("%1").arg(Formatter::Format(val.uintValue[0]));
if(tex.format.compCount > 1)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.uintValue[1]));
if(tex.format.compCount > 2)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.uintValue[2]));
if(tex.format.compCount > 3)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.uintValue[3]));
}
else if(sintTex)
{
statusText += QFormatStr("%1, %2, %3, %4")
.arg(Formatter::Format(val.intValue[0]))
.arg(Formatter::Format(val.intValue[1]))
.arg(Formatter::Format(val.intValue[2]))
.arg(Formatter::Format(val.intValue[3]));
statusText += QFormatStr("%1").arg(Formatter::Format(val.intValue[0]));
if(tex.format.compCount > 1)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.intValue[1]));
if(tex.format.compCount > 2)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.intValue[2]));
if(tex.format.compCount > 3)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.intValue[3]));
}
else
{
statusText += QFormatStr("%1, %2, %3, %4")
.arg(Formatter::Format(val.floatValue[0]))
.arg(Formatter::Format(val.floatValue[1]))
.arg(Formatter::Format(val.floatValue[2]))
.arg(Formatter::Format(val.floatValue[3]));
statusText += QFormatStr("%1").arg(Formatter::Format(val.floatValue[0]));
if(tex.format.compCount > 1)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.floatValue[1]));
if(tex.format.compCount > 2)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.floatValue[2]));
if(tex.format.compCount > 3)
statusText += QFormatStr(", %1").arg(Formatter::Format(val.floatValue[3]));
}
}