2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2009-01-14 16:13:50 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*
|
|
|
|
* Contributor(s): Joshua Leung
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
2011-02-27 20:29:51 +00:00
|
|
|
|
|
|
|
/** \file blender/editors/gpencil/drawgpencil.c
|
|
|
|
* \ingroup edgpencil
|
|
|
|
*/
|
|
|
|
|
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>
|
|
|
|
|
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"
|
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"
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
#include "BKE_context.h"
|
|
|
|
#include "BKE_global.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"
|
2011-01-07 19:18:31 +00:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
|
|
|
|
#include "BIF_gl.h"
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
|
|
|
#include "ED_gpencil.h"
|
2010-08-25 08:31:52 +00:00
|
|
|
#include "ED_view3d.h"
|
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
|
|
|
#include "UI_resources.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 {
|
2012-05-08 18:29:02 +00:00
|
|
|
GP_DRAWDATA_NOSTATUS = (1 << 0), /* don't draw status info */
|
|
|
|
GP_DRAWDATA_ONLY3D = (1 << 1), /* only draw 3d-strokes */
|
|
|
|
GP_DRAWDATA_ONLYV2D = (1 << 2), /* only draw 'canvas' strokes */
|
|
|
|
GP_DRAWDATA_ONLYI2D = (1 << 3), /* only draw 'image' strokes */
|
|
|
|
GP_DRAWDATA_IEDITHACK = (1 << 4), /* special hack for drawing strokes in Image Editor (weird coordinates) */
|
|
|
|
GP_DRAWDATA_NO_XRAY = (1 << 5), /* don't draw xray in 3D view (which is default) */
|
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
|
|
|
GP_DRAWDATA_NO_ONIONS = (1 << 6), /* no onionskins should be drawn (for animation playback) */
|
|
|
|
GP_DRAWDATA_VOLUMETRIC = (1 << 7), /* draw strokes as "volumetric" circular billboards */
|
|
|
|
GP_DRAWDATA_FILL = (1 << 8), /* fill insides/bounded-regions of strokes */
|
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 */
|
2012-05-08 18:29:02 +00:00
|
|
|
#define GP_DRAWTHICKNESS_SPECIAL 3
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* ----- Tool Buffer Drawing ------ */
|
|
|
|
|
|
|
|
/* draw stroke defined in buffer (simple ogl lines/points for now, as dotted lines) */
|
2012-05-08 18:29:02 +00:00
|
|
|
static void gp_draw_stroke_buffer(tGPspoint *points, int totpoints, short thickness, short dflag, short sflag)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
tGPspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* error checking */
|
|
|
|
if ((points == NULL) || (totpoints <= 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* check if buffer can be drawn */
|
2012-05-08 18:29:02 +00:00
|
|
|
if (dflag & (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_ONLYV2D))
|
2009-01-14 16:13:50 +00:00
|
|
|
return;
|
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
/* if drawing a single point, draw it larger */
|
|
|
|
if (totpoints == 1) {
|
2009-01-14 16:13:50 +00:00
|
|
|
/* draw point */
|
|
|
|
glBegin(GL_POINTS);
|
2012-05-08 18:29:02 +00:00
|
|
|
glVertex2iv(&points->x);
|
2009-01-14 16:13:50 +00:00
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
else if (sflag & GP_STROKE_ERASER) {
|
|
|
|
/* don't draw stroke at all! */
|
|
|
|
}
|
|
|
|
else {
|
2011-10-12 03:46:38 +00:00
|
|
|
float oldpressure = points[0].pressure;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* draw stroke curve */
|
2012-03-31 00:59:17 +00:00
|
|
|
if (G.debug & G_DEBUG) setlinestyle(2);
|
2011-10-12 03:46:38 +00:00
|
|
|
|
|
|
|
glLineWidth(oldpressure * thickness);
|
2009-01-14 16:13:50 +00:00
|
|
|
glBegin(GL_LINE_STRIP);
|
2011-10-12 03:46:38 +00:00
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
|
2009-08-30 06:10:38 +00:00
|
|
|
/* if there was a significant pressure change, stop the curve, change the thickness of the stroke,
|
|
|
|
* and continue drawing again (since line-width cannot change in middle of GL_LINE_STRIP)
|
|
|
|
*/
|
2011-03-27 14:59:55 +00:00
|
|
|
if (fabsf(pt->pressure - oldpressure) > 0.2f) {
|
2009-01-14 16:13:50 +00:00
|
|
|
glEnd();
|
|
|
|
glLineWidth(pt->pressure * thickness);
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
|
2009-08-30 06:10:38 +00:00
|
|
|
/* need to roll-back one point to ensure that there are no gaps in the stroke */
|
2011-11-26 05:10:53 +00:00
|
|
|
if (i != 0) glVertex2iv(&(pt - 1)->x);
|
|
|
|
|
2009-08-30 06:10:38 +00:00
|
|
|
/* now the point we want... */
|
2011-11-26 05:10:53 +00:00
|
|
|
glVertex2iv(&pt->x);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
oldpressure = pt->pressure;
|
|
|
|
}
|
|
|
|
else
|
2011-11-26 05:10:53 +00:00
|
|
|
glVertex2iv(&pt->x);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
2011-10-12 03:46:38 +00:00
|
|
|
|
2011-10-12 17:06:15 +00:00
|
|
|
/* reset for predictable OpenGL context */
|
2011-10-12 03:46:38 +00:00
|
|
|
glLineWidth(1.0f);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2012-03-31 00:59:17 +00:00
|
|
|
if (G.debug & G_DEBUG) setlinestyle(0);
|
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
|
|
|
/* --------- 2D Stroke Drawing Helpers --------- */
|
|
|
|
|
|
|
|
/* helper function to calculate x-y drawing coordinates for 2D points */
|
|
|
|
static void gp_calc_2d_stroke_xy(bGPDspoint *pt, short sflag, int offsx, int offsy, int winx, int winy, float r_co[2])
|
|
|
|
{
|
|
|
|
if (sflag & GP_STROKE_2DSPACE) {
|
|
|
|
r_co[0] = pt->x;
|
|
|
|
r_co[1] = pt->y;
|
|
|
|
}
|
|
|
|
else if (sflag & GP_STROKE_2DIMAGE) {
|
|
|
|
const float x = (float)((pt->x * winx) + offsx);
|
|
|
|
const float y = (float)((pt->y * winy) + offsy);
|
|
|
|
|
|
|
|
r_co[0] = x;
|
|
|
|
r_co[1] = y;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const float x = (float)(pt->x / 100 * winx) + offsx;
|
|
|
|
const float y = (float)(pt->y / 100 * winy) + offsy;
|
|
|
|
|
|
|
|
r_co[0] = x;
|
|
|
|
r_co[1] = y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ----------- Volumetric Strokes --------------- */
|
|
|
|
|
|
|
|
/* draw a 2D buffer stroke in "volumetric" style
|
|
|
|
* NOTE: the stroke buffer doesn't have any coordinate offsets/transforms
|
|
|
|
*/
|
2014-11-30 14:39:11 +01:00
|
|
|
static void gp_draw_stroke_volumetric_buffer(tGPspoint *points, int totpoints, short thickness,
|
|
|
|
short dflag, short UNUSED(sflag))
|
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
|
|
|
{
|
|
|
|
GLUquadricObj *qobj = gluNewQuadric();
|
|
|
|
float modelview[4][4];
|
|
|
|
|
|
|
|
tGPspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* error checking */
|
|
|
|
if ((points == NULL) || (totpoints <= 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* check if buffer can be drawn */
|
|
|
|
if (dflag & (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_ONLYV2D))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* get basic matrix - should be camera space (i.e "identity") */
|
|
|
|
glGetFloatv(GL_MODELVIEW_MATRIX, (float *)modelview);
|
|
|
|
|
|
|
|
/* draw points */
|
|
|
|
glPushMatrix();
|
|
|
|
|
|
|
|
for (i = 0, pt = points; i < totpoints; i++, pt++) {
|
|
|
|
/* set the transformed position */
|
|
|
|
// TODO: scale should change based on zoom level, which requires proper translation mult too!
|
|
|
|
modelview[3][0] = pt->x;
|
|
|
|
modelview[3][1] = pt->y;
|
|
|
|
|
|
|
|
glLoadMatrixf((float *)modelview);
|
|
|
|
|
|
|
|
/* draw the disk using the current state... */
|
|
|
|
gluDisk(qobj, 0.0, pt->pressure * thickness, 32, 1);
|
|
|
|
|
|
|
|
|
|
|
|
modelview[3][0] = modelview[3][1] = 0.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
glPopMatrix();
|
|
|
|
gluDeleteQuadric(qobj);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw a 2D strokes in "volumetric" style */
|
2014-11-30 14:39:11 +01:00
|
|
|
static void gp_draw_stroke_volumetric_2d(bGPDspoint *points, int totpoints, short thickness,
|
|
|
|
short UNUSED(dflag), short sflag,
|
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
|
|
|
int offsx, int offsy, int winx, int winy)
|
|
|
|
{
|
|
|
|
GLUquadricObj *qobj = gluNewQuadric();
|
|
|
|
float modelview[4][4];
|
|
|
|
float baseloc[3];
|
|
|
|
|
|
|
|
bGPDspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
|
|
/* get basic matrix */
|
|
|
|
glGetFloatv(GL_MODELVIEW_MATRIX, (float *)modelview);
|
|
|
|
copy_v3_v3(baseloc, modelview[3]);
|
|
|
|
|
|
|
|
/* draw points */
|
|
|
|
glPushMatrix();
|
|
|
|
|
|
|
|
for (i = 0, pt = points; i < totpoints; i++, pt++) {
|
|
|
|
/* set the transformed position */
|
|
|
|
float co[2];
|
|
|
|
|
|
|
|
gp_calc_2d_stroke_xy(pt, sflag, offsx, offsy, winx, winy, co);
|
|
|
|
translate_m4(modelview, co[0], co[1], 0.0f);
|
|
|
|
|
|
|
|
glLoadMatrixf((float *)modelview);
|
|
|
|
|
|
|
|
/* draw the disk using the current state... */
|
|
|
|
gluDisk(qobj, 0.0, pt->pressure * thickness, 32, 1);
|
|
|
|
|
|
|
|
/* restore matrix */
|
|
|
|
copy_v3_v3(modelview[3], baseloc);
|
|
|
|
}
|
|
|
|
|
|
|
|
glPopMatrix();
|
|
|
|
gluDeleteQuadric(qobj);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw a 3D stroke in "volumetric" style */
|
2014-11-30 14:39:11 +01:00
|
|
|
static void gp_draw_stroke_volumetric_3d(bGPDspoint *points, int totpoints, short thickness,
|
|
|
|
short UNUSED(dflag), short UNUSED(sflag))
|
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
|
|
|
{
|
|
|
|
GLUquadricObj *qobj = gluNewQuadric();
|
|
|
|
|
|
|
|
float base_modelview[4][4], modelview[4][4];
|
|
|
|
float base_loc[3];
|
|
|
|
|
|
|
|
bGPDspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
|
|
/* Get the basic modelview matrix we use for performing calculations */
|
|
|
|
glGetFloatv(GL_MODELVIEW_MATRIX, (float *)base_modelview);
|
|
|
|
copy_v3_v3(base_loc, base_modelview[3]);
|
|
|
|
|
|
|
|
/* Create the basic view-aligned billboard matrix we're going to actually draw qobj with:
|
|
|
|
* - We need to knock out the rotation so that we are
|
|
|
|
* simply left with a camera-facing billboard
|
|
|
|
* - The scale factors here are chosen so that the thickness
|
|
|
|
* is relatively reasonable. Otherwise, it gets far too
|
|
|
|
* large!
|
|
|
|
*/
|
|
|
|
scale_m4_fl(modelview, 0.1f);
|
|
|
|
|
|
|
|
/* draw each point as a disk... */
|
|
|
|
glPushMatrix();
|
|
|
|
|
|
|
|
for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
|
|
|
|
/* apply translation to base_modelview, so that the translated point is put in the right place */
|
|
|
|
translate_m4(base_modelview, pt->x, pt->y, pt->z);
|
|
|
|
|
|
|
|
/* copy the translation component to the billboard matrix we're going to use,
|
|
|
|
* then reset the base matrix to the original values so that we can do the same
|
|
|
|
* for the next point without accumulation/pollution effects
|
|
|
|
*/
|
|
|
|
copy_v3_v3(modelview[3], base_modelview[3]); /* copy offset value */
|
|
|
|
copy_v3_v3(base_modelview[3], base_loc); /* restore */
|
|
|
|
|
|
|
|
/* apply our billboard matrix for drawing... */
|
|
|
|
glLoadMatrixf((float *)modelview);
|
|
|
|
|
|
|
|
/* draw the disk using the current state... */
|
|
|
|
gluDisk(qobj, 0.0, pt->pressure * thickness, 32, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
glPopMatrix();
|
|
|
|
gluDeleteQuadric(qobj);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* --------------- Stroke Fills ----------------- */
|
|
|
|
|
|
|
|
/* draw fills for shapes */
|
2014-11-30 14:39:11 +01:00
|
|
|
static void gp_draw_stroke_fill(bGPDspoint *points, int totpoints, short UNUSED(thickness),
|
|
|
|
short UNUSED(dflag), short sflag,
|
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
|
|
|
int offsx, int offsy, int winx, int winy)
|
|
|
|
{
|
|
|
|
bGPDspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
BLI_assert(totpoints >= 3);
|
|
|
|
|
|
|
|
/* As an initial implementation, we use the OpenGL filled polygon drawing
|
|
|
|
* here since it's the easiest option to implement for this case. It does
|
|
|
|
* come with limitations (notably for concave shapes), though it shouldn't
|
|
|
|
* be much of an issue in most cases.
|
|
|
|
*/
|
|
|
|
glBegin(GL_POLYGON);
|
|
|
|
|
|
|
|
for (i = 0, pt = points; i < totpoints; i++, pt++) {
|
|
|
|
if (sflag & GP_STROKE_3DSPACE) {
|
|
|
|
glVertex3fv(&pt->x);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
float co[2];
|
|
|
|
|
|
|
|
gp_calc_2d_stroke_xy(pt, sflag, offsx, offsy, winx, winy, co);
|
|
|
|
glVertex2fv(co);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
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) */
|
2012-10-07 14:00:18 +00:00
|
|
|
static void gp_draw_stroke_point(bGPDspoint *points, short thickness, short dflag, short sflag,
|
|
|
|
int offsx, int offsy, int winx, int winy)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
/* draw point */
|
|
|
|
if (sflag & GP_STROKE_3DSPACE) {
|
|
|
|
glBegin(GL_POINTS);
|
2012-05-08 18:29:02 +00:00
|
|
|
glVertex3fv(&points->x);
|
2009-01-14 16:13:50 +00:00
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
float co[2];
|
|
|
|
|
|
|
|
/* get coordinates of point */
|
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
|
|
|
gp_calc_2d_stroke_xy(points, sflag, offsx, offsy, winx, winy, co);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, simple dot looks ok
|
2012-05-08 18:29:02 +00:00
|
|
|
* - also mandatory in if Image Editor 'image-based' dot
|
2009-01-14 16:13:50 +00:00
|
|
|
*/
|
2012-09-09 00:00:21 +00:00
|
|
|
if ((thickness < GP_DRAWTHICKNESS_SPECIAL) ||
|
|
|
|
((dflag & GP_DRAWDATA_IEDITHACK) && (sflag & GP_STROKE_2DSPACE)))
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
glBegin(GL_POINTS);
|
2012-05-08 18:29:02 +00:00
|
|
|
glVertex2fv(co);
|
2009-01-14 16:13:50 +00:00
|
|
|
glEnd();
|
|
|
|
}
|
2012-03-06 18:40:15 +00:00
|
|
|
else {
|
2009-01-14 16:13:50 +00:00
|
|
|
/* draw filled circle as is done in circf (but without the matrix push/pops which screwed things up) */
|
|
|
|
GLUquadricObj *qobj = gluNewQuadric();
|
|
|
|
|
|
|
|
gluQuadricDrawStyle(qobj, GLU_FILL);
|
|
|
|
|
|
|
|
/* need to translate drawing position, but must reset after too! */
|
2012-04-11 08:15:13 +00:00
|
|
|
glTranslatef(co[0], co[1], 0.0);
|
2009-01-14 16:13:50 +00:00
|
|
|
gluDisk(qobj, 0.0, thickness, 32, 1);
|
2012-04-11 08:15:13 +00:00
|
|
|
glTranslatef(-co[0], -co[1], 0.0);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
gluDeleteQuadric(qobj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw a given stroke in 3d (i.e. in 3d-space), using simple ogl lines */
|
2014-11-30 14:39:11 +01:00
|
|
|
static void gp_draw_stroke_3d(bGPDspoint *points, int totpoints, short thickness, bool debug, short UNUSED(sflag))
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
bGPDspoint *pt;
|
2014-01-12 18:52:14 +01:00
|
|
|
float curpressure = points[0].pressure;
|
2009-01-14 16:13:50 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/* draw stroke curve */
|
2014-01-12 18:52:14 +01:00
|
|
|
glLineWidth(curpressure * thickness);
|
2009-01-14 16:13:50 +00:00
|
|
|
glBegin(GL_LINE_STRIP);
|
2012-05-08 18:29:02 +00:00
|
|
|
for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
|
2009-08-30 06:10:38 +00:00
|
|
|
/* if there was a significant pressure change, stop the curve, change the thickness of the stroke,
|
|
|
|
* and continue drawing again (since line-width cannot change in middle of GL_LINE_STRIP)
|
2014-01-12 18:52:14 +01:00
|
|
|
* Note: we want more visible levels of pressures when thickness is bigger.
|
2009-08-30 06:10:38 +00:00
|
|
|
*/
|
2014-01-12 18:52:14 +01:00
|
|
|
if (fabsf(pt->pressure - curpressure) > 0.2f / (float)thickness) {
|
2009-01-14 16:13:50 +00:00
|
|
|
glEnd();
|
2014-01-12 18:52:14 +01:00
|
|
|
curpressure = pt->pressure;
|
|
|
|
glLineWidth(curpressure * thickness);
|
2009-01-14 16:13:50 +00:00
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
|
2009-08-30 06:10:38 +00:00
|
|
|
/* need to roll-back one point to ensure that there are no gaps in the stroke */
|
2011-11-26 05:10:53 +00:00
|
|
|
if (i != 0) glVertex3fv(&(pt - 1)->x);
|
2012-06-11 00:21:50 +00:00
|
|
|
|
2009-08-30 06:10:38 +00:00
|
|
|
/* now the point we want... */
|
2011-11-26 05:10:53 +00:00
|
|
|
glVertex3fv(&pt->x);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
2011-11-26 05:10:53 +00:00
|
|
|
else {
|
|
|
|
glVertex3fv(&pt->x);
|
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
/* draw debug points of curve on top? */
|
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
|
|
|
/* XXX: for now, we represent "selected" strokes in the same way as debug, which isn't used anymore */
|
2009-01-14 16:13:50 +00:00
|
|
|
if (debug) {
|
|
|
|
glBegin(GL_POINTS);
|
2012-05-08 18:29:02 +00:00
|
|
|
for (i = 0, pt = points; i < totpoints && pt; i++, pt++)
|
2011-11-26 05:10:53 +00:00
|
|
|
glVertex3fv(&pt->x);
|
2009-01-14 16:13:50 +00:00
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ----- Fancy 2D-Stroke Drawing ------ */
|
|
|
|
|
|
|
|
/* draw a given stroke in 2d */
|
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
|
|
|
static void gp_draw_stroke_2d(bGPDspoint *points, int totpoints, short thickness_s, short dflag, short sflag,
|
|
|
|
bool debug, int offsx, int offsy, int winx, int winy)
|
2009-08-30 13:32:08 +00:00
|
|
|
{
|
2010-09-30 17:23:39 +00:00
|
|
|
/* otherwise thickness is twice that of the 3D view */
|
2012-05-08 18:29:02 +00:00
|
|
|
float thickness = (float)thickness_s * 0.5f;
|
2010-09-30 17:23:39 +00:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, 'smooth' opengl lines look better
|
2012-05-08 18:29:02 +00:00
|
|
|
* - 'smooth' opengl lines are also required if Image Editor 'image-based' stroke
|
2009-01-14 16:13:50 +00:00
|
|
|
*/
|
2012-09-09 00:00:21 +00:00
|
|
|
if ((thickness < GP_DRAWTHICKNESS_SPECIAL) ||
|
|
|
|
((dflag & GP_DRAWDATA_IEDITHACK) && (dflag & GP_DRAWDATA_ONLYV2D)))
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
bGPDspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
glBegin(GL_LINE_STRIP);
|
2012-05-08 18:29:02 +00:00
|
|
|
for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
|
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
|
|
|
float co[2];
|
|
|
|
|
|
|
|
gp_calc_2d_stroke_xy(pt, sflag, offsx, offsy, winx, winy, co);
|
|
|
|
glVertex2fv(co);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2012-03-02 16:05:54 +00:00
|
|
|
/* tessellation code - draw stroke as series of connected quads with connection
|
2012-07-04 15:04:38 +00:00
|
|
|
* edges rotated to minimize shrinking artifacts, and rounded endcaps
|
2009-01-14 16:13:50 +00:00
|
|
|
*/
|
2012-03-06 18:40:15 +00:00
|
|
|
else {
|
2009-01-14 16:13:50 +00:00
|
|
|
bGPDspoint *pt1, *pt2;
|
|
|
|
float pm[2];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
glShadeModel(GL_FLAT);
|
|
|
|
glBegin(GL_QUADS);
|
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
for (i = 0, pt1 = points, pt2 = points + 1; i < (totpoints - 1); i++, pt1++, pt2++) {
|
|
|
|
float s0[2], s1[2]; /* segment 'center' points */
|
|
|
|
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 */
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* get x and y coordinates from points */
|
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
|
|
|
gp_calc_2d_stroke_xy(pt1, sflag, offsx, offsy, winx, winy, s0);
|
|
|
|
gp_calc_2d_stroke_xy(pt2, sflag, offsx, offsy, winx, winy, s1);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* calculate gradient and normal - 'angle'=(ny/nx) */
|
2012-05-08 18:29:02 +00:00
|
|
|
m1[1] = s1[1] - s0[1];
|
|
|
|
m1[0] = s1[0] - s0[0];
|
2009-11-10 20:43:45 +00:00
|
|
|
normalize_v2(m1);
|
2012-05-08 18:29:02 +00:00
|
|
|
m2[1] = -m1[0];
|
|
|
|
m2[0] = m1[1];
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* always use pressure from first point here */
|
2012-05-08 18:29:02 +00:00
|
|
|
pthick = (pt1->pressure * thickness);
|
2009-01-14 16:13:50 +00: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)
|
2012-10-21 05:46:41 +00:00
|
|
|
*/
|
2012-05-08 18:29:02 +00:00
|
|
|
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);
|
2012-06-11 00:21:50 +00:00
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
t0[0] = sc[0] - mt[0];
|
|
|
|
t0[1] = sc[1] - mt[1];
|
|
|
|
t1[0] = sc[0] + mt[0];
|
|
|
|
t1[1] = sc[1] + mt[1];
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t1);
|
|
|
|
|
|
|
|
/* calculate points for start of segment */
|
2012-05-08 18:29:02 +00:00
|
|
|
mt[0] = m2[0] * pthick;
|
|
|
|
mt[1] = m2[1] * pthick;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
t0[0] = s0[0] - mt[0];
|
|
|
|
t0[1] = s0[1] - mt[1];
|
|
|
|
t1[0] = s0[0] + mt[0];
|
|
|
|
t1[1] = s0[1] + mt[1];
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* draw this line twice (first to finish off start cap, then for stroke) */
|
|
|
|
glVertex2fv(t1);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t1);
|
|
|
|
}
|
|
|
|
/* if not the first segment, use bisector of angle between segments */
|
|
|
|
else {
|
2012-05-08 18:29:02 +00:00
|
|
|
float mb[2]; /* bisector normal */
|
|
|
|
float athick, dfac; /* actual thickness, difference between thicknesses */
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* calculate gradient of bisector (as average of normals) */
|
2012-05-08 18:29:02 +00:00
|
|
|
mb[0] = (pm[0] + m2[0]) / 2;
|
|
|
|
mb[1] = (pm[1] + m2[1]) / 2;
|
2009-11-10 20:43:45 +00:00
|
|
|
normalize_v2(mb);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* calculate gradient to apply
|
2012-05-08 18:29:02 +00:00
|
|
|
* - as basis, use just pthick * bisector gradient
|
2009-01-14 16:13:50 +00:00
|
|
|
* - if cross-section not as thick as it should be, add extra padding to fix it
|
|
|
|
*/
|
2012-05-08 18:29:02 +00:00
|
|
|
mt[0] = mb[0] * pthick;
|
|
|
|
mt[1] = mb[1] * pthick;
|
|
|
|
athick = len_v2(mt);
|
|
|
|
dfac = pthick - (athick * 2);
|
2012-06-11 00:21:50 +00:00
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
if (((athick * 2.0f) < pthick) && (IS_EQF(athick, pthick) == 0)) {
|
2009-01-14 16:13:50 +00:00
|
|
|
mt[0] += (mb[0] * dfac);
|
|
|
|
mt[1] += (mb[1] * dfac);
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* calculate points for start of segment */
|
2012-05-08 18:29:02 +00:00
|
|
|
t0[0] = s0[0] - mt[0];
|
|
|
|
t0[1] = s0[1] - mt[1];
|
|
|
|
t1[0] = s0[0] + mt[0];
|
|
|
|
t1[1] = s0[1] + mt[1];
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* draw this line twice (once for end of current segment, and once for start of next) */
|
|
|
|
glVertex2fv(t1);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if last segment, also draw end of segment (defined as segment's normal) */
|
2012-05-08 18:29:02 +00:00
|
|
|
if (i == totpoints - 2) {
|
2009-01-14 16:13:50 +00:00
|
|
|
/* for once, we use second point's pressure (otherwise it won't be drawn) */
|
2012-05-08 18:29:02 +00:00
|
|
|
pthick = (pt2->pressure * thickness);
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* calculate points for end of segment */
|
2012-05-08 18:29:02 +00:00
|
|
|
mt[0] = m2[0] * pthick;
|
|
|
|
mt[1] = m2[1] * pthick;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
t0[0] = s1[0] - mt[0];
|
|
|
|
t0[1] = s1[1] - mt[1];
|
|
|
|
t1[0] = s1[0] + mt[0];
|
|
|
|
t1[1] = s1[1] + mt[1];
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* draw this line twice (once for end of stroke, and once for endcap)*/
|
|
|
|
glVertex2fv(t1);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
glVertex2fv(t1);
|
|
|
|
|
|
|
|
|
|
|
|
/* draw end cap as last step
|
|
|
|
* - make points slightly closer to center (about halfway across)
|
2012-10-21 05:46:41 +00:00
|
|
|
*/
|
2012-05-08 18:29:02 +00:00
|
|
|
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);
|
2012-06-11 00:21:50 +00:00
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
t0[0] = sc[0] - mt[0];
|
|
|
|
t0[1] = sc[1] - mt[1];
|
|
|
|
t1[0] = sc[0] + mt[0];
|
|
|
|
t1[1] = sc[1] + mt[1];
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
glVertex2fv(t1);
|
|
|
|
glVertex2fv(t0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* store stroke's 'natural' normal for next stroke to use */
|
2009-11-10 20:43:45 +00:00
|
|
|
copy_v2_v2(pm, m2);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw debug points of curve on top? (original stroke points) */
|
|
|
|
if (debug) {
|
|
|
|
bGPDspoint *pt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
glBegin(GL_POINTS);
|
2012-05-08 18:29:02 +00:00
|
|
|
for (i = 0, pt = points; i < totpoints && pt; i++, pt++) {
|
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
|
|
|
float co[2];
|
|
|
|
|
|
|
|
gp_calc_2d_stroke_xy(pt, sflag, offsx, offsy, winx, winy, co);
|
|
|
|
glVertex2fv(co);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
/* skip stroke if it isn't in the right display space for this drawing context */
|
|
|
|
/* 1) 3D Strokes */
|
|
|
|
if ((dflag & GP_DRAWDATA_ONLY3D) && !(gps->flag & GP_STROKE_3DSPACE))
|
|
|
|
return false;
|
|
|
|
if (!(dflag & GP_DRAWDATA_ONLY3D) && (gps->flag & GP_STROKE_3DSPACE))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* 2) Screen Space 2D Strokes */
|
|
|
|
if ((dflag & GP_DRAWDATA_ONLYV2D) && !(gps->flag & GP_STROKE_2DSPACE))
|
|
|
|
return false;
|
|
|
|
if (!(dflag & GP_DRAWDATA_ONLYV2D) && (gps->flag & GP_STROKE_2DSPACE))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* 3) Image Space (2D) */
|
|
|
|
if ((dflag & GP_DRAWDATA_ONLYI2D) && !(gps->flag & GP_STROKE_2DIMAGE))
|
|
|
|
return false;
|
|
|
|
if (!(dflag & GP_DRAWDATA_ONLYI2D) && (gps->flag & GP_STROKE_2DIMAGE))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
/* skip stroke if it doesn't have any valid data */
|
|
|
|
if ((gps->points == NULL) || (gps->totpoints < 1))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* stroke can be drawn */
|
|
|
|
return true;
|
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* draw a set of strokes */
|
2012-05-08 18:29:02 +00:00
|
|
|
static void gp_draw_strokes(bGPDframe *gpf, int offsx, int offsy, int winx, int winy, int dflag,
|
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
|
|
|
bool debug, short lthick, const float color[4], const float fill_color[4])
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
bGPDstroke *gps;
|
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
for (gps = gpf->strokes.first; gps; gps = gps->next) {
|
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
|
|
|
/* check if stroke can be drawn */
|
|
|
|
if (gp_can_draw_stroke(gps, dflag) == false)
|
2009-01-14 16:13:50 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* check which stroke-drawer to use */
|
2013-03-26 07:41:59 +00:00
|
|
|
if (dflag & GP_DRAWDATA_ONLY3D) {
|
2012-05-08 18:29:02 +00:00
|
|
|
const int no_xray = (dflag & GP_DRAWDATA_NO_XRAY);
|
2011-04-14 04:22:52 +00:00
|
|
|
int mask_orig = 0;
|
|
|
|
|
|
|
|
if (no_xray) {
|
2011-04-01 11:55:21 +00:00
|
|
|
glGetIntegerv(GL_DEPTH_WRITEMASK, &mask_orig);
|
|
|
|
glDepthMask(0);
|
|
|
|
glEnable(GL_DEPTH_TEST);
|
2011-04-14 04:22:52 +00:00
|
|
|
|
2012-10-07 14:00:18 +00:00
|
|
|
/* first arg is normally rv3d->dist, but this isn't
|
|
|
|
* available here and seems to work quite well without */
|
2011-04-01 11:55:21 +00:00
|
|
|
bglPolygonOffset(1.0f, 1.0f);
|
2012-03-03 16:31:46 +00:00
|
|
|
#if 0
|
2011-04-01 11:55:21 +00:00
|
|
|
glEnable(GL_POLYGON_OFFSET_LINE);
|
|
|
|
glPolygonOffset(-1.0f, -1.0f);
|
2012-03-03 16:31:46 +00:00
|
|
|
#endif
|
2011-04-01 11:55:21 +00:00
|
|
|
}
|
2011-04-14 04:22:52 +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
|
|
|
/* 3D Fill */
|
|
|
|
if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
|
|
|
|
glColor4fv(fill_color);
|
|
|
|
gp_draw_stroke_fill(gps->points, gps->totpoints, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 3D Stroke */
|
|
|
|
glColor4fv(color);
|
|
|
|
|
|
|
|
if (dflag & GP_DRAWDATA_VOLUMETRIC) {
|
|
|
|
/* volumetric stroke drawing */
|
|
|
|
gp_draw_stroke_volumetric_3d(gps->points, gps->totpoints, lthick, dflag, gps->flag);
|
2013-03-26 07:41:59 +00:00
|
|
|
}
|
|
|
|
else {
|
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
|
|
|
/* 3D Lines - OpenGL primitives-based */
|
|
|
|
if (gps->totpoints == 1) {
|
|
|
|
gp_draw_stroke_point(gps->points, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gp_draw_stroke_3d(gps->points, gps->totpoints, lthick, debug, gps->flag);
|
|
|
|
}
|
2013-03-26 07:41:59 +00:00
|
|
|
}
|
2011-04-14 04:22:52 +00:00
|
|
|
|
|
|
|
if (no_xray) {
|
2011-04-01 11:55:21 +00:00
|
|
|
glDepthMask(mask_orig);
|
|
|
|
glDisable(GL_DEPTH_TEST);
|
2011-04-14 04:22:52 +00:00
|
|
|
|
2011-04-01 11:55:21 +00:00
|
|
|
bglPolygonOffset(0.0, 0.0);
|
2012-03-03 16:31:46 +00:00
|
|
|
#if 0
|
2011-04-01 11:55:21 +00:00
|
|
|
glDisable(GL_POLYGON_OFFSET_LINE);
|
|
|
|
glPolygonOffset(0, 0);
|
2012-03-03 16:31:46 +00:00
|
|
|
#endif
|
2011-04-01 11:55:21 +00:00
|
|
|
}
|
|
|
|
}
|
2013-03-26 07:41:59 +00:00
|
|
|
else {
|
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 - Fill */
|
|
|
|
if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
|
|
|
|
gp_draw_stroke_fill(gps->points, gps->totpoints, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 2D Strokes... */
|
|
|
|
glColor4fv(color);
|
|
|
|
|
|
|
|
if (dflag & GP_DRAWDATA_VOLUMETRIC) {
|
|
|
|
/* blob/disk-based "volumetric" drawing */
|
|
|
|
gp_draw_stroke_volumetric_2d(gps->points, gps->totpoints, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* normal 2D strokes */
|
|
|
|
if (gps->totpoints == 1) {
|
|
|
|
gp_draw_stroke_point(gps->points, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gp_draw_stroke_2d(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, offsx, offsy, winx, winy);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Draw selected verts for strokes being edited */
|
|
|
|
static void gp_draw_strokes_edit(bGPDframe *gpf, int offsx, int offsy, int winx, int winy, short dflag, const float tcolor[3])
|
|
|
|
{
|
|
|
|
bGPDstroke *gps;
|
|
|
|
|
|
|
|
const int no_xray = (dflag & GP_DRAWDATA_NO_XRAY);
|
|
|
|
int mask_orig = 0;
|
|
|
|
|
|
|
|
/* set up depth masks... */
|
|
|
|
if (dflag & GP_DRAWDATA_ONLY3D) {
|
|
|
|
if (no_xray) {
|
|
|
|
glGetIntegerv(GL_DEPTH_WRITEMASK, &mask_orig);
|
|
|
|
glDepthMask(0);
|
|
|
|
glEnable(GL_DEPTH_TEST);
|
|
|
|
|
|
|
|
/* first arg is normally rv3d->dist, but this isn't
|
|
|
|
* available here and seems to work quite well without */
|
|
|
|
bglPolygonOffset(1.0f, 1.0f);
|
|
|
|
#if 0
|
|
|
|
glEnable(GL_POLYGON_OFFSET_LINE);
|
|
|
|
glPolygonOffset(-1.0f, -1.0f);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* draw stroke verts */
|
|
|
|
for (gps = gpf->strokes.first; gps; gps = gps->next) {
|
|
|
|
bGPDspoint *pt;
|
|
|
|
float vsize, bsize;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* check if stroke can be drawn */
|
|
|
|
if (gp_can_draw_stroke(gps, dflag) == false)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Optimisation: only draw points for selected strokes
|
|
|
|
* We assume that selected points can only occur in
|
|
|
|
* strokes that are selected too.
|
|
|
|
*/
|
|
|
|
if ((gps->flag & GP_STROKE_SELECT) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Get size of verts:
|
|
|
|
* - The selected state needs to be larger than the unselected state so that
|
|
|
|
* they stand out more.
|
|
|
|
* - We use the theme setting for size of the unselected verts
|
|
|
|
*/
|
|
|
|
bsize = UI_GetThemeValuef(TH_VERTEX_SIZE);
|
|
|
|
if ((int)bsize > 8) {
|
|
|
|
vsize = 10.0f;
|
|
|
|
bsize = 8.0f;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vsize = bsize + 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First Pass: Draw all the verts (i.e. these become the unselected state) */
|
|
|
|
if (tcolor != NULL) {
|
|
|
|
/* for now, we assume that the base color of the points is not too close to the real color */
|
|
|
|
glColor3fv(tcolor);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* this doesn't work well with the default theme and black strokes... */
|
|
|
|
UI_ThemeColor(TH_VERTEX);
|
|
|
|
}
|
|
|
|
glPointSize(bsize);
|
|
|
|
|
|
|
|
glBegin(GL_POINTS);
|
|
|
|
for (i = 0, pt = gps->points; i < gps->totpoints && pt; i++, pt++) {
|
|
|
|
if (gps->flag & GP_STROKE_3DSPACE) {
|
|
|
|
glVertex3fv(&pt->x);
|
2013-03-26 07:41:59 +00:00
|
|
|
}
|
|
|
|
else {
|
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
|
|
|
float co[2];
|
|
|
|
|
|
|
|
gp_calc_2d_stroke_xy(pt, gps->flag, offsx, offsy, winx, winy, co);
|
|
|
|
glVertex2fv(co);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
|
|
|
|
/* Second Pass: Draw only verts which are selected */
|
|
|
|
UI_ThemeColor(TH_VERTEX_SELECT);
|
|
|
|
glPointSize(vsize);
|
|
|
|
|
|
|
|
glBegin(GL_POINTS);
|
|
|
|
for (i = 0, pt = gps->points; i < gps->totpoints && pt; i++, pt++) {
|
|
|
|
if (pt->flag & GP_SPOINT_SELECT) {
|
|
|
|
if (gps->flag & GP_STROKE_3DSPACE) {
|
|
|
|
glVertex3fv(&pt->x);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
float co[2];
|
|
|
|
|
|
|
|
gp_calc_2d_stroke_xy(pt, gps->flag, offsx, offsy, winx, winy, co);
|
|
|
|
glVertex2fv(co);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* clear depth mask */
|
|
|
|
if (dflag & GP_DRAWDATA_ONLY3D) {
|
|
|
|
if (no_xray) {
|
|
|
|
glDepthMask(mask_orig);
|
|
|
|
glDisable(GL_DEPTH_TEST);
|
|
|
|
|
|
|
|
bglPolygonOffset(0.0, 0.0);
|
|
|
|
#if 0
|
|
|
|
glDisable(GL_POLYGON_OFFSET_LINE);
|
|
|
|
glPolygonOffset(0, 0);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ----- General Drawing ------ */
|
|
|
|
|
|
|
|
/* draw onion-skinning for a layer */
|
|
|
|
static void gp_draw_onionskins(bGPDlayer *gpl, bGPDframe *gpf, int offsx, int offsy, int winx, int winy,
|
2014-11-30 14:39:11 +01:00
|
|
|
int UNUSED(cfra), int dflag, short debug, short lthick)
|
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
|
|
|
{
|
|
|
|
const float alpha = gpl->color[3];
|
|
|
|
float color[4];
|
|
|
|
|
|
|
|
/* 1) Draw Previous Frames First */
|
|
|
|
if (gpl->flag & GP_LAYER_GHOST_PREVCOL) {
|
|
|
|
copy_v3_v3(color, gpl->gcolor_prev);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v3_v3(color, gpl->color);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gpl->gstep) {
|
|
|
|
bGPDframe *gf;
|
|
|
|
float fac;
|
|
|
|
|
|
|
|
/* draw previous frames first */
|
|
|
|
for (gf = gpf->prev; gf; gf = gf->prev) {
|
|
|
|
/* check if frame is drawable */
|
|
|
|
if ((gpf->framenum - gf->framenum) <= gpl->gstep) {
|
|
|
|
/* alpha decreases with distance from curframe index */
|
|
|
|
fac = 1.0f - ((float)(gpf->framenum - gf->framenum) / (float)(gpl->gstep + 1));
|
|
|
|
color[3] = alpha * fac * 0.66f;
|
|
|
|
gp_draw_strokes(gf, offsx, offsy, winx, winy, dflag, debug, lthick, color, color);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* draw the strokes for the ghost frames (at half of the alpha set by user) */
|
|
|
|
if (gpf->prev) {
|
|
|
|
color[3] = (alpha / 7);
|
|
|
|
gp_draw_strokes(gpf->prev, offsx, offsy, winx, winy, dflag, debug, lthick, color, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 2) Now draw next frames */
|
|
|
|
if (gpl->flag & GP_LAYER_GHOST_NEXTCOL) {
|
|
|
|
copy_v3_v3(color, gpl->gcolor_next);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v3_v3(color, gpl->color);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gpl->gstep_next) {
|
|
|
|
bGPDframe *gf;
|
|
|
|
float fac;
|
|
|
|
|
|
|
|
/* now draw next frames */
|
|
|
|
for (gf = gpf->next; gf; gf = gf->next) {
|
|
|
|
/* check if frame is drawable */
|
|
|
|
if ((gf->framenum - gpf->framenum) <= gpl->gstep_next) {
|
|
|
|
/* alpha decreases with distance from curframe index */
|
|
|
|
fac = 1.0f - ((float)(gf->framenum - gpf->framenum) / (float)(gpl->gstep_next + 1));
|
|
|
|
color[3] = alpha * fac * 0.66f;
|
|
|
|
gp_draw_strokes(gf, offsx, offsy, winx, winy, dflag, debug, lthick, color, color);
|
2013-03-26 07:41:59 +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
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* draw the strokes for the ghost frames (at half of the alpha set by user) */
|
|
|
|
if (gpf->next) {
|
|
|
|
color[3] = (alpha / 4);
|
|
|
|
gp_draw_strokes(gpf->next, offsx, offsy, winx, winy, dflag, debug, lthick, color, color);
|
2013-03-26 07:41:59 +00:00
|
|
|
}
|
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
|
|
|
|
|
|
|
/* 3) restore alpha */
|
|
|
|
glColor4fv(gpl->color);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* draw grease-pencil datablock */
|
2012-05-08 18:29:02 +00:00
|
|
|
static void gp_draw_data(bGPdata *gpd, int offsx, int offsy, int winx, int winy, int cfra, int dflag)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
2011-03-28 02:34:55 +00:00
|
|
|
bGPDlayer *gpl;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2009-08-30 13:32:08 +00:00
|
|
|
/* reset line drawing style (in case previous user didn't reset) */
|
|
|
|
setlinestyle(0);
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* turn on smooth lines (i.e. anti-aliasing) */
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
/* turn on alpha-blending */
|
|
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
|
|
|
/* loop over layers, drawing them */
|
2012-05-08 18:29:02 +00:00
|
|
|
for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
|
2009-01-14 16:13:50 +00:00
|
|
|
bGPDframe *gpf;
|
|
|
|
|
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
|
|
|
bool debug = (gpl->flag & GP_LAYER_DRAWDEBUG) ? true : false;
|
2012-05-08 18:29:02 +00:00
|
|
|
short lthick = gpl->thickness;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* don't draw layer if hidden */
|
|
|
|
if (gpl->flag & GP_LAYER_HIDE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* get frame to draw */
|
2012-05-08 18:29:02 +00:00
|
|
|
gpf = gpencil_layer_getframe(gpl, cfra, 0);
|
2009-01-14 16:13:50 +00:00
|
|
|
if (gpf == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* set color, stroke thickness, and point size */
|
|
|
|
glLineWidth(lthick);
|
|
|
|
glPointSize((float)(gpl->thickness + 2));
|
2011-04-14 04:22:52 +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
|
|
|
/* Add layer drawing settings to the set of "draw flags"
|
|
|
|
* NOTE: If the setting doesn't apply, it *must* be cleared,
|
|
|
|
* as dflag's carry over from the previous layer
|
|
|
|
*/
|
|
|
|
#define GP_DRAWFLAG_APPLY(condition, draw_flag_value) { \
|
|
|
|
if (condition) dflag |= (draw_flag_value); \
|
|
|
|
else dflag &= ~(draw_flag_value); \
|
|
|
|
} (void)0
|
|
|
|
|
|
|
|
/* xray... */
|
|
|
|
GP_DRAWFLAG_APPLY((gpl->flag & GP_LAYER_NO_XRAY), GP_DRAWDATA_NO_XRAY);
|
|
|
|
|
|
|
|
/* volumetric strokes... */
|
|
|
|
GP_DRAWFLAG_APPLY((gpl->flag & GP_LAYER_VOLUMETRIC), GP_DRAWDATA_VOLUMETRIC);
|
|
|
|
|
|
|
|
/* fill strokes... */
|
|
|
|
// XXX: this is not a very good limit
|
|
|
|
GP_DRAWFLAG_APPLY((gpl->fill[3] > 0.001f), GP_DRAWDATA_FILL);
|
|
|
|
#undef GP_DRAWFLAG_APPLY
|
2011-04-14 04:22:52 +00:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* draw 'onionskins' (frame left + right) */
|
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
|
|
|
if ((gpl->flag & GP_LAYER_ONIONSKIN) && !(dflag & GP_DRAWDATA_NO_ONIONS)) {
|
|
|
|
/* Drawing method - only immediately surrounding (gstep = 0),
|
|
|
|
* or within a frame range on either side (gstep > 0)
|
|
|
|
*/
|
|
|
|
gp_draw_onionskins(gpl, gpf, offsx, offsy, winx, winy, cfra, dflag, debug, lthick);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* draw the strokes already in active frame */
|
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
|
|
|
gp_draw_strokes(gpf, offsx, offsy, winx, winy, dflag, debug, lthick, gpl->color, gpl->fill);
|
|
|
|
|
|
|
|
/* Draw verts of selected strokes
|
|
|
|
* - when doing OpenGL renders, we don't want to be showing these, as that ends up flickering
|
|
|
|
* - locked layers can't be edited, so there's no point showing these verts
|
|
|
|
* as they will have no bearings on what gets edited
|
|
|
|
* - only show when in editmode, since operators shouldn't work otherwise
|
|
|
|
* (NOTE: doing it this way means that the toggling editmode shows visible change immediately)
|
|
|
|
*/
|
|
|
|
/* XXX: perhaps we don't want to show these when users are drawing... */
|
|
|
|
if ((G.f & G_RENDER_OGL) == 0 &&
|
|
|
|
(gpl->flag & GP_LAYER_LOCKED) == 0 &&
|
|
|
|
(gpd->flag & GP_DATA_STROKE_EDITMODE))
|
|
|
|
{
|
|
|
|
gp_draw_strokes_edit(gpf, offsx, offsy, winx, winy, dflag,
|
|
|
|
(gpl->color[3] < 0.95f) ? gpl->color : NULL);
|
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
/* Check if may need to draw the active stroke cache, only if this layer is the active layer
|
|
|
|
* that is being edited. (Stroke buffer is currently stored in gp-data)
|
|
|
|
*/
|
2011-09-06 07:59:18 +00:00
|
|
|
if (ED_gpencil_session_active() && (gpl->flag & GP_LAYER_ACTIVE) &&
|
2012-05-08 18:29:02 +00:00
|
|
|
(gpf->flag & GP_FRAME_PAINT))
|
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
|
|
|
/* Set color for drawing buffer stroke - since this may not be set yet */
|
|
|
|
glColor4fv(gpl->color);
|
|
|
|
|
2012-10-07 14:00:18 +00:00
|
|
|
/* Buffer stroke needs to be drawn with a different linestyle
|
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
|
|
|
* to help differentiate them from normal strokes.
|
|
|
|
*
|
|
|
|
* It should also be noted that sbuffer contains temporary point types
|
|
|
|
* i.e. tGPspoints NOT bGPDspoints
|
|
|
|
*/
|
|
|
|
if (gpl->flag & GP_LAYER_VOLUMETRIC) {
|
|
|
|
gp_draw_stroke_volumetric_buffer(gpd->sbuffer, gpd->sbuffer_size, lthick, dflag, gpd->sbuffer_sflag);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gp_draw_stroke_buffer(gpd->sbuffer, gpd->sbuffer_size, lthick, dflag, gpd->sbuffer_sflag);
|
|
|
|
}
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* turn off alpha blending, then smooth lines */
|
|
|
|
glDisable(GL_BLEND); // alpha blending
|
|
|
|
glDisable(GL_LINE_SMOOTH); // smooth lines
|
|
|
|
|
|
|
|
/* restore initial gl conditions */
|
|
|
|
glLineWidth(1.0);
|
|
|
|
glPointSize(1.0);
|
|
|
|
glColor4f(0, 0, 0, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ----- Grease Pencil Sketches Drawing API ------ */
|
|
|
|
|
2012-10-20 20:20:02 +00:00
|
|
|
/* ............................
|
|
|
|
* XXX
|
|
|
|
* We need to review the calls below, since they may be/are not that suitable for
|
|
|
|
* the new ways that we intend to be drawing data...
|
|
|
|
* ............................ */
|
2009-08-28 12:41:45 +00:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* draw grease-pencil sketches to specified 2d-view that uses ibuf corrections */
|
2014-06-14 02:54:17 +10:00
|
|
|
void ED_gpencil_draw_2dimage(const bContext *C)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
2012-05-08 18:29:02 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2009-01-14 16:13:50 +00:00
|
|
|
bGPdata *gpd;
|
|
|
|
int offsx, offsy, sizex, sizey;
|
|
|
|
int dflag = GP_DRAWDATA_NOSTATUS;
|
|
|
|
|
2014-06-14 02:54:17 +10:00
|
|
|
gpd = ED_gpencil_data_get_active(C); // XXX
|
2009-01-14 16:13:50 +00:00
|
|
|
if (gpd == NULL) return;
|
|
|
|
|
|
|
|
/* calculate rect */
|
|
|
|
switch (sa->spacetype) {
|
|
|
|
case SPACE_IMAGE: /* image */
|
2011-11-07 12:55:18 +00:00
|
|
|
case SPACE_CLIP: /* clip */
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
/* just draw using standard scaling (settings here are currently ignored anyways) */
|
2012-07-07 22:51:57 +00:00
|
|
|
/* FIXME: the opengl poly-strokes don't draw at right thickness when done this way, so disabled */
|
2012-05-08 18:29:02 +00:00
|
|
|
offsx = 0;
|
|
|
|
offsy = 0;
|
|
|
|
sizex = ar->winx;
|
|
|
|
sizey = ar->winy;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, ar->v2d.cur.ymin, ar->v2d.cur.ymax);
|
|
|
|
|
2012-05-08 18:29:02 +00:00
|
|
|
dflag |= GP_DRAWDATA_ONLYV2D | GP_DRAWDATA_IEDITHACK;
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
case SPACE_SEQ: /* sequence */
|
|
|
|
{
|
2012-06-11 00:21:50 +00:00
|
|
|
/* just draw using standard scaling (settings here are currently ignored anyways) */
|
|
|
|
offsx = 0;
|
|
|
|
offsy = 0;
|
|
|
|
sizex = ar->winx;
|
|
|
|
sizey = ar->winy;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
2012-06-11 00:21:50 +00:00
|
|
|
/* NOTE: I2D was used in 2.4x, but the old settings for that have been deprecated
|
|
|
|
* and everything moved to standard View2d
|
|
|
|
*/
|
|
|
|
dflag |= GP_DRAWDATA_ONLYV2D;
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
|
|
|
default: /* for spacetype not yet handled */
|
2012-05-08 18:29:02 +00:00
|
|
|
offsx = 0;
|
|
|
|
offsy = 0;
|
|
|
|
sizex = ar->winx;
|
|
|
|
sizey = ar->winy;
|
2009-01-14 16:13:50 +00:00
|
|
|
|
|
|
|
dflag |= GP_DRAWDATA_ONLYI2D;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* draw it! */
|
|
|
|
gp_draw_data(gpd, offsx, offsy, sizex, sizey, CFRA, dflag);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly
|
2012-10-07 14:00:18 +00:00
|
|
|
* Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes,
|
|
|
|
* second time with onlyv2d=0 for screen-aligned strokes */
|
2014-06-14 02:54:17 +10:00
|
|
|
void ED_gpencil_draw_view2d(const bContext *C, bool onlyv2d)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
2012-05-08 18:29:02 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2009-01-14 16:13:50 +00:00
|
|
|
bGPdata *gpd;
|
|
|
|
int dflag = 0;
|
|
|
|
|
|
|
|
/* check that we have grease-pencil stuff to draw */
|
|
|
|
if (sa == NULL) return;
|
2014-06-14 02:54:17 +10:00
|
|
|
gpd = ED_gpencil_data_get_active(C); // XXX
|
2009-01-14 16:13:50 +00:00
|
|
|
if (gpd == NULL) return;
|
|
|
|
|
2009-08-30 13:32:08 +00:00
|
|
|
/* special hack for Image Editor */
|
2012-07-07 22:51:57 +00:00
|
|
|
/* FIXME: the opengl poly-strokes don't draw at right thickness when done this way, so disabled */
|
2011-11-07 12:55:18 +00:00
|
|
|
if (ELEM(sa->spacetype, SPACE_IMAGE, SPACE_CLIP))
|
2009-08-30 13:32:08 +00:00
|
|
|
dflag |= GP_DRAWDATA_IEDITHACK;
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* draw it! */
|
2012-05-08 18:29:02 +00:00
|
|
|
if (onlyv2d) dflag |= (GP_DRAWDATA_ONLYV2D | GP_DRAWDATA_NOSTATUS);
|
2009-01-14 16:13:50 +00:00
|
|
|
gp_draw_data(gpd, 0, 0, ar->winx, ar->winy, CFRA, dflag);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw grease-pencil sketches to specified 3d-view assuming that matrices are already set correctly
|
2012-10-07 14:00:18 +00:00
|
|
|
* Note: this gets called twice - first time with only3d=1 to draw 3d-strokes,
|
|
|
|
* second time with only3d=0 for screen-aligned strokes */
|
2014-06-14 02:54:17 +10:00
|
|
|
void ED_gpencil_draw_view3d(Scene *scene, View3D *v3d, ARegion *ar, bool only3d)
|
2009-01-14 16:13:50 +00:00
|
|
|
{
|
|
|
|
bGPdata *gpd;
|
|
|
|
int dflag = 0;
|
2012-05-08 18:29:02 +00:00
|
|
|
RegionView3D *rv3d = ar->regiondata;
|
2012-09-26 07:37:12 +00:00
|
|
|
int offsx, offsy, winx, winy;
|
2009-11-09 08:03:43 +00:00
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* check that we have grease-pencil stuff to draw */
|
2014-09-02 20:45:28 +10:00
|
|
|
gpd = ED_gpencil_data_get_active_v3d(scene, v3d);
|
2011-04-14 04:22:52 +00:00
|
|
|
if (gpd == NULL) return;
|
2009-11-09 08:03:43 +00:00
|
|
|
|
2012-03-18 07:38:51 +00:00
|
|
|
/* when rendering to the offscreen buffer we don't want to
|
2010-08-25 08:31:52 +00:00
|
|
|
* deal with the camera border, otherwise map the coords to the camera border. */
|
2011-04-14 04:22:52 +00:00
|
|
|
if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) {
|
2010-08-25 08:31:52 +00:00
|
|
|
rctf rectf;
|
2014-04-01 11:34:00 +11:00
|
|
|
ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &rectf, true); /* no shift */
|
2012-09-26 07:37:12 +00:00
|
|
|
|
2014-01-15 13:00:03 +11:00
|
|
|
offsx = iroundf(rectf.xmin);
|
|
|
|
offsy = iroundf(rectf.ymin);
|
|
|
|
winx = iroundf(rectf.xmax - rectf.xmin);
|
|
|
|
winy = iroundf(rectf.ymax - rectf.ymin);
|
2010-08-25 08:31:52 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-09-26 07:37:12 +00:00
|
|
|
offsx = 0;
|
|
|
|
offsy = 0;
|
|
|
|
winx = ar->winx;
|
|
|
|
winy = ar->winy;
|
2010-08-25 08:31:52 +00:00
|
|
|
}
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* draw it! */
|
2012-05-08 18:29:02 +00:00
|
|
|
if (only3d) dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS);
|
2010-08-25 08:31:52 +00:00
|
|
|
|
2012-09-26 07:37:12 +00:00
|
|
|
gp_draw_data(gpd, offsx, offsy, winx, winy, CFRA, dflag);
|
2009-01-14 16:13:50 +00:00
|
|
|
}
|
2009-11-09 08:03:43 +00:00
|
|
|
|
2014-06-14 03:25:07 +10:00
|
|
|
void ED_gpencil_draw_ex(bGPdata *gpd, int winx, int winy, const int cfra)
|
|
|
|
{
|
|
|
|
int dflag = GP_DRAWDATA_NOSTATUS | GP_DRAWDATA_ONLYV2D;
|
|
|
|
|
|
|
|
gp_draw_data(gpd, 0, 0, winx, winy, cfra, dflag);
|
|
|
|
}
|
|
|
|
|
2009-01-14 16:13:50 +00:00
|
|
|
/* ************************************************** */
|