[Bf-blender-cvs] [ef18c6080b4] greasepencil-object: First steps to create new drawing mode for gpencil
Antonio Vazquez
noreply at git.blender.org
Sun Apr 9 16:58:16 CEST 2017
Commit: ef18c6080b45bc32e18a5301cad3dc83a5316999
Author: Antonio Vazquez
Date: Sun Apr 9 16:52:36 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBef18c6080b45bc32e18a5301cad3dc83a5316999
First steps to create new drawing mode for gpencil
Created basic structure of the drawing mode, but pending of adding all functionality and link to draw manager.
===================================================================
M source/blender/draw/CMakeLists.txt
A source/blender/draw/engines/gpencil/gpencil_mode.c
A source/blender/draw/engines/gpencil/gpencil_mode.h
A source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
A source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index cf94fccd4e3..3b1ce7c7a1d 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -67,6 +67,9 @@ set(SRC
engines/eevee/eevee.h
engines/eevee/eevee_private.h
+ engines/gpencil/gpencil_mode.h
+ engines/gpencil/gpencil_mode.c
+
modes/object_mode.c
modes/edit_armature_mode.c
modes/edit_curve_mode.c
@@ -126,6 +129,12 @@ data_to_c_simple(modes/shaders/object_outline_detect_frag.glsl SRC)
data_to_c_simple(modes/shaders/object_grid_frag.glsl SRC)
data_to_c_simple(modes/shaders/object_grid_vert.glsl SRC)
+data_to_c_simple(engines/gpencil/shaders/gpencil_fill_vert.glsl SRC)
+data_to_c_simple(engines/gpencil/shaders/gpencil_fill_frag.glsl SRC)
+data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_vert.glsl SRC)
+data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_geom.glsl SRC)
+data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_frag.glsl SRC)
+
list(APPEND INC
)
diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c b/source/blender/draw/engines/gpencil/gpencil_mode.c
new file mode 100644
index 00000000000..27c3662afc4
--- /dev/null
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -0,0 +1,288 @@
+/*
+ * Copyright 2017, Blender Foundation.
+ *
+ * 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.
+ *
+ * Contributor(s): Blender Institute
+ *
+ */
+
+/** \file blender/draw/engines/gpencil/gpencil_mode.c
+ * \ingroup draw
+ */
+
+#include "DRW_engine.h"
+#include "DRW_render.h"
+
+#include "BKE_gpencil.h"
+
+#include "DNA_gpencil_types.h"
+
+ /* If builtin shaders are needed */
+#include "GPU_shader.h"
+
+#include "draw_common.h"
+
+#include "draw_mode_engines.h"
+
+extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */
+
+extern char datatoc_gpencil_fill_vert[];
+extern char datatoc_gpencil_fill_frag[];
+extern char datatoc_gpencil_stroke_vert[];
+extern char datatoc_gpencil_stroke_geom[];
+extern char datatoc_gpencil_stroke_frag[];
+
+/* *********** LISTS *********** */
+#define MAX_GPENCIL_MAT 512
+
+typedef struct GPENCIL_Storage {
+ int pal_id;
+ PaletteColor *materials[MAX_GPENCIL_MAT];
+ DRWShadingGroup *shgrps_fill[MAX_GPENCIL_MAT];
+ DRWShadingGroup *shgrps_stroke[MAX_GPENCIL_MAT];
+} GPENCIL_Storage;
+
+/* keep it under MAX_STORAGE */
+typedef struct GPENCIL_StorageList {
+ struct GPENCIL_Storage *storage;
+ struct g_data *g_data;
+} GPENCIL_StorageList;
+
+/* keep it under MAX_PASSES */
+typedef struct GPENCIL_PassList {
+ struct DRWPass *pass;
+} GPENCIL_PassList;
+
+/* keep it under MAX_BUFFERS */
+typedef struct GPENCIL_FramebufferList {
+ struct GPUFrameBuffer *fb;
+} GPENCIL_FramebufferList;
+
+/* keep it under MAX_TEXTURES */
+typedef struct GPENCIL_TextureList {
+ struct GPUTexture *texture;
+} GPENCIL_TextureList;
+
+typedef struct GPENCIL_Data {
+ void *engine_type; /* Required */
+ GPENCIL_FramebufferList *fbl;
+ GPENCIL_TextureList *txl;
+ GPENCIL_PassList *psl;
+ GPENCIL_StorageList *stl;
+} GPENCIL_Data;
+
+/* *********** STATIC *********** */
+
+typedef struct g_data{
+ int t_flip;
+ int t_mix;
+} g_data; /* Transient data */
+
+static struct {
+ struct GPUShader *gpencil_fill_sh;
+ struct GPUShader *gpencil_stroke_sh;
+ struct GPUShader *gpencil_point_sh;
+} e_data = {NULL}; /* Engine data */
+
+
+/* *********** FUNCTIONS *********** */
+
+static void GPENCIL_engine_init(void *vedata)
+{
+ GPENCIL_TextureList *txl = ((GPENCIL_Data *)vedata)->txl;
+ GPENCIL_FramebufferList *fbl = ((GPENCIL_Data *)vedata)->fbl;
+ GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
+
+ e_data.gpencil_fill_sh = DRW_shader_create_with_lib(datatoc_gpencil_fill_vert, NULL,
+ datatoc_gpencil_fill_frag,
+ NULL, NULL);
+ e_data.gpencil_stroke_sh = DRW_shader_create_with_lib(datatoc_gpencil_stroke_vert,
+ datatoc_gpencil_stroke_geom,
+ datatoc_gpencil_stroke_frag,
+ NULL, NULL);
+ e_data.gpencil_point_sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
+}
+
+static void GPENCIL_engine_free(void)
+{
+ if (e_data.gpencil_fill_sh)
+ DRW_shader_free(e_data.gpencil_fill_sh);
+ if (e_data.gpencil_stroke_sh)
+ DRW_shader_free(e_data.gpencil_stroke_sh);
+}
+
+/* create shading group for filling */
+static DRWShadingGroup *GPENCIL_shgroup_fill_create(GPENCIL_Data *vedata, DRWPass *pass, PaletteColor *palcolor)
+{
+ GPENCIL_TextureList *txl = ((GPENCIL_Data *)vedata)->txl;
+ GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
+
+ DRWShadingGroup *grp = DRW_shgroup_create(e_data.gpencil_fill_sh, pass);
+ DRW_shgroup_uniform_vec4(grp, "color", palcolor->fill, 1);
+ DRW_shgroup_uniform_vec4(grp, "color2", palcolor->scolor, 1);
+ DRW_shgroup_uniform_int(grp, "fill_type", &palcolor->fill_style, 1);
+ DRW_shgroup_uniform_float(grp, "mix_factor", &palcolor->mix_factor, 1);
+
+ DRW_shgroup_uniform_float(grp, "g_angle", &palcolor->g_angle, 1);
+ DRW_shgroup_uniform_float(grp, "g_radius", &palcolor->g_radius, 1);
+ DRW_shgroup_uniform_float(grp, "g_boxsize", &palcolor->g_boxsize, 1);
+ DRW_shgroup_uniform_vec2(grp, "g_scale", palcolor->g_scale, 1);
+ DRW_shgroup_uniform_vec2(grp, "g_shift", palcolor->g_shift, 1);
+
+ DRW_shgroup_uniform_float(grp, "t_angle", &palcolor->t_angle, 1);
+ DRW_shgroup_uniform_vec2(grp, "t_scale", palcolor->t_scale, 1);
+ DRW_shgroup_uniform_vec2(grp, "t_shift", palcolor->t_shift, 1);
+ DRW_shgroup_uniform_float(grp, "t_opacity", &palcolor->t_opacity, 1);
+
+ stl->g_data->t_mix = palcolor->flag & PAC_COLOR_TEX_MIX ? 1 : 0;
+ DRW_shgroup_uniform_int(grp, "t_mix", &stl->g_data->t_mix, 1);
+
+ stl->g_data->t_flip = palcolor->flag & PAC_COLOR_FLIP_FILL ? 1 : 0;
+ DRW_shgroup_uniform_int(grp, "t_flip", &stl->g_data->t_flip, 1);
+
+ /* TODO: image texture */
+ if ((palcolor->fill_style == FILL_STYLE_TEXTURE) || (palcolor->flag & PAC_COLOR_TEX_MIX)) {
+ //gp_set_filling_texture(palcolor->ima, palcolor->flag);
+ DRW_shgroup_uniform_buffer(grp, "myTexture", &txl->texture, 0);
+ }
+
+ return grp;
+}
+
+/* create shading group for strokes */
+static DRWShadingGroup *GPENCIL_shgroup_stroke_create(GPENCIL_Data *vedata, DRWPass *pass, PaletteColor *palcolor)
+{
+ GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
+
+ float *viewport_size = DRW_viewport_size_get();
+ DRWShadingGroup *grp = DRW_shgroup_create(e_data.gpencil_stroke_sh, pass);
+ DRW_shgroup_uniform_vec2(grp, "Viewport", viewport_size, 1);
+
+ return grp;
+}
+
+
+static void GPENCIL_cache_init(void *vedata)
+{
+ GPENCIL_PassList *psl = ((GPENCIL_Data *)vedata)->psl;
+ GPENCIL_TextureList *txl = ((GPENCIL_Data *)vedata)->txl;
+ GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
+ DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
+
+ const struct bContext *C = DRW_get_context();
+ Scene *scene = CTX_data_scene(C);
+ SceneLayer *sl = CTX_data_scene_layer(C);
+
+ if (!stl->g_data) {
+ /* Alloc transient pointers */
+ stl->g_data = MEM_mallocN(sizeof(g_data), "g_data");
+ }
+
+ {
+ /* Create a pass */
+ DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
+ psl->pass = DRW_pass_create("Gpencil Pass", state);
+ stl->storage->pal_id = 0;
+ memset(stl->storage->shgrps_fill, 0, sizeof(DRWShadingGroup *) * MAX_GPENCIL_MAT);
+ memset(stl->storage->shgrps_stroke, 0, sizeof(DRWShadingGroup *) * MAX_GPENCIL_MAT);
+ memset(stl->storage->materials, 0, sizeof(PaletteColor *) * MAX_GPENCIL_MAT);
+ }
+}
+
+static int GPENCIL_shgroup_find(GPENCIL_Storage *storage, PaletteColor *palcolor)
+{
+ for (int i = 0; i < storage->pal_id; ++i) {
+ if (storage->materials[i] == palcolor) {
+ return i;
+ }
+ }
+
+ /* not found */
+ return -1;
+}
+
+static void GPENCIL_cache_populate(void *vedata, Object *ob)
+{
+ GPENCIL_PassList *psl = ((GPENCIL_Data *)vedata)->psl;
+ GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
+ DRWShadingGroup *fillgrp;
+ DRWShadingGroup *strokegrp;
+ const bContext *C = DRW_get_context();
+ Scene *scene = CTX_data_scene(C);
+ bGPdata *gpd = ob->gpd;
+
+ UNUSED_VARS(psl, stl);
+
+ if (ob->type == OB_GPENCIL) {
+ if (!gpd) {
+ return;
+ }
+
+ for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+ bGPDframe *gpf = BKE_gpencil_layer_getframe(gpl, CFRA, 0);
+ // TODO: need to replace this code with full drawing checks
+ for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
+ /* try to find shader group or create a new one */
+ int id = GPENCIL_shgroup_find(stl->storage, gps->palcolor);
+ if (id == -1) {
+ id = stl->storage->pal_id;
+ stl->storage->materials[id] = gps->palcolor;
+ stl->storage->shgrps_fill[id] = GPENCIL_shgroup_fill_create(vedata, psl->pass, gps->palcolor);
+ stl->storage->shgrps_stroke[id] = GPENCIL_shgroup_stroke_create(vedata, psl->pass, gps->palcolor);
+ ++stl->storage->pal_id;
+ }
+
+ fillgrp = stl->storage->shgrps_fill[id];
+ strokegrp = stl->storage->shgrps_stroke[id];
+
+ /* fill */
+ struct Batch *fill_geom = DRW_cache_surface_get(ob); // TODO: replace with real funct
+ /* Add fill geom to a shading group */
+ DRW_shgroup_call_add(fillgrp, fill_geom, ob->obmat);
+
+ /* stroke */
+ struct Batch *stroke_geom = DRW_cache_surface_get(ob); // TODO: replace with real funct
+ /* Add stroke geom to a shading group */
+ DRW_shgroup_call_add(strokegrp, stroke_geom, ob->obmat);
+ }
+ }
+ }
+}
+
+static void GPENCIL_draw
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list