[Bf-blender-cvs] [0d67f8d5c46] strand_editmode: Removed unused shaders in the draw modes module.
Lukas Tönne
noreply at git.blender.org
Sat Aug 19 10:58:52 CEST 2017
Commit: 0d67f8d5c46fcc97cbb0544ef7d8c3c0056025c4
Author: Lukas Tönne
Date: Sat Aug 19 08:56:04 2017 +0100
Branches: strand_editmode
https://developer.blender.org/rB0d67f8d5c46fcc97cbb0544ef7d8c3c0056025c4
Removed unused shaders in the draw modes module.
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/modes/edit_strands_mode.c
D source/blender/draw/modes/shaders/hair_frag.glsl
D source/blender/draw/modes/shaders/hair_vert.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index bcedcfc0f0a..5b39779035d 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -187,8 +187,6 @@ data_to_c_simple(modes/shaders/edit_lattice_overlay_loosevert_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_normals_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_normals_geom.glsl SRC)
data_to_c_simple(modes/shaders/edit_strands_vert.glsl SRC)
-data_to_c_simple(modes/shaders/hair_vert.glsl SRC)
-data_to_c_simple(modes/shaders/hair_frag.glsl SRC)
data_to_c_simple(modes/shaders/object_empty_image_frag.glsl SRC)
data_to_c_simple(modes/shaders/object_empty_image_vert.glsl SRC)
data_to_c_simple(modes/shaders/object_outline_resolve_frag.glsl SRC)
diff --git a/source/blender/draw/modes/edit_strands_mode.c b/source/blender/draw/modes/edit_strands_mode.c
index 68d0e4effe3..38b601efc9b 100644
--- a/source/blender/draw/modes/edit_strands_mode.c
+++ b/source/blender/draw/modes/edit_strands_mode.c
@@ -42,8 +42,6 @@
extern GlobalsUboStorage ts;
extern char datatoc_edit_strands_vert_glsl[];
-extern char datatoc_hair_vert_glsl[];
-extern char datatoc_hair_frag_glsl[];
extern char datatoc_gpu_shader_point_varying_color_frag_glsl[];
extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
diff --git a/source/blender/draw/modes/shaders/hair_frag.glsl b/source/blender/draw/modes/shaders/hair_frag.glsl
deleted file mode 100644
index 73c721553d7..00000000000
--- a/source/blender/draw/modes/shaders/hair_frag.glsl
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef MAX_LIGHT
-#define MAX_LIGHT 3
-#endif
-
-uniform vec4 ambient;
-uniform vec4 diffuse;
-uniform vec4 specular;
-
-uniform mat4 ProjectionMatrix;
-
-in vec3 fPosition;
-in vec3 fTangent;
-in vec3 fColor;
-
-out vec4 outColor;
-
-void main()
-{
-#ifdef SHADING_CLASSIC_BLENDER
- vec3 N = normalize(fTangent);
-#endif
-#ifdef SHADING_KAJIYA
- vec3 T = normalize(fTangent);
-#endif
-
- /* view vector computation, depends on orthographics or perspective */
- vec3 V = (ProjectionMatrix[3][3] == 0.0) ? normalize(fPosition) : vec3(0.0, 0.0, -1.0);
-#ifdef SHADING_KAJIYA
- float cosine_eye = dot(T, V);
- float sine_eye = sqrt(1.0 - cosine_eye*cosine_eye);
-#endif
-
- vec3 L_diffuse = vec3(0.0);
- vec3 L_specular = vec3(0.0);
-#if 0
- for (int i = 0; i < MAX_LIGHT; i++) {
- LightData ld = lights_data[i];
-
- //vec4 l_vector; /* Non-Normalized Light Vector with length in last component. */
- //l_vector.xyz = ld.l_position - worldPosition;
- //l_vector.w = length(l_vector.xyz);
- //vec3 l_color_vis = ld.l_color * light_visibility(ld, worldPosition, l_vector);
-
-#ifdef SHADING_CLASSIC_BLENDER
- /* diffuse light */
- vec3 light_diffuse = gl_LightSource[i].diffuse.rgb;
- float diffuse_bsdf = max(dot(N, light_direction), 0.0);
- L_diffuse += light_diffuse * diffuse_bsdf * intensity;
-
- /* specular light */
- vec3 light_specular = gl_LightSource[i].specular.rgb;
- vec3 H = normalize(light_direction - V);
- float specular_bsdf = pow(max(dot(N, H), 0.0), gl_FrontMaterial.shininess);
- L_specular += light_specular * specular_bsdf * intensity;
-#endif
-#ifdef SHADING_KAJIYA
- float cosine_light = dot(T, light_direction);
- float sine_light = sqrt(1.0 - cosine_light*cosine_light);
-
- /* diffuse light */
- vec3 light_diffuse = gl_LightSource[i].diffuse.rgb;
- float diffuse_bsdf = sine_light;
- L_diffuse += light_diffuse * diffuse_bsdf * intensity;
-
- /* specular light */
- vec3 light_specular = gl_LightSource[i].specular.rgb;
- float specular_bsdf = pow(abs(cosine_light)*abs(cosine_eye) + sine_light*sine_eye, gl_FrontMaterial.shininess);
- L_specular += light_specular * specular_bsdf * intensity;
-#endif
- }
-#endif
-
- /* sum lighting */
-
- vec3 L = vec3(0.0, 0.0, 0.0);
- L += ambient.rgb;
- L += L_diffuse * diffuse.rgb;
- L += L_specular * specular.rgb;
- float alpha = diffuse.a;
-
- /* write out fragment color */
- outColor = vec4(L, alpha);
-}
diff --git a/source/blender/draw/modes/shaders/hair_vert.glsl b/source/blender/draw/modes/shaders/hair_vert.glsl
deleted file mode 100644
index d323855bc8c..00000000000
--- a/source/blender/draw/modes/shaders/hair_vert.glsl
+++ /dev/null
@@ -1,190 +0,0 @@
-uniform sampler1D strand_data;
-uniform int strand_map_start;
-uniform int strand_vertex_start;
-uniform int fiber_start;
-uniform float ribbon_width;
-
-uniform mat4 ModelViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 ModelViewProjectionMatrix;
-uniform mat3 NormalMatrix;
-uniform vec2 viewport_size;
-
-in int fiber_index;
-in float curve_param;
-
-/* ---- Per instance Attribs ---- */
-in mat4 InstanceModelMatrix;
-
-out vec3 fPosition;
-out vec3 fTangent;
-out vec3 fColor;
-
-#ifdef WITH_DEBUG
-out ivec4 dbgParentIndex;
-out vec4 dbgParentWeight;
-out vec3 dbgRootPosition;
-#endif
-
-#define M_PI 3.1415926535897932384626433832795
-
-#define INDEX_INVALID -1
-
-mat3 mat3_from_vectors(vec3 nor, vec3 tang)
-{
- tang = normalize(tang);
- vec3 xnor = normalize(cross(nor, tang));
- return mat3(tang, xnor, cross(tang, xnor));
-}
-
-void get_strand_data(int index, out int start, out int count)
-{
- int offset = strand_map_start + index;
- vec4 a = texelFetch(strand_data, offset, 0);
-
- start = floatBitsToInt(a.r);
- count = floatBitsToInt(a.g);
-}
-
-void get_strand_vertex(int index, out vec3 co, out vec3 nor, out vec3 tang)
-{
- int offset = strand_vertex_start + index * 5;
- vec4 a = texelFetch(strand_data, offset, 0);
- vec4 b = texelFetch(strand_data, offset + 1, 0);
- vec4 c = texelFetch(strand_data, offset + 2, 0);
- vec4 d = texelFetch(strand_data, offset + 3, 0);
- vec4 e = texelFetch(strand_data, offset + 4, 0);
-
- co = vec3(a.rg, b.r);
- nor = vec3(b.g, c.rg);
- tang = vec3(d.rg, e.r);
-}
-
-void get_strand_root(int index, out vec3 co)
-{
- int offset = strand_vertex_start + index * 5;
- vec4 a = texelFetch(strand_data, offset, 0);
- vec4 b = texelFetch(strand_data, offset + 1, 0);
-
- co = vec3(a.rg, b.r);
-}
-
-void get_fiber_data(out ivec4 parent_index, out vec4 parent_weight, out vec3 pos)
-{
- int offset = fiber_start + fiber_index * 6;
- vec4 a = texelFetch(strand_data, offset, 0);
- vec4 b = texelFetch(strand_data, offset + 1, 0);
- vec4 c = texelFetch(strand_data, offset + 2, 0);
- vec4 d = texelFetch(strand_data, offset + 3, 0);
- vec4 e = texelFetch(strand_data, offset + 4, 0);
- vec4 f = texelFetch(strand_data, offset + 5, 0);
-
- parent_index = ivec4(floatBitsToInt(a.rg), floatBitsToInt(b.rg));
- parent_weight = vec4(c.rg, d.rg);
- pos = vec3(e.rg, f.r);
-
-#ifdef WITH_DEBUG
- dbgParentIndex = parent_index;
- dbgParentWeight = parent_weight;
- dbgRootPosition = pos;
-#endif
-}
-
-void interpolate_parent_curve(int index, out vec3 co, out vec3 nor, out vec3 tang)
-{
- int start, count;
- get_strand_data(index, start, count);
-
- vec3 rootco;
- get_strand_root(start, rootco);
-
-#if 0 // Don't have to worry about out-of-bounds segment here, as long as lerpfac becomes 0.0 when curve_param==1.0
- float maxlen = float(count - 1);
- float arclength = curve_param * maxlen;
- int segment = min(int(arclength), count - 2);
- float lerpfac = arclength - min(floor(arclength), maxlen - 1.0);
-#else
- float maxlen = float(count - 1);
- float arclength = curve_param * maxlen;
- int segment = int(arclength);
- float lerpfac = arclength - floor(arclength);
-#endif
-
- vec3 co0, nor0, tang0;
- vec3 co1, nor1, tang1;
- get_strand_vertex(start + segment, co0, nor0, tang0);
- get_strand_vertex(start + segment + 1, co1, nor1, tang1);
-
- co = mix(co0, co1, lerpfac) - rootco;
- nor = mix(nor0, nor1, lerpfac);
- tang = mix(tang0, tang1, lerpfac);
-}
-
-void interpolate_vertex(out vec3 co, out vec3 tang,
- out vec3 target_co, out mat3 target_matrix)
-{
- ivec4 parent_index;
- vec4 parent_weight;
- vec3 rootpos;
- get_fiber_data(parent_index, parent_weight, rootpos);
-
- co = vec3(0.0);
- tang = vec3(0.0);
- target_co = vec3(0.0);
- target_matrix = mat3(1.0);
-
- vec3 pco, pnor, ptang;
- if (parent_index.x != INDEX_INVALID) {
- interpolate_parent_curve(parent_index.x, pco, pnor, ptang);
- co += parent_weight.x * pco;
- tang += parent_weight.x * normalize(ptang);
- target_co = co;
- target_matrix = mat3_from_vectors(pnor, ptang);
- }
- if (parent_index.y != INDEX_INVALID) {
- interpolate_parent_curve(parent_index.y, pco, pnor, ptang);
- co += parent_weight.y * pco;
- tang += parent_weight.y * normalize(ptang);
- }
- if (parent_index.z != INDEX_INVALID) {
- interpolate_parent_curve(parent_index.z, pco, pnor, ptang);
- co += parent_weight.z * pco;
- tang += parent_weight.z * normalize(ptang);
- }
- if (parent_index.w != INDEX_INVALID) {
- interpolate_parent_curve(parent_index.w, pco, pnor, ptang);
- co += parent_weight.w * pco;
- tang += parent_weight.w * normalize(ptang);
- }
-
- co += rootpos;
- tang = normalize(tang);
-}
-
-void displace_vertex(inout vec3 loc, inout vec3 tang, in float t, in float tscale, in vec3 target_loc, in mat3 target_frame)
-{
- // TODO
-}
-
-void main()
-{
- vec3 loc, tang, target_loc;
- mat3 target_frame;
- interpolate_vertex(loc, tang, target_loc, target_frame);
-
- // TODO define proper curve scale, independent of subdivision!
- displace_vertex(loc, tang, curve_param, 1.0, target_loc, target_frame);
-
- mat4 InstanceViewMatrix = ModelViewMatrix * InstanceModelMatrix;
- vec4 co = InstanceViewMatrix * vec4(loc, 1.0);
- fPosition = vec3(co);
- fTangent = vec3(ProjectionMatrix * InstanceViewMatrix * vec4(tang, 0.0));
- fColor = vec3(1,1,0);
- gl_Position = ProjectionMatrix * co;
-
-#ifdef FIBER_RIBBON
- float ribbon_side = (float(gl_VertexID % 2) - 0.5) * ribbon_width;
- vec2 view_offset = normalize(vec2(fTangent.y, -fTangent.x)) / viewport_size * ribbon_side;
- gl_Position = vec4(gl_Position.xyz + vec3(view_offset, 0.0) * gl_Position.w, gl_Position.w);
-#endif
-}
More information about the Bf-blender-cvs
mailing list