2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2009-01-14 16:13:50 +00:00
|
|
|
* 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-01-14 16:13:50 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2008, Blender Foundation
|
|
|
|
* This is a new part of Blender
|
|
|
|
*/
|
2011-02-27 20:29:51 +00:00
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
* \ingroup edgpencil
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <float.h>
|
|
|
|
|
2016-04-29 01:10:33 +12:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2013-05-28 19:35:26 +00:00
|
|
|
#include "BLI_sys_types.h"
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2012-06-11 00:21:50 +00:00
|
|
|
#include "BLI_math.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2018-02-18 21:27:33 +11:00
|
|
|
#include "BLI_polyfill_2d.h"
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2015-04-02 20:49:29 +13:00
|
|
|
#include "BLF_api.h"
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2015-04-02 20:49:29 +13:00
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "DNA_brush_types.h"
|
2009-01-14 16:13:50 +00:00
|
|
|
#include "DNA_gpencil_types.h"
|
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "DNA_space_types.h"
|
2010-08-25 08:31:52 +00:00
|
|
|
#include "DNA_view3d_types.h"
|
2014-05-01 07:38:14 +10:00
|
|
|
#include "DNA_userdef_types.h"
|
2016-08-03 23:31:48 +02:00
|
|
|
#include "DNA_object_types.h"
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
#include "BKE_context.h"
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "BKE_brush.h"
|
2009-01-14 16:13:50 +00:00
|
|
|
#include "BKE_global.h"
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "BKE_paint.h"
|
2.5
Patch from Joshua, converting Grease Pencil to 2.5.
All GP data now is an ID block, allowing re-use, link and append.
For better contextual control within 2.5, these GP ID's will get
linked to actual data, like NodeTrees, Scenes, Images or Objects.
That will ensure Undo works, and opens up exciting new use cases
as well. :)
Patch note: on reading files, GPencils linked from editors will
get moved to the main library, using standard naming (indicating
where it was used), and with "Fake User" set. That way the user
can manually relink the pencils where appropriate.
We can check on just linking GP to some default, like 3d window
pencils to Scene? Nice to experiment with.
Notes for Joshua:
- for reading old GPencil, it has to use old code as well, meaning
to tread data as "indirect data, within another ID".
- Saving ID data means the chunk in file BHead needs the ID_GD code,
and not "DATA", which indicates 'indirect data'. That's the file
format spec.
- I've added do_versions_gpencil_2_50(), feel free to further tweak
things here, like linking things to scene or so.
- Formerly GPencil saved 2.50 files won't convert gpencil
2009-04-20 10:13:55 +00:00
|
|
|
#include "BKE_gpencil.h"
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "BKE_image.h"
|
|
|
|
|
|
|
|
#include "DEG_depsgraph.h"
|
2011-01-07 19:18:31 +00:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
2016-10-01 18:11:58 -04:00
|
|
|
#include "GPU_immediate.h"
|
|
|
|
#include "GPU_draw.h"
|
2018-06-27 19:07:23 -06:00
|
|
|
#include "GPU_state.h"
|
2016-10-01 18:11:58 -04:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
#include "ED_gpencil.h"
|
2015-04-06 13:21:18 +12:00
|
|
|
#include "ED_screen.h"
|
2010-08-25 08:31:52 +00:00
|
|
|
#include "ED_view3d.h"
|
2016-09-07 09:54:50 +02:00
|
|
|
#include "ED_space_api.h"
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2015-04-02 20:49:29 +13:00
|
|
|
#include "UI_interface_icons.h"
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
#include "UI_resources.h"
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "IMB_imbuf_types.h"
|
|
|
|
|
|
|
|
#include "gpencil_intern.h"
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* ************************************************** */
|
|
|
|
/* GREASE PENCIL DRAWING */
|
|
|
|
|
|
|
|
/* ----- General Defines ------ */
|
|
|
|
/* flags for sflag */
|
2011-04-14 04:22:52 +00:00
|
|
|
typedef enum eDrawStrokeFlags {
|
2019-04-17 06:17:24 +02:00
|
|
|
/** don't draw status info */
|
|
|
|
GP_DRAWDATA_NOSTATUS = (1 << 0),
|
|
|
|
/** only draw 3d-strokes */
|
|
|
|
GP_DRAWDATA_ONLY3D = (1 << 1),
|
|
|
|
/** only draw 'canvas' strokes */
|
|
|
|
GP_DRAWDATA_ONLYV2D = (1 << 2),
|
|
|
|
/** only draw 'image' strokes */
|
|
|
|
GP_DRAWDATA_ONLYI2D = (1 << 3),
|
|
|
|
/** special hack for drawing strokes in Image Editor (weird coordinates) */
|
|
|
|
GP_DRAWDATA_IEDITHACK = (1 << 4),
|
|
|
|
/** don't draw xray in 3D view (which is default) */
|
|
|
|
GP_DRAWDATA_NO_XRAY = (1 << 5),
|
|
|
|
/** no onionskins should be drawn (for animation playback) */
|
|
|
|
GP_DRAWDATA_NO_ONIONS = (1 << 6),
|
|
|
|
/** draw strokes as "volumetric" circular billboards */
|
|
|
|
GP_DRAWDATA_VOLUMETRIC = (1 << 7),
|
|
|
|
/** fill insides/bounded-regions of strokes */
|
|
|
|
GP_DRAWDATA_FILL = (1 << 8),
|
2011-04-14 04:22:52 +00:00
|
|
|
} eDrawStrokeFlags;
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* thickness above which we should use special drawing */
|
2017-03-02 00:36:33 +11:00
|
|
|
#if 0
|
2019-04-17 06:17:24 +02:00
|
|
|
# define GP_DRAWTHICKNESS_SPECIAL 3
|
2017-03-02 00:36:33 +11:00
|
|
|
#endif
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2016-10-01 18:11:58 -04:00
|
|
|
/* conversion utility (float --> normalized unsigned byte) */
|
2018-07-31 10:22:19 +02:00
|
|
|
#define F2UB(x) (uchar)(255.0f * x)
|
2016-10-01 18:11:58 -04:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* ----- Tool Buffer Drawing ------ */
|
2016-10-06 12:45:04 -04:00
|
|
|
/* helper functions to set color of buffer point */
|
2016-08-03 23:31:48 +02:00
|
|
|
|
2016-10-06 14:40:47 -04:00
|
|
|
static void gp_set_point_uniform_color(const bGPDspoint *pt, const float ink[4])
|
2016-10-01 18:11:58 -04:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
float alpha = ink[3] * pt->strength;
|
|
|
|
CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
|
|
|
|
immUniformColor3fvAlpha(ink, alpha);
|
2016-10-01 18:11:58 -04:00
|
|
|
}
|
|
|
|
|
2019-04-29 16:24:32 +02:00
|
|
|
static void gp_set_point_varying_color(const bGPDspoint *pt,
|
|
|
|
const float ink[4],
|
|
|
|
uint attr_id,
|
|
|
|
bool fix_strength)
|
2016-10-01 18:11:58 -04:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
float alpha = ink[3] * pt->strength;
|
2019-04-29 16:24:32 +02:00
|
|
|
if ((fix_strength) && (alpha >= 0.1f)) {
|
|
|
|
alpha = 1.0f;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
|
|
|
|
immAttr4ub(attr_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha));
|
2016-10-01 18:11:58 -04:00
|
|
|
}
|
|
|
|
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
/* --------- 2D Stroke Drawing Helpers --------- */
|
2016-08-03 23:31:48 +02:00
|
|
|
/* change in parameter list */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_calc_2d_stroke_fxy(
|
|
|
|
const float pt[3], short sflag, int offsx, int offsy, int winx, int winy, float r_co[2])
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
if (sflag & GP_STROKE_2DSPACE) {
|
|
|
|
r_co[0] = pt[0];
|
|
|
|
r_co[1] = pt[1];
|
|
|
|
}
|
|
|
|
else if (sflag & GP_STROKE_2DIMAGE) {
|
|
|
|
const float x = (float)((pt[0] * winx) + offsx);
|
|
|
|
const float y = (float)((pt[1] * winy) + offsy);
|
|
|
|
|
|
|
|
r_co[0] = x;
|
|
|
|
r_co[1] = y;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const float x = (float)(pt[0] / 100 * winx) + offsx;
|
|
|
|
const float y = (float)(pt[1] / 100 * winy) + offsy;
|
|
|
|
|
|
|
|
r_co[0] = x;
|
|
|
|
r_co[1] = y;
|
|
|
|
}
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
}
|
|
|
|
/* ----------- Volumetric Strokes --------------- */
|
|
|
|
|
|
|
|
/* draw a 2D strokes in "volumetric" style */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_draw_stroke_volumetric_2d(const bGPDspoint *points,
|
|
|
|
int totpoints,
|
|
|
|
short thickness,
|
|
|
|
short UNUSED(dflag),
|
|
|
|
short sflag,
|
|
|
|
int offsx,
|
|
|
|
int offsy,
|
|
|
|
int winx,
|
|
|
|
int winy,
|
|
|
|
const float diff_mat[4][4],
|
|
|
|
const float ink[4])
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
|
|
|
|
uint size = GPU_vertformat_attr_add(format, "size", GPU_COMP_F32, 1, GPU_FETCH_FLOAT);
|
|
|
|
uint color = GPU_vertformat_attr_add(
|
|
|
|
format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
|
|
|
|
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
|
|
|
|
GPU_enable_program_point_size();
|
|
|
|
immBegin(GPU_PRIM_POINTS, totpoints);
|
|
|
|
|
|
|
|
const bGPDspoint *pt = points;
|
|
|
|
for (int i = 0; i < totpoints; i++, pt++) {
|
|
|
|
/* transform position to 2D */
|
|
|
|
float co[2];
|
|
|
|
float fpt[3];
|
|
|
|
|
|
|
|
mul_v3_m4v3(fpt, diff_mat, &pt->x);
|
|
|
|
gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, co);
|
|
|
|
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(pt, ink, color, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
immAttr1f(size, pt->pressure * thickness); /* TODO: scale based on view transform */
|
|
|
|
immVertex2f(pos, co[0], co[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
immEnd();
|
|
|
|
immUnbindProgram();
|
|
|
|
GPU_disable_program_point_size();
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
/* draw a 3D stroke in "volumetric" style */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_draw_stroke_volumetric_3d(const bGPDspoint *points,
|
|
|
|
int totpoints,
|
|
|
|
short thickness,
|
|
|
|
const float ink[4])
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
|
|
|
|
uint size = GPU_vertformat_attr_add(format, "size", GPU_COMP_F32, 1, GPU_FETCH_FLOAT);
|
|
|
|
uint color = GPU_vertformat_attr_add(
|
|
|
|
format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
|
|
|
|
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
|
|
|
|
GPU_enable_program_point_size();
|
|
|
|
immBegin(GPU_PRIM_POINTS, totpoints);
|
|
|
|
|
|
|
|
const bGPDspoint *pt = points;
|
|
|
|
for (int i = 0; i < totpoints && pt; i++, pt++) {
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(pt, ink, color, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
/* TODO: scale based on view transform */
|
|
|
|
immAttr1f(size, pt->pressure * thickness);
|
|
|
|
/* we can adjust size in vertex shader based on view/projection! */
|
|
|
|
immVertex3fv(pos, &pt->x);
|
|
|
|
}
|
|
|
|
|
|
|
|
immEnd();
|
|
|
|
immUnbindProgram();
|
|
|
|
GPU_disable_program_point_size();
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
/* --------------- Stroke Fills ----------------- */
|
2018-07-31 10:22:19 +02:00
|
|
|
/* calc bounding box in 2d using flat projection data */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_calc_2d_bounding_box(
|
|
|
|
const float (*points2d)[2], int totpoints, float minv[2], float maxv[2], bool expand)
|
2018-07-31 10:22:19 +02:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
copy_v2_v2(minv, points2d[0]);
|
|
|
|
copy_v2_v2(maxv, points2d[0]);
|
|
|
|
|
|
|
|
for (int i = 1; i < totpoints; i++) {
|
|
|
|
/* min */
|
|
|
|
if (points2d[i][0] < minv[0]) {
|
|
|
|
minv[0] = points2d[i][0];
|
|
|
|
}
|
|
|
|
if (points2d[i][1] < minv[1]) {
|
|
|
|
minv[1] = points2d[i][1];
|
|
|
|
}
|
|
|
|
/* max */
|
|
|
|
if (points2d[i][0] > maxv[0]) {
|
|
|
|
maxv[0] = points2d[i][0];
|
|
|
|
}
|
|
|
|
if (points2d[i][1] > maxv[1]) {
|
|
|
|
maxv[1] = points2d[i][1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* If not expanded, use a perfect square */
|
|
|
|
if (expand == false) {
|
|
|
|
if (maxv[0] > maxv[1]) {
|
|
|
|
maxv[1] = maxv[0];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
maxv[0] = maxv[1];
|
|
|
|
}
|
|
|
|
}
|
2018-07-31 10:22:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* calc texture coordinates using flat projected points */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_calc_stroke_text_coordinates(
|
|
|
|
const float (*points2d)[2], int totpoints, float minv[2], float maxv[2], float (*r_uv)[2])
|
2018-07-31 10:22:19 +02:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
float d[2];
|
|
|
|
d[0] = maxv[0] - minv[0];
|
|
|
|
d[1] = maxv[1] - minv[1];
|
|
|
|
for (int i = 0; i < totpoints; i++) {
|
|
|
|
r_uv[i][0] = (points2d[i][0] - minv[0]) / d[0];
|
|
|
|
r_uv[i][1] = (points2d[i][1] - minv[1]) / d[1];
|
|
|
|
}
|
2018-07-31 10:22:19 +02:00
|
|
|
}
|
2016-04-29 03:12:53 +12:00
|
|
|
|
2019-04-22 00:18:34 +10:00
|
|
|
/* Triangulate stroke for high quality fill
|
|
|
|
* (this is done only if cache is null or stroke was modified). */
|
2016-04-29 01:10:33 +12:00
|
|
|
static void gp_triangulate_stroke_fill(bGPDstroke *gps)
|
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
BLI_assert(gps->totpoints >= 3);
|
|
|
|
|
|
|
|
/* allocate memory for temporary areas */
|
|
|
|
gps->tot_triangles = gps->totpoints - 2;
|
|
|
|
uint(*tmp_triangles)[3] = MEM_mallocN(sizeof(*tmp_triangles) * gps->tot_triangles,
|
|
|
|
"GP Stroke temp triangulation");
|
|
|
|
float(*points2d)[2] = MEM_mallocN(sizeof(*points2d) * gps->totpoints,
|
|
|
|
"GP Stroke temp 2d points");
|
|
|
|
float(*uv)[2] = MEM_mallocN(sizeof(*uv) * gps->totpoints, "GP Stroke temp 2d uv data");
|
|
|
|
|
|
|
|
int direction = 0;
|
|
|
|
|
|
|
|
/* convert to 2d and triangulate */
|
|
|
|
BKE_gpencil_stroke_2d_flat(gps->points, gps->totpoints, points2d, &direction);
|
|
|
|
BLI_polyfill_calc(points2d, (uint)gps->totpoints, direction, tmp_triangles);
|
|
|
|
|
|
|
|
/* calc texture coordinates automatically */
|
|
|
|
float minv[2];
|
|
|
|
float maxv[2];
|
|
|
|
/* first needs bounding box data */
|
|
|
|
gp_calc_2d_bounding_box((const float(*)[2])points2d, gps->totpoints, minv, maxv, false);
|
|
|
|
/* calc uv data */
|
|
|
|
gp_calc_stroke_text_coordinates((const float(*)[2])points2d, gps->totpoints, minv, maxv, uv);
|
|
|
|
|
|
|
|
/* Number of triangles */
|
|
|
|
gps->tot_triangles = gps->totpoints - 2;
|
|
|
|
/* save triangulation data in stroke cache */
|
|
|
|
if (gps->tot_triangles > 0) {
|
|
|
|
if (gps->triangles == NULL) {
|
|
|
|
gps->triangles = MEM_callocN(sizeof(*gps->triangles) * gps->tot_triangles,
|
|
|
|
"GP Stroke triangulation");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gps->triangles = MEM_recallocN(gps->triangles, sizeof(*gps->triangles) * gps->tot_triangles);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < gps->tot_triangles; i++) {
|
|
|
|
bGPDtriangle *stroke_triangle = &gps->triangles[i];
|
|
|
|
memcpy(stroke_triangle->verts, tmp_triangles[i], sizeof(uint[3]));
|
|
|
|
/* copy texture coordinates */
|
|
|
|
copy_v2_v2(stroke_triangle->uv[0], uv[tmp_triangles[i][0]]);
|
|
|
|
copy_v2_v2(stroke_triangle->uv[1], uv[tmp_triangles[i][1]]);
|
|
|
|
copy_v2_v2(stroke_triangle->uv[2], uv[tmp_triangles[i][2]]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* No triangles needed - Free anything allocated previously */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (gps->triangles) {
|
2019-04-17 06:17:24 +02:00
|
|
|
MEM_freeN(gps->triangles);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
gps->triangles = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* disable recalculation flag */
|
|
|
|
if (gps->flag & GP_STROKE_RECALC_GEOMETRY) {
|
|
|
|
gps->flag &= ~GP_STROKE_RECALC_GEOMETRY;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* clear memory */
|
|
|
|
MEM_SAFE_FREE(tmp_triangles);
|
|
|
|
MEM_SAFE_FREE(points2d);
|
|
|
|
MEM_SAFE_FREE(uv);
|
2016-04-29 01:10:33 +12:00
|
|
|
}
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
/* add a new fill point and texture coordinates to vertex buffer */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_add_filldata_tobuffer(const bGPDspoint *pt,
|
|
|
|
const float uv[2],
|
|
|
|
uint pos,
|
|
|
|
uint texcoord,
|
|
|
|
short flag,
|
|
|
|
int offsx,
|
|
|
|
int offsy,
|
|
|
|
int winx,
|
|
|
|
int winy,
|
|
|
|
const float diff_mat[4][4])
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
float fpt[3];
|
|
|
|
float co[2];
|
|
|
|
|
|
|
|
mul_v3_m4v3(fpt, diff_mat, &pt->x);
|
|
|
|
/* if 2d, need conversion */
|
|
|
|
if (!(flag & GP_STROKE_3DSPACE)) {
|
|
|
|
gp_calc_2d_stroke_fxy(fpt, flag, offsx, offsy, winx, winy, co);
|
|
|
|
copy_v2_v2(fpt, co);
|
|
|
|
fpt[2] = 0.0f; /* 2d always is z=0.0f */
|
|
|
|
}
|
|
|
|
|
|
|
|
immAttr2f(texcoord, uv[0], uv[1]); /* texture coordinates */
|
|
|
|
immVertex3fv(pos, fpt); /* position */
|
2018-07-31 10:22:19 +02:00
|
|
|
}
|
2016-08-03 23:31:48 +02:00
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
#if 0 /* GPXX disabled, not used in annotations */
|
|
|
|
/* assign image texture for filling stroke */
|
|
|
|
static int gp_set_filling_texture(Image *image, short flag)
|
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
ImBuf *ibuf;
|
|
|
|
uint *bind = &image->bindcode[TEXTARGET_TEXTURE_2D];
|
|
|
|
int error = GL_NO_ERROR;
|
2019-04-17 08:24:14 +02:00
|
|
|
ImageUser iuser = {NULL};
|
2019-04-17 06:17:24 +02:00
|
|
|
void *lock;
|
|
|
|
|
|
|
|
iuser.ok = true;
|
|
|
|
|
|
|
|
ibuf = BKE_image_acquire_ibuf(image, &iuser, &lock);
|
|
|
|
|
|
|
|
if (ibuf == NULL || ibuf->rect == NULL) {
|
|
|
|
BKE_image_release_ibuf(image, ibuf, NULL);
|
|
|
|
return (int)GL_INVALID_OPERATION;
|
|
|
|
}
|
|
|
|
|
|
|
|
GPU_create_gl_tex(
|
2019-04-17 08:24:14 +02:00
|
|
|
bind, ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, GL_TEXTURE_2D, false, false, image);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
|
|
if (flag & GP_STYLE_COLOR_TEX_CLAMP) {
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
|
|
|
|
}
|
|
|
|
BKE_image_release_ibuf(image, ibuf, NULL);
|
|
|
|
|
|
|
|
return error;
|
2018-07-31 10:22:19 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* draw fills for shapes */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_draw_stroke_fill(bGPdata *gpd,
|
|
|
|
bGPDstroke *gps,
|
|
|
|
int offsx,
|
|
|
|
int offsy,
|
|
|
|
int winx,
|
|
|
|
int winy,
|
|
|
|
const float diff_mat[4][4],
|
|
|
|
const float color[4])
|
2018-07-31 10:22:19 +02:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
BLI_assert(gps->totpoints >= 3);
|
|
|
|
Material *ma = gpd->mat[gps->mat_nr];
|
|
|
|
MaterialGPencilStyle *gp_style = (ma) ? ma->gp_style : NULL;
|
|
|
|
|
|
|
|
/* Calculate triangles cache for filling area (must be done only after changes) */
|
|
|
|
if ((gps->flag & GP_STROKE_RECALC_GEOMETRY) || (gps->tot_triangles == 0) ||
|
|
|
|
(gps->triangles == NULL)) {
|
|
|
|
gp_triangulate_stroke_fill(gps);
|
|
|
|
}
|
|
|
|
BLI_assert(gps->tot_triangles >= 1);
|
|
|
|
|
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
|
|
|
|
uint texcoord = GPU_vertformat_attr_add(format, "texCoord", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_GPENCIL_FILL);
|
|
|
|
|
|
|
|
immUniformColor4fv(color);
|
|
|
|
immUniform4fv("color2", gp_style->mix_rgba);
|
|
|
|
immUniform1i("fill_type", gp_style->fill_style);
|
|
|
|
immUniform1f("mix_factor", gp_style->mix_factor);
|
|
|
|
|
|
|
|
immUniform1f("gradient_angle", gp_style->gradient_angle);
|
|
|
|
immUniform1f("gradient_radius", gp_style->gradient_radius);
|
|
|
|
immUniform1f("pattern_gridsize", gp_style->pattern_gridsize);
|
|
|
|
immUniform2fv("gradient_scale", gp_style->gradient_scale);
|
|
|
|
immUniform2fv("gradient_shift", gp_style->gradient_shift);
|
|
|
|
|
|
|
|
immUniform1f("texture_angle", gp_style->texture_angle);
|
|
|
|
immUniform2fv("texture_scale", gp_style->texture_scale);
|
|
|
|
immUniform2fv("texture_offset", gp_style->texture_offset);
|
|
|
|
immUniform1f("texture_opacity", gp_style->texture_opacity);
|
2019-04-18 14:19:00 +02:00
|
|
|
immUniform1i("t_mix", (gp_style->flag & GP_STYLE_FILL_TEX_MIX) != 0);
|
2019-04-17 06:17:24 +02:00
|
|
|
immUniform1i("t_flip", (gp_style->flag & GP_STYLE_COLOR_FLIP_FILL) != 0);
|
2018-07-31 10:22:19 +02:00
|
|
|
#if 0 /* GPXX disabled, not used in annotations */
|
2019-04-17 06:17:24 +02:00
|
|
|
/* image texture */
|
2019-04-17 08:24:14 +02:00
|
|
|
if ((gp_style->fill_style == GP_STYLE_FILL_STYLE_TEXTURE) ||
|
|
|
|
(gp_style->flag & GP_STYLE_COLOR_TEX_MIX)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
gp_set_filling_texture(gp_style->ima, gp_style->flag);
|
|
|
|
}
|
2018-07-31 10:22:19 +02:00
|
|
|
#endif
|
2019-04-17 06:17:24 +02:00
|
|
|
/* Draw all triangles for filling the polygon (cache must be calculated before) */
|
|
|
|
immBegin(GPU_PRIM_TRIS, gps->tot_triangles * 3);
|
|
|
|
/* TODO: use batch instead of immediate mode, to share vertices */
|
|
|
|
|
|
|
|
const bGPDtriangle *stroke_triangle = gps->triangles;
|
|
|
|
for (int i = 0; i < gps->tot_triangles; i++, stroke_triangle++) {
|
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
gp_add_filldata_tobuffer(&gps->points[stroke_triangle->verts[j]],
|
|
|
|
stroke_triangle->uv[j],
|
|
|
|
pos,
|
|
|
|
texcoord,
|
|
|
|
gps->flag,
|
|
|
|
offsx,
|
|
|
|
offsy,
|
|
|
|
winx,
|
|
|
|
winy,
|
|
|
|
diff_mat);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
immEnd();
|
|
|
|
immUnbindProgram();
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
}
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* ----- Existing Strokes Drawing (3D and Point) ------ */
|
|
|
|
|
|
|
|
/* draw a given stroke - just a single dot (only one point) */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_draw_stroke_point(const bGPDspoint *points,
|
|
|
|
short thickness,
|
|
|
|
short UNUSED(dflag),
|
|
|
|
short sflag,
|
|
|
|
int offsx,
|
|
|
|
int offsy,
|
|
|
|
int winx,
|
|
|
|
int winy,
|
|
|
|
const float diff_mat[4][4],
|
|
|
|
const float ink[4])
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
const bGPDspoint *pt = points;
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* get final position using parent matrix */
|
|
|
|
float fpt[3];
|
|
|
|
mul_v3_m4v3(fpt, diff_mat, &pt->x);
|
2016-08-03 23:31:48 +02:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
|
2016-10-06 14:40:47 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
if (sflag & GP_STROKE_3DSPACE) {
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
|
2016-10-06 14:40:47 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* get 2D coordinates of point */
|
|
|
|
float co[3] = {0.0f};
|
|
|
|
gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, co);
|
|
|
|
copy_v3_v3(fpt, co);
|
|
|
|
}
|
2016-10-06 14:40:47 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
gp_set_point_uniform_color(pt, ink);
|
|
|
|
/* set point thickness (since there's only one of these) */
|
|
|
|
immUniform1f("size", (float)(thickness + 2) * pt->pressure);
|
2016-10-06 14:40:47 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
immBegin(GPU_PRIM_POINTS, 1);
|
|
|
|
immVertex3fv(pos, fpt);
|
|
|
|
immEnd();
|
2016-10-06 14:40:47 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
immUnbindProgram();
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
/* draw a given stroke in 3d (i.e. in 3d-space) */
|
|
|
|
static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4], bool cyclic)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
bGPDspoint *points = tgpw->gps->points;
|
|
|
|
int totpoints = tgpw->gps->totpoints;
|
|
|
|
|
|
|
|
const float viewport[2] = {(float)tgpw->winx, (float)tgpw->winy};
|
|
|
|
float curpressure = points[0].pressure;
|
|
|
|
float fpt[3];
|
|
|
|
|
|
|
|
/* if cyclic needs more vertex */
|
|
|
|
int cyclic_add = (cyclic) ? 1 : 0;
|
|
|
|
|
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
const struct {
|
|
|
|
uint pos, color, thickness;
|
|
|
|
} attr_id = {
|
|
|
|
.pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT),
|
|
|
|
.color = GPU_vertformat_attr_add(
|
|
|
|
format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT),
|
|
|
|
.thickness = GPU_vertformat_attr_add(format, "thickness", GPU_COMP_F32, 1, GPU_FETCH_FLOAT),
|
|
|
|
};
|
|
|
|
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_GPENCIL_STROKE);
|
|
|
|
immUniform2fv("Viewport", viewport);
|
|
|
|
immUniform1f("pixsize", tgpw->rv3d->pixsize);
|
|
|
|
float obj_scale = tgpw->ob ?
|
|
|
|
(tgpw->ob->scale[0] + tgpw->ob->scale[1] + tgpw->ob->scale[2]) / 3.0f :
|
|
|
|
1.0f;
|
|
|
|
|
|
|
|
immUniform1f("objscale", obj_scale);
|
|
|
|
int keep_size = (int)((tgpw->gpd) && (tgpw->gpd->flag & GP_DATA_STROKE_KEEPTHICKNESS));
|
|
|
|
immUniform1i("keep_size", keep_size);
|
|
|
|
immUniform1f("pixfactor", tgpw->gpd->pixfactor);
|
|
|
|
/* xray mode always to 3D space to avoid wrong zdepth calculation (T60051) */
|
|
|
|
immUniform1i("xraymode", GP_XRAY_3DSPACE);
|
|
|
|
immUniform1i("caps_start", (int)tgpw->gps->caps[0]);
|
|
|
|
immUniform1i("caps_end", (int)tgpw->gps->caps[1]);
|
|
|
|
immUniform1i("fill_stroke", (int)tgpw->is_fill_stroke);
|
|
|
|
|
|
|
|
/* draw stroke curve */
|
|
|
|
GPU_line_width(max_ff(curpressure * thickness, 1.0f));
|
|
|
|
immBeginAtMost(GPU_PRIM_LINE_STRIP_ADJ, totpoints + cyclic_add + 2);
|
|
|
|
const bGPDspoint *pt = points;
|
|
|
|
|
|
|
|
for (int i = 0; i < totpoints; i++, pt++) {
|
|
|
|
/* first point for adjacency (not drawn) */
|
|
|
|
if (i == 0) {
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(points, ink, attr_id.color, (bool)tgpw->is_fill_stroke);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
if ((cyclic) && (totpoints > 2)) {
|
|
|
|
immAttr1f(attr_id.thickness, max_ff((points + totpoints - 1)->pressure * thickness, 1.0f));
|
|
|
|
mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + totpoints - 1)->x);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
immAttr1f(attr_id.thickness, max_ff((points + 1)->pressure * thickness, 1.0f));
|
|
|
|
mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + 1)->x);
|
|
|
|
}
|
|
|
|
immVertex3fv(attr_id.pos, fpt);
|
|
|
|
}
|
|
|
|
/* set point */
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(pt, ink, attr_id.color, (bool)tgpw->is_fill_stroke);
|
2019-04-17 06:17:24 +02:00
|
|
|
immAttr1f(attr_id.thickness, max_ff(pt->pressure * thickness, 1.0f));
|
|
|
|
mul_v3_m4v3(fpt, tgpw->diff_mat, &pt->x);
|
|
|
|
immVertex3fv(attr_id.pos, fpt);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cyclic && totpoints > 2) {
|
|
|
|
/* draw line to first point to complete the cycle */
|
|
|
|
immAttr1f(attr_id.thickness, max_ff(points->pressure * thickness, 1.0f));
|
|
|
|
mul_v3_m4v3(fpt, tgpw->diff_mat, &points->x);
|
|
|
|
immVertex3fv(attr_id.pos, fpt);
|
|
|
|
|
|
|
|
/* now add adjacency point (not drawn) */
|
|
|
|
immAttr1f(attr_id.thickness, max_ff((points + 1)->pressure * thickness, 1.0f));
|
|
|
|
mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + 1)->x);
|
|
|
|
immVertex3fv(attr_id.pos, fpt);
|
|
|
|
}
|
|
|
|
/* last adjacency point (not drawn) */
|
|
|
|
else {
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(
|
|
|
|
points + totpoints - 2, ink, attr_id.color, (bool)tgpw->is_fill_stroke);
|
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
immAttr1f(attr_id.thickness, max_ff((points + totpoints - 2)->pressure * thickness, 1.0f));
|
|
|
|
mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + totpoints - 2)->x);
|
|
|
|
immVertex3fv(attr_id.pos, fpt);
|
|
|
|
}
|
|
|
|
|
|
|
|
immEnd();
|
|
|
|
immUnbindProgram();
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ----- Fancy 2D-Stroke Drawing ------ */
|
|
|
|
|
|
|
|
/* draw a given stroke in 2d */
|
2019-04-17 06:17:24 +02:00
|
|
|
static void gp_draw_stroke_2d(const bGPDspoint *points,
|
|
|
|
int totpoints,
|
|
|
|
short thickness_s,
|
|
|
|
short dflag,
|
|
|
|
short sflag,
|
|
|
|
bool UNUSED(debug),
|
|
|
|
int offsx,
|
|
|
|
int offsy,
|
|
|
|
int winx,
|
|
|
|
int winy,
|
|
|
|
const float diff_mat[4][4],
|
|
|
|
const float ink[4])
|
2009-08-30 13:32:08 +00:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
/* otherwise thickness is twice that of the 3D view */
|
|
|
|
float thickness = (float)thickness_s * 0.5f;
|
|
|
|
|
|
|
|
/* strokes in Image Editor need a scale factor, since units there are not pixels! */
|
|
|
|
float scalefac = 1.0f;
|
|
|
|
if ((dflag & GP_DRAWDATA_IEDITHACK) && (dflag & GP_DRAWDATA_ONLYV2D)) {
|
|
|
|
scalefac = 0.001f;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: fancy++ with the magic of shaders */
|
|
|
|
|
2019-04-22 00:18:34 +10:00
|
|
|
/* tessellation code - draw stroke as series of connected quads (triangle strips in fact)
|
|
|
|
* with connection edges rotated to minimize shrinking artifacts, and rounded endcaps.
|
2019-04-17 06:17:24 +02:00
|
|
|
*/
|
|
|
|
{
|
|
|
|
const bGPDspoint *pt1, *pt2;
|
|
|
|
float s0[2], s1[2]; /* segment 'center' points */
|
|
|
|
float pm[2]; /* normal from previous segment. */
|
|
|
|
int i;
|
|
|
|
float fpt[3];
|
|
|
|
|
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
const struct {
|
|
|
|
uint pos, color;
|
|
|
|
} attr_id = {
|
|
|
|
.pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT),
|
|
|
|
.color = GPU_vertformat_attr_add(
|
|
|
|
format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT),
|
|
|
|
};
|
|
|
|
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
|
|
|
|
immBegin(GPU_PRIM_TRI_STRIP, totpoints * 2 + 4);
|
|
|
|
|
|
|
|
/* get x and y coordinates from first point */
|
|
|
|
mul_v3_m4v3(fpt, diff_mat, &points->x);
|
|
|
|
gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, s0);
|
|
|
|
|
|
|
|
for (i = 0, pt1 = points, pt2 = points + 1; i < (totpoints - 1); i++, pt1++, pt2++) {
|
|
|
|
float t0[2], t1[2]; /* tessellated coordinates */
|
|
|
|
float m1[2], m2[2]; /* gradient and normal */
|
|
|
|
float mt[2], sc[2]; /* gradient for thickness, point for end-cap */
|
|
|
|
float pthick; /* thickness at segment point */
|
|
|
|
|
2019-04-22 00:18:34 +10:00
|
|
|
/* Get x and y coordinates from point2
|
|
|
|
* (point1 has already been computed in previous iteration). */
|
2019-04-17 06:17:24 +02:00
|
|
|
mul_v3_m4v3(fpt, diff_mat, &pt2->x);
|
|
|
|
gp_calc_2d_stroke_fxy(fpt, sflag, offsx, offsy, winx, winy, s1);
|
|
|
|
|
|
|
|
/* calculate gradient and normal - 'angle'=(ny/nx) */
|
|
|
|
m1[1] = s1[1] - s0[1];
|
|
|
|
m1[0] = s1[0] - s0[0];
|
|
|
|
normalize_v2(m1);
|
|
|
|
m2[1] = -m1[0];
|
|
|
|
m2[0] = m1[1];
|
|
|
|
|
|
|
|
/* always use pressure from first point here */
|
|
|
|
pthick = (pt1->pressure * thickness * scalefac);
|
|
|
|
|
|
|
|
/* color of point */
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(pt1, ink, attr_id.color, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
/* if the first segment, start of segment is segment's normal */
|
|
|
|
if (i == 0) {
|
|
|
|
/* draw start cap first
|
|
|
|
* - make points slightly closer to center (about halfway across)
|
|
|
|
*/
|
|
|
|
mt[0] = m2[0] * pthick * 0.5f;
|
|
|
|
mt[1] = m2[1] * pthick * 0.5f;
|
|
|
|
sc[0] = s0[0] - (m1[0] * pthick * 0.75f);
|
|
|
|
sc[1] = s0[1] - (m1[1] * pthick * 0.75f);
|
|
|
|
|
|
|
|
t0[0] = sc[0] - mt[0];
|
|
|
|
t0[1] = sc[1] - mt[1];
|
|
|
|
t1[0] = sc[0] + mt[0];
|
|
|
|
t1[1] = sc[1] + mt[1];
|
|
|
|
|
|
|
|
/* First two points of cap. */
|
|
|
|
immVertex2fv(attr_id.pos, t0);
|
|
|
|
immVertex2fv(attr_id.pos, t1);
|
|
|
|
|
|
|
|
/* calculate points for start of segment */
|
|
|
|
mt[0] = m2[0] * pthick;
|
|
|
|
mt[1] = m2[1] * pthick;
|
|
|
|
|
|
|
|
t0[0] = s0[0] - mt[0];
|
|
|
|
t0[1] = s0[1] - mt[1];
|
|
|
|
t1[0] = s0[0] + mt[0];
|
|
|
|
t1[1] = s0[1] + mt[1];
|
|
|
|
|
|
|
|
/* Last two points of start cap (and first two points of first segment). */
|
|
|
|
immVertex2fv(attr_id.pos, t0);
|
|
|
|
immVertex2fv(attr_id.pos, t1);
|
|
|
|
}
|
|
|
|
/* if not the first segment, use bisector of angle between segments */
|
|
|
|
else {
|
|
|
|
float mb[2]; /* bisector normal */
|
|
|
|
float athick, dfac; /* actual thickness, difference between thicknesses */
|
|
|
|
|
|
|
|
/* calculate gradient of bisector (as average of normals) */
|
|
|
|
mb[0] = (pm[0] + m2[0]) / 2;
|
|
|
|
mb[1] = (pm[1] + m2[1]) / 2;
|
|
|
|
normalize_v2(mb);
|
|
|
|
|
|
|
|
/* calculate gradient to apply
|
|
|
|
* - as basis, use just pthick * bisector gradient
|
|
|
|
* - if cross-section not as thick as it should be, add extra padding to fix it
|
|
|
|
*/
|
|
|
|
mt[0] = mb[0] * pthick;
|
|
|
|
mt[1] = mb[1] * pthick;
|
|
|
|
athick = len_v2(mt);
|
|
|
|
dfac = pthick - (athick * 2);
|
|
|
|
|
|
|
|
if (((athick * 2.0f) < pthick) && (IS_EQF(athick, pthick) == 0)) {
|
|
|
|
mt[0] += (mb[0] * dfac);
|
|
|
|
mt[1] += (mb[1] * dfac);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* calculate points for start of segment */
|
|
|
|
t0[0] = s0[0] - mt[0];
|
|
|
|
t0[1] = s0[1] - mt[1];
|
|
|
|
t1[0] = s0[0] + mt[0];
|
|
|
|
t1[1] = s0[1] + mt[1];
|
|
|
|
|
|
|
|
/* Last two points of previous segment, and first two points of current segment. */
|
|
|
|
immVertex2fv(attr_id.pos, t0);
|
|
|
|
immVertex2fv(attr_id.pos, t1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if last segment, also draw end of segment (defined as segment's normal) */
|
|
|
|
if (i == totpoints - 2) {
|
|
|
|
/* for once, we use second point's pressure (otherwise it won't be drawn) */
|
|
|
|
pthick = (pt2->pressure * thickness * scalefac);
|
|
|
|
|
|
|
|
/* color of point */
|
2019-04-29 16:24:32 +02:00
|
|
|
gp_set_point_varying_color(pt2, ink, attr_id.color, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
/* calculate points for end of segment */
|
|
|
|
mt[0] = m2[0] * pthick;
|
|
|
|
mt[1] = m2[1] * pthick;
|
|
|
|
|
|
|
|
t0[0] = s1[0] - mt[0];
|
|
|
|
t0[1] = s1[1] - mt[1];
|
|
|
|
t1[0] = s1[0] + mt[0];
|
|
|
|
t1[1] = s1[1] + mt[1];
|
|
|
|
|
|
|
|
/* Last two points of last segment (and first two points of end cap). */
|
|
|
|
immVertex2fv(attr_id.pos, t0);
|
|
|
|
immVertex2fv(attr_id.pos, t1);
|
|
|
|
|
|
|
|
/* draw end cap as last step
|
|
|
|
* - make points slightly closer to center (about halfway across)
|
|
|
|
*/
|
|
|
|
mt[0] = m2[0] * pthick * 0.5f;
|
|
|
|
mt[1] = m2[1] * pthick * 0.5f;
|
|
|
|
sc[0] = s1[0] + (m1[0] * pthick * 0.75f);
|
|
|
|
sc[1] = s1[1] + (m1[1] * pthick * 0.75f);
|
|
|
|
|
|
|
|
t0[0] = sc[0] - mt[0];
|
|
|
|
t0[1] = sc[1] - mt[1];
|
|
|
|
t1[0] = sc[0] + mt[0];
|
|
|
|
t1[1] = sc[1] + mt[1];
|
|
|
|
|
|
|
|
/* Last two points of end cap. */
|
|
|
|
immVertex2fv(attr_id.pos, t0);
|
|
|
|
immVertex2fv(attr_id.pos, t1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* store computed point2 coordinates as point1 ones of next segment. */
|
|
|
|
copy_v2_v2(s0, s1);
|
|
|
|
/* store stroke's 'natural' normal for next stroke to use */
|
|
|
|
copy_v2_v2(pm, m2);
|
|
|
|
}
|
|
|
|
|
|
|
|
immEnd();
|
|
|
|
immUnbindProgram();
|
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
/* ----- Strokes Drawing ------ */
|
|
|
|
|
|
|
|
/* Helper for doing all the checks on whether a stroke can be drawn */
|
|
|
|
static bool gp_can_draw_stroke(const bGPDstroke *gps, const int dflag)
|
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
/* skip stroke if it isn't in the right display space for this drawing context */
|
|
|
|
/* 1) 3D Strokes */
|
2019-04-22 09:19:45 +10:00
|
|
|
if ((dflag & GP_DRAWDATA_ONLY3D) && !(gps->flag & GP_STROKE_3DSPACE)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
if (!(dflag & GP_DRAWDATA_ONLY3D) && (gps->flag & GP_STROKE_3DSPACE)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
/* 2) Screen Space 2D Strokes */
|
2019-04-22 09:19:45 +10:00
|
|
|
if ((dflag & GP_DRAWDATA_ONLYV2D) && !(gps->flag & GP_STROKE_2DSPACE)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
if (!(dflag & GP_DRAWDATA_ONLYV2D) && (gps->flag & GP_STROKE_2DSPACE)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
/* 3) Image Space (2D) */
|
2019-04-22 09:19:45 +10:00
|
|
|
if ((dflag & GP_DRAWDATA_ONLYI2D) && !(gps->flag & GP_STROKE_2DIMAGE)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
if (!(dflag & GP_DRAWDATA_ONLYI2D) && (gps->flag & GP_STROKE_2DIMAGE)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
/* skip stroke if it doesn't have any valid data */
|
2019-04-22 09:19:45 +10:00
|
|
|
if ((gps->points == NULL) || (gps->totpoints < 1)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
/* stroke can be drawn */
|
|
|
|
return true;
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* draw a set of strokes */
|
2018-07-31 10:22:19 +02:00
|
|
|
static void gp_draw_strokes(tGPDdraw *tgpw)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
float tcolor[4];
|
|
|
|
float tfill[4];
|
|
|
|
short sthickness;
|
|
|
|
float ink[4];
|
|
|
|
|
|
|
|
GPU_enable_program_point_size();
|
|
|
|
|
2019-04-29 16:24:32 +02:00
|
|
|
bGPDstroke *gps_init = (tgpw->gps) ? tgpw->gps : tgpw->t_gpf->strokes.first;
|
|
|
|
|
|
|
|
for (bGPDstroke *gps = gps_init; gps; gps = gps->next) {
|
2019-04-17 06:17:24 +02:00
|
|
|
/* check if stroke can be drawn */
|
|
|
|
if (gp_can_draw_stroke(gps, tgpw->dflag) == false) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* check if the color is visible */
|
|
|
|
Material *ma = tgpw->gpd->mat[gps->mat_nr];
|
|
|
|
MaterialGPencilStyle *gp_style = (ma) ? ma->gp_style : NULL;
|
|
|
|
|
|
|
|
if ((gp_style == NULL) || (gp_style->flag & GP_STYLE_COLOR_HIDE) ||
|
|
|
|
/* if onion and ghost flag do not draw*/
|
|
|
|
(tgpw->onion && (gp_style->flag & GP_STYLE_COLOR_ONIONSKIN))) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if disable fill, the colors with fill must be omitted too except fill boundary strokes */
|
|
|
|
if ((tgpw->disable_fill == 1) && (gp_style->fill_rgba[3] > 0.0f) &&
|
|
|
|
((gps->flag & GP_STROKE_NOFILL) == 0)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* calculate thickness */
|
|
|
|
sthickness = gps->thickness + tgpw->lthick;
|
|
|
|
|
|
|
|
if (tgpw->is_fill_stroke) {
|
|
|
|
sthickness = (short)max_ii(1, sthickness / 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sthickness <= 0) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check which stroke-drawer to use */
|
|
|
|
if (tgpw->dflag & GP_DRAWDATA_ONLY3D) {
|
|
|
|
const int no_xray = (tgpw->dflag & GP_DRAWDATA_NO_XRAY);
|
|
|
|
int mask_orig = 0;
|
|
|
|
|
|
|
|
if (no_xray) {
|
|
|
|
glGetIntegerv(GL_DEPTH_WRITEMASK, &mask_orig);
|
|
|
|
glDepthMask(0);
|
|
|
|
GPU_depth_test(true);
|
|
|
|
|
|
|
|
/* first arg is normally rv3d->dist, but this isn't
|
|
|
|
* available here and seems to work quite well without */
|
|
|
|
bglPolygonOffset(1.0f, 1.0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 3D Fill */
|
2019-05-01 11:09:22 +10:00
|
|
|
// if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
|
2019-04-17 06:17:24 +02:00
|
|
|
if ((gps->totpoints >= 3) && (tgpw->disable_fill != 1)) {
|
|
|
|
/* set color using material, tint color and opacity */
|
|
|
|
interp_v3_v3v3(tfill, gp_style->fill_rgba, tgpw->tintcolor, tgpw->tintcolor[3]);
|
|
|
|
tfill[3] = gp_style->fill_rgba[3] * tgpw->opacity;
|
|
|
|
if ((tfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gp_style->fill_style > 0)) {
|
|
|
|
const float *color;
|
|
|
|
if (!tgpw->onion) {
|
|
|
|
color = tfill;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (tgpw->custonion) {
|
|
|
|
color = tgpw->tintcolor;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ARRAY_SET_ITEMS(tfill, UNPACK3(gp_style->fill_rgba), tgpw->tintcolor[3]);
|
|
|
|
color = tfill;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
gp_draw_stroke_fill(tgpw->gpd,
|
|
|
|
gps,
|
|
|
|
tgpw->offsx,
|
|
|
|
tgpw->offsy,
|
|
|
|
tgpw->winx,
|
|
|
|
tgpw->winy,
|
|
|
|
tgpw->diff_mat,
|
|
|
|
color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 3D Stroke */
|
|
|
|
/* set color using material tint color and opacity */
|
|
|
|
if (!tgpw->onion) {
|
|
|
|
interp_v3_v3v3(tcolor, gp_style->stroke_rgba, tgpw->tintcolor, tgpw->tintcolor[3]);
|
|
|
|
tcolor[3] = gp_style->stroke_rgba[3] * tgpw->opacity;
|
|
|
|
copy_v4_v4(ink, tcolor);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (tgpw->custonion) {
|
|
|
|
copy_v4_v4(ink, tgpw->tintcolor);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ARRAY_SET_ITEMS(tcolor, UNPACK3(gp_style->stroke_rgba), tgpw->opacity);
|
|
|
|
copy_v4_v4(ink, tcolor);
|
|
|
|
}
|
|
|
|
}
|
2019-04-29 16:24:32 +02:00
|
|
|
|
|
|
|
/* if used for fill, set opacity to 1 */
|
|
|
|
if (tgpw->is_fill_stroke) {
|
|
|
|
if (ink[3] >= GPENCIL_ALPHA_OPACITY_THRESH) {
|
|
|
|
ink[3] = 1.0f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
if (gp_style->mode == GP_STYLE_MODE_DOTS) {
|
|
|
|
/* volumetric stroke drawing */
|
|
|
|
if (tgpw->disable_fill != 1) {
|
|
|
|
gp_draw_stroke_volumetric_3d(gps->points, gps->totpoints, sthickness, ink);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* 3D Lines - OpenGL primitives-based */
|
|
|
|
if (gps->totpoints == 1) {
|
|
|
|
if (tgpw->disable_fill != 1) {
|
|
|
|
gp_draw_stroke_point(gps->points,
|
|
|
|
sthickness,
|
|
|
|
tgpw->dflag,
|
|
|
|
gps->flag,
|
|
|
|
tgpw->offsx,
|
|
|
|
tgpw->offsy,
|
|
|
|
tgpw->winx,
|
|
|
|
tgpw->winy,
|
|
|
|
tgpw->diff_mat,
|
|
|
|
ink);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tgpw->gps = gps;
|
|
|
|
gp_draw_stroke_3d(tgpw, sthickness, ink, gps->flag & GP_STROKE_CYCLIC);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (no_xray) {
|
|
|
|
glDepthMask(mask_orig);
|
|
|
|
GPU_depth_test(false);
|
|
|
|
|
|
|
|
bglPolygonOffset(0.0, 0.0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* 2D - Fill */
|
|
|
|
if (gps->totpoints >= 3) {
|
|
|
|
/* set color using material, tint color and opacity */
|
|
|
|
interp_v3_v3v3(tfill, gp_style->fill_rgba, tgpw->tintcolor, tgpw->tintcolor[3]);
|
|
|
|
tfill[3] = gp_style->fill_rgba[3] * tgpw->opacity;
|
|
|
|
if ((tfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gp_style->fill_style > 0)) {
|
|
|
|
const float *color;
|
|
|
|
if (!tgpw->onion) {
|
|
|
|
color = tfill;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (tgpw->custonion) {
|
|
|
|
color = tgpw->tintcolor;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ARRAY_SET_ITEMS(tfill, UNPACK3(gp_style->fill_rgba), tgpw->tintcolor[3]);
|
|
|
|
color = tfill;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
gp_draw_stroke_fill(tgpw->gpd,
|
|
|
|
gps,
|
|
|
|
tgpw->offsx,
|
|
|
|
tgpw->offsy,
|
|
|
|
tgpw->winx,
|
|
|
|
tgpw->winy,
|
|
|
|
tgpw->diff_mat,
|
|
|
|
color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 2D Strokes... */
|
|
|
|
/* set color using material, tint color and opacity */
|
|
|
|
if (!tgpw->onion) {
|
|
|
|
interp_v3_v3v3(tcolor, gp_style->stroke_rgba, tgpw->tintcolor, tgpw->tintcolor[3]);
|
|
|
|
tcolor[3] = gp_style->stroke_rgba[3] * tgpw->opacity;
|
|
|
|
copy_v4_v4(ink, tcolor);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (tgpw->custonion) {
|
|
|
|
copy_v4_v4(ink, tgpw->tintcolor);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ARRAY_SET_ITEMS(tcolor, UNPACK3(gp_style->stroke_rgba), tgpw->opacity);
|
|
|
|
copy_v4_v4(ink, tcolor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gp_style->mode == GP_STYLE_MODE_DOTS) {
|
|
|
|
/* blob/disk-based "volumetric" drawing */
|
|
|
|
gp_draw_stroke_volumetric_2d(gps->points,
|
|
|
|
gps->totpoints,
|
|
|
|
sthickness,
|
|
|
|
tgpw->dflag,
|
|
|
|
gps->flag,
|
|
|
|
tgpw->offsx,
|
|
|
|
tgpw->offsy,
|
|
|
|
tgpw->winx,
|
|
|
|
tgpw->winy,
|
|
|
|
tgpw->diff_mat,
|
|
|
|
ink);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* normal 2D strokes */
|
|
|
|
if (gps->totpoints == 1) {
|
|
|
|
gp_draw_stroke_point(gps->points,
|
|
|
|
sthickness,
|
|
|
|
tgpw->dflag,
|
|
|
|
gps->flag,
|
|
|
|
tgpw->offsx,
|
|
|
|
tgpw->offsy,
|
|
|
|
tgpw->winx,
|
|
|
|
tgpw->winy,
|
|
|
|
tgpw->diff_mat,
|
|
|
|
ink);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gp_draw_stroke_2d(gps->points,
|
|
|
|
gps->totpoints,
|
|
|
|
sthickness,
|
|
|
|
tgpw->dflag,
|
|
|
|
gps->flag,
|
|
|
|
false,
|
|
|
|
tgpw->offsx,
|
|
|
|
tgpw->offsy,
|
|
|
|
tgpw->winx,
|
|
|
|
tgpw->winy,
|
|
|
|
tgpw->diff_mat,
|
|
|
|
ink);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-29 16:24:32 +02:00
|
|
|
/* if only one stroke, exit from loop */
|
|
|
|
if (tgpw->gps) {
|
|
|
|
break;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
GPU_disable_program_point_size();
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ----- General Drawing ------ */
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
/* draw interpolate strokes (used only while operator is running) */
|
|
|
|
void ED_gp_draw_interpolation(const bContext *C, tGPDinterpolate *tgpi, const int type)
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
tGPDdraw tgpw;
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
RegionView3D *rv3d = ar->regiondata;
|
|
|
|
tGPDinterpolate_layer *tgpil;
|
|
|
|
Object *obact = CTX_data_active_object(C);
|
|
|
|
Depsgraph *depsgraph = CTX_data_depsgraph(C);
|
|
|
|
|
|
|
|
float color[4];
|
|
|
|
|
|
|
|
UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, color);
|
|
|
|
color[3] = 0.6f;
|
|
|
|
int dflag = 0;
|
|
|
|
/* if 3d stuff, enable flags */
|
|
|
|
if (type == REGION_DRAW_POST_VIEW) {
|
|
|
|
dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS);
|
|
|
|
}
|
|
|
|
|
|
|
|
tgpw.rv3d = rv3d;
|
|
|
|
tgpw.depsgraph = depsgraph;
|
|
|
|
tgpw.ob = obact;
|
|
|
|
tgpw.gpd = tgpi->gpd;
|
|
|
|
tgpw.offsx = 0;
|
|
|
|
tgpw.offsy = 0;
|
|
|
|
tgpw.winx = tgpi->ar->winx;
|
|
|
|
tgpw.winy = tgpi->ar->winy;
|
|
|
|
tgpw.dflag = dflag;
|
|
|
|
|
|
|
|
/* turn on alpha-blending */
|
|
|
|
GPU_blend(true);
|
|
|
|
for (tgpil = tgpi->ilayers.first; tgpil; tgpil = tgpil->next) {
|
|
|
|
/* calculate parent position */
|
|
|
|
ED_gpencil_parent_location(depsgraph, obact, tgpi->gpd, tgpil->gpl, tgpw.diff_mat);
|
|
|
|
if (tgpil->interFrame) {
|
|
|
|
tgpw.gpl = tgpil->gpl;
|
|
|
|
tgpw.gpf = tgpil->interFrame;
|
|
|
|
tgpw.t_gpf = tgpil->interFrame;
|
2019-04-29 16:24:32 +02:00
|
|
|
tgpw.gps = NULL;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
|
|
|
tgpw.lthick = tgpil->gpl->line_change;
|
|
|
|
tgpw.opacity = 1.0;
|
|
|
|
copy_v4_v4(tgpw.tintcolor, color);
|
|
|
|
tgpw.onion = true;
|
|
|
|
tgpw.custonion = true;
|
|
|
|
|
|
|
|
gp_draw_strokes(&tgpw);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GPU_blend(false);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
/* wrapper to draw strokes for filling operator */
|
|
|
|
void ED_gp_draw_fill(tGPDdraw *tgpw)
|
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
gp_draw_strokes(tgpw);
|
2018-07-31 10:22:19 +02:00
|
|
|
}
|
|
|
|
|
2015-04-02 20:49:29 +13:00
|
|
|
/* draw a short status message in the top-right corner */
|
2018-07-31 10:22:19 +02:00
|
|
|
static void UNUSED_FUNCTION(gp_draw_status_text)(const bGPdata *gpd, ARegion *ar)
|
2015-04-02 20:49:29 +13:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
rcti rect;
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* Cannot draw any status text when drawing OpenGL Renders */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (G.f & G_FLAG_RENDER_VIEWPORT) {
|
2019-04-17 06:17:24 +02:00
|
|
|
return;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* Get bounds of region - Necessary to avoid problems with region overlap */
|
|
|
|
ED_region_visible_rect(ar, &rect);
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* for now, this should only be used to indicate when we are in stroke editmode */
|
|
|
|
if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
|
|
|
|
const char *printable = IFACE_("GPencil Stroke Editing");
|
|
|
|
float printable_size[2];
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
int font_id = BLF_default();
|
2017-02-05 00:54:21 -05:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
BLF_width_and_height(
|
|
|
|
font_id, printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
int xco = (rect.xmax - U.widget_unit) - (int)printable_size[0];
|
|
|
|
int yco = (rect.ymax - U.widget_unit);
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* text label */
|
|
|
|
UI_FontThemeColor(font_id, TH_TEXT_HI);
|
2015-04-02 20:49:29 +13:00
|
|
|
#ifdef WITH_INTERNATIONAL
|
2019-04-17 06:17:24 +02:00
|
|
|
BLF_draw_default(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
|
2015-04-02 20:49:29 +13:00
|
|
|
#else
|
2019-04-17 06:17:24 +02:00
|
|
|
BLF_draw_default_ascii(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
|
2015-04-02 20:49:29 +13:00
|
|
|
#endif
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
/* grease pencil icon... */
|
|
|
|
// XXX: is this too intrusive?
|
|
|
|
GPU_blend_set_func_separate(
|
|
|
|
GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
|
|
|
|
GPU_blend(true);
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
xco -= U.widget_unit;
|
|
|
|
yco -= (int)printable_size[1] / 2;
|
2015-04-02 20:49:29 +13:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
UI_icon_draw(xco, yco, ICON_GREASEPENCIL);
|
2016-10-06 19:13:49 -04:00
|
|
|
|
2019-04-17 06:17:24 +02:00
|
|
|
GPU_blend(false);
|
|
|
|
}
|
2015-04-02 20:49:29 +13:00
|
|
|
}
|