2022-02-11 09:07:11 +11:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
|
* Copyright 2009 Blender Foundation, Joshua Leung. All rights reserved. */
|
2008-12-22 08:13:25 +00:00
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup editors
|
2011-02-21 07:25:24 +00:00
|
|
|
*/
|
|
|
|
|
|
2012-02-17 18:59:41 +00:00
|
|
|
#pragma once
|
2008-12-22 08:13:25 +00:00
|
|
|
|
2020-03-02 15:09:10 +01:00
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-06-23 13:25:31 +00:00
|
|
|
struct AnimData;
|
2021-08-11 16:18:52 +02:00
|
|
|
struct AnimKeylistDrawList;
|
2009-01-20 11:07:42 +00:00
|
|
|
struct FCurve;
|
2012-06-04 16:42:58 +00:00
|
|
|
struct MaskLayer;
|
2019-01-28 21:08:24 +11:00
|
|
|
struct Object;
|
2009-02-13 06:33:07 +00:00
|
|
|
struct Scene;
|
2009-07-09 13:14:51 +00:00
|
|
|
struct View2D;
|
2019-01-28 21:08:24 +11:00
|
|
|
struct bAction;
|
|
|
|
|
struct bActionGroup;
|
|
|
|
|
struct bAnimContext;
|
|
|
|
|
struct bDopeSheet;
|
|
|
|
|
struct bGPDlayer;
|
2008-12-22 08:13:25 +00:00
|
|
|
|
2017-02-11 00:24:59 -05:00
|
|
|
/* draw simple diamond-shape keyframe */
|
2021-09-23 15:53:38 +02:00
|
|
|
/* caller should set up vertex format, bind GPU_SHADER_KEYFRAME_SHAPE,
|
2019-01-15 23:24:20 +11:00
|
|
|
* immBegin(GPU_PRIM_POINTS, n), then call this n times */
|
2021-08-13 09:37:38 +02:00
|
|
|
typedef struct KeyframeShaderBindings {
|
|
|
|
|
uint pos_id;
|
|
|
|
|
uint size_id;
|
|
|
|
|
uint color_id;
|
|
|
|
|
uint outline_color_id;
|
|
|
|
|
uint flags_id;
|
|
|
|
|
} KeyframeShaderBindings;
|
|
|
|
|
|
2017-02-11 00:24:59 -05:00
|
|
|
void draw_keyframe_shape(float x,
|
|
|
|
|
float y,
|
|
|
|
|
float size,
|
|
|
|
|
bool sel,
|
|
|
|
|
short key_type,
|
|
|
|
|
short mode,
|
|
|
|
|
float alpha,
|
2021-08-13 09:37:38 +02:00
|
|
|
const KeyframeShaderBindings *sh_bindings,
|
2020-09-04 20:59:13 +02:00
|
|
|
short handle_type,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
short extreme_type);
|
2009-07-10 00:32:13 +00:00
|
|
|
|
2008-12-22 08:13:25 +00:00
|
|
|
/* ******************************* Methods ****************************** */
|
|
|
|
|
|
2009-11-15 11:20:44 +00:00
|
|
|
/* Channel Drawing ------------------ */
|
|
|
|
|
/* F-Curve */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_fcurve_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct AnimData *adt,
|
|
|
|
|
struct FCurve *fcu,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2009-11-15 11:20:44 +00:00
|
|
|
/* Action Group Summary */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_agroup_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct AnimData *adt,
|
|
|
|
|
struct bActionGroup *agrp,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2009-11-15 11:20:44 +00:00
|
|
|
/* Action Summary */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_action_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct AnimData *adt,
|
|
|
|
|
struct bAction *act,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2009-11-15 11:20:44 +00:00
|
|
|
/* Object Summary */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_object_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct bDopeSheet *ads,
|
|
|
|
|
struct Object *ob,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2009-11-15 11:20:44 +00:00
|
|
|
/* Scene Summary */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_scene_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct bDopeSheet *ads,
|
|
|
|
|
struct Scene *sce,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2013-05-09 10:03:38 +00:00
|
|
|
/* DopeSheet Summary */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_summary_channel(struct AnimKeylistDrawList *draw_list,
|
|
|
|
|
struct bAnimContext *ac,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
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
|
|
|
/* Grease Pencil Layer */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_gpl_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct bDopeSheet *ads,
|
|
|
|
|
struct bGPDlayer *gpl,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2012-06-08 14:31:38 +00:00
|
|
|
/* Mask Layer */
|
2021-08-11 16:18:52 +02:00
|
|
|
void draw_masklay_channel(struct AnimKeylistDrawList *draw_list,
|
Dope Sheet: new option to display keyframe interpolation mode and extremes.
With the new automatic handle algorithm, it is possible to do a lot
of the animation via keyframes without touching the curves. It is
however necessary to change the keyframe interpolation and handle
types in certain cases. Currently the dopesheet/action editor
allows changing the types, but does not show them in any way.
To fix, add a new menu option to display this information. For handle
type, it is represented using the shape of the key icons: diamond for
Free, clipped diamond for Aligned, square for Vector, circle for Auto
Clamp, and cirle with dot for Automatic.
Non-bezier interpolation is a property of intervals between keys,
so it is marked by drawing lines, similar to holds. In this initial
version, only the fact of non-bezier interpolation is displayed,
without distinguishing types. For summaries, the line is drawn at
half alpha if not all curves in the group are non-bezier.
In addition, it is sometimes helpful to know the general direction
of change of the curve, and which keys are extremes. This commit
also adds an option to highlight extremes, based on comparing the
keyed values with adjacent keys. Half-intensity display is used
for overshot bezier extremes, or non-uniform summaries.
Reviewers: brecht, aligorith, billreynish
Differential Revision: https://developer.blender.org/D3788
2018-10-19 18:55:19 +03:00
|
|
|
struct bDopeSheet *ads,
|
|
|
|
|
struct MaskLayer *masklay,
|
|
|
|
|
float ypos,
|
|
|
|
|
float yscale_fac,
|
|
|
|
|
int saction_flag);
|
2008-12-22 08:13:25 +00:00
|
|
|
|
2021-08-11 16:18:52 +02:00
|
|
|
struct AnimKeylistDrawList *ED_keylist_draw_list_create(void);
|
|
|
|
|
void ED_keylist_draw_list_flush(struct AnimKeylistDrawList *draw_list, struct View2D *v2d);
|
|
|
|
|
void ED_keylist_draw_list_free(struct AnimKeylistDrawList *draw_list);
|
|
|
|
|
|
2020-03-02 15:09:10 +01:00
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|