archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Clip Editor: Fix visualization of plane track image

Browse Source 
Pair programming with Clement.
This commit is contained in:
Sergey Sharybin
2019-11-26 15:32:42 +01:00
parent a01ba66cf6
commit 630cb1bb1d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_clip/clip_draw.c
View File

@@ -1243,27 +1243,28 @@ static void draw_plane_marker_image(Scene *scene,
GPU_matrix_mul(gl_matrix); GPU_matrix_mul(gl_matrix);
GPUVertFormat *imm_format = immVertexFormat(); GPUVertFormat *imm_format = immVertexFormat();
uint pos = GPU_vertformat_attr_add(imm_format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); uint pos = GPU_vertformat_attr_add(imm_format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
uint texCoord = GPU_vertformat_attr_add( uint texCoord = GPU_vertformat_attr_add(
imm_format, "texCoord", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); imm_format, "texCoord", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR); immBindBuiltinProgram(GPU_SHADER_3D_IMAGE_MODULATE_ALPHA);
immUniformColor4f(1.0f, 1.0f, 1.0f, plane_track->image_opacity);
immUniform1f("alpha", plane_track->image_opacity);
immUniform1i("image", 0); immUniform1i("image", 0);
immBegin(GPU_PRIM_TRI_FAN, 4); immBegin(GPU_PRIM_TRI_FAN, 4);
immAttr2f(texCoord, 0.0f, 0.0f); immAttr2f(texCoord, 0.0f, 0.0f);
immVertex2f(pos, 0.0f, 0.0f); immVertex3f(pos, 0.0f, 0.0f, 0.0f);
immAttr2f(texCoord, 1.0f, 0.0f); immAttr2f(texCoord, 1.0f, 0.0f);
immVertex2f(pos, 1.0f, 0.0f); immVertex3f(pos, 1.0f, 0.0f, 0.0f);
immAttr2f(texCoord, 1.0f, 1.0f); immAttr2f(texCoord, 1.0f, 1.0f);
immVertex2f(pos, 1.0f, 1.0f); immVertex3f(pos, 1.0f, 1.0f, 0.0f);
immAttr2f(texCoord, 0.0f, 1.0f); immAttr2f(texCoord, 0.0f, 1.0f);
immVertex2f(pos, 0.0f, 1.0f); immVertex3f(pos, 0.0f, 1.0f, 0.0f);
immEnd(); immEnd();