⚡️ Fix lag when editing the color gradient on a Color Ramp node

CoolLibs · Nov 8, 2023 · 9df9435 · 9df9435
1 parent acc0db6
commit 9df9435
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/Cool b/Cool
diff --git a/changelog.md b/changelog.md
@@ -19,6 +19,7 @@
 - ✨ Added "Load Backup" in case you accidentally refused to save your unsaved changes.
 - 🐛 Fix: the transparency information was sometimes getting lost between nodes.
 - 🐛 Fix: crash on Linux "Too many open files".
+- ⚡️ Fix lag when editing the color gradient on a Color Ramp node.
 - 👩‍💻 Replaced CIELAB with Oklab
 - 👩‍💻 Replaced HSLuv with Okhsl
 

diff --git a/src/CommandCore/CommandExecutionContext_Ref.h b/src/CommandCore/CommandExecutionContext_Ref.h
@@ -36,9 +36,9 @@ class CommandExecutionContext_Ref {
         _data.executor.execute(command, *this);
     }
     template<typename T>
-    void set_dirty(Cool::VariableId<T> const& id) const
+    void set_dirty(Cool::VariableId<T> const& id, bool use_secondary_dirty_flag = false) const
     {
-        _data.set_dirty(id);
+        _data.set_dirty(id, use_secondary_dirty_flag);
     }
 
     struct Data { // We wrap our members in a struct to get a constructor automatically

diff --git a/src/Commands/Command_SetVariable.h b/src/Commands/Command_SetVariable.h
@@ -12,10 +12,17 @@ namespace internal {
 template<typename T>
 void set_value_default_impl(CommandExecutionContext_Ref const& ctx, const Cool::VariableId<T>& id, const T& value)
 {
+    bool use_secondary_flag{false};
     ctx.registries().with_mutable_ref<Cool::Variable<T>>(id, [&](Cool::Variable<T>& variable) {
+        if constexpr (std::is_same_v<T, Cool::Gradient>)
+        {
+            // Request shader code generation only if the number of marks has changed.
+            use_secondary_flag = variable.value().value.gradient().get_marks().size()
+                                 != value.value.gradient().get_marks().size();
+        }
         variable.value() = value;
     });
-    ctx.set_dirty(id);
+    ctx.set_dirty(id, use_secondary_flag);
 }
 
 } // namespace internal

diff --git a/src/Module_Nodes/NodesConfig.cpp b/src/Module_Nodes/NodesConfig.cpp
@@ -1,5 +1,5 @@
 #include "NodesConfig.h"
-#include <Cool/Dependencies/requires_shader_code_generation.h>
+#include <Cool/Dependencies/always_requires_shader_code_generation.h>
 #include <Module_Nodes/NodeColor.h>
 #include <algorithm>
 #include <string>
@@ -319,7 +319,8 @@ auto NodesConfig::make_node(Cool::NodeDefinitionAndCategoryName const& cat_id) -
     {
         node.value_inputs().push_back(_input_factory.make(
             value_input_def,
-            Cool::requires_shader_code_generation(value_input_def) ? _regenerate_code_flag : _rerender_flag
+            Cool::always_requires_shader_code_generation(value_input_def) ? _regenerate_code_flag : _rerender_flag,
+            _regenerate_code_flag // At the moment only used by Gradient variable when we detect that the number of marks has changed. See `set_value_default_impl()` of Command_SetVariable.h
         ));
         node.input_pins().push_back(Cool::InputPin{std::visit([](auto&& value_input_def) { return value_input_def.name; }, value_input_def)});
     }
+7 −4		src/Cool/Dependencies/Input.h
+2 −2		src/Cool/Dependencies/InputFactory_Ref.cpp
+5 −3		src/Cool/Dependencies/InputFactory_Ref.h
+2 −2		src/Cool/Dependencies/SetVariableDirty_Ref.h
+16 −0		src/Cool/Dependencies/always_requires_shader_code_generation.cpp
+8 −0		src/Cool/Dependencies/always_requires_shader_code_generation.h
+0 −16		src/Cool/Dependencies/requires_shader_code_generation.cpp
+0 −8		src/Cool/Dependencies/requires_shader_code_generation.h
+9 −3		src/Cool/InputParser/InputParser.cpp
+2 −0		src/Cool/InputParser/InputParser.h
+2 −2		src/Cool/Variables/generated/always_requires_shader_code_generation.inl
+29 −28		src/Cool/Variables/generator_variables.py