blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

GP: New Canvas offset parameters 

Now the canvas can me moved in X/Y axis.
This commit is contained in:
Antonio Vazquez 2018-10-08 23:21:44 +02:00
parent e1293da014
commit 11877e5bec
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/properties_data_gpencil.py
View File

@ -365,6 +365,7 @@ class DATA_PT_gpencil_canvas(DataButtonsPanel, Panel):
col = row.column()
col.prop(grid, "color")
col.prop(grid, "scale")
col.prop(grid, "offset")
row = layout.row(align=True)
col = row.column()
col.prop(grid, "lines", text="Subdivisions")

25
source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
View File

@ -703,6 +703,7 @@ GPUBatch *DRW_gpencil_get_grid(Object *ob)
const float grid_h = gpd->grid.scale[1] * ED_scene_grid_scale(scene, &grid_unit);
const float space_w = (grid_w / gridlines);
const float space_h = (grid_h / gridlines);
const float offset[2] = { gpd->grid.offset[0], gpd->grid.offset[1] };
const uint vertex_len = 2 * (gridlines * 4 + 2);
@ -722,34 +723,34 @@ GPUBatch *DRW_gpencil_get_grid(Object *ob)
const float line_w = a * space_w;
const float line_h = a * space_h;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -grid_w, -line_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -grid_w + offset[0], -line_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +grid_w, -line_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +grid_w + offset[0], -line_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -grid_w, +line_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -grid_w + offset[0], +line_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +grid_w, +line_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +grid_w + offset[0], +line_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -line_w, -grid_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -line_w + offset[0], -grid_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -line_w, +grid_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -line_w + offset[0], +grid_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +line_w, -grid_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +line_w + offset[0], -grid_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +line_w, +grid_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +line_w + offset[0], +grid_h + offset[1], axis);
idx++;
}
/* center lines */
if (do_center) {
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -grid_w, 0.0f, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, -grid_w + offset[0], 0.0f + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +grid_w, 0.0f, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, +grid_w + offset[0], 0.0f + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, 0.0f, -grid_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, 0.0f + offset[0], -grid_h + offset[1], axis);
idx++;
set_grid_point(vbo, idx, col_grid, pos_id, color_id, 0.0f, +grid_h, axis);
set_grid_point(vbo, idx, col_grid, pos_id, color_id, 0.0f + offset[0], +grid_h + offset[1], axis);
idx++;
}
return GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);

1
source/blender/makesdna/DNA_gpencil_types.h
View File

@ -328,6 +328,7 @@ typedef struct bGPdata_Runtime {
typedef struct bGPgrid {
float color[3];
float scale[2];
float offset[2];
char _pad1[4];
int lines;

7
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -1279,6 +1279,13 @@ static void rna_def_gpencil_grid(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Grid Subdivisions", "Number of subdivisions in each side of symmetry line");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_XYZ);
RNA_def_property_float_sdna(prop, NULL, "offset");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_array(prop, 2);
RNA_def_property_ui_text(prop, "Offset", "Offset of the canvas");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "axis");
RNA_def_property_enum_items(prop, rna_enum_gpencil_grid_axis_items);