[Bf-blender-cvs] [436696b087c] greasepencil-refactor: Cleanup: GPencil: Remove duplicated code
Clément Foucault
noreply at git.blender.org
Fri Dec 13 19:45:09 CET 2019
Commit: 436696b087c07d0efdfffd9eed7a56fc55541b4b
Author: Clément Foucault
Date: Fri Dec 13 19:38:41 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB436696b087c07d0efdfffd9eed7a56fc55541b4b
Cleanup: GPencil: Remove duplicated code
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
===================================================================
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
index ddb73d56981..8d3a34d545d 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
@@ -171,23 +171,18 @@ void stroke_vertex()
vec2 y_axis;
int alignement = materials[m].flag & GP_STROKE_ALIGNMENT;
if (alignement == GP_STROKE_ALIGNMENT_STROKE) {
- /* TODO case where ndc1 & ndc2 is behind camera */
- vec2 ss1 = project_to_screenspace(ndc1);
- vec2 ss2 = project_to_screenspace(ndc2);
- /* Screenspace Lines tangents. */
- x_axis = safe_normalize(ss2 - ss1);
- y_axis = rotate_90deg(x_axis);
+ x_axis = line;
}
else if (alignement == GP_STROKE_ALIGNMENT_OBJECT) {
/* TODO */
x_axis = vec2(1.0, 0.0);
- y_axis = vec2(0.0, 1.0);
}
else /* GP_STROKE_ALIGNMENT_FIXED*/ {
x_axis = vec2(1.0, 0.0);
- y_axis = vec2(0.0, 1.0);
}
+ y_axis = rotate_90deg(x_axis);
+
gl_Position.xy += (x * x_axis + y * y_axis) * sizeViewportInv.xy * thickness;
}
else {
More information about the Bf-blender-cvs
mailing list