From eb0b5d16bf7da4c1a5bb74d1cdb3b1d185a91393 Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Mon, 8 Mar 2021 16:58:25 -0800 Subject: [PATCH] Migrate ColorGrading to SimpleViewer. --- .../google/android/filament/ColorGrading.java | 3 +- .../src/main/cpp/AutomationEngine.cpp | 7 + .../filament/utils/AutomationEngine.java | 23 ++ .../android/filament/gltf/MainActivity.kt | 1 + libs/viewer/include/viewer/AutomationEngine.h | 18 ++ libs/viewer/include/viewer/SimpleViewer.h | 4 + libs/viewer/src/AutomationEngine.cpp | 16 ++ libs/viewer/src/SimpleViewer.cpp | 247 +++++++++++++++++ samples/gltf_viewer.cpp | 249 ------------------ 9 files changed, 318 insertions(+), 250 deletions(-) diff --git a/android/filament-android/src/main/java/com/google/android/filament/ColorGrading.java b/android/filament-android/src/main/java/com/google/android/filament/ColorGrading.java index 9004f09e93..521794c41c 100644 --- a/android/filament-android/src/main/java/com/google/android/filament/ColorGrading.java +++ b/android/filament-android/src/main/java/com/google/android/filament/ColorGrading.java @@ -117,7 +117,8 @@ public class ColorGrading { DISPLAY_RANGE, } - ColorGrading(long colorGrading) { + // NOTE: This constructor is public only so that filament-utils can use it. + public ColorGrading(long colorGrading) { mNativeObject = colorGrading; } diff --git a/android/filament-utils-android/src/main/cpp/AutomationEngine.cpp b/android/filament-utils-android/src/main/cpp/AutomationEngine.cpp index cd0029b5fa..e391570756 100644 --- a/android/filament-utils-android/src/main/cpp/AutomationEngine.cpp +++ b/android/filament-utils-android/src/main/cpp/AutomationEngine.cpp @@ -120,6 +120,13 @@ Java_com_google_android_filament_utils_AutomationEngine_nApplySettings(JNIEnv* e } } +extern "C" JNIEXPORT jlong JNICALL +Java_com_google_android_filament_utils_AutomationEngine_nGetColorGrading(JNIEnv*, jclass, + jlong nativeObject, jlong nativeEngine) { + AutomationEngine* automation = (AutomationEngine*) nativeObject; + return (jlong) automation->getColorGrading((Engine*) nativeEngine); +} + extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_utils_AutomationEngine_nSignalBatchMode(JNIEnv*, jclass, jlong native) { AutomationEngine* automation = (AutomationEngine*) native; diff --git a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/AutomationEngine.java b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/AutomationEngine.java index 82f030ddfc..f147ca7c9a 100644 --- a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/AutomationEngine.java +++ b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/AutomationEngine.java @@ -19,6 +19,8 @@ package com.google.android.filament.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.google.android.filament.ColorGrading; +import com.google.android.filament.Engine; import com.google.android.filament.Entity; import com.google.android.filament.IndirectLight; import com.google.android.filament.LightManager; @@ -50,6 +52,7 @@ import com.google.android.filament.Renderer; */ public class AutomationEngine { private long mNativeObject; + private ColorGrading mColorGrading; /** * Allows users to toggle screenshots, change the sleep duration between tests, etc. @@ -147,6 +150,9 @@ public class AutomationEngine { * * This method is an alternative to tick(). It allows clients to use the automation engine as a * remote control, as opposed to iterating through a predetermined test sequence. + * + * This updates the stashed Settings object, then pushes those settings to the given + * Filament objects. Clients can optionally call getColorGrading() after calling this method. */ public void applySettings(@NonNull String settingsJson, @NonNull View view, @Nullable MaterialInstance[] materials, @Nullable IndirectLight ibl, @Entity int light, @@ -166,6 +172,22 @@ public class AutomationEngine { nativeIbl, light, nativeLm, nativeScene); } + /** + * Gets a color grading object that corresponds to the latest settings. + * + * This method either returns a cached instance, or it destroys the cached instance and creates + * a new one. + */ + public ColorGrading getColorGrading(@NonNull Engine engine) { + // The native layer automatically destroys the old color grading instance, + // so there is no need to call Engine#destroyColorGrading here. + long nativeCg = nGetColorGrading(mNativeObject, engine.getNativeObject()); + if (mColorGrading == null || mColorGrading.getNativeObject() != nativeCg) { + mColorGrading = new ColorGrading(nativeCg); + } + return mColorGrading; + } + /** * Signals that batch mode can begin. Call this after all meshes and textures finish loading. */ @@ -197,6 +219,7 @@ public class AutomationEngine { float deltaTime); private static native void nApplySettings(long nativeObject, String jsonSettings, long view, long[] materials, long ibl, int light, long lightManager, long scene); + private static native long nGetColorGrading(long nativeObject, long nativeEngine); private static native void nSignalBatchMode(long nativeObject); private static native void nStopRunning(long nativeObject); private static native boolean nShouldClose(long nativeObject); diff --git a/android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt b/android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt index e54f9095a7..ba258782a9 100644 --- a/android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt +++ b/android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt @@ -240,6 +240,7 @@ class MainActivity : Activity() { automation.applySettings(json, modelViewer.view, null, modelViewer.scene.indirectLight, modelViewer.light, modelViewer.engine.lightManager, modelViewer.scene) + modelViewer.view.colorGrading = automation.getColorGrading((modelViewer.engine)) } inner class FrameCallback : Choreographer.FrameCallback { diff --git a/libs/viewer/include/viewer/AutomationEngine.h b/libs/viewer/include/viewer/AutomationEngine.h index ca70a33509..a6040b50f4 100644 --- a/libs/viewer/include/viewer/AutomationEngine.h +++ b/libs/viewer/include/viewer/AutomationEngine.h @@ -21,6 +21,8 @@ namespace filament { +class ColorGrading; +class Engine; class LightManager; class MaterialInstance; class Renderer; @@ -151,11 +153,22 @@ public: * * This method is an alternative to tick(). It allows clients to use the automation engine as a * remote control, as opposed to iterating through a predetermined test sequence. + * + * This updates the stashed Settings object, then pushes those settings to the given + * Filament objects. Clients can optionally call getColorGrading() after calling this method. */ void applySettings(const char* json, size_t jsonLength, View* view, MaterialInstance* const* materials, size_t materialCount, IndirectLight* ibl, utils::Entity sunlight, LightManager* lm, Scene* scene); + /** + * Gets a color grading object that corresponds to the latest settings. + * + * This method either returns a cached instance, or it destroys the cached instance and creates + * a new one. + */ + ColorGrading* getColorGrading(Engine* engine); + /** * Signals that batch mode can begin. Call this after all meshes and textures finish loading. */ @@ -202,6 +215,11 @@ private: AutomationSpec const * const mSpec; Settings * const mSettings; Options mOptions; + + Engine* mColorGradingEngine = nullptr; + ColorGrading* mColorGrading = nullptr; + ColorGradingSettings mColorGradingSettings = {}; + size_t mCurrentTest; float mElapsedTime; int mElapsedFrames; diff --git a/libs/viewer/include/viewer/SimpleViewer.h b/libs/viewer/include/viewer/SimpleViewer.h index 9c9573c8f3..c1ca119e6b 100644 --- a/libs/viewer/include/viewer/SimpleViewer.h +++ b/libs/viewer/include/viewer/SimpleViewer.h @@ -222,6 +222,10 @@ private: Settings mSettings; int mSidebarWidth; uint32_t mFlags; + + // Color grading UI state. + float mRangePlot[1024 * 3]; + float mCurvePlot[1024 * 3]; }; filament::math::mat4f fitIntoUnitCube(const filament::Aabb& bounds); diff --git a/libs/viewer/src/AutomationEngine.cpp b/libs/viewer/src/AutomationEngine.cpp index 7b02014ea8..9244058926 100644 --- a/libs/viewer/src/AutomationEngine.cpp +++ b/libs/viewer/src/AutomationEngine.cpp @@ -16,6 +16,7 @@ #include +#include #include #include @@ -101,6 +102,9 @@ AutomationEngine* AutomationEngine::createDefault() { } AutomationEngine::~AutomationEngine() { + if (mColorGrading) { + mColorGradingEngine->destroy(mColorGrading); + } if (mOwnsSettings) { delete mSpec; delete mSettings; @@ -144,6 +148,18 @@ void AutomationEngine::applySettings(const char* json, size_t jsonLength, View* viewer::applySettings(mSettings->lighting, ibl, sunlight, lm, scene); } +ColorGrading* AutomationEngine::getColorGrading(Engine* engine) { + if (mSettings->view.colorGrading != mColorGradingSettings) { + mColorGradingSettings = mSettings->view.colorGrading; + if (mColorGrading) { + mColorGradingEngine->destroy(mColorGrading); + } + mColorGrading = createColorGrading(mColorGradingSettings, engine); + mColorGradingEngine = engine; + } + return mColorGrading; +} + void AutomationEngine::tick(View* view, MaterialInstance* const* materials, size_t materialCount, Renderer* renderer, float deltaTime) { const auto activateTest = [this, view, materials, materialCount]() { diff --git a/libs/viewer/src/SimpleViewer.cpp b/libs/viewer/src/SimpleViewer.cpp index 9fe8932bf4..54c3bab10b 100644 --- a/libs/viewer/src/SimpleViewer.cpp +++ b/libs/viewer/src/SimpleViewer.cpp @@ -37,6 +37,7 @@ #include using namespace filagui; +using namespace filament::math; namespace filament { namespace viewer { @@ -54,6 +55,250 @@ filament::math::mat4f fitIntoUnitCube(const filament::Aabb& bounds) { return mat4f::scaling(float3(scaleFactor)) * mat4f::translation(-center); } +static void computeRangePlot(Settings& settings, float* rangePlot) { + float4& ranges = settings.view.colorGrading.ranges; + ranges.y = clamp(ranges.y, ranges.x + 1e-5f, ranges.w - 1e-5f); // darks + ranges.z = clamp(ranges.z, ranges.x + 1e-5f, ranges.w - 1e-5f); // lights + + for (size_t i = 0; i < 1024; i++) { + float x = i / 1024.0f; + float s = 1.0f - smoothstep(ranges.x, ranges.y, x); + float h = smoothstep(ranges.z, ranges.w, x); + rangePlot[i] = s; + rangePlot[1024 + i] = 1.0f - s - h; + rangePlot[2048 + i] = h; + } +} + +static void rangePlotSeriesStart(int series) { + switch (series) { + case 0: + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.4f, 0.25f, 1.0f)); + break; + case 1: + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.8f, 0.25f, 1.0f)); + break; + case 2: + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.17f, 0.21f, 1.0f)); + break; + } +} + +static void rangePlotSeriesEnd(int series) { + if (series < 3) { + ImGui::PopStyleColor(); + } +} + +static float getRangePlotValue(int series, void* data, int index) { + return ((float*) data)[series * 1024 + index]; +} + +inline float3 curves(float3 v, float3 shadowGamma, float3 midPoint, float3 highlightScale) { + float3 d = 1.0f / (pow(midPoint, shadowGamma - 1.0f)); + float3 dark = pow(v, shadowGamma) * d; + float3 light = highlightScale * (v - midPoint) + midPoint; + return float3{ + v.r <= midPoint.r ? dark.r : light.r, + v.g <= midPoint.g ? dark.g : light.g, + v.b <= midPoint.b ? dark.b : light.b, + }; +} + +static void computeCurvePlot(Settings& settings, float* curvePlot) { + const auto& colorGradingOptions = settings.view.colorGrading; + for (size_t i = 0; i < 1024; i++) { + float3 x{i / 1024.0f * 2.0f}; + float3 y = curves(x, + colorGradingOptions.gamma, + colorGradingOptions.midPoint, + colorGradingOptions.scale); + curvePlot[i] = y.r; + curvePlot[1024 + i] = y.g; + curvePlot[2048 + i] = y.b; + } +} + +static void tooltipFloat(float value) { + if (ImGui::IsItemActive() || ImGui::IsItemHovered()) { + ImGui::SetTooltip("%.2f", value); + } +} + +static void pushSliderColors(float hue) { + ImGui::PushStyleColor(ImGuiCol_FrameBg, (ImVec4) ImColor::HSV(hue, 0.5f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, (ImVec4) ImColor::HSV(hue, 0.6f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_FrameBgActive, (ImVec4) ImColor::HSV(hue, 0.7f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_SliderGrab, (ImVec4) ImColor::HSV(hue, 0.9f, 0.9f)); +} + +static void popSliderColors() { ImGui::PopStyleColor(4); } + +static void colorGradingUI(Settings& settings, float* rangePlot, float* curvePlot) { + const static ImVec2 verticalSliderSize(18.0f, 160.0f); + const static ImVec2 plotLinesSize(260.0f, 160.0f); + const static ImVec2 plotLinesWideSize(350.0f, 120.0f); + + if (ImGui::CollapsingHeader("Color grading")) { + ColorGradingSettings& colorGrading = settings.view.colorGrading; + + ImGui::Indent(); + ImGui::Checkbox("Enabled##colorGrading", &colorGrading.enabled); + + int quality = (int) colorGrading.quality; + ImGui::Combo("Quality##colorGradingQuality", &quality, "Low\0Medium\0High\0Ultra\0\0"); + colorGrading.quality = (decltype(colorGrading.quality)) quality; + + int toneMapping = (int) colorGrading.toneMapping; + ImGui::Combo("Tone-mapping", &toneMapping, + "Linear\0ACES (legacy)\0ACES\0Filmic\0Uchimura\0Reinhard\0Display Range\0\0"); + colorGrading.toneMapping = (decltype(colorGrading.toneMapping)) toneMapping; + + if (ImGui::CollapsingHeader("White balance")) { + int temperature = colorGrading.temperature * 100.0f; + int tint = colorGrading.tint * 100.0f; + ImGui::SliderInt("Temperature", &temperature, -100, 100); + ImGui::SliderInt("Tint", &tint, -100, 100); + colorGrading.temperature = temperature / 100.0f; + colorGrading.tint = tint / 100.0f; + } + + if (ImGui::CollapsingHeader("Channel mixer")) { + pushSliderColors(0.0f / 7.0f); + ImGui::VSliderFloat("##outRed.r", verticalSliderSize, &colorGrading.outRed.r, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outRed.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##outRed.g", verticalSliderSize, &colorGrading.outRed.g, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outRed.g); + ImGui::SameLine(); + ImGui::VSliderFloat("##outRed.b", verticalSliderSize, &colorGrading.outRed.b, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outRed.b); + ImGui::SameLine(0.0f, 18.0f); + popSliderColors(); + + pushSliderColors(2.0f / 7.0f); + ImGui::VSliderFloat("##outGreen.r", verticalSliderSize, &colorGrading.outGreen.r, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outGreen.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##outGreen.g", verticalSliderSize, &colorGrading.outGreen.g, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outGreen.g); + ImGui::SameLine(); + ImGui::VSliderFloat("##outGreen.b", verticalSliderSize, &colorGrading.outGreen.b, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outGreen.b); + ImGui::SameLine(0.0f, 18.0f); + popSliderColors(); + + pushSliderColors(4.0f / 7.0f); + ImGui::VSliderFloat("##outBlue.r", verticalSliderSize, &colorGrading.outBlue.r, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outBlue.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##outBlue.g", verticalSliderSize, &colorGrading.outBlue.g, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outBlue.g); + ImGui::SameLine(); + ImGui::VSliderFloat("##outBlue.b", verticalSliderSize, &colorGrading.outBlue.b, -2.0f, 2.0f, ""); + tooltipFloat(colorGrading.outBlue.b); + popSliderColors(); + } + if (ImGui::CollapsingHeader("Tonal ranges")) { + ImGui::ColorEdit3("Shadows", &colorGrading.shadows.x); + ImGui::SliderFloat("Weight##shadowsWeight", &colorGrading.shadows.w, -2.0f, 2.0f); + ImGui::ColorEdit3("Mid-tones", &colorGrading.midtones.x); + ImGui::SliderFloat("Weight##midTonesWeight", &colorGrading.midtones.w, -2.0f, 2.0f); + ImGui::ColorEdit3("Highlights", &colorGrading.highlights.x); + ImGui::SliderFloat("Weight##highlightsWeight", &colorGrading.highlights.w, -2.0f, 2.0f); + ImGui::SliderFloat4("Ranges", &colorGrading.ranges.x, 0.0f, 1.0f); + computeRangePlot(settings, rangePlot); + ImGuiExt::PlotLinesSeries("", 3, + rangePlotSeriesStart, getRangePlotValue, rangePlotSeriesEnd, + rangePlot, 1024, 0, "", 0.0f, 1.0f, plotLinesWideSize); + } + if (ImGui::CollapsingHeader("Color decision list")) { + ImGui::SliderFloat3("Slope", &colorGrading.slope.x, 0.0f, 2.0f); + ImGui::SliderFloat3("Offset", &colorGrading.offset.x, -0.5f, 0.5f); + ImGui::SliderFloat3("Power", &colorGrading.power.x, 0.0f, 2.0f); + } + if (ImGui::CollapsingHeader("Adjustments")) { + ImGui::SliderFloat("Contrast", &colorGrading.contrast, 0.0f, 2.0f); + ImGui::SliderFloat("Vibrance", &colorGrading.vibrance, 0.0f, 2.0f); + ImGui::SliderFloat("Saturation", &colorGrading.saturation, 0.0f, 2.0f); + } + if (ImGui::CollapsingHeader("Curves")) { + ImGui::Checkbox("Linked curves", &colorGrading.linkedCurves); + + computeCurvePlot(settings, curvePlot); + + if (!colorGrading.linkedCurves) { + pushSliderColors(0.0f / 7.0f); + ImGui::VSliderFloat("##curveGamma.r", verticalSliderSize, &colorGrading.gamma.r, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.gamma.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveMid.r", verticalSliderSize, &colorGrading.midPoint.r, 0.0f, 2.0f, ""); + tooltipFloat(colorGrading.midPoint.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveScale.r", verticalSliderSize, &colorGrading.scale.r, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.scale.r); + ImGui::SameLine(0.0f, 18.0f); + popSliderColors(); + + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.0f, 0.7f, 0.8f)); + ImGui::PlotLines("", curvePlot, 1024, 0, "Red", 0.0f, 2.0f, plotLinesSize); + ImGui::PopStyleColor(); + + pushSliderColors(2.0f / 7.0f); + ImGui::VSliderFloat("##curveGamma.g", verticalSliderSize, &colorGrading.gamma.g, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.gamma.g); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveMid.g", verticalSliderSize, &colorGrading.midPoint.g, 0.0f, 2.0f, ""); + tooltipFloat(colorGrading.midPoint.g); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveScale.g", verticalSliderSize, &colorGrading.scale.g, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.scale.g); + ImGui::SameLine(0.0f, 18.0f); + popSliderColors(); + + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.3f, 0.7f, 0.8f)); + ImGui::PlotLines("", curvePlot + 1024, 1024, 0, "Green", 0.0f, 2.0f, plotLinesSize); + ImGui::PopStyleColor(); + + pushSliderColors(4.0f / 7.0f); + ImGui::VSliderFloat("##curveGamma.b", verticalSliderSize, &colorGrading.gamma.b, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.gamma.b); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveMid.b", verticalSliderSize, &colorGrading.midPoint.b, 0.0f, 2.0f, ""); + tooltipFloat(colorGrading.midPoint.b); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveScale.b", verticalSliderSize, &colorGrading.scale.b, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.scale.b); + ImGui::SameLine(0.0f, 18.0f); + popSliderColors(); + + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.6f, 0.7f, 0.8f)); + ImGui::PlotLines("", curvePlot + 2048, 1024, 0, "Blue", 0.0f, 2.0f, plotLinesSize); + ImGui::PopStyleColor(); + } else { + ImGui::VSliderFloat("##curveGamma", verticalSliderSize, &colorGrading.gamma.r, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.gamma.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveMid", verticalSliderSize, &colorGrading.midPoint.r, 0.0f, 2.0f, ""); + tooltipFloat(colorGrading.midPoint.r); + ImGui::SameLine(); + ImGui::VSliderFloat("##curveScale", verticalSliderSize, &colorGrading.scale.r, 0.0f, 4.0f, ""); + tooltipFloat(colorGrading.scale.r); + ImGui::SameLine(0.0f, 18.0f); + + colorGrading.gamma = float3{colorGrading.gamma.r}; + colorGrading.midPoint = float3{colorGrading.midPoint.r}; + colorGrading.scale = float3{colorGrading.scale.r}; + + ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.17f, 0.21f, 0.9f)); + ImGui::PlotLines("", curvePlot, 1024, 0, "RGB", 0.0f, 2.0f, plotLinesSize); + ImGui::PopStyleColor(); + } + } + ImGui::Unindent(); + } +} + SimpleViewer::SimpleViewer(filament::Engine* engine, filament::Scene* scene, filament::View* view, int sidebarWidth) : mEngine(engine), mScene(scene), mView(view), @@ -413,6 +658,8 @@ void SimpleViewer::updateUserInterface() { ImGui::Unindent(); } + colorGradingUI(mSettings, mRangePlot, mCurvePlot); + // At this point, all View settings have been modified, // so we can now push them into the Filament View. applySettings(mSettings.view, mView); diff --git a/samples/gltf_viewer.cpp b/samples/gltf_viewer.cpp index e14c073186..e474e2d042 100644 --- a/samples/gltf_viewer.cpp +++ b/samples/gltf_viewer.cpp @@ -105,9 +105,6 @@ struct App { ColorGrading* colorGrading = nullptr; - float rangePlot[1024 * 3]; - float curvePlot[1024 * 3]; - // 0 is the default "free camera". Additional cameras come from the gltf file. int currentCamera = 0; @@ -352,250 +349,6 @@ static void createGroundPlane(Engine* engine, Scene* scene, App& app) { app.scene.groundMaterial = shadowMaterial; } -static void computeRangePlot(App& app, float* rangePlot) { - float4& ranges = app.viewer->getSettings().view.colorGrading.ranges; - ranges.y = clamp(ranges.y, ranges.x + 1e-5f, ranges.w - 1e-5f); // darks - ranges.z = clamp(ranges.z, ranges.x + 1e-5f, ranges.w - 1e-5f); // lights - - for (size_t i = 0; i < 1024; i++) { - float x = i / 1024.0f; - float s = 1.0f - smoothstep(ranges.x, ranges.y, x); - float h = smoothstep(ranges.z, ranges.w, x); - rangePlot[i] = s; - rangePlot[1024 + i] = 1.0f - s - h; - rangePlot[2048 + i] = h; - } -} - -static void rangePlotSeriesStart(int series) { - switch (series) { - case 0: - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.4f, 0.25f, 1.0f)); - break; - case 1: - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.8f, 0.25f, 1.0f)); - break; - case 2: - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.17f, 0.21f, 1.0f)); - break; - } -} - -static void rangePlotSeriesEnd(int series) { - if (series < 3) { - ImGui::PopStyleColor(); - } -} - -static float getRangePlotValue(int series, void* data, int index) { - return ((float*) data)[series * 1024 + index]; -} - -inline float3 curves(float3 v, float3 shadowGamma, float3 midPoint, float3 highlightScale) { - float3 d = 1.0f / (pow(midPoint, shadowGamma - 1.0f)); - float3 dark = pow(v, shadowGamma) * d; - float3 light = highlightScale * (v - midPoint) + midPoint; - return float3{ - v.r <= midPoint.r ? dark.r : light.r, - v.g <= midPoint.g ? dark.g : light.g, - v.b <= midPoint.b ? dark.b : light.b, - }; -} - -static void computeCurvePlot(App& app, float* curvePlot) { - const auto& colorGradingOptions = app.viewer->getSettings().view.colorGrading; - for (size_t i = 0; i < 1024; i++) { - float3 x{i / 1024.0f * 2.0f}; - float3 y = curves(x, - colorGradingOptions.gamma, - colorGradingOptions.midPoint, - colorGradingOptions.scale); - curvePlot[i] = y.r; - curvePlot[1024 + i] = y.g; - curvePlot[2048 + i] = y.b; - } -} - -static void tooltipFloat(float value) { - if (ImGui::IsItemActive() || ImGui::IsItemHovered()) { - ImGui::SetTooltip("%.2f", value); - } -} - -static void pushSliderColors(float hue) { - ImGui::PushStyleColor(ImGuiCol_FrameBg, (ImVec4) ImColor::HSV(hue, 0.5f, 0.5f)); - ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, (ImVec4) ImColor::HSV(hue, 0.6f, 0.5f)); - ImGui::PushStyleColor(ImGuiCol_FrameBgActive, (ImVec4) ImColor::HSV(hue, 0.7f, 0.5f)); - ImGui::PushStyleColor(ImGuiCol_SliderGrab, (ImVec4) ImColor::HSV(hue, 0.9f, 0.9f)); -} - -static void popSliderColors() { ImGui::PopStyleColor(4); } - -static void colorGradingUI(App& app) { - const static ImVec2 verticalSliderSize(18.0f, 160.0f); - const static ImVec2 plotLinesSize(260.0f, 160.0f); - const static ImVec2 plotLinesWideSize(350.0f, 120.0f); - - if (ImGui::CollapsingHeader("Color grading")) { - ColorGradingSettings& colorGrading = app.viewer->getSettings().view.colorGrading; - - ImGui::Indent(); - ImGui::Checkbox("Enabled##colorGrading", &colorGrading.enabled); - - int quality = (int) colorGrading.quality; - ImGui::Combo("Quality##colorGradingQuality", &quality, "Low\0Medium\0High\0Ultra\0\0"); - colorGrading.quality = (decltype(colorGrading.quality)) quality; - - int toneMapping = (int) colorGrading.toneMapping; - ImGui::Combo("Tone-mapping", &toneMapping, - "Linear\0ACES (legacy)\0ACES\0Filmic\0Uchimura\0Reinhard\0Display Range\0\0"); - colorGrading.toneMapping = (decltype(colorGrading.toneMapping)) toneMapping; - - if (ImGui::CollapsingHeader("White balance")) { - int temperature = colorGrading.temperature * 100.0f; - int tint = colorGrading.tint * 100.0f; - ImGui::SliderInt("Temperature", &temperature, -100, 100); - ImGui::SliderInt("Tint", &tint, -100, 100); - colorGrading.temperature = temperature / 100.0f; - colorGrading.tint = tint / 100.0f; - } - - if (ImGui::CollapsingHeader("Channel mixer")) { - pushSliderColors(0.0f / 7.0f); - ImGui::VSliderFloat("##outRed.r", verticalSliderSize, &colorGrading.outRed.r, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outRed.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##outRed.g", verticalSliderSize, &colorGrading.outRed.g, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outRed.g); - ImGui::SameLine(); - ImGui::VSliderFloat("##outRed.b", verticalSliderSize, &colorGrading.outRed.b, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outRed.b); - ImGui::SameLine(0.0f, 18.0f); - popSliderColors(); - - pushSliderColors(2.0f / 7.0f); - ImGui::VSliderFloat("##outGreen.r", verticalSliderSize, &colorGrading.outGreen.r, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outGreen.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##outGreen.g", verticalSliderSize, &colorGrading.outGreen.g, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outGreen.g); - ImGui::SameLine(); - ImGui::VSliderFloat("##outGreen.b", verticalSliderSize, &colorGrading.outGreen.b, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outGreen.b); - ImGui::SameLine(0.0f, 18.0f); - popSliderColors(); - - pushSliderColors(4.0f / 7.0f); - ImGui::VSliderFloat("##outBlue.r", verticalSliderSize, &colorGrading.outBlue.r, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outBlue.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##outBlue.g", verticalSliderSize, &colorGrading.outBlue.g, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outBlue.g); - ImGui::SameLine(); - ImGui::VSliderFloat("##outBlue.b", verticalSliderSize, &colorGrading.outBlue.b, -2.0f, 2.0f, ""); - tooltipFloat(colorGrading.outBlue.b); - popSliderColors(); - } - if (ImGui::CollapsingHeader("Tonal ranges")) { - ImGui::ColorEdit3("Shadows", &colorGrading.shadows.x); - ImGui::SliderFloat("Weight##shadowsWeight", &colorGrading.shadows.w, -2.0f, 2.0f); - ImGui::ColorEdit3("Mid-tones", &colorGrading.midtones.x); - ImGui::SliderFloat("Weight##midTonesWeight", &colorGrading.midtones.w, -2.0f, 2.0f); - ImGui::ColorEdit3("Highlights", &colorGrading.highlights.x); - ImGui::SliderFloat("Weight##highlightsWeight", &colorGrading.highlights.w, -2.0f, 2.0f); - ImGui::SliderFloat4("Ranges", &colorGrading.ranges.x, 0.0f, 1.0f); - computeRangePlot(app, app.rangePlot); - ImGuiExt::PlotLinesSeries("", 3, - rangePlotSeriesStart, getRangePlotValue, rangePlotSeriesEnd, - app.rangePlot, 1024, 0, "", 0.0f, 1.0f, plotLinesWideSize); - } - if (ImGui::CollapsingHeader("Color decision list")) { - ImGui::SliderFloat3("Slope", &colorGrading.slope.x, 0.0f, 2.0f); - ImGui::SliderFloat3("Offset", &colorGrading.offset.x, -0.5f, 0.5f); - ImGui::SliderFloat3("Power", &colorGrading.power.x, 0.0f, 2.0f); - } - if (ImGui::CollapsingHeader("Adjustments")) { - ImGui::SliderFloat("Contrast", &colorGrading.contrast, 0.0f, 2.0f); - ImGui::SliderFloat("Vibrance", &colorGrading.vibrance, 0.0f, 2.0f); - ImGui::SliderFloat("Saturation", &colorGrading.saturation, 0.0f, 2.0f); - } - if (ImGui::CollapsingHeader("Curves")) { - ImGui::Checkbox("Linked curves", &colorGrading.linkedCurves); - - computeCurvePlot(app, app.curvePlot); - - if (!colorGrading.linkedCurves) { - pushSliderColors(0.0f / 7.0f); - ImGui::VSliderFloat("##curveGamma.r", verticalSliderSize, &colorGrading.gamma.r, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.gamma.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveMid.r", verticalSliderSize, &colorGrading.midPoint.r, 0.0f, 2.0f, ""); - tooltipFloat(colorGrading.midPoint.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveScale.r", verticalSliderSize, &colorGrading.scale.r, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.scale.r); - ImGui::SameLine(0.0f, 18.0f); - popSliderColors(); - - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.0f, 0.7f, 0.8f)); - ImGui::PlotLines("", app.curvePlot, 1024, 0, "Red", 0.0f, 2.0f, plotLinesSize); - ImGui::PopStyleColor(); - - pushSliderColors(2.0f / 7.0f); - ImGui::VSliderFloat("##curveGamma.g", verticalSliderSize, &colorGrading.gamma.g, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.gamma.g); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveMid.g", verticalSliderSize, &colorGrading.midPoint.g, 0.0f, 2.0f, ""); - tooltipFloat(colorGrading.midPoint.g); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveScale.g", verticalSliderSize, &colorGrading.scale.g, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.scale.g); - ImGui::SameLine(0.0f, 18.0f); - popSliderColors(); - - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.3f, 0.7f, 0.8f)); - ImGui::PlotLines("", app.curvePlot + 1024, 1024, 0, "Green", 0.0f, 2.0f, plotLinesSize); - ImGui::PopStyleColor(); - - pushSliderColors(4.0f / 7.0f); - ImGui::VSliderFloat("##curveGamma.b", verticalSliderSize, &colorGrading.gamma.b, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.gamma.b); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveMid.b", verticalSliderSize, &colorGrading.midPoint.b, 0.0f, 2.0f, ""); - tooltipFloat(colorGrading.midPoint.b); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveScale.b", verticalSliderSize, &colorGrading.scale.b, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.scale.b); - ImGui::SameLine(0.0f, 18.0f); - popSliderColors(); - - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.6f, 0.7f, 0.8f)); - ImGui::PlotLines("", app.curvePlot + 2048, 1024, 0, "Blue", 0.0f, 2.0f, plotLinesSize); - ImGui::PopStyleColor(); - } else { - ImGui::VSliderFloat("##curveGamma", verticalSliderSize, &colorGrading.gamma.r, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.gamma.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveMid", verticalSliderSize, &colorGrading.midPoint.r, 0.0f, 2.0f, ""); - tooltipFloat(colorGrading.midPoint.r); - ImGui::SameLine(); - ImGui::VSliderFloat("##curveScale", verticalSliderSize, &colorGrading.scale.r, 0.0f, 4.0f, ""); - tooltipFloat(colorGrading.scale.r); - ImGui::SameLine(0.0f, 18.0f); - - colorGrading.gamma = float3{colorGrading.gamma.r}; - colorGrading.midPoint = float3{colorGrading.midPoint.r}; - colorGrading.scale = float3{colorGrading.scale.r}; - - ImGui::PushStyleColor(ImGuiCol_PlotLines, (ImVec4) ImColor::HSV(0.17f, 0.21f, 0.9f)); - ImGui::PlotLines("", app.curvePlot, 1024, 0, "RGB", 0.0f, 2.0f, plotLinesSize); - ImGui::PopStyleColor(); - } - } - ImGui::Unindent(); - } -} - static LinearColor inverseTonemapSRGB(sRGBColor x) { return (x * -0.155) / (x - 1.019); } @@ -878,8 +631,6 @@ int main(int argc, char** argv) { ImGui::Unindent(); } - colorGradingUI(app); - if (ImGui::CollapsingHeader("Debug")) { if (ImGui::Button("Capture frame")) { auto& debug = engine->getDebugRegistry();