Allow live-update to work even if import button hasn't been pressed. …

…Added raw import test images for various pixel formats, with and without multiple surfaces and mipmaps. Both HDR (lRGB) and LDR (sRGB) examples were included and tested.
bluescan · Jul 1, 2024 · ee73529 · ee73529
1 parent 24bb59a
commit ee73529
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 7 deletions.
diff --git a/Src/ImportRaw.cpp b/Src/ImportRaw.cpp
@@ -274,18 +274,17 @@ bool Viewer::ShowImportRawOverlay(bool* popen, bool justOpened)
 			"order set this checkbox to true."
 		);
 
-		if (!ImportRaw::ImportedDstFile.IsValid())
-			Gutil::PushDisable();
 		ImGui::SetNextItemWidth(itemWidth);
-		ImGui::Checkbox("Live Updates", &profile.ImportRawLiveUpdate);
-		if (!ImportRaw::ImportedDstFile.IsValid())
-			Gutil::PopDisable();
+		if (ImGui::Checkbox("Live Updates", &profile.ImportRawLiveUpdate))
+		{
+			// If turned it on need an immediate update.
+			if (profile.ImportRawLiveUpdate) liveUpdated = true;
+		}
 		ImGui::SameLine();
 		Gutil::HelpMark
 		(
 			"Automatically re-import on any change. This can be slow as the entire raw\n"
-			"input file is re-parsed, decoded, saved, and re-bound for display. This\n"
-			"option is only available after you have successfully imported at least once."
+			"input file is read, parsed, decoded, saved, and re-bound for display."
 		);
 
 		Gutil::Separator();
@@ -333,7 +332,11 @@ bool Viewer::ShowImportRawOverlay(bool* popen, bool justOpened)
 
 		tString resultText;
 		tsPrintf(resultText, "Import Result: %s", importResultMessage.IsEmpty() ? "None" :  importResultMessage.Chr());
+		if (importResultMessage.IsValid() && (importResultMessage != "Success"))
+			ImGui::PushStyleColor(ImGuiCol_Text, tVector4(1.0f, 0.3f, 0.31f, 1.0f) );
 		ImGui::Text(resultText.Chr());
+		if (importResultMessage.IsValid() && (importResultMessage != "Success"))
+			ImGui::PopStyleColor();
 
 		tString previewModeText;
 		if (profile.ImportRawFilename.IsValid() && ImportRaw::ImportedDstFile.IsValid())

diff --git a/...rt/Raw_ASTC8X5_1280x720_sRGB_Offset16.raw → ...Import/ASTC8X5_1280x720_sRGB_O0_RR_S1.raw b/...rt/Raw_ASTC8X5_1280x720_sRGB_Offset16.raw → ...Import/ASTC8X5_1280x720_sRGB_O0_RR_S1.raw
diff --git a/...ort/Raw_ASTC8X5_644x874_lRGB_Offset16.raw → ...Import/ASTC8X5_644x874_lRGB_O16_RR_S1.raw b/...ort/Raw_ASTC8X5_644x874_lRGB_Offset16.raw → ...Import/ASTC8X5_644x874_lRGB_O16_RR_S1.raw
diff --git a/TestImages/RawImport/B10G11R11uf_1280x720_lRGB_O68_RR_M11.raw b/TestImages/RawImport/B10G11R11uf_1280x720_lRGB_O68_RR_M11.raw
diff --git a/TestImages/RawImport/B8G8R8_317x177_sRGB_O18_NR_S1.raw b/TestImages/RawImport/B8G8R8_317x177_sRGB_O18_NR_S1.raw
diff --git a/TestImages/RawImport/BC1DXT1_1280x720_sRGB_O68_RR_M11.raw b/TestImages/RawImport/BC1DXT1_1280x720_sRGB_O68_RR_M11.raw
diff --git a/TestImages/RawImport/BC1DXT1_512x512_sRGB_O128_RR_S6.raw b/TestImages/RawImport/BC1DXT1_512x512_sRGB_O128_RR_S6.raw
diff --git a/TestImages/RawImport/E5B9G9R9uf_1280x720_lRGB_O68_RR_S1.raw b/TestImages/RawImport/E5B9G9R9uf_1280x720_lRGB_O68_RR_S1.raw
diff --git a/TestImages/RawImport/ETC1_1024x512_lRGB_O68_RR_M11.raw b/TestImages/RawImport/ETC1_1024x512_lRGB_O68_RR_M11.raw
diff --git a/TestImages/RawImport/R8G8B8D8_644x874_lRGB_O68_RR_S1.raw b/TestImages/RawImport/R8G8B8D8_644x874_lRGB_O68_RR_S1.raw
diff --git a/TestImages/RawImport/R8G8B8M8_644x874_lRGB_O68_RR_S1.raw b/TestImages/RawImport/R8G8B8M8_644x874_lRGB_O68_RR_S1.raw
diff --git a/TestImages/RawImport/Readme.txt b/TestImages/RawImport/Readme.txt
@@ -0,0 +1,7 @@
+Raw pixel data file names follow the convention:
+PixelFormat_WidthxHeight_ColourSpace_Offset_RowOrder_SurfOrMipCount
+
+ColourSpace may be sRGB or lRGB.
+Offset is ONN where NN is the offset count in bytes.
+RowOrder is NR for no row-reversal and RR for row reversal.
+SurfOfMipCount is SNN for surfaces and MNN for mipmaps. NN is count.