griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Node Editor: Make nodelink arrow size and link width dpi dependant.

Browse Source
This commit is contained in:
Clément Foucault
2018-04-05 16:07:28 +02:00
parent fb8a1a58d9
commit 1c1dc39466
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_node/drawnode.c
View File

@@ -3394,11 +3394,10 @@ bool node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, flo
#define NODELINK_GROUP_SIZE 256
#define LINK_RESOL 24
#define LINK_WIDTH 2.5f
// #define ARROW_SIZE (7 * UI_DPI_FAC)
#define ARROW_SIZE 7
#define LINK_WIDTH (2.5f * UI_DPI_FAC)
#define ARROW_SIZE (7 * UI_DPI_FAC)
static float arrow_verts[3][2] = {{-ARROW_SIZE, ARROW_SIZE}, {0.0f, 0.0f}, {-ARROW_SIZE, -ARROW_SIZE}};
static float arrow_verts[3][2] = {{-1.0f, 1.0f}, {0.0f, 0.0f}, {-1.0f, -1.0f}};
static float arrow_expand_axis[3][2] = {{0.7071f, 0.7071f}, {M_SQRT2, 0.0f}, {0.7071f, -0.7071f}};
struct {
@@ -3542,6 +3541,7 @@ static void nodelink_batch_draw(SpaceNode *snode)
GWN_batch_program_set_builtin(g_batch_link.batch, GPU_SHADER_2D_NODELINK_INST);
GWN_batch_uniform_4fv_array(g_batch_link.batch, "colors", 6, (float *)colors);
GWN_batch_uniform_1f(g_batch_link.batch, "expandSize", snode->aspect * LINK_WIDTH);
GWN_batch_uniform_1f(g_batch_link.batch, "arrowSize", ARROW_SIZE);
GWN_batch_draw(g_batch_link.batch);
nodelink_batch_reset();
@@ -3618,6 +3618,7 @@ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link,
GWN_batch_uniform_2fv_array(batch, "bezierPts", 4, (float *)vec);
GWN_batch_uniform_4fv_array(batch, "colors", 3, (float *)colors);
GWN_batch_uniform_1f(batch, "expandSize", snode->aspect * LINK_WIDTH);
GWN_batch_uniform_1f(batch, "arrowSize", ARROW_SIZE);
GWN_batch_uniform_1i(batch, "doArrow", drawarrow);
GWN_batch_draw(batch);
}

3
source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
View File

@@ -44,6 +44,7 @@ uniform bool doArrow;
#endif
uniform float expandSize;
uniform float arrowSize;
uniform mat4 ModelViewProjectionMatrix;
out float colorGradient;
@@ -72,7 +73,7 @@ void main(void)
vec2 normal = tangent.yx * vec2(-1.0, 1.0);
/* Position vertex on the curve tangent space */
point += pos.x * tangent + pos.y * normal;
point += (pos.x * tangent + pos.y * normal) * arrowSize;
gl_Position = ModelViewProjectionMatrix * vec4(point, 0.0, 1.0);