diff options
Diffstat (limited to 'source/blender/gpu')
3 files changed, 73 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_material_library.h b/source/blender/gpu/intern/gpu_material_library.h index 3a38eb5c600..08c36e24920 100644 --- a/source/blender/gpu/intern/gpu_material_library.h +++ b/source/blender/gpu/intern/gpu_material_library.h @@ -316,7 +316,7 @@ static GPUMaterialLibrary gpu_shader_material_mapping_library = { static GPUMaterialLibrary gpu_shader_material_map_range_library = { .code = datatoc_gpu_shader_material_map_range_glsl, - .dependencies = {NULL}, + .dependencies = {&gpu_shader_material_math_util_library, NULL}, }; static GPUMaterialLibrary gpu_shader_material_math_library = { diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_clamp.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_clamp.glsl index b8842064b6f..b196aed690f 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_clamp.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_clamp.glsl @@ -2,3 +2,8 @@ void clamp_value(float value, float min, float max, out float result) { result = clamp(value, min, max); } + +void clamp_range(float value, float min, float max, out float result) +{ + result = (max > min) ? clamp(value, min, max) : clamp(value, max, min); +} diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl index a185774f4b3..7853aae31a1 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl @@ -1,5 +1,16 @@ -void map_range( - float value, float fromMin, float fromMax, float toMin, float toMax, out float result) +float smootherstep(float edge0, float edge1, float x) +{ + x = clamp(safe_divide((x - edge0), (edge1 - edge0)), 0.0, 1.0); + return x * x * x * (x * (x * 6.0 - 15.0) + 10.0); +} + +void map_range_linear(float value, + float fromMin, + float fromMax, + float toMin, + float toMax, + float steps, + out float result) { if (fromMax != fromMin) { result = toMin + ((value - fromMin) / (fromMax - fromMin)) * (toMax - toMin); @@ -8,3 +19,57 @@ void map_range( result = 0.0; } } + +void map_range_stepped(float value, + float fromMin, + float fromMax, + float toMin, + float toMax, + float steps, + out float result) +{ + if (fromMax != fromMin) { + float factor = (value - fromMin) / (fromMax - fromMin); + factor = (steps > 0.0) ? floor(factor * (steps + 1.0)) / steps : 0.0; + result = toMin + factor * (toMax - toMin); + } + else { + result = 0.0; + } +} + +void map_range_smoothstep(float value, + float fromMin, + float fromMax, + float toMin, + float toMax, + float steps, + out float result) +{ + if (fromMax != fromMin) { + float factor = (fromMin > fromMax) ? 1.0 - smoothstep(fromMax, fromMin, value) : + smoothstep(fromMin, fromMax, value); + result = toMin + factor * (toMax - toMin); + } + else { + result = 0.0; + } +} + +void map_range_smootherstep(float value, + float fromMin, + float fromMax, + float toMin, + float toMax, + float steps, + out float result) +{ + if (fromMax != fromMin) { + float factor = (fromMin > fromMax) ? 1.0 - smootherstep(fromMax, fromMin, value) : + smootherstep(fromMin, fromMax, value); + result = toMin + factor * (toMax - toMin); + } + else { + result = 0.0; + } +} |