✨ [ColorSpaces] Replaced HSLuv with Okhsl

CoolLibs · Oct 10, 2023 · e7eb113 · e7eb113
1 parent f9e49f2
commit e7eb113
Show file tree

Hide file tree

Showing 19 changed files with 354 additions and 354 deletions.
diff --git a/Cool b/Cool
diff --git a/Nodes/10 Image/Color HSL.clbnode b/Nodes/10 Image/Color HSL.clbnode
@@ -4,7 +4,7 @@ INPUT Hue 'Hue';
 INPUT float 'Saturation'; /// Goes between 0 and 1.
 INPUT float 'Lightness';  /// Goes between 0 and 1.
 
-HSLuv main()
+Okhsl main()
 {
     return vec3('Hue', 'Saturation', 'Lightness');
 }
diff --git a/Nodes/11 Image Modifier (Post Process)/HSL Adjustments.clbnode b/Nodes/11 Image Modifier (Post Process)/HSL Adjustments.clbnode
@@ -4,7 +4,7 @@ INPUT float 'Shift';
 INPUT float 'S';
 INPUT float 'L';
 
-HSLuv main(HSLuv Image)
+Okhsl main(Okhsl Image)
 {
     Image.x = fract(Image.x + 'Shift');
     Image.y = Image.y * (-4. * 'S') * ('S' - 1.) + 2. * 'S' * ('S' - 0.5);

diff --git a/src/Module_Nodes/generated/cpp_type_as_string_cases.inl b/src/Module_Nodes/generated/cpp_type_as_string_cases.inl
@@ -32,6 +32,6 @@ case PrimitiveType::LinearRGB_StraightA: return "LinearRGB_StraightA";
 case PrimitiveType::sRGB: return "sRGB";
 case PrimitiveType::sRGB_PremultipliedA: return "sRGB_PremultipliedA";
 case PrimitiveType::sRGB_StraightA: return "sRGB_StraightA";
-case PrimitiveType::HSLuv: return "HSLuv";
-case PrimitiveType::HSLuv_PremultipliedA: return "HSLuv_PremultipliedA";
-case PrimitiveType::HSLuv_StraightA: return "HSLuv_StraightA"; 
+case PrimitiveType::Okhsl: return "Okhsl";
+case PrimitiveType::Okhsl_PremultipliedA: return "Okhsl_PremultipliedA";
+case PrimitiveType::Okhsl_StraightA: return "Okhsl_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
@@ -32,6 +32,6 @@ case PrimitiveType::LinearRGB_StraightA: return "/*LinearRGB_StraightA*/ vec4";
 case PrimitiveType::sRGB: return "/*sRGB*/ vec3";
 case PrimitiveType::sRGB_PremultipliedA: return "/*sRGB_PremultipliedA*/ vec4";
 case PrimitiveType::sRGB_StraightA: return "/*sRGB_StraightA*/ vec4";
-case PrimitiveType::HSLuv: return "/*HSLuv*/ vec3";
-case PrimitiveType::HSLuv_PremultipliedA: return "/*HSLuv_PremultipliedA*/ vec4";
-case PrimitiveType::HSLuv_StraightA: return "/*HSLuv_StraightA*/ vec4"; 
+case PrimitiveType::Okhsl: return "/*Okhsl*/ vec3";
+case PrimitiveType::Okhsl_PremultipliedA: return "/*Okhsl_PremultipliedA*/ vec4";
+case PrimitiveType::Okhsl_StraightA: return "/*Okhsl_StraightA*/ vec4"; 
diff --git a/src/Module_Nodes/generated/has_an_alpha_channel.inl b/src/Module_Nodes/generated/has_an_alpha_channel.inl
@@ -10,8 +10,8 @@ case PrimitiveType::LinearRGB_StraightA:
 case PrimitiveType::LinearRGB_PremultipliedA:
 case PrimitiveType::sRGB_StraightA:
 case PrimitiveType::sRGB_PremultipliedA:
-case PrimitiveType::HSLuv_StraightA:
-case PrimitiveType::HSLuv_PremultipliedA:
+case PrimitiveType::Okhsl_StraightA:
+case PrimitiveType::Okhsl_PremultipliedA:
 case PrimitiveType::Float_StraightA:
 case PrimitiveType::Float_PremultipliedA:
 return true;
diff --git a/src/Module_Nodes/generated/has_straight_alpha_channel.inl b/src/Module_Nodes/generated/has_straight_alpha_channel.inl
@@ -7,6 +7,6 @@
 case PrimitiveType::Oklab_StraightA:
 case PrimitiveType::LinearRGB_StraightA:
 case PrimitiveType::sRGB_StraightA:
-case PrimitiveType::HSLuv_StraightA:
+case PrimitiveType::Okhsl_StraightA:
 case PrimitiveType::Float_StraightA:
 return true;
+393 −164		res/shaders/color_conversions.glsl
+4 −20		res/shaders/generated/conversions_glsl.inl
+4 −4		res/shaders/generated/conversions_glsl_with_float.inl
+382 −234		src/Cool/ColorSpaces/conversions.cpp
+2 −2		src/Cool/ColorSpaces/generated/color_and_alpha_space_enum.inl
+1 −1		src/Cool/ColorSpaces/generated/color_space_enum.inl
+6 −6		src/Cool/ColorSpaces/generated/conversions_cpp_declaration.inl
+4 −20		src/Cool/ColorSpaces/generated/conversions_cpp_definition.inl
+4 −4		src/Cool/ColorSpaces/generated/convert_col_and_alpha_as.inl
+2 −2		src/Cool/ColorSpaces/generated/convert_col_as.inl
+2 −2		src/Cool/ColorSpaces/generated/declare_color_and_alpha_getters.inl
+1 −1		src/Cool/ColorSpaces/generated/declare_color_getters.inl
+4 −4		src/Cool/ColorSpaces/generated/define_color_and_alpha_getters.inl
+2 −2		src/Cool/ColorSpaces/generated/define_color_getters.inl
+4 −4		src/Cool/ColorSpaces/generated/parse_color_and_alpha_space.inl
+2 −2		src/Cool/ColorSpaces/generated/parse_color_space.inl
+10 −2		src/Cool/ColorSpaces/generator_colors.py
+4 −4		src/Cool/type_from_string/generated/evaluate_function_template.inl
+3 −3		src/Cool/type_from_string/generated/string_to_type_associations.inl