✨ Replace CIELAB with Oklab

CoolLibs · Oct 9, 2023 · f1e12e3 · f1e12e3
1 parent 5112914
commit f1e12e3
Show file tree

Hide file tree

Showing 30 changed files with 78 additions and 1,669 deletions.
diff --git a/Cool b/Cool
diff --git a/Nodes/11 Image Modifier (Post Process)/Black & White.clbnode b/Nodes/11 Image Modifier (Post Process)/Black & White.clbnode
@@ -1,6 +1,6 @@
 // To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro
 
-float main(CIELAB Color)
+float main(Oklab Color)
 {
     return Color.x;
 }
diff --git a/Nodes/11 Image Modifier (Post Process)/Color Ramp.clbnode b/Nodes/11 Image Modifier (Post Process)/Color Ramp.clbnode
@@ -2,7 +2,7 @@
 
 INPUT Gradient 'Color Gradient';
 
-CIELAB_PremultipliedA main(float Greyscale)
+Oklab_PremultipliedA main(float Greyscale)
 {
     return 'Color Gradient'(Greyscale);
 }
diff --git a/Nodes/11 Image Modifier (Post Process)/Film Grain.clbnode b/Nodes/11 Image Modifier (Post Process)/Film Grain.clbnode
@@ -1,10 +1,10 @@
 // To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro
 // Inspired by https://youtube.com/shorts/mQp_Klk2gJs?feature=share
 
-INPUT UV->CIELAB 'Image';
+INPUT UV->Oklab 'Image';
 INPUT float 'Intensity';
 
