diff --git a/Cool b/Cool index 64b12984..5802ef2c 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 64b12984ad9bb949c5ebfddc7ac593d2ecd2f30c +Subproject commit 5802ef2c2e7e0ea69dc384349bc76097e606aa00 diff --git a/Nodes/10 Image/Color HSL.clbnode b/Nodes/10 Image/Color HSL.clbnode index 19c9190b..b048f54a 100644 --- 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'); } \ No newline at end of file diff --git a/Nodes/11 Image Modifier (Post Process)/HSL Adjustments.clbnode b/Nodes/11 Image Modifier (Post Process)/HSL Adjustments.clbnode index cc97c22a..130cc1af 100644 --- 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 index 9a6f9798..987792e7 100644 --- 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"; \ No newline at end of file +case PrimitiveType::Okhsl: return "Okhsl"; +case PrimitiveType::Okhsl_PremultipliedA: return "Okhsl_PremultipliedA"; +case PrimitiveType::Okhsl_StraightA: return "Okhsl_StraightA"; \ No newline at end of file diff --git a/src/Module_Nodes/generated/glsl_type_as_string_cases.inl b/src/Module_Nodes/generated/glsl_type_as_string_cases.inl index 692a5d49..c0cef30e 100644 --- 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"; \ No newline at end of file +case PrimitiveType::Okhsl: return "/*Okhsl*/ vec3"; +case PrimitiveType::Okhsl_PremultipliedA: return "/*Okhsl_PremultipliedA*/ vec4"; +case PrimitiveType::Okhsl_StraightA: return "/*Okhsl_StraightA*/ vec4"; \ No newline at end of file diff --git a/src/Module_Nodes/generated/has_an_alpha_channel.inl b/src/Module_Nodes/generated/has_an_alpha_channel.inl index eb9db7ee..9c801c7e 100644 --- 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; \ No newline at end of file diff --git a/src/Module_Nodes/generated/has_straight_alpha_channel.inl b/src/Module_Nodes/generated/has_straight_alpha_channel.inl index 597b8593..5f606643 100644 --- 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; \ No newline at end of file diff --git a/src/Module_Nodes/generated/implicit_color_conversions.inl b/src/Module_Nodes/generated/implicit_color_conversions.inl index fe989b17..7d9cc7e7 100644 --- a/src/Module_Nodes/generated/implicit_color_conversions.inl +++ b/src/Module_Nodes/generated/implicit_color_conversions.inl @@ -391,15 +391,15 @@ if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::sRGB_Pre }); } -if (from == PrimitiveType::Oklab && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Oklab && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_Oklab", + .name = "Coollab_Okhsl_from_Oklab", .definition = R"STR( - vec3 Coollab_HSLuv_from_Oklab/*coollabdef*/(vec3 from) + vec3 Coollab_Okhsl_from_Oklab/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_Oklab(from); + vec3 to = Cool_Okhsl_from_Oklab(from); return to; } @@ -407,15 +407,15 @@ if (from == PrimitiveType::Oklab && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::Oklab && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Oklab && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_Oklab", + .name = "Coollab_Okhsl_StraightA_from_Oklab", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_Oklab/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_StraightA_from_Oklab/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_Oklab(from); + vec3 to = Cool_Okhsl_from_Oklab(from); return vec4(to, 1.); } @@ -423,15 +423,15 @@ if (from == PrimitiveType::Oklab && to == PrimitiveType::HSLuv_StraightA) }); } -if (from == PrimitiveType::Oklab && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Oklab && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_Oklab", + .name = "Coollab_Okhsl_PremultipliedA_from_Oklab", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_Oklab/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Oklab/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_Oklab(from); + vec3 to = Cool_Okhsl_from_Oklab(from); return vec4(to, 1.); } @@ -439,15 +439,15 @@ if (from == PrimitiveType::Oklab && to == PrimitiveType::HSLuv_PremultipliedA) }); } -if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_Oklab_StraightA", + .name = "Coollab_Okhsl_from_Oklab_StraightA", .definition = R"STR( - vec3 Coollab_HSLuv_from_Oklab_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_Oklab_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_Oklab(from.xyz); + vec3 to = Cool_Okhsl_from_Oklab(from.xyz); return to; } @@ -455,15 +455,15 @@ if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_Oklab_StraightA", + .name = "Coollab_Okhsl_StraightA_from_Oklab_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_Oklab_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_Oklab_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_Oklab(from.xyz); + vec3 to = Cool_Okhsl_from_Oklab(from.xyz); return vec4(to, from.a); } @@ -471,15 +471,15 @@ if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::HSLuv_Straigh }); } -if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_Oklab_StraightA", + .name = "Coollab_Okhsl_PremultipliedA_from_Oklab_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_Oklab_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Oklab_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_Oklab(from.xyz); + vec3 to = Cool_Okhsl_from_Oklab(from.xyz); return vec4(to * saturate(from.a), from.a); } @@ -487,15 +487,15 @@ if (from == PrimitiveType::Oklab_StraightA && to == PrimitiveType::HSLuv_Premult }); } -if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_Oklab_PremultipliedA", + .name = "Coollab_Okhsl_from_Oklab_PremultipliedA", .definition = R"STR( - vec3 Coollab_HSLuv_from_Oklab_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_Oklab_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_Oklab(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_Oklab(from.xyz / saturate(from.a)); return to; } @@ -503,15 +503,15 @@ if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_Oklab_PremultipliedA", + .name = "Coollab_Okhsl_StraightA_from_Oklab_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_Oklab_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_Oklab_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_Oklab(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_Oklab(from.xyz / saturate(from.a)); return vec4(to, from.a); } @@ -519,16 +519,16 @@ if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::HSLuv_St }); } -if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Oklab_PremultipliedA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_Oklab_PremultipliedA", + .name = "Coollab_Okhsl_PremultipliedA_from_Oklab_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_Oklab_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Oklab_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_HSLuv_from_Oklab(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_Oklab(from.xyz / saturate(from.a)); return vec4(to * saturate(from.a), from.a); } @@ -1067,15 +1067,15 @@ if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::sRGB }); } -if (from == PrimitiveType::LinearRGB && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::LinearRGB && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_LinearRGB", + .name = "Coollab_Okhsl_from_LinearRGB", .definition = R"STR( - vec3 Coollab_HSLuv_from_LinearRGB/*coollabdef*/(vec3 from) + vec3 Coollab_Okhsl_from_LinearRGB/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from); + vec3 to = Cool_Okhsl_from_LinearRGB(from); return to; } @@ -1083,15 +1083,15 @@ if (from == PrimitiveType::LinearRGB && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::LinearRGB && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::LinearRGB && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_LinearRGB", + .name = "Coollab_Okhsl_StraightA_from_LinearRGB", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_LinearRGB/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_StraightA_from_LinearRGB/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from); + vec3 to = Cool_Okhsl_from_LinearRGB(from); return vec4(to, 1.); } @@ -1099,15 +1099,15 @@ if (from == PrimitiveType::LinearRGB && to == PrimitiveType::HSLuv_StraightA) }); } -if (from == PrimitiveType::LinearRGB && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::LinearRGB && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_LinearRGB", + .name = "Coollab_Okhsl_PremultipliedA_from_LinearRGB", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_LinearRGB/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_PremultipliedA_from_LinearRGB/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from); + vec3 to = Cool_Okhsl_from_LinearRGB(from); return vec4(to, 1.); } @@ -1115,15 +1115,15 @@ if (from == PrimitiveType::LinearRGB && to == PrimitiveType::HSLuv_Premultiplied }); } -if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_LinearRGB_StraightA", + .name = "Coollab_Okhsl_from_LinearRGB_StraightA", .definition = R"STR( - vec3 Coollab_HSLuv_from_LinearRGB_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_LinearRGB_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from.xyz); + vec3 to = Cool_Okhsl_from_LinearRGB(from.xyz); return to; } @@ -1131,15 +1131,15 @@ if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_LinearRGB_StraightA", + .name = "Coollab_Okhsl_StraightA_from_LinearRGB_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_LinearRGB_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_LinearRGB_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from.xyz); + vec3 to = Cool_Okhsl_from_LinearRGB(from.xyz); return vec4(to, from.a); } @@ -1147,15 +1147,15 @@ if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::HSLuv_Str }); } -if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_LinearRGB_StraightA", + .name = "Coollab_Okhsl_PremultipliedA_from_LinearRGB_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_LinearRGB_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_LinearRGB_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from.xyz); + vec3 to = Cool_Okhsl_from_LinearRGB(from.xyz); return vec4(to * saturate(from.a), from.a); } @@ -1163,15 +1163,15 @@ if (from == PrimitiveType::LinearRGB_StraightA && to == PrimitiveType::HSLuv_Pre }); } -if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_LinearRGB_PremultipliedA", + .name = "Coollab_Okhsl_from_LinearRGB_PremultipliedA", .definition = R"STR( - vec3 Coollab_HSLuv_from_LinearRGB_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_LinearRGB_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_LinearRGB(from.xyz / saturate(from.a)); return to; } @@ -1179,15 +1179,15 @@ if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::HSLu }); } -if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_LinearRGB_PremultipliedA", + .name = "Coollab_Okhsl_StraightA_from_LinearRGB_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_LinearRGB_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_LinearRGB_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_LinearRGB(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_LinearRGB(from.xyz / saturate(from.a)); return vec4(to, from.a); } @@ -1195,16 +1195,16 @@ if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::HSLu }); } -if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::LinearRGB_PremultipliedA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_LinearRGB_PremultipliedA", + .name = "Coollab_Okhsl_PremultipliedA_from_LinearRGB_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_LinearRGB_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_LinearRGB_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_HSLuv_from_LinearRGB(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_LinearRGB(from.xyz / saturate(from.a)); return vec4(to * saturate(from.a), from.a); } @@ -1743,15 +1743,15 @@ if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::sRGB_Stra }); } -if (from == PrimitiveType::sRGB && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::sRGB && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_sRGB", + .name = "Coollab_Okhsl_from_sRGB", .definition = R"STR( - vec3 Coollab_HSLuv_from_sRGB/*coollabdef*/(vec3 from) + vec3 Coollab_Okhsl_from_sRGB/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_sRGB(from); + vec3 to = Cool_Okhsl_from_sRGB(from); return to; } @@ -1759,15 +1759,15 @@ if (from == PrimitiveType::sRGB && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::sRGB && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::sRGB && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_sRGB", + .name = "Coollab_Okhsl_StraightA_from_sRGB", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_sRGB/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_StraightA_from_sRGB/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_sRGB(from); + vec3 to = Cool_Okhsl_from_sRGB(from); return vec4(to, 1.); } @@ -1775,15 +1775,15 @@ if (from == PrimitiveType::sRGB && to == PrimitiveType::HSLuv_StraightA) }); } -if (from == PrimitiveType::sRGB && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::sRGB && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_sRGB", + .name = "Coollab_Okhsl_PremultipliedA_from_sRGB", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_sRGB/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_PremultipliedA_from_sRGB/*coollabdef*/(vec3 from) { - vec3 to = Cool_HSLuv_from_sRGB(from); + vec3 to = Cool_Okhsl_from_sRGB(from); return vec4(to, 1.); } @@ -1791,15 +1791,15 @@ if (from == PrimitiveType::sRGB && to == PrimitiveType::HSLuv_PremultipliedA) }); } -if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_sRGB_StraightA", + .name = "Coollab_Okhsl_from_sRGB_StraightA", .definition = R"STR( - vec3 Coollab_HSLuv_from_sRGB_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_sRGB_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_sRGB(from.xyz); + vec3 to = Cool_Okhsl_from_sRGB(from.xyz); return to; } @@ -1807,15 +1807,15 @@ if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_sRGB_StraightA", + .name = "Coollab_Okhsl_StraightA_from_sRGB_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_sRGB_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_sRGB_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_sRGB(from.xyz); + vec3 to = Cool_Okhsl_from_sRGB(from.xyz); return vec4(to, from.a); } @@ -1823,15 +1823,15 @@ if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::HSLuv_Straight }); } -if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_sRGB_StraightA", + .name = "Coollab_Okhsl_PremultipliedA_from_sRGB_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_sRGB_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_sRGB_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_sRGB(from.xyz); + vec3 to = Cool_Okhsl_from_sRGB(from.xyz); return vec4(to * saturate(from.a), from.a); } @@ -1839,15 +1839,15 @@ if (from == PrimitiveType::sRGB_StraightA && to == PrimitiveType::HSLuv_Premulti }); } -if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_sRGB_PremultipliedA", + .name = "Coollab_Okhsl_from_sRGB_PremultipliedA", .definition = R"STR( - vec3 Coollab_HSLuv_from_sRGB_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_sRGB_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_sRGB(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_sRGB(from.xyz / saturate(from.a)); return to; } @@ -1855,15 +1855,15 @@ if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_sRGB_PremultipliedA", + .name = "Coollab_Okhsl_StraightA_from_sRGB_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_sRGB_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_sRGB_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_HSLuv_from_sRGB(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_sRGB(from.xyz / saturate(from.a)); return vec4(to, from.a); } @@ -1871,16 +1871,16 @@ if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::HSLuv_Str }); } -if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_sRGB_PremultipliedA", + .name = "Coollab_Okhsl_PremultipliedA_from_sRGB_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_sRGB_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_sRGB_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_HSLuv_from_sRGB(from.xyz / saturate(from.a)); + vec3 to = Cool_Okhsl_from_sRGB(from.xyz / saturate(from.a)); return vec4(to * saturate(from.a), from.a); } @@ -2033,15 +2033,15 @@ if (from == PrimitiveType::sRGB_PremultipliedA && to == PrimitiveType::Float_Pre }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::Oklab) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Oklab) { return context.push_function({ - .name = "Coollab_Oklab_from_HSLuv", + .name = "Coollab_Oklab_from_Okhsl", .definition = R"STR( - vec3 Coollab_Oklab_from_HSLuv/*coollabdef*/(vec3 from) + vec3 Coollab_Oklab_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_Oklab_from_HSLuv(from); + vec3 to = Cool_Oklab_from_Okhsl(from); return to; } @@ -2049,15 +2049,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::Oklab) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::Oklab_StraightA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Oklab_StraightA) { return context.push_function({ - .name = "Coollab_Oklab_StraightA_from_HSLuv", + .name = "Coollab_Oklab_StraightA_from_Okhsl", .definition = R"STR( - vec4 Coollab_Oklab_StraightA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_Oklab_StraightA_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_Oklab_from_HSLuv(from); + vec3 to = Cool_Oklab_from_Okhsl(from); return vec4(to, 1.); } @@ -2065,15 +2065,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::Oklab_StraightA) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::Oklab_PremultipliedA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Oklab_PremultipliedA) { return context.push_function({ - .name = "Coollab_Oklab_PremultipliedA_from_HSLuv", + .name = "Coollab_Oklab_PremultipliedA_from_Okhsl", .definition = R"STR( - vec4 Coollab_Oklab_PremultipliedA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_Oklab_PremultipliedA_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_Oklab_from_HSLuv(from); + vec3 to = Cool_Oklab_from_Okhsl(from); return vec4(to, 1.); } @@ -2081,15 +2081,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::Oklab_PremultipliedA) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Oklab) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Oklab) { return context.push_function({ - .name = "Coollab_Oklab_from_HSLuv_StraightA", + .name = "Coollab_Oklab_from_Okhsl_StraightA", .definition = R"STR( - vec3 Coollab_Oklab_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_Oklab_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_Oklab_from_HSLuv(from.xyz); + vec3 to = Cool_Oklab_from_Okhsl(from.xyz); return to; } @@ -2097,15 +2097,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Oklab) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Oklab_StraightA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Oklab_StraightA) { return context.push_function({ - .name = "Coollab_Oklab_StraightA_from_HSLuv_StraightA", + .name = "Coollab_Oklab_StraightA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_Oklab_StraightA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Oklab_StraightA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_Oklab_from_HSLuv(from.xyz); + vec3 to = Cool_Oklab_from_Okhsl(from.xyz); return vec4(to, from.a); } @@ -2113,15 +2113,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Oklab_Straigh }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Oklab_PremultipliedA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Oklab_PremultipliedA) { return context.push_function({ - .name = "Coollab_Oklab_PremultipliedA_from_HSLuv_StraightA", + .name = "Coollab_Oklab_PremultipliedA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_Oklab_PremultipliedA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Oklab_PremultipliedA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_Oklab_from_HSLuv(from.xyz); + vec3 to = Cool_Oklab_from_Okhsl(from.xyz); return vec4(to * saturate(from.a), from.a); } @@ -2129,15 +2129,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Oklab_Premult }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Oklab) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Oklab) { return context.push_function({ - .name = "Coollab_Oklab_from_HSLuv_PremultipliedA", + .name = "Coollab_Oklab_from_Okhsl_PremultipliedA", .definition = R"STR( - vec3 Coollab_Oklab_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_Oklab_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_Oklab_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_Oklab_from_Okhsl(from.xyz / saturate(from.a)); return to; } @@ -2145,15 +2145,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Oklab) }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Oklab_StraightA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Oklab_StraightA) { return context.push_function({ - .name = "Coollab_Oklab_StraightA_from_HSLuv_PremultipliedA", + .name = "Coollab_Oklab_StraightA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_Oklab_StraightA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Oklab_StraightA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_Oklab_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_Oklab_from_Okhsl(from.xyz / saturate(from.a)); return vec4(to, from.a); } @@ -2161,16 +2161,16 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Oklab_St }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Oklab_PremultipliedA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Oklab_PremultipliedA) { return context.push_function({ - .name = "Coollab_Oklab_PremultipliedA_from_HSLuv_PremultipliedA", + .name = "Coollab_Oklab_PremultipliedA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_Oklab_PremultipliedA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Oklab_PremultipliedA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_Oklab_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_Oklab_from_Okhsl(from.xyz / saturate(from.a)); return vec4(to * saturate(from.a), from.a); } @@ -2178,15 +2178,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Oklab_Pr }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::LinearRGB) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::LinearRGB) { return context.push_function({ - .name = "Coollab_LinearRGB_from_HSLuv", + .name = "Coollab_LinearRGB_from_Okhsl", .definition = R"STR( - vec3 Coollab_LinearRGB_from_HSLuv/*coollabdef*/(vec3 from) + vec3 Coollab_LinearRGB_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from); + vec3 to = Cool_LinearRGB_from_Okhsl(from); return to; } @@ -2194,15 +2194,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::LinearRGB) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::LinearRGB_StraightA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::LinearRGB_StraightA) { return context.push_function({ - .name = "Coollab_LinearRGB_StraightA_from_HSLuv", + .name = "Coollab_LinearRGB_StraightA_from_Okhsl", .definition = R"STR( - vec4 Coollab_LinearRGB_StraightA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_LinearRGB_StraightA_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from); + vec3 to = Cool_LinearRGB_from_Okhsl(from); return vec4(to, 1.); } @@ -2210,15 +2210,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::LinearRGB_StraightA) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::LinearRGB_PremultipliedA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::LinearRGB_PremultipliedA) { return context.push_function({ - .name = "Coollab_LinearRGB_PremultipliedA_from_HSLuv", + .name = "Coollab_LinearRGB_PremultipliedA_from_Okhsl", .definition = R"STR( - vec4 Coollab_LinearRGB_PremultipliedA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_LinearRGB_PremultipliedA_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from); + vec3 to = Cool_LinearRGB_from_Okhsl(from); return vec4(to, 1.); } @@ -2226,15 +2226,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::LinearRGB_Premultiplied }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::LinearRGB) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::LinearRGB) { return context.push_function({ - .name = "Coollab_LinearRGB_from_HSLuv_StraightA", + .name = "Coollab_LinearRGB_from_Okhsl_StraightA", .definition = R"STR( - vec3 Coollab_LinearRGB_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_LinearRGB_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from.xyz); + vec3 to = Cool_LinearRGB_from_Okhsl(from.xyz); return to; } @@ -2242,15 +2242,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::LinearRGB) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::LinearRGB_StraightA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::LinearRGB_StraightA) { return context.push_function({ - .name = "Coollab_LinearRGB_StraightA_from_HSLuv_StraightA", + .name = "Coollab_LinearRGB_StraightA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_LinearRGB_StraightA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_LinearRGB_StraightA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from.xyz); + vec3 to = Cool_LinearRGB_from_Okhsl(from.xyz); return vec4(to, from.a); } @@ -2258,15 +2258,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::LinearRGB_Str }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::LinearRGB_PremultipliedA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::LinearRGB_PremultipliedA) { return context.push_function({ - .name = "Coollab_LinearRGB_PremultipliedA_from_HSLuv_StraightA", + .name = "Coollab_LinearRGB_PremultipliedA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_LinearRGB_PremultipliedA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_LinearRGB_PremultipliedA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from.xyz); + vec3 to = Cool_LinearRGB_from_Okhsl(from.xyz); return vec4(to * saturate(from.a), from.a); } @@ -2274,15 +2274,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::LinearRGB_Pre }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::LinearRGB) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::LinearRGB) { return context.push_function({ - .name = "Coollab_LinearRGB_from_HSLuv_PremultipliedA", + .name = "Coollab_LinearRGB_from_Okhsl_PremultipliedA", .definition = R"STR( - vec3 Coollab_LinearRGB_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_LinearRGB_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_LinearRGB_from_Okhsl(from.xyz / saturate(from.a)); return to; } @@ -2290,15 +2290,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::LinearRG }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::LinearRGB_StraightA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::LinearRGB_StraightA) { return context.push_function({ - .name = "Coollab_LinearRGB_StraightA_from_HSLuv_PremultipliedA", + .name = "Coollab_LinearRGB_StraightA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_LinearRGB_StraightA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_LinearRGB_StraightA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_LinearRGB_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_LinearRGB_from_Okhsl(from.xyz / saturate(from.a)); return vec4(to, from.a); } @@ -2306,16 +2306,16 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::LinearRG }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::LinearRGB_PremultipliedA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::LinearRGB_PremultipliedA) { return context.push_function({ - .name = "Coollab_LinearRGB_PremultipliedA_from_HSLuv_PremultipliedA", + .name = "Coollab_LinearRGB_PremultipliedA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_LinearRGB_PremultipliedA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_LinearRGB_PremultipliedA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_LinearRGB_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_LinearRGB_from_Okhsl(from.xyz / saturate(from.a)); return vec4(to * saturate(from.a), from.a); } @@ -2323,15 +2323,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::LinearRG }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::sRGB) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::sRGB) { return context.push_function({ - .name = "Coollab_sRGB_from_HSLuv", + .name = "Coollab_sRGB_from_Okhsl", .definition = R"STR( - vec3 Coollab_sRGB_from_HSLuv/*coollabdef*/(vec3 from) + vec3 Coollab_sRGB_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_sRGB_from_HSLuv(from); + vec3 to = Cool_sRGB_from_Okhsl(from); return to; } @@ -2339,15 +2339,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::sRGB) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::sRGB_StraightA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::sRGB_StraightA) { return context.push_function({ - .name = "Coollab_sRGB_StraightA_from_HSLuv", + .name = "Coollab_sRGB_StraightA_from_Okhsl", .definition = R"STR( - vec4 Coollab_sRGB_StraightA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_sRGB_StraightA_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_sRGB_from_HSLuv(from); + vec3 to = Cool_sRGB_from_Okhsl(from); return vec4(to, 1.); } @@ -2355,15 +2355,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::sRGB_StraightA) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::sRGB_PremultipliedA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::sRGB_PremultipliedA) { return context.push_function({ - .name = "Coollab_sRGB_PremultipliedA_from_HSLuv", + .name = "Coollab_sRGB_PremultipliedA_from_Okhsl", .definition = R"STR( - vec4 Coollab_sRGB_PremultipliedA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_sRGB_PremultipliedA_from_Okhsl/*coollabdef*/(vec3 from) { - vec3 to = Cool_sRGB_from_HSLuv(from); + vec3 to = Cool_sRGB_from_Okhsl(from); return vec4(to, 1.); } @@ -2371,15 +2371,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::sRGB_PremultipliedA) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::sRGB) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::sRGB) { return context.push_function({ - .name = "Coollab_sRGB_from_HSLuv_StraightA", + .name = "Coollab_sRGB_from_Okhsl_StraightA", .definition = R"STR( - vec3 Coollab_sRGB_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_sRGB_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_sRGB_from_HSLuv(from.xyz); + vec3 to = Cool_sRGB_from_Okhsl(from.xyz); return to; } @@ -2387,15 +2387,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::sRGB) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::sRGB_StraightA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::sRGB_StraightA) { return context.push_function({ - .name = "Coollab_sRGB_StraightA_from_HSLuv_StraightA", + .name = "Coollab_sRGB_StraightA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_sRGB_StraightA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_sRGB_StraightA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_sRGB_from_HSLuv(from.xyz); + vec3 to = Cool_sRGB_from_Okhsl(from.xyz); return vec4(to, from.a); } @@ -2403,15 +2403,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::sRGB_Straight }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::sRGB_PremultipliedA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::sRGB_PremultipliedA) { return context.push_function({ - .name = "Coollab_sRGB_PremultipliedA_from_HSLuv_StraightA", + .name = "Coollab_sRGB_PremultipliedA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_sRGB_PremultipliedA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_sRGB_PremultipliedA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - vec3 to = Cool_sRGB_from_HSLuv(from.xyz); + vec3 to = Cool_sRGB_from_Okhsl(from.xyz); return vec4(to * saturate(from.a), from.a); } @@ -2419,15 +2419,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::sRGB_Premulti }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::sRGB) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::sRGB) { return context.push_function({ - .name = "Coollab_sRGB_from_HSLuv_PremultipliedA", + .name = "Coollab_sRGB_from_Okhsl_PremultipliedA", .definition = R"STR( - vec3 Coollab_sRGB_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_sRGB_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_sRGB_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_sRGB_from_Okhsl(from.xyz / saturate(from.a)); return to; } @@ -2435,15 +2435,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::sRGB) }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::sRGB_StraightA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::sRGB_StraightA) { return context.push_function({ - .name = "Coollab_sRGB_StraightA_from_HSLuv_PremultipliedA", + .name = "Coollab_sRGB_StraightA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_sRGB_StraightA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_sRGB_StraightA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - vec3 to = Cool_sRGB_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_sRGB_from_Okhsl(from.xyz / saturate(from.a)); return vec4(to, from.a); } @@ -2451,16 +2451,16 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::sRGB_Str }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::sRGB_PremultipliedA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::sRGB_PremultipliedA) { return context.push_function({ - .name = "Coollab_sRGB_PremultipliedA_from_HSLuv_PremultipliedA", + .name = "Coollab_sRGB_PremultipliedA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_sRGB_PremultipliedA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_sRGB_PremultipliedA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_sRGB_from_HSLuv(from.xyz / saturate(from.a)); + vec3 to = Cool_sRGB_from_Okhsl(from.xyz / saturate(from.a)); return vec4(to * saturate(from.a), from.a); } @@ -2468,12 +2468,12 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::sRGB_Pre }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_HSLuv", + .name = "Coollab_Okhsl_StraightA_from_Okhsl", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_StraightA_from_Okhsl/*coollabdef*/(vec3 from) { vec3 to = (from); @@ -2484,12 +2484,12 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::HSLuv_StraightA) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_HSLuv", + .name = "Coollab_Okhsl_PremultipliedA_from_Okhsl", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_HSLuv/*coollabdef*/(vec3 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Okhsl/*coollabdef*/(vec3 from) { vec3 to = (from); @@ -2500,12 +2500,12 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::HSLuv_PremultipliedA) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_HSLuv_StraightA", + .name = "Coollab_Okhsl_from_Okhsl_StraightA", .definition = R"STR( - vec3 Coollab_HSLuv_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { vec3 to = (from.xyz); @@ -2516,12 +2516,12 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_HSLuv_StraightA", + .name = "Coollab_Okhsl_PremultipliedA_from_Okhsl_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { vec3 to = (from.xyz); @@ -2532,12 +2532,12 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::HSLuv_Premult }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_HSLuv_PremultipliedA", + .name = "Coollab_Okhsl_from_Okhsl_PremultipliedA", .definition = R"STR( - vec3 Coollab_HSLuv_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec3 Coollab_Okhsl_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { vec3 to = (from.xyz / saturate(from.a)); @@ -2548,12 +2548,12 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_HSLuv_PremultipliedA", + .name = "Coollab_Okhsl_StraightA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec4 Coollab_Okhsl_StraightA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { vec3 to = (from.xyz / saturate(from.a)); @@ -2564,15 +2564,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::HSLuv_St }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::Float) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Float) { return context.push_function({ - .name = "Coollab_Float_from_HSLuv", + .name = "Coollab_Float_from_Okhsl", .definition = R"STR( - float Coollab_Float_from_HSLuv/*coollabdef*/(vec3 from) + float Coollab_Float_from_Okhsl/*coollabdef*/(vec3 from) { - float to = Cool_Float_from_HSLuv(from); + float to = Cool_Float_from_Okhsl(from); return to; } @@ -2580,15 +2580,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::Float) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::Float_StraightA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Float_StraightA) { return context.push_function({ - .name = "Coollab_Float_StraightA_from_HSLuv", + .name = "Coollab_Float_StraightA_from_Okhsl", .definition = R"STR( - vec2 Coollab_Float_StraightA_from_HSLuv/*coollabdef*/(vec3 from) + vec2 Coollab_Float_StraightA_from_Okhsl/*coollabdef*/(vec3 from) { - float to = Cool_Float_from_HSLuv(from); + float to = Cool_Float_from_Okhsl(from); return vec2(to, 1.); } @@ -2596,15 +2596,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::Float_StraightA) }); } -if (from == PrimitiveType::HSLuv && to == PrimitiveType::Float_PremultipliedA) +if (from == PrimitiveType::Okhsl && to == PrimitiveType::Float_PremultipliedA) { return context.push_function({ - .name = "Coollab_Float_PremultipliedA_from_HSLuv", + .name = "Coollab_Float_PremultipliedA_from_Okhsl", .definition = R"STR( - vec2 Coollab_Float_PremultipliedA_from_HSLuv/*coollabdef*/(vec3 from) + vec2 Coollab_Float_PremultipliedA_from_Okhsl/*coollabdef*/(vec3 from) { - float to = Cool_Float_from_HSLuv(from); + float to = Cool_Float_from_Okhsl(from); return vec2(to, 1.); } @@ -2612,15 +2612,15 @@ if (from == PrimitiveType::HSLuv && to == PrimitiveType::Float_PremultipliedA) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Float) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Float) { return context.push_function({ - .name = "Coollab_Float_from_HSLuv_StraightA", + .name = "Coollab_Float_from_Okhsl_StraightA", .definition = R"STR( - float Coollab_Float_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + float Coollab_Float_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - float to = Cool_Float_from_HSLuv(from.xyz); + float to = Cool_Float_from_Okhsl(from.xyz); return to; } @@ -2628,15 +2628,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Float) }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Float_StraightA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Float_StraightA) { return context.push_function({ - .name = "Coollab_Float_StraightA_from_HSLuv_StraightA", + .name = "Coollab_Float_StraightA_from_Okhsl_StraightA", .definition = R"STR( - vec2 Coollab_Float_StraightA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec2 Coollab_Float_StraightA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - float to = Cool_Float_from_HSLuv(from.xyz); + float to = Cool_Float_from_Okhsl(from.xyz); return vec2(to, from.a); } @@ -2644,15 +2644,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Float_Straigh }); } -if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Float_PremultipliedA) +if (from == PrimitiveType::Okhsl_StraightA && to == PrimitiveType::Float_PremultipliedA) { return context.push_function({ - .name = "Coollab_Float_PremultipliedA_from_HSLuv_StraightA", + .name = "Coollab_Float_PremultipliedA_from_Okhsl_StraightA", .definition = R"STR( - vec2 Coollab_Float_PremultipliedA_from_HSLuv_StraightA/*coollabdef*/(vec4 from) + vec2 Coollab_Float_PremultipliedA_from_Okhsl_StraightA/*coollabdef*/(vec4 from) { - float to = Cool_Float_from_HSLuv(from.xyz); + float to = Cool_Float_from_Okhsl(from.xyz); return vec2(to * saturate(from.a), from.a); } @@ -2660,15 +2660,15 @@ if (from == PrimitiveType::HSLuv_StraightA && to == PrimitiveType::Float_Premult }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Float) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Float) { return context.push_function({ - .name = "Coollab_Float_from_HSLuv_PremultipliedA", + .name = "Coollab_Float_from_Okhsl_PremultipliedA", .definition = R"STR( - float Coollab_Float_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + float Coollab_Float_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - float to = Cool_Float_from_HSLuv(from.xyz / saturate(from.a)); + float to = Cool_Float_from_Okhsl(from.xyz / saturate(from.a)); return to; } @@ -2676,15 +2676,15 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Float) }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Float_StraightA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Float_StraightA) { return context.push_function({ - .name = "Coollab_Float_StraightA_from_HSLuv_PremultipliedA", + .name = "Coollab_Float_StraightA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec2 Coollab_Float_StraightA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec2 Coollab_Float_StraightA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { - float to = Cool_Float_from_HSLuv(from.xyz / saturate(from.a)); + float to = Cool_Float_from_Okhsl(from.xyz / saturate(from.a)); return vec2(to, from.a); } @@ -2692,16 +2692,16 @@ if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Float_St }); } -if (from == PrimitiveType::HSLuv_PremultipliedA && to == PrimitiveType::Float_PremultipliedA) +if (from == PrimitiveType::Okhsl_PremultipliedA && to == PrimitiveType::Float_PremultipliedA) { return context.push_function({ - .name = "Coollab_Float_PremultipliedA_from_HSLuv_PremultipliedA", + .name = "Coollab_Float_PremultipliedA_from_Okhsl_PremultipliedA", .definition = R"STR( - vec2 Coollab_Float_PremultipliedA_from_HSLuv_PremultipliedA/*coollabdef*/(vec4 from) + vec2 Coollab_Float_PremultipliedA_from_Okhsl_PremultipliedA/*coollabdef*/(vec4 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - float to = Cool_Float_from_HSLuv(from.xyz / saturate(from.a)); + float to = Cool_Float_from_Okhsl(from.xyz / saturate(from.a)); return vec2(to * saturate(from.a), from.a); } @@ -3144,15 +3144,15 @@ if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::sRGB_Pre }); } -if (from == PrimitiveType::Float && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Float && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_Float", + .name = "Coollab_Okhsl_from_Float", .definition = R"STR( - vec3 Coollab_HSLuv_from_Float/*coollabdef*/(float from) + vec3 Coollab_Okhsl_from_Float/*coollabdef*/(float from) { - vec3 to = Cool_HSLuv_from_Float(from); + vec3 to = Cool_Okhsl_from_Float(from); return to; } @@ -3160,15 +3160,15 @@ if (from == PrimitiveType::Float && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::Float && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Float && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_Float", + .name = "Coollab_Okhsl_StraightA_from_Float", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_Float/*coollabdef*/(float from) + vec4 Coollab_Okhsl_StraightA_from_Float/*coollabdef*/(float from) { - vec3 to = Cool_HSLuv_from_Float(from); + vec3 to = Cool_Okhsl_from_Float(from); return vec4(to, 1.); } @@ -3176,15 +3176,15 @@ if (from == PrimitiveType::Float && to == PrimitiveType::HSLuv_StraightA) }); } -if (from == PrimitiveType::Float && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Float && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_Float", + .name = "Coollab_Okhsl_PremultipliedA_from_Float", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_Float/*coollabdef*/(float from) + vec4 Coollab_Okhsl_PremultipliedA_from_Float/*coollabdef*/(float from) { - vec3 to = Cool_HSLuv_from_Float(from); + vec3 to = Cool_Okhsl_from_Float(from); return vec4(to, 1.); } @@ -3192,15 +3192,15 @@ if (from == PrimitiveType::Float && to == PrimitiveType::HSLuv_PremultipliedA) }); } -if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_Float_StraightA", + .name = "Coollab_Okhsl_from_Float_StraightA", .definition = R"STR( - vec3 Coollab_HSLuv_from_Float_StraightA/*coollabdef*/(vec2 from) + vec3 Coollab_Okhsl_from_Float_StraightA/*coollabdef*/(vec2 from) { - vec3 to = Cool_HSLuv_from_Float(from.x); + vec3 to = Cool_Okhsl_from_Float(from.x); return to; } @@ -3208,15 +3208,15 @@ if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_Float_StraightA", + .name = "Coollab_Okhsl_StraightA_from_Float_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_Float_StraightA/*coollabdef*/(vec2 from) + vec4 Coollab_Okhsl_StraightA_from_Float_StraightA/*coollabdef*/(vec2 from) { - vec3 to = Cool_HSLuv_from_Float(from.x); + vec3 to = Cool_Okhsl_from_Float(from.x); return vec4(to, from.y); } @@ -3224,15 +3224,15 @@ if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::HSLuv_Straigh }); } -if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_Float_StraightA", + .name = "Coollab_Okhsl_PremultipliedA_from_Float_StraightA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_Float_StraightA/*coollabdef*/(vec2 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Float_StraightA/*coollabdef*/(vec2 from) { - vec3 to = Cool_HSLuv_from_Float(from.x); + vec3 to = Cool_Okhsl_from_Float(from.x); return vec4(to * saturate(from.y), from.y); } @@ -3240,15 +3240,15 @@ if (from == PrimitiveType::Float_StraightA && to == PrimitiveType::HSLuv_Premult }); } -if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::HSLuv) +if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::Okhsl) { return context.push_function({ - .name = "Coollab_HSLuv_from_Float_PremultipliedA", + .name = "Coollab_Okhsl_from_Float_PremultipliedA", .definition = R"STR( - vec3 Coollab_HSLuv_from_Float_PremultipliedA/*coollabdef*/(vec2 from) + vec3 Coollab_Okhsl_from_Float_PremultipliedA/*coollabdef*/(vec2 from) { - vec3 to = Cool_HSLuv_from_Float(from.x / saturate(from.y)); + vec3 to = Cool_Okhsl_from_Float(from.x / saturate(from.y)); return to; } @@ -3256,15 +3256,15 @@ if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::HSLuv) }); } -if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::HSLuv_StraightA) +if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::Okhsl_StraightA) { return context.push_function({ - .name = "Coollab_HSLuv_StraightA_from_Float_PremultipliedA", + .name = "Coollab_Okhsl_StraightA_from_Float_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_StraightA_from_Float_PremultipliedA/*coollabdef*/(vec2 from) + vec4 Coollab_Okhsl_StraightA_from_Float_PremultipliedA/*coollabdef*/(vec2 from) { - vec3 to = Cool_HSLuv_from_Float(from.x / saturate(from.y)); + vec3 to = Cool_Okhsl_from_Float(from.x / saturate(from.y)); return vec4(to, from.y); } @@ -3272,16 +3272,16 @@ if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::HSLuv_St }); } -if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::HSLuv_PremultipliedA) +if (from == PrimitiveType::Float_PremultipliedA && to == PrimitiveType::Okhsl_PremultipliedA) { return context.push_function({ - .name = "Coollab_HSLuv_PremultipliedA_from_Float_PremultipliedA", + .name = "Coollab_Okhsl_PremultipliedA_from_Float_PremultipliedA", .definition = R"STR( - vec4 Coollab_HSLuv_PremultipliedA_from_Float_PremultipliedA/*coollabdef*/(vec2 from) + vec4 Coollab_Okhsl_PremultipliedA_from_Float_PremultipliedA/*coollabdef*/(vec2 from) { // We need to unpremultiply for the color conversion, and re-premultiply afterwards - vec3 to = Cool_HSLuv_from_Float(from.x / saturate(from.y)); + vec3 to = Cool_Okhsl_from_Float(from.x / saturate(from.y)); return vec4(to * saturate(from.y), from.y); } diff --git a/src/Module_Nodes/generated/input_to_primitive_type.inl b/src/Module_Nodes/generated/input_to_primitive_type.inl index 81b4022b..a14841c7 100644 --- a/src/Module_Nodes/generated/input_to_primitive_type.inl +++ b/src/Module_Nodes/generated/input_to_primitive_type.inl @@ -71,11 +71,11 @@ if (std::holds_alternative>(input) && std::get< if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorAndAlphaSpace::sRGB_StraightA)) return PrimitiveType::sRGB_StraightA; -if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorSpace::HSLuv)) - return PrimitiveType::HSLuv; +if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorSpace::Okhsl)) + return PrimitiveType::Okhsl; -if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorAndAlphaSpace::HSLuv_PremultipliedA)) - return PrimitiveType::HSLuv_PremultipliedA; +if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorAndAlphaSpace::Okhsl_PremultipliedA)) + return PrimitiveType::Okhsl_PremultipliedA; -if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorAndAlphaSpace::HSLuv_StraightA)) - return PrimitiveType::HSLuv_StraightA; \ No newline at end of file +if (std::holds_alternative>(input) && std::get>(input)._desired_color_space == static_cast(Cool::ColorAndAlphaSpace::Okhsl_StraightA)) + return PrimitiveType::Okhsl_StraightA; \ No newline at end of file diff --git a/src/Module_Nodes/generated/is_color_type.inl b/src/Module_Nodes/generated/is_color_type.inl index 52f09707..552c74f9 100644 --- a/src/Module_Nodes/generated/is_color_type.inl +++ b/src/Module_Nodes/generated/is_color_type.inl @@ -13,6 +13,6 @@ type == PrimitiveType::Oklab || type == PrimitiveType::sRGB || type == PrimitiveType::sRGB_StraightA || type == PrimitiveType::sRGB_PremultipliedA - || type == PrimitiveType::HSLuv - || type == PrimitiveType::HSLuv_StraightA - || type == PrimitiveType::HSLuv_PremultipliedA \ No newline at end of file + || type == PrimitiveType::Okhsl + || type == PrimitiveType::Okhsl_StraightA + || type == PrimitiveType::Okhsl_PremultipliedA \ No newline at end of file diff --git a/src/Module_Nodes/generated/parse_primitive_type.inl b/src/Module_Nodes/generated/parse_primitive_type.inl index 3942cbca..725df05b 100644 --- a/src/Module_Nodes/generated/parse_primitive_type.inl +++ b/src/Module_Nodes/generated/parse_primitive_type.inl @@ -112,15 +112,15 @@ if (str == "sRGB_StraightA") { return PrimitiveType::sRGB_StraightA; } -if (str == "HSLuv") +if (str == "Okhsl") { - return PrimitiveType::HSLuv; + return PrimitiveType::Okhsl; } -if (str == "HSLuv_PremultipliedA") +if (str == "Okhsl_PremultipliedA") { - return PrimitiveType::HSLuv_PremultipliedA; + return PrimitiveType::Okhsl_PremultipliedA; } -if (str == "HSLuv_StraightA") +if (str == "Okhsl_StraightA") { - return PrimitiveType::HSLuv_StraightA; + return PrimitiveType::Okhsl_StraightA; } \ No newline at end of file diff --git a/src/Module_Nodes/generated/primitive_types_enum_members.inl b/src/Module_Nodes/generated/primitive_types_enum_members.inl index ef2c9e21..88528707 100644 --- a/src/Module_Nodes/generated/primitive_types_enum_members.inl +++ b/src/Module_Nodes/generated/primitive_types_enum_members.inl @@ -32,6 +32,6 @@ Bool, sRGB, sRGB_PremultipliedA, sRGB_StraightA, - HSLuv, - HSLuv_PremultipliedA, - HSLuv_StraightA \ No newline at end of file + Okhsl, + Okhsl_PremultipliedA, + Okhsl_StraightA \ No newline at end of file diff --git a/src/Module_Nodes/generated/raw_glsl_type_as_string_cases.inl b/src/Module_Nodes/generated/raw_glsl_type_as_string_cases.inl index a0190757..cc32acdf 100644 --- a/src/Module_Nodes/generated/raw_glsl_type_as_string_cases.inl +++ b/src/Module_Nodes/generated/raw_glsl_type_as_string_cases.inl @@ -32,6 +32,6 @@ case PrimitiveType::LinearRGB_StraightA: return "vec4"; case PrimitiveType::sRGB: return "vec3"; case PrimitiveType::sRGB_PremultipliedA: return "vec4"; case PrimitiveType::sRGB_StraightA: return "vec4"; -case PrimitiveType::HSLuv: return "vec3"; -case PrimitiveType::HSLuv_PremultipliedA: return "vec4"; -case PrimitiveType::HSLuv_StraightA: return "vec4"; \ No newline at end of file +case PrimitiveType::Okhsl: return "vec3"; +case PrimitiveType::Okhsl_PremultipliedA: return "vec4"; +case PrimitiveType::Okhsl_StraightA: return "vec4"; \ No newline at end of file diff --git a/src/Module_Nodes/generated/string_listing_the_parsed_types.inl b/src/Module_Nodes/generated/string_listing_the_parsed_types.inl index fffebb03..515dd0af 100644 --- a/src/Module_Nodes/generated/string_listing_the_parsed_types.inl +++ b/src/Module_Nodes/generated/string_listing_the_parsed_types.inl @@ -31,6 +31,6 @@ R"STR( - bool - sRGB - sRGB_PremultipliedA - sRGB_StraightA - - HSLuv - - HSLuv_PremultipliedA - - HSLuv_StraightA)STR" \ No newline at end of file + - Okhsl + - Okhsl_PremultipliedA + - Okhsl_StraightA)STR" \ No newline at end of file diff --git a/src/Module_Nodes/generated/with_straight_alpha.inl b/src/Module_Nodes/generated/with_straight_alpha.inl index e0241165..6480fdc6 100644 --- a/src/Module_Nodes/generated/with_straight_alpha.inl +++ b/src/Module_Nodes/generated/with_straight_alpha.inl @@ -11,7 +11,7 @@ case PrimitiveType::LinearRGB: return PrimitiveType::LinearRGB_StraightA; case PrimitiveType::sRGB: return PrimitiveType::sRGB_StraightA; -case PrimitiveType::HSLuv: -return PrimitiveType::HSLuv_StraightA; +case PrimitiveType::Okhsl: +return PrimitiveType::Okhsl_StraightA; case PrimitiveType::Float: return PrimitiveType::Float_StraightA; \ No newline at end of file diff --git a/src/Module_Nodes/generated/with_straight_alpha_if_has_no_alpha.inl b/src/Module_Nodes/generated/with_straight_alpha_if_has_no_alpha.inl index 34971f51..dee4637a 100644 --- a/src/Module_Nodes/generated/with_straight_alpha_if_has_no_alpha.inl +++ b/src/Module_Nodes/generated/with_straight_alpha_if_has_no_alpha.inl @@ -11,7 +11,7 @@ case PrimitiveType::LinearRGB: return PrimitiveType::LinearRGB_StraightA; case PrimitiveType::sRGB: return PrimitiveType::sRGB_StraightA; -case PrimitiveType::HSLuv: -return PrimitiveType::HSLuv_StraightA; +case PrimitiveType::Okhsl: +return PrimitiveType::Okhsl_StraightA; case PrimitiveType::Float: return PrimitiveType::Float_StraightA; \ No newline at end of file diff --git a/website/content/Tutorials/30-Writing Nodes/10-Primitive types.md b/website/content/Tutorials/30-Writing Nodes/10-Primitive types.md index 25bad11e..701a2ac0 100644 --- a/website/content/Tutorials/30-Writing Nodes/10-Primitive types.md +++ b/website/content/Tutorials/30-Writing Nodes/10-Primitive types.md @@ -6,8 +6,8 @@ Now that you know how to write a basic node, you might wonder what all the possi - `UV`: The 2D coordinates that we use to sample our images. (`vec2` under the hood). - `float`: Just a regular number. - `SignedDistance`: A distance to an object, used for [SDF rendering](https://youtu.be/PGtv-dBi2wE). (`float` under the hood). -- Color (`Oklab`, `sRGB`, `LinearRGB` or `HSLuv`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec3` under the hood). -- Color and alpha. (`Oklab_PremultipliedA`, `Oklab_StraightA`, `LinearRGB_PremultipliedA`, `LinearRGB_StraightA`, `sRGB_PremultipliedA`, `sRGB_StraightA`, `HSLuv_PremultipliedA` or `HSLuv_StraightA`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec4` under the hood). +- Color (`Oklab`, `sRGB`, `LinearRGB` or `Okhsl`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec3` under the hood). +- Color and alpha. (`Oklab_PremultipliedA`, `Oklab_StraightA`, `LinearRGB_PremultipliedA`, `LinearRGB_StraightA`, `sRGB_PremultipliedA`, `sRGB_StraightA`, `Okhsl_PremultipliedA` or `Okhsl_StraightA`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec4` under the hood). And here are all the remaining types, that are seldom used: - `bool` diff --git a/website/content/Tutorials/30-Writing Nodes/20-Inputs.md b/website/content/Tutorials/30-Writing Nodes/20-Inputs.md index e4bcba73..499719bb 100644 --- a/website/content/Tutorials/30-Writing Nodes/20-Inputs.md +++ b/website/content/Tutorials/30-Writing Nodes/20-Inputs.md @@ -26,8 +26,8 @@ Here are all the types you can have as a value input: - `Angle` (`float` under the hood) - `Direction2D` (`vec2` under the hood, guaranteed to be of length 1) - `Hue` (`float` under the hood, guaranteed to be between 0 and 1). -- Color (`Oklab`, `sRGB`, `LinearRGB` or `HSLuv`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec3` under the hood). -- Color and alpha (`Oklab_PremultipliedA`, `Oklab_StraightA`, `LinearRGB_PremultipliedA`, `LinearRGB_StraightA`, `sRGB_PremultipliedA`, `sRGB_StraightA`, `HSLuv_PremultipliedA` or `HSLuv_StraightA`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec4` under the hood). +- Color (`Oklab`, `sRGB`, `LinearRGB` or `Okhsl`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec3` under the hood). +- Color and alpha (`Oklab_PremultipliedA`, `Oklab_StraightA`, `LinearRGB_PremultipliedA`, `LinearRGB_StraightA`, `sRGB_PremultipliedA`, `sRGB_StraightA`, `Okhsl_PremultipliedA` or `Okhsl_StraightA`). See the [Color Spaces section](40-Color%20Spaces.md) to learn all about the various color types. (`vec4` under the hood). ## Input functions diff --git a/website/content/Tutorials/30-Writing Nodes/40-Color Spaces.md b/website/content/Tutorials/30-Writing Nodes/40-Color Spaces.md index b9a48aee..0a6b1f78 100644 --- a/website/content/Tutorials/30-Writing Nodes/40-Color Spaces.md +++ b/website/content/Tutorials/30-Writing Nodes/40-Color Spaces.md @@ -9,7 +9,7 @@ If you have the choice between several color spaces because your effect will wor - Oklab - Linear RGB - sRGB -- HSLuv +- Okhsl Now let's see why you might prefer one space over another: @@ -22,11 +22,11 @@ The first component stores the lightness, a number between 0 and 1.
The second and third components store chromaticity information. They don't have a specific range. For more information, see https://bottosson.github.io/posts/oklab/ -### HSLuv +### Okhsl -You might already be familiar with HSL (Hue - Saturation - Lightness); [HSLuv](https://www.hsluv.org/) is simply a perceptually-accurate version of it. +You might already be familiar with HSL (Hue - Saturation - Lightness); [Okhsl](https://bottosson.github.io/posts/colorpicker/) is simply a perceptually-accurate version of it. -**This is what you will want to use in nodes that directly manipulate either the hue and / or the saturation.** (Note that Oklab also gives you access to the lightness so there is no need to use HSLuv if you are only interested in the lightness). +**This is what you will want to use in nodes that directly manipulate either the hue and / or the saturation.** (Note that Oklab also gives you access to the lightness so there is no need to use Okhsl if you are only interested in the lightness). The three channels are numbers between 0 and 1.