🐛 [Nodes] Fix missing conversions between Float_with_alpha and Hue / …

…Int / etc.
CoolLibs · Nov 7, 2023 · b28be1a · b28be1a
1 parent 69e210d
commit b28be1a
Show file tree

Hide file tree

Showing 9 changed files with 4,467 additions and 2,751 deletions.
diff --git a/Cool b/Cool
diff --git a/Nodes/12 Image Blend/Over (Paint).clbnode b/Nodes/12 Image Blend/Over (Paint).clbnode
@@ -6,10 +6,10 @@ sRGB_PremultipliedA main(sRGB_PremultipliedA Foreground)
 {
     float new_alpha = Foreground.a + (1. - Foreground.a) * 'Background'.a;
     return vec4(
-        premultiply(
+        Cool_premultiply_color(
             mixbox_lerp(
-                unpremultiply('Background'.rgb, 'Background'.a),
-                unpremultiply(Foreground.rgb, Foreground.a),
+                Cool_unpremultiply_color('Background'.rgb, 'Background'.a),
+                Cool_unpremultiply_color(Foreground.rgb, Foreground.a),
                 Foreground.a
             ),
             new_alpha

diff --git a/src/Module_Nodes/CodeGen_implicit_conversion.cpp b/src/Module_Nodes/CodeGen_implicit_conversion.cpp
@@ -3,6 +3,9 @@
 
 namespace Lab {
 
+#include "generated/def_implicit_color_conversions.inl"
+#include "generated/def_implicit_conversions.inl"
+
 auto gen_implicit_conversion(PrimitiveType from, PrimitiveType to, CodeGenContext& context) // NOLINT(readability-function-cognitive-complexity)
     -> std::optional<std::string>
 {
+27 −14		res/shaders/color_conversions.glsl
+1 −1		src/Cool/ColorSpaces/_ReadMe.md
+3 −3		src/Cool/InputParser/InputParser.cpp