-CIELAB main(UV uv)
+Oklab main(UV uv)
 {
     vec2 noise_uv = to_view_space(uv);
 

diff --git a/Nodes/11 Image Modifier (Post Process)/Mask Image.clbnode b/Nodes/11 Image Modifier (Post Process)/Mask Image.clbnode
@@ -2,7 +2,7 @@
 
 INPUT float 'Mask';
 
-CIELAB_StraightA main(CIELAB_StraightA Image)
+Oklab_StraightA main(Oklab_StraightA Image)
 {
     Image.a *= 'Mask';
     return Image;

diff --git a/Nodes/11 Image Modifier (Post Process)/Render N Times.clbnode b/Nodes/11 Image Modifier (Post Process)/Render N Times.clbnode
@@ -1,12 +1,12 @@
 // To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro
 
-INPUT UV->CIELAB_PremultipliedA 'Image';
+INPUT UV->Oklab_PremultipliedA 'Image';
 INPUT int 'N';
-INPUT(CIELAB_PremultipliedA, CIELAB_PremultipliedA)->CIELAB_PremultipliedA 'Blend Mode';
+INPUT(Oklab_PremultipliedA, Oklab_PremultipliedA)->Oklab_PremultipliedA 'Blend Mode';
 
 OUTPUT float 'Index';
 
-CIELAB_PremultipliedA main(UV uv)
+Oklab_PremultipliedA main(UV uv)
 {
     vec4 color = vec4(0.);
 

diff --git a/Nodes/11 Image Modifier (Post Process)/Set Opacity (Alpha).clbnode b/Nodes/11 Image Modifier (Post Process)/Set Opacity (Alpha).clbnode
@@ -2,7 +2,7 @@
 
 INPUT float 'Opacity';
 
-CIELAB_StraightA main(CIELAB_StraightA Image)
+Oklab_StraightA main(Oklab_StraightA Image)
 {
     Image.a = 'Opacity';
     return Image;

diff --git a/Nodes/11 Image Modifier (Post Process)/Vignetting.clbnode b/Nodes/11 Image Modifier (Post Process)/Vignetting.clbnode
@@ -1,10 +1,10 @@
 INPUT float 'Strength';
 INPUT float 'Radius';
-INPUT UV->CIELAB 'Image';
-INPUT CIELAB 'Color';
+INPUT UV->Oklab 'Image';
+INPUT Oklab 'Color';
 INPUT float 'Mask';
 
-CIELAB main(UV uv)
+Oklab main(UV uv)
 {
     vec3 in_color = 'Image'(uv);
 

diff --git a/Nodes/12 Image Blend/Over.clbnode b/Nodes/12 Image Blend/Over.clbnode
@@ -1,8 +1,8 @@
 // To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro
 
-INPUT CIELAB_PremultipliedA 'Background';
+INPUT Oklab_PremultipliedA 'Background';
 
-CIELAB_PremultipliedA main(CIELAB_PremultipliedA Foreground)
+Oklab_PremultipliedA main(Oklab_PremultipliedA Foreground)
 {
     return Foreground + (1. - Foreground.a) * 'Background';
 }
diff --git a/Nodes/12 Image Blend/Switcher.clbnode b/Nodes/12 Image Blend/Switcher.clbnode
@@ -1,10 +1,10 @@
-INPUT UV->CIELAB_PremultipliedA 'Image 1';
-INPUT UV->CIELAB_PremultipliedA 'Image 2';
+INPUT UV->Oklab_PremultipliedA 'Image 1';
+INPUT UV->Oklab_PremultipliedA 'Image 2';
 INPUT float 'Duration of one image';
 INPUT float 'Transition duration';
 INPUT float 'Time';
 
-CIELAB_PremultipliedA main(UV uv)
+Oklab_PremultipliedA main(UV uv)
 {
     float t     = 'Time' / 'Duration of one image';
     int   index = int(floor(t));

diff --git a/Nodes/33 Shape Renderer/Debug.clbnode b/Nodes/33 Shape Renderer/Debug.clbnode
@@ -1,9 +1,9 @@
-INPUT CIELAB 'Shape Color';
-INPUT CIELAB 'Background Color';
-INPUT CIELAB 'Border Color';
+INPUT Oklab 'Shape Color';
+INPUT Oklab 'Background Color';
+INPUT Oklab 'Border Color';
 
 // IQ's SDF debug view https://www.shadertoy.com/view/3ltSW2
-CIELAB main(SignedDistance Shape)
+Oklab main(SignedDistance Shape)
 {
     vec3 col = (Shape > 0.0) ? 'Background Color' : 'Shape Color';
     col *= 1.0 - exp(-4.0 * abs(Shape));                                     // Darken border

diff --git a/Nodes/70 Input/Sample Image.clbnode b/Nodes/70 Input/Sample Image.clbnode
@@ -1,7 +1,7 @@
-INPUT UV->CIELAB_PremultipliedA 'Image';
+INPUT UV->Oklab_PremultipliedA 'Image';
 INPUT Point2D 'Position';
 
-CIELAB_PremultipliedA main()
+Oklab_PremultipliedA main()
 {
     return 'Image'('Position');
 }
diff --git a/src/Module_Nodes/CodeGen_default_function.cpp b/src/Module_Nodes/CodeGen_default_function.cpp
@@ -100,7 +100,7 @@ static auto maybe_generate_default(FunctionSignature current_signature, std::str
 auto gen_default_function(FunctionSignature signature, CodeGenContext& context)
     -> ExpectedFunctionName
 {
-    using fmt::literals::             operator""_a;
+    using fmt::literals::operator""_a;
     static constexpr std::string_view signed_to_float = "antialised_step(sd)";
     {
         auto const func = maybe_generate_default(
@@ -213,7 +213,7 @@ vec2 default_curve/*coollabdef*/(float t)
 
     {
         auto const func = maybe_generate_default(
-            FunctionSignature{.from = PrimitiveType::CIELAB_PremultipliedA, .to = PrimitiveType::CIELAB_PremultipliedA, .arity = 2},
+            FunctionSignature{.from = PrimitiveType::Oklab_PremultipliedA, .to = PrimitiveType::Oklab_PremultipliedA, .arity = 2},
             "default_blend_mode", R"STR(
 vec4 default_blend_mode/*coollabdef*/(vec4 over, vec4 under)
 {

diff --git a/src/Module_Nodes/generated/cpp_type_as_string_cases.inl b/src/Module_Nodes/generated/cpp_type_as_string_cases.inl
@@ -23,9 +23,6 @@ case PrimitiveType::Direction2D: return "Direction2D";
 case PrimitiveType::Void: return "Void";
 case PrimitiveType::Any: return "Any";
 case PrimitiveType::RayMarchRes: return "RayMarchRes";
-case PrimitiveType::CIELAB: return "CIELAB";
-case PrimitiveType::CIELAB_PremultipliedA: return "CIELAB_PremultipliedA";
-case PrimitiveType::CIELAB_StraightA: return "CIELAB_StraightA";
 case PrimitiveType::Oklab: return "Oklab";
 case PrimitiveType::Oklab_PremultipliedA: return "Oklab_PremultipliedA";
 case PrimitiveType::Oklab_StraightA: return "Oklab_StraightA";

diff --git a/src/Module_Nodes/generated/glsl_type_as_string_cases.inl b/src/Module_Nodes/generated/glsl_type_as_string_cases.inl
@@ -23,9 +23,6 @@ case PrimitiveType::Direction2D: return "/*Direction2D*/ vec2";
 case PrimitiveType::Void: return "/*Void*/ void";
 case PrimitiveType::Any: return "/*Any*/ ERROR the Any type should have been converted earlier in the compilation process.";
 case PrimitiveType::RayMarchRes: return "/*RayMarchRes*/ RayMarchRes";
-case PrimitiveType::CIELAB: return "/*CIELAB*/ vec3";
-case PrimitiveType::CIELAB_PremultipliedA: return "/*CIELAB_PremultipliedA*/ vec4";
-case PrimitiveType::CIELAB_StraightA: return "/*CIELAB_StraightA*/ vec4";
 case PrimitiveType::Oklab: return "/*Oklab*/ vec3";
 case PrimitiveType::Oklab_PremultipliedA: return "/*Oklab_PremultipliedA*/ vec4";
 case PrimitiveType::Oklab_StraightA: return "/*Oklab_StraightA*/ vec4";

diff --git a/src/Module_Nodes/generated/has_an_alpha_channel.inl b/src/Module_Nodes/generated/has_an_alpha_channel.inl
@@ -4,8 +4,6 @@
  * Instead, go to "gen_primitive_types.py" and edit the "has_an_alpha_channel" function there.
  * -----------------------------------------------------------------------------
  */
-case PrimitiveType::CIELAB_StraightA:
-case PrimitiveType::CIELAB_PremultipliedA:
 case PrimitiveType::Oklab_StraightA:
 case PrimitiveType::Oklab_PremultipliedA:
 case PrimitiveType::LinearRGB_StraightA:

diff --git a/src/Module_Nodes/generated/has_straight_alpha_channel.inl b/src/Module_Nodes/generated/has_straight_alpha_channel.inl
@@ -4,7 +4,6 @@
  * Instead, go to "gen_primitive_types.py" and edit the "has_straight_alpha_channel" function there.
  * -----------------------------------------------------------------------------
  */
-case PrimitiveType::CIELAB_StraightA:
 case PrimitiveType::Oklab_StraightA:
 case PrimitiveType::LinearRGB_StraightA:
 case PrimitiveType::sRGB_StraightA:
+1 −1		lib/ImGui_StyleEditor
+1 −1		lib/imgui_gradient
+2 −31		res/shaders/color_conversions.glsl
+0 −32		res/shaders/generated/conversions_glsl.inl
+6 −14		res/shaders/generated/conversions_glsl_with_float.inl
+0 −31		src/Cool/ColorSpaces/conversions.cpp
+1 −3		src/Cool/ColorSpaces/generated/color_and_alpha_space_enum.inl
+1 −2		src/Cool/ColorSpaces/generated/color_space_enum.inl
+0 −8		src/Cool/ColorSpaces/generated/conversions_cpp_declaration.inl
+0 −32		src/Cool/ColorSpaces/generated/conversions_cpp_definition.inl
+0 −6		src/Cool/ColorSpaces/generated/convert_col_and_alpha_as.inl
+0 −3		src/Cool/ColorSpaces/generated/convert_col_as.inl
+0 −2		src/Cool/ColorSpaces/generated/declare_color_and_alpha_getters.inl
+0 −1		src/Cool/ColorSpaces/generated/declare_color_getters.inl
+0 −22		src/Cool/ColorSpaces/generated/define_color_and_alpha_getters.inl
+0 −5		src/Cool/ColorSpaces/generated/define_color_getters.inl
+0 −4		src/Cool/ColorSpaces/generated/parse_color_and_alpha_space.inl
+0 −2		src/Cool/ColorSpaces/generated/parse_color_space.inl
+3 −7		src/Cool/ColorSpaces/generator_colors.py
+1 −1		src/Cool/Gpu/OpenGL/Shader.cpp
+1 −1		src/Cool/StrongTypes/Color.cpp
+74 −80		src/Cool/type_from_string/generated/evaluate_function_template.inl
+0 −15		src/Cool/type_from_string/generated/string_to_type_associations.inl