[Bf-blender-cvs] [f1966fae33f] greasepencil-object: GPencil: Try to add some randomness to textured strokes

Antonioya noreply at git.blender.org
Wed Mar 6 19:47:23 CET 2019


Commit: f1966fae33fa2f55c8044b64245f3ff4a706ac68
Author: Antonioya
Date:   Wed Mar 6 19:47:17 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf1966fae33fa2f55c8044b64245f3ff4a706ac68

GPencil: Try to add some randomness to textured strokes

This is a test to check the sclae of the random value for UV in strokes.

===================================================================

M	source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl

===================================================================

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
index a3780a3dd4f..3de266036a0 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
@@ -60,6 +60,13 @@ bool is_equal(vec4 p1, vec4 p2)
 	return false;
 }
 
+vec2 scaleUV(vec2 uv, float scale)
+{
+	float limit = 0.025;
+	float factor = 1.0 + clamp(scale, -limit, limit);
+	return vec2(uv.x * factor, uv.y);
+}
+
 void main(void)
 {
 	float MiterLimit = 0.75;
@@ -195,11 +202,13 @@ void main(void)
 	EmitVertex();
 
 	mTexCoord = (color_type == GPENCIL_COLOR_SOLID) ? vec2(1, 0) : vec2(finaluvdata[2].x, 0);
+	mTexCoord = scaleUV(mTexCoord, finaluvdata[2].y);
 	mColor = finalColor[2];
 	gl_Position = vec4((sp2 + length_b * miter_b) / Viewport, getZdepth(P2), 1.0);
 	EmitVertex();
 
 	mTexCoord = (color_type == GPENCIL_COLOR_SOLID) ? vec2(1, 1) : vec2(finaluvdata[2].x, 1);
+	mTexCoord = scaleUV(mTexCoord, finaluvdata[2].y);
 	mColor = finalColor[2];
 	gl_Position = vec4((sp2 - length_b * miter_b) / Viewport, getZdepth(P2), 1.0);
 	EmitVertex();



More information about the Bf-blender-cvs mailing list