From bb83bd773c855d3989770d2f87c4a88a255152ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 9 Oct 2018 18:34:25 +0200 Subject: Cleanup: Remove old smoke drawing code --- .../blender/gpu/shaders/gpu_shader_fire_frag.glsl | 15 ------- .../blender/gpu/shaders/gpu_shader_smoke_frag.glsl | 47 ---------------------- .../blender/gpu/shaders/gpu_shader_smoke_vert.glsl | 15 ------- 3 files changed, 77 deletions(-) delete mode 100644 source/blender/gpu/shaders/gpu_shader_fire_frag.glsl delete mode 100644 source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl delete mode 100644 source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl (limited to 'source/blender/gpu/shaders') diff --git a/source/blender/gpu/shaders/gpu_shader_fire_frag.glsl b/source/blender/gpu/shaders/gpu_shader_fire_frag.glsl deleted file mode 100644 index fc9cafb6b02..00000000000 --- a/source/blender/gpu/shaders/gpu_shader_fire_frag.glsl +++ /dev/null @@ -1,15 +0,0 @@ - -in vec3 coords; -out vec4 fragColor; - -uniform sampler3D flame_texture; -uniform sampler1D spectrum_texture; - -void main() -{ - float flame = texture(flame_texture, coords).r; - vec4 emission = texture(spectrum_texture, flame); - - fragColor.rgb = emission.a * emission.rgb; - fragColor.a = emission.a; -} diff --git a/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl b/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl deleted file mode 100644 index b57bd5b6a37..00000000000 --- a/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl +++ /dev/null @@ -1,47 +0,0 @@ - -in vec3 coords; -out vec4 fragColor; - -uniform vec3 active_color; -uniform float step_size; -uniform float density_scale; - -uniform sampler3D soot_texture; -uniform sampler3D shadow_texture; - -#ifdef USE_COBA -uniform sampler1D transfer_texture; -uniform sampler3D color_band_texture; -#endif - -void main() -{ - /* compute color and density from volume texture */ - vec4 soot = texture(soot_texture, coords); - -#ifndef USE_COBA - vec3 soot_color; - if (soot.a != 0) { - soot_color = active_color * soot.rgb / soot.a; - } - else { - soot_color = vec3(0); - } - float soot_density = density_scale * soot.a; - - /* compute transmittance and alpha */ - float soot_transmittance = pow(2.71828182846, -soot_density * step_size); - float soot_alpha = 1.0 - soot_transmittance; - - /* shade */ - float shadow = texture(shadow_texture, coords).r; - soot_color *= soot_transmittance * shadow; - - /* premultiply alpha */ - fragColor = vec4(soot_alpha * soot_color, soot_alpha); -#else - float color_band = texture(color_band_texture, coords).r; - vec4 transfer_function = texture(transfer_texture, color_band); - fragColor = transfer_function * density_scale; -#endif -} diff --git a/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl deleted file mode 100644 index 8c30e9baf9e..00000000000 --- a/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl +++ /dev/null @@ -1,15 +0,0 @@ - -uniform mat4 ModelViewProjectionMatrix; - -out vec3 coords; - -uniform vec3 min_location; -uniform vec3 invsize; -uniform vec3 ob_sizei; - -void main() -{ - // TODO: swap gl_Vertex for vec3 pos, update smoke setup code - gl_Position = ModelViewProjectionMatrix * vec4(gl_Vertex.xyz * ob_sizei, 1.0); - coords = (gl_Vertex.xyz - min_location) * invsize; -} -- cgit v1.2.3