Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/include/ED_gpencil.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/include/ED_gpencil.h')
-rw-r--r--source/blender/editors/include/ED_gpencil.h180
1 files changed, 103 insertions, 77 deletions
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 1f86a8c7f46..ac998cbcb71 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -67,22 +67,22 @@ struct wmWindowManager;
* Used as part of the 'stroke cache' used during drawing of new strokes
*/
typedef struct tGPspoint {
- float x, y; /* x and y coordinates of cursor (in relative to area) */
- float pressure; /* pressure of tablet at this point */
- float strength; /* pressure of tablet at this point for alpha factor */
- float time; /* Time relative to stroke start (used when converting to path) */
- float uv_fac; /* factor of uv along the stroke */
- float uv_rot; /* uv rotation for dor mode */
- float rnd[3]; /* rnd value */
- bool rnd_dirty; /* rnd flag */
+ float x, y; /* x and y coordinates of cursor (in relative to area) */
+ float pressure; /* pressure of tablet at this point */
+ float strength; /* pressure of tablet at this point for alpha factor */
+ float time; /* Time relative to stroke start (used when converting to path) */
+ float uv_fac; /* factor of uv along the stroke */
+ float uv_rot; /* uv rotation for dor mode */
+ float rnd[3]; /* rnd value */
+ bool rnd_dirty; /* rnd flag */
} tGPspoint;
/* used to sort by zdepth gpencil objects in viewport */
/* TODO: this could be a system parameter in userprefs screen */
#define GP_CACHE_BLOCK_SIZE 16
typedef struct tGPencilSort {
- struct Base *base;
- float zdepth;
+ struct Base *base;
+ float zdepth;
} tGPencilSort;
/* ----------- Grease Pencil Tools/Context ------------- */
@@ -90,26 +90,24 @@ typedef struct tGPencilSort {
/* Context-dependent */
struct bGPdata **ED_gpencil_data_get_pointers(const struct bContext *C, struct PointerRNA *r_ptr);
-struct bGPdata *ED_gpencil_data_get_active(const struct bContext *C);
-struct bGPdata *ED_gpencil_data_get_active_evaluated(const struct bContext *C);
+struct bGPdata *ED_gpencil_data_get_active(const struct bContext *C);
+struct bGPdata *ED_gpencil_data_get_active_evaluated(const struct bContext *C);
/* Context independent (i.e. each required part is passed in instead) */
-struct bGPdata **ED_gpencil_data_get_pointers_direct(
- struct ID *screen_id,
- struct ScrArea *sa,
- struct Scene *scene,
- struct Object *ob,
- struct PointerRNA *r_ptr);
-struct bGPdata *ED_gpencil_data_get_active_direct(
- struct ID *screen_id,
- struct ScrArea *sa,
- struct Scene *scene,
- struct Object *ob);
+struct bGPdata **ED_gpencil_data_get_pointers_direct(struct ID *screen_id,
+ struct ScrArea *sa,
+ struct Scene *scene,
+ struct Object *ob,
+ struct PointerRNA *r_ptr);
+struct bGPdata *ED_gpencil_data_get_active_direct(struct ID *screen_id,
+ struct ScrArea *sa,
+ struct Scene *scene,
+ struct Object *ob);
bool ED_gpencil_data_owner_is_annotation(struct PointerRNA *owner_ptr);
/* 3D View */
-struct bGPdata *ED_gpencil_data_get_active_v3d(struct ViewLayer *view_layer, struct View3D *v3d);
+struct bGPdata *ED_gpencil_data_get_active_v3d(struct ViewLayer *view_layer, struct View3D *v3d);
bool ED_gpencil_has_keyframe_v3d(struct Scene *scene, struct Object *ob, int cfra);
@@ -117,7 +115,9 @@ bool ED_gpencil_has_keyframe_v3d(struct Scene *scene, struct Object *ob, int cfr
bool ED_gpencil_stroke_can_use_direct(const struct ScrArea *sa, const struct bGPDstroke *gps);
bool ED_gpencil_stroke_can_use(const struct bContext *C, const struct bGPDstroke *gps);
-bool ED_gpencil_stroke_color_use(struct Object *ob, const struct bGPDlayer *gpl, const struct bGPDstroke *gps);
+bool ED_gpencil_stroke_color_use(struct Object *ob,
+ const struct bGPDlayer *gpl,
+ const struct bGPDstroke *gps);
/* ----------- Grease Pencil Operators ----------------- */
@@ -131,67 +131,78 @@ void ED_operatormacros_gpencil(void);
/* Strokes copybuf */
void ED_gpencil_strokes_copybuf_free(void);
-
/* ------------ Grease-Pencil Drawing API ------------------ */
/* drawgpencil.c */
void ED_annotation_draw_2dimage(const struct bContext *C);
void ED_annotation_draw_view2d(const struct bContext *C, bool onlyv2d);
-void ED_annotation_draw_view3d(
- struct Scene *scene, struct Depsgraph *depsgraph,
- struct View3D *v3d, struct ARegion *ar,
- bool only3d);
-void ED_annotation_draw_ex(
- struct Scene *scene,
- struct bGPdata *gpd, int winx, int winy,
- const int cfra, const char spacetype);
+void ED_annotation_draw_view3d(struct Scene *scene,
+ struct Depsgraph *depsgraph,
+ struct View3D *v3d,
+ struct ARegion *ar,
+ bool only3d);
+void ED_annotation_draw_ex(struct Scene *scene,
+ struct bGPdata *gpd,
+ int winx,
+ int winy,
+ const int cfra,
+ const char spacetype);
/* ----------- Grease-Pencil AnimEdit API ------------------ */
-bool ED_gplayer_frames_looper(struct bGPDlayer *gpl, struct Scene *scene,
- short (*gpf_cb)(struct bGPDframe *, struct Scene *));
+bool ED_gplayer_frames_looper(struct bGPDlayer *gpl,
+ struct Scene *scene,
+ short (*gpf_cb)(struct bGPDframe *, struct Scene *));
void ED_gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, bool onlysel);
-bool ED_gplayer_frame_select_check(struct bGPDlayer *gpl);
-void ED_gplayer_frame_select_set(struct bGPDlayer *gpl, short mode);
-void ED_gplayer_frames_select_box(struct bGPDlayer *gpl, float min, float max, short select_mode);
-void ED_gplayer_frames_select_region(struct KeyframeEditData *ked, struct bGPDlayer *gpl, short tool, short select_mode);
-void ED_gpencil_select_frames(struct bGPDlayer *gpl, short select_mode);
-void ED_gpencil_select_frame(struct bGPDlayer *gpl, int selx, short select_mode);
+bool ED_gplayer_frame_select_check(struct bGPDlayer *gpl);
+void ED_gplayer_frame_select_set(struct bGPDlayer *gpl, short mode);
+void ED_gplayer_frames_select_box(struct bGPDlayer *gpl, float min, float max, short select_mode);
+void ED_gplayer_frames_select_region(struct KeyframeEditData *ked,
+ struct bGPDlayer *gpl,
+ short tool,
+ short select_mode);
+void ED_gpencil_select_frames(struct bGPDlayer *gpl, short select_mode);
+void ED_gpencil_select_frame(struct bGPDlayer *gpl, int selx, short select_mode);
-bool ED_gplayer_frames_delete(struct bGPDlayer *gpl);
-void ED_gplayer_frames_duplicate(struct bGPDlayer *gpl);
+bool ED_gplayer_frames_delete(struct bGPDlayer *gpl);
+void ED_gplayer_frames_duplicate(struct bGPDlayer *gpl);
void ED_gplayer_frames_keytype_set(struct bGPDlayer *gpl, short type);
-void ED_gplayer_snap_frames(struct bGPDlayer *gpl, struct Scene *scene, short mode);
-void ED_gplayer_mirror_frames(struct bGPDlayer *gpl, struct Scene *scene, short mode);
+void ED_gplayer_snap_frames(struct bGPDlayer *gpl, struct Scene *scene, short mode);
+void ED_gplayer_mirror_frames(struct bGPDlayer *gpl, struct Scene *scene, short mode);
void ED_gpencil_anim_copybuf_free(void);
bool ED_gpencil_anim_copybuf_copy(struct bAnimContext *ac);
bool ED_gpencil_anim_copybuf_paste(struct bAnimContext *ac, const short copy_mode);
-
/* ------------ Grease-Pencil Undo System ------------------ */
int ED_gpencil_session_active(void);
int ED_undo_gpencil_step(struct bContext *C, int step, const char *name);
/* ------------ Grease-Pencil Armature weights ------------------ */
-bool ED_gpencil_add_armature_weights(
- const struct bContext *C, struct ReportList *reports,
- struct Object *ob, struct Object *ob_arm, int mode);
+bool ED_gpencil_add_armature_weights(const struct bContext *C,
+ struct ReportList *reports,
+ struct Object *ob,
+ struct Object *ob_arm,
+ int mode);
/* keep this aligned with gpencil_armature enum */
-#define GP_PAR_ARMATURE_NAME 0
-#define GP_PAR_ARMATURE_AUTO 1
+#define GP_PAR_ARMATURE_NAME 0
+#define GP_PAR_ARMATURE_AUTO 1
/* ------------ Transformation Utilities ------------ */
/* get difference matrix */
-void ED_gpencil_parent_location(
- const struct Depsgraph *depsgraph, struct Object *obact, struct bGPdata *gpd,
- struct bGPDlayer *gpl, float diff_mat[4][4]);
+void ED_gpencil_parent_location(const struct Depsgraph *depsgraph,
+ struct Object *obact,
+ struct bGPdata *gpd,
+ struct bGPDlayer *gpl,
+ float diff_mat[4][4]);
/* reset parent matrix for all layers */
-void ED_gpencil_reset_layers_parent(struct Depsgraph *depsgraph, struct Object *obact, struct bGPdata *gpd);
+void ED_gpencil_reset_layers_parent(struct Depsgraph *depsgraph,
+ struct Object *obact,
+ struct bGPdata *gpd);
/* cursor utilities */
void ED_gpencil_brush_draw_eraser(struct Brush *brush, int x, int y);
@@ -202,25 +213,34 @@ void ED_gpencil_create_monkey(struct bContext *C, struct Object *ob, float mat[4
void ED_gpencil_create_stroke(struct bContext *C, struct Object *ob, float mat[4][4]);
/* ------------ Object Utilities ------------ */
-struct Object *ED_gpencil_add_object(
- struct bContext *C, struct Scene *scene, const float loc[3], unsigned short local_view_bits);
+struct Object *ED_gpencil_add_object(struct bContext *C,
+ struct Scene *scene,
+ const float loc[3],
+ unsigned short local_view_bits);
void ED_gpencil_add_defaults(struct bContext *C, struct Object *ob);
/* set object modes */
void ED_gpencil_setup_modes(struct bContext *C, struct bGPdata *gpd, int newmode);
-void ED_gp_project_stroke_to_plane(
- const struct Scene *scene,
- const struct Object *ob, const struct RegionView3D *rv3d,
- struct bGPDstroke *gps, const float origin[3], const int axis);
-void ED_gp_project_point_to_plane(
- const struct Scene *scene,
- const struct Object *ob, const struct RegionView3D *rv3d,
- const float origin[3], const int axis, struct bGPDspoint *pt);
-void ED_gp_get_drawing_reference(
- const struct Scene *scene, const struct Object *ob,
- struct bGPDlayer *gpl, char align_flag, float vec[3]);
-void ED_gpencil_project_stroke_to_view(
- struct bContext *C, struct bGPDlayer *gpl, struct bGPDstroke *gps);
+void ED_gp_project_stroke_to_plane(const struct Scene *scene,
+ const struct Object *ob,
+ const struct RegionView3D *rv3d,
+ struct bGPDstroke *gps,
+ const float origin[3],
+ const int axis);
+void ED_gp_project_point_to_plane(const struct Scene *scene,
+ const struct Object *ob,
+ const struct RegionView3D *rv3d,
+ const float origin[3],
+ const int axis,
+ struct bGPDspoint *pt);
+void ED_gp_get_drawing_reference(const struct Scene *scene,
+ const struct Object *ob,
+ struct bGPDlayer *gpl,
+ char align_flag,
+ float vec[3]);
+void ED_gpencil_project_stroke_to_view(struct bContext *C,
+ struct bGPDlayer *gpl,
+ struct bGPDstroke *gps);
/* set sculpt cursor */
void ED_gpencil_toggle_brush_cursor(struct bContext *C, bool enable, void *customdata);
@@ -235,7 +255,10 @@ void ED_gpencil_vgroup_deselect(struct bContext *C, struct Object *ob);
int ED_gpencil_join_objects_exec(struct bContext *C, struct wmOperator *op);
/* texture coordinate utilities */
-void ED_gpencil_tpoint_to_point(struct ARegion *ar, float origin[3], const struct tGPspoint *tpt, struct bGPDspoint *pt);
+void ED_gpencil_tpoint_to_point(struct ARegion *ar,
+ float origin[3],
+ const struct tGPspoint *tpt,
+ struct bGPDspoint *pt);
void ED_gpencil_calc_stroke_uv(struct Object *ob, struct bGPDstroke *gps);
void ED_gpencil_update_color_uv(struct Main *bmain, struct Material *mat);
@@ -246,11 +269,14 @@ void ED_gpencil_update_color_uv(struct Main *bmain, struct Material *mat);
* 2 - Hit in point B
* 3 - Hit in point A and B
*/
-int ED_gpencil_select_stroke_segment(
- struct bGPDlayer *gpl,
- struct bGPDstroke *gps, struct bGPDspoint *pt,
- bool select, bool insert, const float scale,
- float r_hita[3], float r_hitb[3]);
+int ED_gpencil_select_stroke_segment(struct bGPDlayer *gpl,
+ struct bGPDstroke *gps,
+ struct bGPDspoint *pt,
+ bool select,
+ bool insert,
+ const float scale,
+ float r_hita[3],
+ float r_hitb[3]);
void ED_gpencil_select_toggle_all(struct bContext *C, int action);