From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- source/blender/blenkernel/BKE_paint.h | 279 ++++++++++++++++++---------------- 1 file changed, 148 insertions(+), 131 deletions(-) (limited to 'source/blender/blenkernel/BKE_paint.h') diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index abb1b1d9cc5..b0fbf07d467 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -68,65 +68,72 @@ extern const char PAINT_CURSOR_WEIGHT_PAINT[3]; extern const char PAINT_CURSOR_TEXTURE_PAINT[3]; typedef enum ePaintMode { - PAINT_MODE_SCULPT = 0, - /** Vertex color. */ - PAINT_MODE_VERTEX = 1, - PAINT_MODE_WEIGHT = 2, - /** 3D view (projection painting). */ - PAINT_MODE_TEXTURE_3D = 3, - /** Image space (2D painting). */ - PAINT_MODE_TEXTURE_2D = 4, - PAINT_MODE_SCULPT_UV = 5, - PAINT_MODE_GPENCIL = 6, - - /** Keep last. */ - PAINT_MODE_INVALID = 7, + PAINT_MODE_SCULPT = 0, + /** Vertex color. */ + PAINT_MODE_VERTEX = 1, + PAINT_MODE_WEIGHT = 2, + /** 3D view (projection painting). */ + PAINT_MODE_TEXTURE_3D = 3, + /** Image space (2D painting). */ + PAINT_MODE_TEXTURE_2D = 4, + PAINT_MODE_SCULPT_UV = 5, + PAINT_MODE_GPENCIL = 6, + + /** Keep last. */ + PAINT_MODE_INVALID = 7, } ePaintMode; #define PAINT_MODE_HAS_BRUSH(mode) !ELEM(mode, PAINT_MODE_SCULPT_UV) /* overlay invalidation */ typedef enum eOverlayControlFlags { - PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY = 1, - PAINT_OVERLAY_INVALID_TEXTURE_SECONDARY = (1 << 2), - PAINT_OVERLAY_INVALID_CURVE = (1 << 3), - PAINT_OVERLAY_OVERRIDE_CURSOR = (1 << 4), - PAINT_OVERLAY_OVERRIDE_PRIMARY = (1 << 5), - PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6), + PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY = 1, + PAINT_OVERLAY_INVALID_TEXTURE_SECONDARY = (1 << 2), + PAINT_OVERLAY_INVALID_CURVE = (1 << 3), + PAINT_OVERLAY_OVERRIDE_CURSOR = (1 << 4), + PAINT_OVERLAY_OVERRIDE_PRIMARY = (1 << 5), + PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6), } eOverlayControlFlags; #define PAINT_OVERRIDE_MASK \ - (PAINT_OVERLAY_OVERRIDE_SECONDARY | \ - PAINT_OVERLAY_OVERRIDE_PRIMARY | \ - PAINT_OVERLAY_OVERRIDE_CURSOR) - -void BKE_paint_invalidate_overlay_tex(struct Scene *scene, struct ViewLayer *view_layer, const struct Tex *tex); -void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, struct ViewLayer *view_layer, struct CurveMapping *curve); + (PAINT_OVERLAY_OVERRIDE_SECONDARY | PAINT_OVERLAY_OVERRIDE_PRIMARY | \ + PAINT_OVERLAY_OVERRIDE_CURSOR) + +void BKE_paint_invalidate_overlay_tex(struct Scene *scene, + struct ViewLayer *view_layer, + const struct Tex *tex); +void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, + struct ViewLayer *view_layer, + struct CurveMapping *curve); void BKE_paint_invalidate_overlay_all(void); eOverlayControlFlags BKE_paint_get_overlay_flags(void); void BKE_paint_reset_overlay_invalid(eOverlayControlFlags flag); void BKE_paint_set_overlay_override(enum eOverlayFlags flag); /* palettes */ -void BKE_palette_init(struct Palette *palette); -void BKE_palette_free(struct Palette *palette); -struct Palette *BKE_palette_add(struct Main *bmain, const char *name); -void BKE_palette_copy_data( - struct Main *bmain, struct Palette *palette_dst, const struct Palette *palette_src, const int flag); -struct Palette *BKE_palette_copy(struct Main *bmain, const struct Palette *palette); -void BKE_palette_make_local(struct Main *bmain, struct Palette *palette, const bool lib_local); +void BKE_palette_init(struct Palette *palette); +void BKE_palette_free(struct Palette *palette); +struct Palette *BKE_palette_add(struct Main *bmain, const char *name); +void BKE_palette_copy_data(struct Main *bmain, + struct Palette *palette_dst, + const struct Palette *palette_src, + const int flag); +struct Palette *BKE_palette_copy(struct Main *bmain, const struct Palette *palette); +void BKE_palette_make_local(struct Main *bmain, struct Palette *palette, const bool lib_local); struct PaletteColor *BKE_palette_color_add(struct Palette *palette); -bool BKE_palette_is_empty(const struct Palette *palette); -void BKE_palette_color_remove(struct Palette *palette, struct PaletteColor *color); -void BKE_palette_clear(struct Palette *palette); +bool BKE_palette_is_empty(const struct Palette *palette); +void BKE_palette_color_remove(struct Palette *palette, struct PaletteColor *color); +void BKE_palette_clear(struct Palette *palette); /* paint curves */ struct PaintCurve *BKE_paint_curve_add(struct Main *bmain, const char *name); void BKE_paint_curve_free(struct PaintCurve *pc); -void BKE_paint_curve_copy_data( - struct Main *bmain, struct PaintCurve *pc_dst, const struct PaintCurve *pc_src, const int flag); +void BKE_paint_curve_copy_data(struct Main *bmain, + struct PaintCurve *pc_dst, + const struct PaintCurve *pc_src, + const int flag); struct PaintCurve *BKE_paint_curve_copy(struct Main *bmain, const struct PaintCurve *pc); -void BKE_paint_curve_make_local(struct Main *bmain, struct PaintCurve *pc, const bool lib_local); +void BKE_paint_curve_make_local(struct Main *bmain, struct PaintCurve *pc, const bool lib_local); bool BKE_paint_ensure(const struct ToolSettings *ts, struct Paint **r_paint); void BKE_paint_init(struct Main *bmain, struct Scene *sce, ePaintMode mode, const char col[3]); @@ -153,8 +160,10 @@ void BKE_paint_palette_set(struct Paint *p, struct Palette *palette); void BKE_paint_curve_set(struct Brush *br, struct PaintCurve *pc); void BKE_paint_curve_clamp_endpoint_add_index(struct PaintCurve *pc, const int add_index); -void BKE_paint_data_warning(struct ReportList *reports, bool uvs, bool mat, bool tex, bool stencil); -bool BKE_paint_proj_mesh_data_check(struct Scene *scene, struct Object *ob, bool *uvs, bool *mat, bool *tex, bool *stencil); +void BKE_paint_data_warning( + struct ReportList *reports, bool uvs, bool mat, bool tex, bool stencil); +bool BKE_paint_proj_mesh_data_check( + struct Scene *scene, struct Object *ob, bool *uvs, bool *mat, bool *tex, bool *stencil); /* testing face select mode * Texture paint could be removed since selected faces are not used @@ -164,22 +173,28 @@ bool BKE_paint_select_vert_test(struct Object *ob); bool BKE_paint_select_elem_test(struct Object *ob); /* partial visibility */ -bool paint_is_face_hidden(const struct MLoopTri *lt, const struct MVert *mvert, const struct MLoop *mloop); -bool paint_is_grid_face_hidden(const unsigned int *grid_hidden, - int gridsize, int x, int y); +bool paint_is_face_hidden(const struct MLoopTri *lt, + const struct MVert *mvert, + const struct MLoop *mloop); +bool paint_is_grid_face_hidden(const unsigned int *grid_hidden, int gridsize, int x, int y); bool paint_is_bmesh_face_hidden(struct BMFace *f); /* paint masks */ -float paint_grid_paint_mask(const struct GridPaintMask *gpm, unsigned level, - unsigned x, unsigned y); +float paint_grid_paint_mask(const struct GridPaintMask *gpm, + unsigned level, + unsigned x, + unsigned y); /* stroke related */ -bool paint_calculate_rake_rotation(struct UnifiedPaintSettings *ups, struct Brush *brush, const float mouse_pos[2]); -void paint_update_brush_rake_rotation(struct UnifiedPaintSettings *ups, struct Brush *brush, float rotation); +bool paint_calculate_rake_rotation(struct UnifiedPaintSettings *ups, + struct Brush *brush, + const float mouse_pos[2]); +void paint_update_brush_rake_rotation(struct UnifiedPaintSettings *ups, + struct Brush *brush, + float rotation); void BKE_paint_stroke_get_average(struct Scene *scene, struct Object *ob, float stroke[3]); - /* Tool slot API. */ void BKE_paint_toolslots_init_from_main(struct Main *bmain); void BKE_paint_toolslots_len_ensure(struct Paint *paint, int len); @@ -190,87 +205,87 @@ struct Brush *BKE_paint_toolslots_brush_get(struct Paint *paint, int slot_index) /* Used for both vertex color and weight paint */ struct SculptVertexPaintGeomMap { - int *vert_map_mem; - struct MeshElemMap *vert_to_loop; - int *poly_map_mem; - struct MeshElemMap *vert_to_poly; + int *vert_map_mem; + struct MeshElemMap *vert_to_loop; + int *poly_map_mem; + struct MeshElemMap *vert_to_poly; }; /* Session data (mode-specific) */ typedef struct SculptSession { - /* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */ - struct MultiresModifierData *multires; /* Special handling for multires meshes */ - struct MVert *mvert; - struct MPoly *mpoly; - struct MLoop *mloop; - int totvert, totpoly; - struct KeyBlock *kb; - float *vmask; - - /* Mesh connectivity */ - struct MeshElemMap *pmap; - int *pmap_mem; - - /* BMesh for dynamic topology sculpting */ - struct BMesh *bm; - int cd_vert_node_offset; - int cd_face_node_offset; - bool bm_smooth_shading; - /* Undo/redo log for dynamic topology sculpting */ - struct BMLog *bm_log; - - /* Limit surface/grids. */ - struct SubdivCCG *subdiv_ccg; - - /* PBVH acceleration structure */ - struct PBVH *pbvh; - bool show_diffuse_color; - bool show_mask; - - /* Painting on deformed mesh */ - bool modifiers_active; /* object is deformed with some modifiers */ - float (*orig_cos)[3]; /* coords of undeformed mesh */ - float (*deform_cos)[3]; /* coords of deformed mesh but without stroke displacement */ - float (*deform_imats)[3][3]; /* crazyspace deformation matrices */ - - /* Partial redraw */ - bool partial_redraw; - - /* Used to cache the render of the active texture */ - unsigned int texcache_side, *texcache, texcache_actual; - struct ImagePool *tex_pool; - - /* Layer brush persistence between strokes */ - float (*layer_co)[3]; /* Copy of the mesh vertices' locations */ - - struct StrokeCache *cache; - - union { - struct { - struct SculptVertexPaintGeomMap gmap; - - /* For non-airbrush painting to re-apply from the original (MLoop aligned). */ - unsigned int *previous_color; - } vpaint; - - struct { - struct SculptVertexPaintGeomMap gmap; - /* Keep track of how much each vertex has been painted (non-airbrush only). */ - float *alpha_weight; - - /* Needed to continuously re-apply over the same weights (BRUSH_ACCUMULATE disabled). - * Lazy initialize as needed (flag is set to 1 to tag it as uninitialized). */ - struct MDeformVert *dvert_prev; - } wpaint; - - /* TODO: identify sculpt-only fields */ - // struct { ... } sculpt; - } mode; - int mode_type; - - /* This flag prevents PBVH from being freed when creating the vp_handle for texture paint. */ - bool building_vp_handle; + /* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */ + struct MultiresModifierData *multires; /* Special handling for multires meshes */ + struct MVert *mvert; + struct MPoly *mpoly; + struct MLoop *mloop; + int totvert, totpoly; + struct KeyBlock *kb; + float *vmask; + + /* Mesh connectivity */ + struct MeshElemMap *pmap; + int *pmap_mem; + + /* BMesh for dynamic topology sculpting */ + struct BMesh *bm; + int cd_vert_node_offset; + int cd_face_node_offset; + bool bm_smooth_shading; + /* Undo/redo log for dynamic topology sculpting */ + struct BMLog *bm_log; + + /* Limit surface/grids. */ + struct SubdivCCG *subdiv_ccg; + + /* PBVH acceleration structure */ + struct PBVH *pbvh; + bool show_diffuse_color; + bool show_mask; + + /* Painting on deformed mesh */ + bool modifiers_active; /* object is deformed with some modifiers */ + float (*orig_cos)[3]; /* coords of undeformed mesh */ + float (*deform_cos)[3]; /* coords of deformed mesh but without stroke displacement */ + float (*deform_imats)[3][3]; /* crazyspace deformation matrices */ + + /* Partial redraw */ + bool partial_redraw; + + /* Used to cache the render of the active texture */ + unsigned int texcache_side, *texcache, texcache_actual; + struct ImagePool *tex_pool; + + /* Layer brush persistence between strokes */ + float (*layer_co)[3]; /* Copy of the mesh vertices' locations */ + + struct StrokeCache *cache; + + union { + struct { + struct SculptVertexPaintGeomMap gmap; + + /* For non-airbrush painting to re-apply from the original (MLoop aligned). */ + unsigned int *previous_color; + } vpaint; + + struct { + struct SculptVertexPaintGeomMap gmap; + /* Keep track of how much each vertex has been painted (non-airbrush only). */ + float *alpha_weight; + + /* Needed to continuously re-apply over the same weights (BRUSH_ACCUMULATE disabled). + * Lazy initialize as needed (flag is set to 1 to tag it as uninitialized). */ + struct MDeformVert *dvert_prev; + } wpaint; + + /* TODO: identify sculpt-only fields */ + // struct { ... } sculpt; + } mode; + int mode_type; + + /* This flag prevents PBVH from being freed when creating the vp_handle for texture paint. */ + bool building_vp_handle; } SculptSession; void BKE_sculptsession_free(struct Object *ob); @@ -278,12 +293,14 @@ void BKE_sculptsession_free_deformMats(struct SculptSession *ss); void BKE_sculptsession_free_vwpaint_data(struct SculptSession *ss); void BKE_sculptsession_bm_to_me(struct Object *ob, bool reorder); void BKE_sculptsession_bm_to_me_for_render(struct Object *object); -void BKE_sculpt_update_mesh_elements( - struct Depsgraph *depsgraph, struct Scene *scene, struct Sculpt *sd, struct Object *ob, - bool need_pmap, bool need_mask); +void BKE_sculpt_update_mesh_elements(struct Depsgraph *depsgraph, + struct Scene *scene, + struct Sculpt *sd, + struct Object *ob, + bool need_pmap, + bool need_mask); struct MultiresModifierData *BKE_sculpt_multires_active(struct Scene *scene, struct Object *ob); -int BKE_sculpt_mask_layers_ensure(struct Object *ob, - struct MultiresModifierData *mmd); +int BKE_sculpt_mask_layers_ensure(struct Object *ob, struct MultiresModifierData *mmd); void BKE_sculpt_toolsettings_data_ensure(struct Scene *scene); struct PBVH *BKE_sculpt_object_pbvh_ensure(struct Depsgraph *depsgraph, struct Object *ob); @@ -291,7 +308,7 @@ struct PBVH *BKE_sculpt_object_pbvh_ensure(struct Depsgraph *depsgraph, struct O void BKE_sculpt_bvh_update_from_ccg(struct PBVH *pbvh, struct SubdivCCG *subdiv_ccg); enum { - SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), - SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1), + SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), + SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1), }; #endif -- cgit v1.2.3