[Bf-blender-cvs] [380a7021725] tmp-overlay-engine: Overlay Engine: Edit Text
Clément Foucault
noreply at git.blender.org
Sat Nov 16 00:30:05 CET 2019
Commit: 380a70217256f5950fb7e66ffacceffc3237fc34
Author: Clément Foucault
Date: Sat Nov 16 00:29:23 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rB380a70217256f5950fb7e66ffacceffc3237fc34
Overlay Engine: Edit Text
===================================================================
M source/blender/draw/CMakeLists.txt
A source/blender/draw/engines/overlay/overlay_edit_text.c
M source/blender/draw/engines/overlay/overlay_engine.c
M source/blender/draw/engines/overlay/overlay_private.h
M source/blender/draw/engines/overlay/overlay_shader.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager_exec.c
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 805b5590bdd..5843fe9710e 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -137,6 +137,7 @@ set(SRC
engines/overlay/overlay_armature.c
engines/overlay/overlay_engine.c
engines/overlay/overlay_edit_curve.c
+ engines/overlay/overlay_edit_text.c
engines/overlay/overlay_edit_mesh.c
engines/overlay/overlay_extra.c
engines/overlay/overlay_facing.c
diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.c b/source/blender/draw/engines/overlay/overlay_edit_text.c
new file mode 100644
index 00000000000..ca600a8e33b
--- /dev/null
+++ b/source/blender/draw/engines/overlay/overlay_edit_text.c
@@ -0,0 +1,199 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Copyright 2019, Blender Foundation.
+ */
+
+/** \file
+ * \ingroup draw_engine
+ */
+
+#include "DRW_render.h"
+
+#include "BKE_font.h"
+
+#include "DNA_curve_types.h"
+
+#include "overlay_private.h"
+
+void OVERLAY_edit_text_cache_init(OVERLAY_Data *vedata)
+{
+ OVERLAY_PassList *psl = vedata->psl;
+ OVERLAY_PrivateData *pd = vedata->stl->pd;
+ const DRWContextState *draw_ctx = DRW_context_state_get();
+ View3D *v3d = draw_ctx->v3d;
+ DRWShadingGroup *grp;
+ GPUShader *sh;
+ DRWState state;
+
+ pd->edit_curve.show_handles = (v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) != 0;
+ pd->shdata.edit_curve_normal_length = v3d->overlay.normals_length;
+
+ /* Run Twice for in-front passes. */
+ for (int i = 0; i < 2; i++) {
+ state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH;
+ state |= ((i == 0) ? DRW_STATE_DEPTH_LESS_EQUAL : DRW_STATE_DEPTH_ALWAYS);
+ DRW_PASS_CREATE(psl->edit_text_wire_ps[i], state | pd->clipping_state);
+
+ sh = OVERLAY_shader_uniform_color();
+ pd->edit_text_wire_grp[i] = grp = DRW_shgroup_create(sh, psl->edit_text_wire_ps[i]);
+ DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorWire);
+ }
+ {
+ state = DRW_STATE_WRITE_COLOR | DRW_STATE_LOGIC_INVERT;
+ DRW_PASS_CREATE(psl->edit_text_overlay_ps, state | pd->clipping_state);
+
+ sh = OVERLAY_shader_uniform_color();
+ pd->edit_text_overlay_grp = DRW_shgroup_create(sh, psl->edit_text_overlay_ps);
+ }
+}
+
+/* Use 2D quad corners to create a matrix that set
+ * a [-1..1] quad at the right position. */
+static void v2_quad_corners_to_mat4(float corners[4][2], float r_mat[4][4])
+{
+ unit_m4(r_mat);
+ sub_v2_v2v2(r_mat[0], corners[1], corners[0]);
+ sub_v2_v2v2(r_mat[1], corners[3], corners[0]);
+ mul_v2_fl(r_mat[0], 0.5f);
+ mul_v2_fl(r_mat[1], 0.5f);
+ copy_v2_v2(r_mat[3], corners[0]);
+ add_v2_v2(r_mat[3], r_mat[0]);
+ add_v2_v2(r_mat[3], r_mat[1]);
+}
+
+static void edit_text_cache_populate_select(OVERLAY_Data *vedata, Object *ob)
+{
+ OVERLAY_PrivateData *pd = vedata->stl->pd;
+ const Curve *cu = ob->data;
+ EditFont *ef = cu->editfont;
+ float final_mat[4][4], box[4][2];
+ struct GPUBatch *geom = DRW_cache_quad_get();
+
+ for (int i = 0; i < ef->selboxes_len; i++) {
+ EditFontSelBox *sb = &ef->selboxes[i];
+
+ float selboxw;
+ if (i + 1 != ef->selboxes_len) {
+ if (ef->selboxes[i + 1].y == sb->y) {
+ selboxw = ef->selboxes[i + 1].x - sb->x;
+ }
+ else {
+ selboxw = sb->w;
+ }
+ }
+ else {
+ selboxw = sb->w;
+ }
+ /* NOTE: v2_quad_corners_to_mat4 don't need the 3rd corner. */
+ if (sb->rot == 0.0f) {
+ copy_v2_fl2(box[0], sb->x, sb->y);
+ copy_v2_fl2(box[1], sb->x + selboxw, sb->y);
+ copy_v2_fl2(box[3], sb->x, sb->y + sb->h);
+ }
+ else {
+ float mat[2][2];
+ angle_to_mat2(mat, sb->rot);
+ copy_v2_fl2(box[0], sb->x, sb->y);
+ mul_v2_v2fl(box[1], mat[0], selboxw);
+ add_v2_v2(box[1], &sb->x);
+ mul_v2_v2fl(box[3], mat[1], sb->h);
+ add_v2_v2(box[3], &sb->x);
+ }
+ v2_quad_corners_to_mat4(box, final_mat);
+ mul_m4_m4m4(final_mat, ob->obmat, final_mat);
+
+ DRW_shgroup_call_obmat(pd->edit_text_overlay_grp, geom, final_mat);
+ }
+}
+
+static void edit_text_cache_populate_cursor(OVERLAY_Data *vedata, Object *ob)
+{
+ OVERLAY_PrivateData *pd = vedata->stl->pd;
+ const Curve *cu = ob->data;
+ EditFont *edit_font = cu->editfont;
+ float(*cursor)[2] = edit_font->textcurs;
+ float mat[4][4];
+
+ v2_quad_corners_to_mat4(cursor, mat);
+ mul_m4_m4m4(mat, ob->obmat, mat);
+
+ struct GPUBatch *geom = DRW_cache_quad_get();
+ DRW_shgroup_call_obmat(pd->edit_text_overlay_grp, geom, mat);
+}
+
+static void edit_text_cache_populate_boxes(OVERLAY_Data *vedata, Object *ob)
+{
+ OVERLAY_ExtraCallBuffers *cb = OVERLAY_extra_call_buffer_get(vedata, ob);
+ const Curve *cu = ob->data;
+
+ for (int i = 0; i < cu->totbox; i++) {
+ TextBox *tb = &cu->tb[i];
+ const bool is_active = (i == (cu->actbox - 1));
+ float *color = is_active ? G_draw.block.colorActive : G_draw.block.colorWire;
+
+ if ((tb->w != 0.0f) || (tb->h != 0.0f)) {
+ float vecs[4][3];
+ vecs[0][0] = vecs[1][0] = vecs[2][0] = vecs[3][0] = cu->xof + tb->x;
+ vecs[0][1] = vecs[1][1] = vecs[2][1] = vecs[3][1] = cu->yof + tb->y + cu->fsize_realtime;
+ vecs[0][2] = vecs[1][2] = vecs[2][2] = vecs[3][2] = 0.001;
+
+ vecs[1][0] += tb->w;
+ vecs[2][0] += tb->w;
+ vecs[2][1] -= tb->h;
+ vecs[3][1] -= tb->h;
+
+ for (int j = 0; j < 4; j++) {
+ mul_v3_m4v3(vecs[j], ob->obmat, vecs[j]);
+ }
+ for (int j = 0; j < 4; j++) {
+ OVERLAY_extra_line_dashed(cb, vecs[j], vecs[(j + 1) % 4], color);
+ }
+ }
+ }
+}
+
+void OVERLAY_edit_text_cache_populate(OVERLAY_Data *vedata, Object *ob)
+{
+ OVERLAY_PrivateData *pd = vedata->stl->pd;
+ Curve *cu = ob->data;
+ struct GPUBatch *geom;
+ bool do_in_front = (ob->dtx & OB_DRAWXRAY) != 0;
+
+ bool has_surface = (cu->flag & (CU_FRONT | CU_BACK)) || cu->ext1 != 0.0f || cu->ext2 != 0.0f;
+ if ((cu->flag & CU_FAST) || !has_surface) {
+ geom = DRW_cache_text_edge_wire_get(ob);
+ if (geom) {
+ DRW_shgroup_call(pd->edit_text_wire_grp[do_in_front], geom, ob);
+ }
+ }
+ else {
+ /* object mode draws */
+ }
+
+ edit_text_cache_populate_select(vedata, ob);
+ edit_text_cache_populate_cursor(vedata, ob);
+ edit_text_cache_populate_boxes(vedata, ob);
+}
+
+void OVERLAY_edit_text_draw(OVERLAY_Data *vedata)
+{
+ OVERLAY_PassList *psl = vedata->psl;
+
+ DRW_draw_pass(psl->edit_text_wire_ps[0]);
+ DRW_draw_pass(psl->edit_text_wire_ps[1]);
+
+ DRW_draw_pass(psl->edit_text_overlay_ps);
+}
\ No newline at end of file
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c
index f4fd14e0792..a6a14055375 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -59,6 +59,7 @@ static void OVERLAY_engine_init(void *vedata)
/* Nothing to do. */
break;
case CTX_MODE_EDIT_TEXT:
+ /* Nothing to do. */
break;
case CTX_MODE_EDIT_ARMATURE:
break;
@@ -126,6 +127,7 @@ static void OVERLAY_cache_init(void *vedata)
OVERLAY_edit_curve_cache_init(vedata);
break;
case CTX_MODE_EDIT_TEXT:
+ OVERLAY_edit_text_cache_init(vedata);
break;
case CTX_MODE_EDIT_ARMATURE:
break;
@@ -240,6 +242,7 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
case OB_MBALL:
break;
case OB_FONT:
+ OVERLAY_edit_text_cache_populate(vedata, ob);
break;
}
}
@@ -336,6 +339,9 @@ static void OVERLAY_draw_scene(void *vedata)
case CTX_MODE_EDIT_CURVE:
OVERLAY_edit_curve_draw(vedata);
break;
+ case CTX_MODE_EDIT_TEXT:
+ OVERLAY_edit_text_draw(vedata);
+ break;
default:
break;
}
diff --git a/source/blender/draw/engines/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h
index 2504761df7c..9bce5318995 100644
--- a/source/blender/draw/engines/overlay/overlay_private.h
+++ b/source/blender/draw/engines/overlay/overlay_private.h
@@ -50,6 +50,8 @@ typedef struct OVERLAY_PassList {
DRWPass *armature_ps[2];
DRWPass *edit_curve_wire_ps[2];
DRWPass *edit_curve_handle_ps;
+ DRWPass *edit_text_overlay_ps;
+ DRWPass *edit_text_wire_ps[2];
DRWPass *edit_mesh_depth_ps[2];
DRWPass *edit_mesh_verts_ps[2];
DRWPass *edit_mesh_edges_ps[2];
@@ -184,6 +186,8 @@ typedef struct OVERLAY_PrivateData {
DRWShadingGroup *edit_curve_wire_grp[2];
DRWShadingGroup *edit_curve_handle_grp;
DRWShadingGroup *edit_curve_points_grp;
+ DRWShadingGroup *edit_text_overlay_grp;
+ DRWShadingGroup *edit_text_wire_grp[2];
DRWShadingGroup *edit_mesh_depth_grp[2];
DRWShadingGroup *edit_mesh_faces_grp[2];
DRWShadingGroup *edit_mesh_faces_cage_grp[2];
@@ -306,6 +310,10 @@ void OVERLAY_edit_curve_cache_populate(OVERLAY_Data *vedata, Object *ob);
void OVERLAY_edit_surf_cache_populate(OVERLAY_Data *vedata, Object *ob);
void OVERLAY_edit_curve_draw(OVERLAY_Data *vedata);
+void OVERLAY_edit_text_cache_init(OVERLAY_Data *vedata);
+void OVERLAY_edit_text_cache_populate(OVERLAY_Data *vedata, Object *ob);
+void OVERLAY_edit_text_draw(OVERLAY_Data *vedata);
+
void OVERLAY_edit_mesh_init(OVERLAY_Data *vedata);
void OVERLAY_edit_mesh_cache_init(OVERLAY_Data *vedata);
void OVERLAY_edit_mesh_cache_populate(OVERLAY_Data *vedata, Object *ob);
@@ -401,6 +409,7 @@ GPUShader *OVERLAY_shader_grid(void);
GPUShader *OVERLAY_shader_image(void);
GPU
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list