[Bf-blender-cvs] [0a12d49392e] tmp-overlay-engine: Overlay Engine: Edit Curve / Surface
Clément Foucault
noreply at git.blender.org
Sat Nov 16 00:30:03 CET 2019
Commit: 0a12d49392e825305f67e86984b032224cfe40b7
Author: Clément Foucault
Date: Fri Nov 15 20:24:51 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rB0a12d49392e825305f67e86984b032224cfe40b7
Overlay Engine: Edit Curve / Surface
===================================================================
M source/blender/draw/CMakeLists.txt
A source/blender/draw/engines/overlay/overlay_edit_curve.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
A source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl
A source/blender/draw/engines/overlay/shaders/edit_curve_handle_vert.glsl
A source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl
A source/blender/draw/engines/overlay/shaders/edit_curve_wire_vert.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 2ebfc018b21..805b5590bdd 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -136,6 +136,7 @@ set(SRC
engines/select/select_engine.c
engines/overlay/overlay_armature.c
engines/overlay/overlay_engine.c
+ engines/overlay/overlay_edit_curve.c
engines/overlay/overlay_edit_mesh.c
engines/overlay/overlay_extra.c
engines/overlay/overlay_facing.c
@@ -387,6 +388,10 @@ data_to_c_simple(engines/overlay/shaders/armature_stick_frag.glsl SRC)
data_to_c_simple(engines/overlay/shaders/armature_stick_vert.glsl SRC)
data_to_c_simple(engines/overlay/shaders/armature_wire_vert.glsl SRC)
data_to_c_simple(engines/overlay/shaders/depth_only_vert.glsl SRC)
+data_to_c_simple(engines/overlay/shaders/edit_curve_handle_geom.glsl SRC)
+data_to_c_simple(engines/overlay/shaders/edit_curve_handle_vert.glsl SRC)
+data_to_c_simple(engines/overlay/shaders/edit_curve_point_vert.glsl SRC)
+data_to_c_simple(engines/overlay/shaders/edit_curve_wire_vert.glsl SRC)
data_to_c_simple(engines/overlay/shaders/edit_mesh_common_lib.glsl SRC)
data_to_c_simple(engines/overlay/shaders/edit_mesh_facefill_frag.glsl SRC)
data_to_c_simple(engines/overlay/shaders/edit_mesh_facefill_vert.glsl SRC)
diff --git a/source/blender/draw/engines/overlay/overlay_edit_curve.c b/source/blender/draw/engines/overlay/overlay_edit_curve.c
new file mode 100644
index 00000000000..81253347632
--- /dev/null
+++ b/source/blender/draw/engines/overlay/overlay_edit_curve.c
@@ -0,0 +1,127 @@
+/*
+ * 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 "DNA_curve_types.h"
+
+#include "overlay_private.h"
+
+void OVERLAY_edit_curve_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_curve_wire_ps[i], state | pd->clipping_state);
+
+ sh = OVERLAY_shader_edit_curve_wire();
+ pd->edit_curve_normal_grp[i] = grp = DRW_shgroup_create(sh, psl->edit_curve_wire_ps[i]);
+ DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_float_copy(grp, "normalSize", pd->shdata.edit_curve_normal_length);
+
+ pd->edit_curve_wire_grp[i] = grp = DRW_shgroup_create(sh, psl->edit_curve_wire_ps[i]);
+ DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_float_copy(grp, "normalSize", 0.0f);
+ }
+ {
+ state = DRW_STATE_WRITE_COLOR;
+ DRW_PASS_CREATE(psl->edit_curve_handle_ps, state | pd->clipping_state);
+
+ sh = OVERLAY_shader_edit_curve_handle();
+ pd->edit_curve_handle_grp = grp = DRW_shgroup_create(sh, psl->edit_curve_handle_ps);
+ DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
+ DRW_shgroup_state_enable(grp, DRW_STATE_BLEND_ALPHA);
+
+ sh = OVERLAY_shader_edit_curve_point();
+ pd->edit_curve_points_grp = grp = DRW_shgroup_create(sh, psl->edit_curve_handle_ps);
+ DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+ }
+}
+
+void OVERLAY_edit_curve_cache_populate(OVERLAY_Data *vedata, Object *ob)
+{
+ OVERLAY_PrivateData *pd = vedata->stl->pd;
+ bool draw_normals = (pd->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_NORMALS) != 0;
+ bool do_xray = (ob->dtx & OB_DRAWXRAY) != 0;
+
+ Curve *cu = ob->data;
+ struct GPUBatch *geom;
+
+ geom = DRW_cache_curve_edge_wire_get(ob);
+ if (geom) {
+ DRW_shgroup_call_no_cull(pd->edit_curve_wire_grp[do_xray], geom, ob);
+ }
+
+ if ((cu->flag & CU_3D) && draw_normals) {
+ geom = DRW_cache_curve_edge_normal_get(ob);
+ DRW_shgroup_call_instances(pd->edit_curve_normal_grp[do_xray], ob, geom, 3);
+ }
+
+ geom = DRW_cache_curve_edge_overlay_get(ob);
+ if (geom) {
+ DRW_shgroup_call_no_cull(pd->edit_curve_handle_grp, geom, ob);
+ }
+
+ geom = DRW_cache_curve_vert_overlay_get(ob, pd->edit_curve.show_handles);
+ if (geom) {
+ DRW_shgroup_call_no_cull(pd->edit_curve_points_grp, geom, ob);
+ }
+}
+
+void OVERLAY_edit_surf_cache_populate(OVERLAY_Data *vedata, Object *ob)
+{
+ OVERLAY_PrivateData *pd = vedata->stl->pd;
+ struct GPUBatch *geom;
+
+ geom = DRW_cache_curve_edge_overlay_get(ob);
+ if (geom) {
+ DRW_shgroup_call_no_cull(pd->edit_curve_handle_grp, geom, ob);
+ }
+
+ geom = DRW_cache_curve_vert_overlay_get(ob, false);
+ if (geom) {
+ DRW_shgroup_call_no_cull(pd->edit_curve_points_grp, geom, ob);
+ }
+}
+
+void OVERLAY_edit_curve_draw(OVERLAY_Data *vedata)
+{
+ OVERLAY_PassList *psl = vedata->psl;
+
+ DRW_draw_pass(psl->edit_curve_wire_ps[0]);
+ DRW_draw_pass(psl->edit_curve_wire_ps[1]);
+
+ DRW_draw_pass(psl->edit_curve_handle_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 12f2076813e..f4fd14e0792 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -56,6 +56,7 @@ static void OVERLAY_engine_init(void *vedata)
break;
case CTX_MODE_EDIT_SURFACE:
case CTX_MODE_EDIT_CURVE:
+ /* Nothing to do. */
break;
case CTX_MODE_EDIT_TEXT:
break;
@@ -122,6 +123,7 @@ static void OVERLAY_cache_init(void *vedata)
break;
case CTX_MODE_EDIT_SURFACE:
case CTX_MODE_EDIT_CURVE:
+ OVERLAY_edit_curve_cache_init(vedata);
break;
case CTX_MODE_EDIT_TEXT:
break;
@@ -228,8 +230,10 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
OVERLAY_edit_armature_cache_populate(vedata, ob);
break;
case OB_CURVE:
+ OVERLAY_edit_curve_cache_populate(vedata, ob);
break;
case OB_SURF:
+ OVERLAY_edit_surf_cache_populate(vedata, ob);
break;
case OB_LATTICE:
break;
@@ -328,6 +332,10 @@ static void OVERLAY_draw_scene(void *vedata)
case CTX_MODE_EDIT_MESH:
OVERLAY_edit_mesh_draw(vedata);
break;
+ case CTX_MODE_EDIT_SURFACE:
+ case CTX_MODE_EDIT_CURVE:
+ OVERLAY_edit_curve_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 14345af30f8..2504761df7c 100644
--- a/source/blender/draw/engines/overlay/overlay_private.h
+++ b/source/blender/draw/engines/overlay/overlay_private.h
@@ -48,6 +48,8 @@ typedef struct OVERLAY_TextureList {
typedef struct OVERLAY_PassList {
DRWPass *armature_transp_ps;
DRWPass *armature_ps[2];
+ DRWPass *edit_curve_wire_ps[2];
+ DRWPass *edit_curve_handle_ps;
DRWPass *edit_mesh_depth_ps[2];
DRWPass *edit_mesh_verts_ps[2];
DRWPass *edit_mesh_edges_ps[2];
@@ -91,6 +93,8 @@ typedef struct OVERLAY_ShadingData {
int zneg_flag;
/** Wireframe */
float wire_step_param;
+ /** Edit Curve */
+ float edit_curve_normal_length;
/** Edit Mesh */
int data_mask[4];
} OVERLAY_ShadingData;
@@ -176,6 +180,10 @@ typedef struct OVERLAY_ArmatureCallBuffers {
} OVERLAY_ArmatureCallBuffers;
typedef struct OVERLAY_PrivateData {
+ DRWShadingGroup *edit_curve_normal_grp[2];
+ DRWShadingGroup *edit_curve_wire_grp[2];
+ DRWShadingGroup *edit_curve_handle_grp;
+ DRWShadingGroup *edit_curve_points_grp;
DRWShadingGroup *edit_mesh_depth_grp[2];
DRWShadingGroup *edit_mesh_faces_grp[2];
DRWShadingGroup *edit_mesh_faces_cage_grp[2];
@@ -227,6 +235,9 @@ typedef struct OVERLAY_PrivateData {
DRWState clipping_state;
OVERLAY_ShadingData shdata;
+ struct {
+ bool show_handles;
+ } edit_curve;
struct {
int ghost_ob;
int edit_ob;
@@ -289,6 +300,12 @@ void OVERLAY_edit_armature_cache_populate(OVERLAY_Data *vedata, Object *ob);
void OVERLAY_pose_armature_cache_populate(OVERLAY_Data *vedata, Object *ob);
void OVERLAY_armature_draw(OVERLAY_Data *vedata);
+void OVERLAY_edit_curve_init(OVERLAY_Data *vedata);
+void OVERLAY_edit_curve_cache_init(OVERLAY_Data *vedata);
+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_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);
@@ -362,6 +379,9 @@ GPUShader *OVERLAY_shader_armature_sphere(bool use_outline);
GPUShader *OVERLAY_shader_armature_stick(void);
GPUShader *OVERLAY_shader_armature_wire(void);
GPUShader *OVERLAY_shader_depth_only(void);
+GPUShader *OVERLAY_shader_edit_curve_handle(void);
+GPUShader *OVERLAY_shader_edit_curve_point(void);
+GPUShader *OVERLAY_shader_edit_curve_wire(void);
GPUShader *OVERLAY_shader_edit_mes
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list