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/makesdna/DNA_curve_types.h | 655 +++++++++++++++--------------- 1 file changed, 335 insertions(+), 320 deletions(-) (limited to 'source/blender/makesdna/DNA_curve_types.h') diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 1ee81b56636..3c63f909efd 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -29,7 +29,7 @@ #include "DNA_vec_types.h" #include "DNA_ID.h" -#define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ +#define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ struct AnimData; struct BoundBox; @@ -45,44 +45,44 @@ struct VFont; # # typedef struct PathPoint { - /** Grr, cant get rid of tilt yet. */ - float vec[4]; - float quat[4]; - float radius, weight; + /** Grr, cant get rid of tilt yet. */ + float vec[4]; + float quat[4]; + float radius, weight; } PathPoint; /* These two Lines with # tell makesdna this struct can be excluded. */ # # typedef struct Path { - struct PathPoint *data; - int len; - float totdist; + struct PathPoint *data; + int len; + float totdist; } Path; /* These two Lines with # tell makesdna this struct can be excluded. */ # # typedef struct BevPoint { - float vec[3], tilt, radius, weight, offset; - /** 2D Only. */ - float sina, cosa; - /** 3D Only. */ - float dir[3], tan[3], quat[4]; - short split_tag, dupe_tag; + float vec[3], tilt, radius, weight, offset; + /** 2D Only. */ + float sina, cosa; + /** 3D Only. */ + float dir[3], tan[3], quat[4]; + short split_tag, dupe_tag; } BevPoint; /* These two Lines with # tell makesdna this struct can be excluded. */ # # typedef struct BevList { - struct BevList *next, *prev; - int nr, dupe_nr; - int poly, hole; - int charidx; - int *segbevcount; - float *seglen; - BevPoint *bevpoints; + struct BevList *next, *prev; + int nr, dupe_nr; + int poly, hole; + int charidx; + int *segbevcount; + float *seglen; + BevPoint *bevpoints; } BevList; /** @@ -103,52 +103,52 @@ typedef struct BevList { * - vec[2][2] = z location of handle 2 (not used for FCurve Points(2d)) */ typedef struct BezTriple { - float vec[3][3]; - /** Tilt in 3D View. */ - float tilt; - /** Used for softbody goal weight. */ - float weight; - /** For bevel tapering & modifiers. */ - float radius; - - /** Ipo: interpolation mode for segment from this BezTriple to the next. */ - char ipo; - - /** H1, h2: the handle type of the two handles. */ - char h1, h2; - /** F1, f2, f3: used for selection status. */ - char f1, f2, f3; - - /** Hide: used to indicate whether BezTriple is hidden (3D), - * type of keyframe (eBezTriple_KeyframeType). */ - char hide; - - /** Easing: easing type for interpolation mode (eBezTriple_Easing). */ - char easing; - /** BEZT_IPO_BACK. */ - float back; - /** BEZT_IPO_ELASTIC. */ - float amplitude, period; - - /** F5: used for auto handle to distinguish between normal handle and exception (extrema). */ - char f5; - char _pad[3]; + float vec[3][3]; + /** Tilt in 3D View. */ + float tilt; + /** Used for softbody goal weight. */ + float weight; + /** For bevel tapering & modifiers. */ + float radius; + + /** Ipo: interpolation mode for segment from this BezTriple to the next. */ + char ipo; + + /** H1, h2: the handle type of the two handles. */ + char h1, h2; + /** F1, f2, f3: used for selection status. */ + char f1, f2, f3; + + /** Hide: used to indicate whether BezTriple is hidden (3D), + * type of keyframe (eBezTriple_KeyframeType). */ + char hide; + + /** Easing: easing type for interpolation mode (eBezTriple_Easing). */ + char easing; + /** BEZT_IPO_BACK. */ + float back; + /** BEZT_IPO_ELASTIC. */ + float amplitude, period; + + /** F5: used for auto handle to distinguish between normal handle and exception (extrema). */ + char f5; + char _pad[3]; } BezTriple; /** * \note #BPoint.tilt location in struct is abused by Key system. */ typedef struct BPoint { - float vec[4]; - /** Tilt in 3D View. */ - float tilt; - /** Used for softbody goal weight. */ - float weight; - /** F1: selection status, hide: is point hidden or not. */ - short f1, hide; - /** User-set radius per point for beveling etc. */ - float radius; - char _pad[4]; + float vec[4]; + /** Tilt in 3D View. */ + float tilt; + /** Used for softbody goal weight. */ + float weight; + /** F1: selection status, hide: is point hidden or not. */ + short f1, hide; + /** User-set radius per point for beveling etc. */ + float radius; + char _pad[4]; } BPoint; /** @@ -156,373 +156,388 @@ typedef struct BPoint { * also, it should be NURBS (Nurb isn't the singular of Nurbs). */ typedef struct Nurb { - /** Multiple nurbs per curve object are allowed. */ - struct Nurb *next, *prev; - short type; - /** Index into material list. */ - short mat_nr; - short hide, flag; - /** Number of points in the U or V directions. */ - int pntsu, pntsv; - char _pad[4]; - /** Tessellation resolution in the U or V directions. */ - short resolu, resolv; - short orderu, orderv; - short flagu, flagv; - - float *knotsu, *knotsv; - BPoint *bp; - BezTriple *bezt; - - /** KEY_LINEAR, KEY_CARDINAL, KEY_BSPLINE. */ - short tilt_interp; - short radius_interp; - - /* only used for dynamically generated Nurbs created from OB_FONT's */ - int charidx; + /** Multiple nurbs per curve object are allowed. */ + struct Nurb *next, *prev; + short type; + /** Index into material list. */ + short mat_nr; + short hide, flag; + /** Number of points in the U or V directions. */ + int pntsu, pntsv; + char _pad[4]; + /** Tessellation resolution in the U or V directions. */ + short resolu, resolv; + short orderu, orderv; + short flagu, flagv; + + float *knotsu, *knotsv; + BPoint *bp; + BezTriple *bezt; + + /** KEY_LINEAR, KEY_CARDINAL, KEY_BSPLINE. */ + short tilt_interp; + short radius_interp; + + /* only used for dynamically generated Nurbs created from OB_FONT's */ + int charidx; } Nurb; typedef struct CharInfo { - short kern; - /** Index start at 1, unlike mesh & nurbs. */ - short mat_nr; - char flag; - char _pad[3]; + short kern; + /** Index start at 1, unlike mesh & nurbs. */ + short mat_nr; + char flag; + char _pad[3]; } CharInfo; typedef struct TextBox { - float x, y, w, h; + float x, y, w, h; } TextBox; typedef struct EditNurb { - /* base of nurbs' list (old Curve->editnurb) */ - ListBase nurbs; + /* base of nurbs' list (old Curve->editnurb) */ + ListBase nurbs; - /* index data for shape keys */ - struct GHash *keyindex; + /* index data for shape keys */ + struct GHash *keyindex; - /* shape key being edited */ - int shapenr; + /* shape key being edited */ + int shapenr; - char _pad[4]; + char _pad[4]; } EditNurb; typedef struct Curve { - ID id; - /** Animation data (must be immediately after id for utilities to use it). */ - struct AnimData *adt; - - struct BoundBox *bb; - - /** Actual data, called splines in rna. */ - ListBase nurb; - - /** Edited data, not in file, use pointer so we can check for it. */ - EditNurb *editnurb; - - struct Object *bevobj, *taperobj, *textoncurve; - /** Old animation system, deprecated for 2.5. */ - struct Ipo *ipo DNA_DEPRECATED; - struct Key *key; - struct Material **mat; - - /* texture space, copied as one block in editobject.c */ - float loc[3]; - float size[3]; - float rot[3]; - - /** Creation-time type of curve datablock. */ - short type; - - /** Keep a short because of BKE_object_obdata_texspace_get(). */ - short texflag; - char _pad0[2]; - short twist_mode; - float twist_smooth, smallcaps_scale; - - int pathlen; - short bevresol, totcol; - int flag; - float width, ext1, ext2; - - /* default */ - short resolu, resolv; - short resolu_ren, resolv_ren; - - /* edit, index in nurb list */ - int actnu; - /* edit, index in active nurb (BPoint or BezTriple) */ - int actvert; - - char overflow; - char spacemode, align_y; - char _pad[3]; - - /* font part */ - short lines; - float spacing, linedist, shear, fsize, wordspace, ulpos, ulheight; - float xof, yof; - float linewidth; - - /* copy of EditFont vars (wchar_t aligned), - * warning! don't use in editmode (storage only) */ - int pos; - int selstart, selend; - - /* text data */ - /** Number of characters (strinfo). */ - int len_wchar; - /** Number of bytes (str - utf8). */ - int len; - char *str; - struct EditFont *editfont; - - char family[64]; - struct VFont *vfont; - struct VFont *vfontb; - struct VFont *vfonti; - struct VFont *vfontbi; - - struct TextBox *tb; - int totbox, actbox; - - struct CharInfo *strinfo; - struct CharInfo curinfo; - /* font part end */ - - - /** Current evaltime - for use by Objects parented to curves. */ - float ctime; - float bevfac1, bevfac2; - char bevfac1_mapping, bevfac2_mapping; - - char _pad2[6]; - float fsize_realtime; - - void *batch_cache; + ID id; + /** Animation data (must be immediately after id for utilities to use it). */ + struct AnimData *adt; + + struct BoundBox *bb; + + /** Actual data, called splines in rna. */ + ListBase nurb; + + /** Edited data, not in file, use pointer so we can check for it. */ + EditNurb *editnurb; + + struct Object *bevobj, *taperobj, *textoncurve; + /** Old animation system, deprecated for 2.5. */ + struct Ipo *ipo DNA_DEPRECATED; + struct Key *key; + struct Material **mat; + + /* texture space, copied as one block in editobject.c */ + float loc[3]; + float size[3]; + float rot[3]; + + /** Creation-time type of curve datablock. */ + short type; + + /** Keep a short because of BKE_object_obdata_texspace_get(). */ + short texflag; + char _pad0[2]; + short twist_mode; + float twist_smooth, smallcaps_scale; + + int pathlen; + short bevresol, totcol; + int flag; + float width, ext1, ext2; + + /* default */ + short resolu, resolv; + short resolu_ren, resolv_ren; + + /* edit, index in nurb list */ + int actnu; + /* edit, index in active nurb (BPoint or BezTriple) */ + int actvert; + + char overflow; + char spacemode, align_y; + char _pad[3]; + + /* font part */ + short lines; + float spacing, linedist, shear, fsize, wordspace, ulpos, ulheight; + float xof, yof; + float linewidth; + + /* copy of EditFont vars (wchar_t aligned), + * warning! don't use in editmode (storage only) */ + int pos; + int selstart, selend; + + /* text data */ + /** Number of characters (strinfo). */ + int len_wchar; + /** Number of bytes (str - utf8). */ + int len; + char *str; + struct EditFont *editfont; + + char family[64]; + struct VFont *vfont; + struct VFont *vfontb; + struct VFont *vfonti; + struct VFont *vfontbi; + + struct TextBox *tb; + int totbox, actbox; + + struct CharInfo *strinfo; + struct CharInfo curinfo; + /* font part end */ + + /** Current evaltime - for use by Objects parented to curves. */ + float ctime; + float bevfac1, bevfac2; + char bevfac1_mapping, bevfac2_mapping; + + char _pad2[6]; + float fsize_realtime; + + void *batch_cache; } Curve; -#define CURVE_VFONT_ANY(cu) \ - ((cu)->vfont), ((cu)->vfontb), ((cu)->vfonti), ((cu)->vfontbi) +#define CURVE_VFONT_ANY(cu) ((cu)->vfont), ((cu)->vfontb), ((cu)->vfonti), ((cu)->vfontbi) /* **************** CURVE ********************* */ /* Curve.texflag */ enum { - CU_AUTOSPACE = 1, + CU_AUTOSPACE = 1, }; #if 0 /* Moved to overlay options in 2.8 */ /* Curve.drawflag */ enum { - CU_HIDE_HANDLES = 1 << 0, - CU_HIDE_NORMALS = 1 << 1, + CU_HIDE_HANDLES = 1 << 0, + CU_HIDE_NORMALS = 1 << 1, }; #endif /* Curve.flag */ enum { - CU_3D = 1 << 0, - CU_FRONT = 1 << 1, - CU_BACK = 1 << 2, - CU_PATH = 1 << 3, - CU_FOLLOW = 1 << 4, - CU_UV_ORCO = 1 << 5, - CU_DEFORM_BOUNDS_OFF = 1 << 6, - CU_STRETCH = 1 << 7, - /* CU_OFFS_PATHDIST = 1 << 8, */ /* DEPRECATED */ - CU_FAST = 1 << 9, /* Font: no filling inside editmode */ - /* CU_RETOPO = 1 << 10, */ /* DEPRECATED */ - CU_DS_EXPAND = 1 << 11, - /** make use of the path radius if this is enabled (default for new curves) */ - CU_PATH_RADIUS = 1 << 12, - /** fill 2d curve after deformation */ - CU_DEFORM_FILL = 1 << 13, - /** fill bevel caps */ - CU_FILL_CAPS = 1 << 14, - /** map taper object to beveled area */ - CU_MAP_TAPER = 1 << 15, + CU_3D = 1 << 0, + CU_FRONT = 1 << 1, + CU_BACK = 1 << 2, + CU_PATH = 1 << 3, + CU_FOLLOW = 1 << 4, + CU_UV_ORCO = 1 << 5, + CU_DEFORM_BOUNDS_OFF = 1 << 6, + CU_STRETCH = 1 << 7, + /* CU_OFFS_PATHDIST = 1 << 8, */ /* DEPRECATED */ + CU_FAST = 1 << 9, /* Font: no filling inside editmode */ + /* CU_RETOPO = 1 << 10, */ /* DEPRECATED */ + CU_DS_EXPAND = 1 << 11, + /** make use of the path radius if this is enabled (default for new curves) */ + CU_PATH_RADIUS = 1 << 12, + /** fill 2d curve after deformation */ + CU_DEFORM_FILL = 1 << 13, + /** fill bevel caps */ + CU_FILL_CAPS = 1 << 14, + /** map taper object to beveled area */ + CU_MAP_TAPER = 1 << 15, }; /* Curve.twist_mode */ enum { - CU_TWIST_Z_UP = 0, - /* CU_TWIST_Y_UP = 1, */ /* not used yet */ - /* CU_TWIST_X_UP = 2, */ - CU_TWIST_MINIMUM = 3, - CU_TWIST_TANGENT = 4, + CU_TWIST_Z_UP = 0, + /* CU_TWIST_Y_UP = 1, */ /* not used yet */ + /* CU_TWIST_X_UP = 2, */ + CU_TWIST_MINIMUM = 3, + CU_TWIST_TANGENT = 4, }; /* Curve.bevfac1_mapping, Curve.bevfac2_mapping, bevel factor mapping */ enum { - CU_BEVFAC_MAP_RESOLU = 0, - CU_BEVFAC_MAP_SEGMENT = 1, - CU_BEVFAC_MAP_SPLINE = 2, + CU_BEVFAC_MAP_RESOLU = 0, + CU_BEVFAC_MAP_SEGMENT = 1, + CU_BEVFAC_MAP_SPLINE = 2, }; /* Curve.spacemode */ enum { - CU_ALIGN_X_LEFT = 0, - CU_ALIGN_X_MIDDLE = 1, - CU_ALIGN_X_RIGHT = 2, - CU_ALIGN_X_JUSTIFY = 3, - CU_ALIGN_X_FLUSH = 4, + CU_ALIGN_X_LEFT = 0, + CU_ALIGN_X_MIDDLE = 1, + CU_ALIGN_X_RIGHT = 2, + CU_ALIGN_X_JUSTIFY = 3, + CU_ALIGN_X_FLUSH = 4, }; /* Curve.align_y */ enum { - CU_ALIGN_Y_TOP_BASELINE = 0, - CU_ALIGN_Y_TOP = 1, - CU_ALIGN_Y_CENTER = 2, - CU_ALIGN_Y_BOTTOM_BASELINE = 3, - CU_ALIGN_Y_BOTTOM = 4, + CU_ALIGN_Y_TOP_BASELINE = 0, + CU_ALIGN_Y_TOP = 1, + CU_ALIGN_Y_CENTER = 2, + CU_ALIGN_Y_BOTTOM_BASELINE = 3, + CU_ALIGN_Y_BOTTOM = 4, }; /* Curve.overflow. */ enum { - CU_OVERFLOW_NONE = 0, - CU_OVERFLOW_SCALE = 1, - CU_OVERFLOW_TRUNCATE = 2, + CU_OVERFLOW_NONE = 0, + CU_OVERFLOW_SCALE = 1, + CU_OVERFLOW_TRUNCATE = 2, }; /* Nurb.flag */ enum { - CU_SMOOTH = 1 << 0, - CU_2D = 1 << 3, /* moved from type since 2.4x */ + CU_SMOOTH = 1 << 0, + CU_2D = 1 << 3, /* moved from type since 2.4x */ }; /* Nurb.type */ enum { - CU_POLY = 0, - CU_BEZIER = 1, - CU_BSPLINE = 2, - CU_CARDINAL = 3, - CU_NURBS = 4, - CU_TYPE = (CU_POLY | CU_BEZIER | CU_BSPLINE | CU_CARDINAL | CU_NURBS), - - /* only for adding */ - CU_PRIMITIVE = 0xF00, - - /* 2 or 4 points */ - CU_PRIM_CURVE = 0x100, - /* 8 points circle */ - CU_PRIM_CIRCLE = 0x200, - /* 4x4 patch Nurb */ - CU_PRIM_PATCH = 0x300, - CU_PRIM_TUBE = 0x400, - CU_PRIM_SPHERE = 0x500, - CU_PRIM_DONUT = 0x600, - /* 5 points, 5th order straight line (for anim path) */ - CU_PRIM_PATH = 0x700, + CU_POLY = 0, + CU_BEZIER = 1, + CU_BSPLINE = 2, + CU_CARDINAL = 3, + CU_NURBS = 4, + CU_TYPE = (CU_POLY | CU_BEZIER | CU_BSPLINE | CU_CARDINAL | CU_NURBS), + + /* only for adding */ + CU_PRIMITIVE = 0xF00, + + /* 2 or 4 points */ + CU_PRIM_CURVE = 0x100, + /* 8 points circle */ + CU_PRIM_CIRCLE = 0x200, + /* 4x4 patch Nurb */ + CU_PRIM_PATCH = 0x300, + CU_PRIM_TUBE = 0x400, + CU_PRIM_SPHERE = 0x500, + CU_PRIM_DONUT = 0x600, + /* 5 points, 5th order straight line (for anim path) */ + CU_PRIM_PATH = 0x700, }; /* Nurb.flagu, Nurb.flagv */ enum { - CU_NURB_CYCLIC = 1 << 0, - CU_NURB_ENDPOINT = 1 << 1, - CU_NURB_BEZIER = 1 << 2, + CU_NURB_CYCLIC = 1 << 0, + CU_NURB_ENDPOINT = 1 << 1, + CU_NURB_BEZIER = 1 << 2, }; -#define CU_ACT_NONE -1 +#define CU_ACT_NONE -1 /* *************** BEZTRIPLE **************** */ /* BezTriple.f1,2,3 */ typedef enum eBezTriple_Flag { - /* SELECT */ - BEZT_FLAG_TEMP_TAG = (1 << 1), /* always clear. */ + /* SELECT */ + BEZT_FLAG_TEMP_TAG = (1 << 1), /* always clear. */ } eBezTriple_Flag; /* h1 h2 (beztriple) */ typedef enum eBezTriple_Handle { - HD_FREE = 0, - HD_AUTO = 1, - HD_VECT = 2, - HD_ALIGN = 3, - HD_AUTO_ANIM = 4, /* auto-clamped handles for animation */ - HD_ALIGN_DOUBLESIDE = 5, /* align handles, displayed both of them. used for masks */ + HD_FREE = 0, + HD_AUTO = 1, + HD_VECT = 2, + HD_ALIGN = 3, + HD_AUTO_ANIM = 4, /* auto-clamped handles for animation */ + HD_ALIGN_DOUBLESIDE = 5, /* align handles, displayed both of them. used for masks */ } eBezTriple_Handle; /* f5 (beztriple) */ typedef enum eBezTriple_Auto_Type { - HD_AUTOTYPE_NORMAL = 0, - HD_AUTOTYPE_SPECIAL = 1, + HD_AUTOTYPE_NORMAL = 0, + HD_AUTOTYPE_SPECIAL = 1, } eBezTriple_Auto_Type; /* interpolation modes (used only for BezTriple->ipo) */ typedef enum eBezTriple_Interpolation { - /* traditional interpolation */ - BEZT_IPO_CONST = 0, /* constant interpolation */ - BEZT_IPO_LIN = 1, /* linear interpolation */ - BEZT_IPO_BEZ = 2, /* bezier interpolation */ - - /* easing equations */ - BEZT_IPO_BACK = 3, - BEZT_IPO_BOUNCE = 4, - BEZT_IPO_CIRC = 5, - BEZT_IPO_CUBIC = 6, - BEZT_IPO_ELASTIC = 7, - BEZT_IPO_EXPO = 8, - BEZT_IPO_QUAD = 9, - BEZT_IPO_QUART = 10, - BEZT_IPO_QUINT = 11, - BEZT_IPO_SINE = 12, + /* traditional interpolation */ + BEZT_IPO_CONST = 0, /* constant interpolation */ + BEZT_IPO_LIN = 1, /* linear interpolation */ + BEZT_IPO_BEZ = 2, /* bezier interpolation */ + + /* easing equations */ + BEZT_IPO_BACK = 3, + BEZT_IPO_BOUNCE = 4, + BEZT_IPO_CIRC = 5, + BEZT_IPO_CUBIC = 6, + BEZT_IPO_ELASTIC = 7, + BEZT_IPO_EXPO = 8, + BEZT_IPO_QUAD = 9, + BEZT_IPO_QUART = 10, + BEZT_IPO_QUINT = 11, + BEZT_IPO_SINE = 12, } eBezTriple_Interpolation; /* easing modes (used only for Keyframes - BezTriple->easing) */ typedef enum eBezTriple_Easing { - BEZT_IPO_EASE_AUTO = 0, + BEZT_IPO_EASE_AUTO = 0, - BEZT_IPO_EASE_IN = 1, - BEZT_IPO_EASE_OUT = 2, - BEZT_IPO_EASE_IN_OUT = 3, + BEZT_IPO_EASE_IN = 1, + BEZT_IPO_EASE_OUT = 2, + BEZT_IPO_EASE_IN_OUT = 3, } eBezTriple_Easing; /* types of keyframe (used only for BezTriple->hide when BezTriple is used in F-Curves) */ typedef enum eBezTriple_KeyframeType { - BEZT_KEYTYPE_KEYFRAME = 0, /* default - 'proper' Keyframe */ - BEZT_KEYTYPE_EXTREME = 1, /* 'extreme' keyframe */ - BEZT_KEYTYPE_BREAKDOWN = 2, /* 'breakdown' keyframe */ - BEZT_KEYTYPE_JITTER = 3, /* 'jitter' keyframe (for adding 'filler' secondary motion) */ - BEZT_KEYTYPE_MOVEHOLD = 4, /* one end of a 'moving hold' */ + BEZT_KEYTYPE_KEYFRAME = 0, /* default - 'proper' Keyframe */ + BEZT_KEYTYPE_EXTREME = 1, /* 'extreme' keyframe */ + BEZT_KEYTYPE_BREAKDOWN = 2, /* 'breakdown' keyframe */ + BEZT_KEYTYPE_JITTER = 3, /* 'jitter' keyframe (for adding 'filler' secondary motion) */ + BEZT_KEYTYPE_MOVEHOLD = 4, /* one end of a 'moving hold' */ } eBezTriple_KeyframeType; /* checks if the given BezTriple is selected */ #define BEZT_ISSEL_ANY(bezt) \ - (((bezt)->f2 & SELECT) || ((bezt)->f1 & SELECT) || ((bezt)->f3 & SELECT)) + (((bezt)->f2 & SELECT) || ((bezt)->f1 & SELECT) || ((bezt)->f3 & SELECT)) #define BEZT_ISSEL_ALL(bezt) \ - (((bezt)->f2 & SELECT) && ((bezt)->f1 & SELECT) && ((bezt)->f3 & SELECT)) + (((bezt)->f2 & SELECT) && ((bezt)->f1 & SELECT) && ((bezt)->f3 & SELECT)) #define BEZT_ISSEL_ALL_HIDDENHANDLES(v3d, bezt) \ - ((((v3d) != NULL) && ((v3d)->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) ? (bezt)->f2 & SELECT : BEZT_ISSEL_ALL(bezt)) + ((((v3d) != NULL) && ((v3d)->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) ? \ + (bezt)->f2 & SELECT : \ + BEZT_ISSEL_ALL(bezt)) #define BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, bezt) \ - ((((v3d) != NULL) && ((v3d)->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) ? (bezt)->f2 & SELECT : BEZT_ISSEL_ANY(bezt)) - -#define BEZT_SEL_ALL(bezt) { (bezt)->f1 |= SELECT; (bezt)->f2 |= SELECT; (bezt)->f3 |= SELECT; } ((void)0) -#define BEZT_DESEL_ALL(bezt) { (bezt)->f1 &= ~SELECT; (bezt)->f2 &= ~SELECT; (bezt)->f3 &= ~SELECT; } ((void)0) - -#define BEZT_IS_AUTOH(bezt) (ELEM((bezt)->h1, HD_AUTO, HD_AUTO_ANIM) && ELEM((bezt)->h2, HD_AUTO, HD_AUTO_ANIM)) + ((((v3d) != NULL) && ((v3d)->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) ? \ + (bezt)->f2 & SELECT : \ + BEZT_ISSEL_ANY(bezt)) + +#define BEZT_SEL_ALL(bezt) \ + { \ + (bezt)->f1 |= SELECT; \ + (bezt)->f2 |= SELECT; \ + (bezt)->f3 |= SELECT; \ + } \ + ((void)0) +#define BEZT_DESEL_ALL(bezt) \ + { \ + (bezt)->f1 &= ~SELECT; \ + (bezt)->f2 &= ~SELECT; \ + (bezt)->f3 &= ~SELECT; \ + } \ + ((void)0) + +#define BEZT_IS_AUTOH(bezt) \ + (ELEM((bezt)->h1, HD_AUTO, HD_AUTO_ANIM) && ELEM((bezt)->h2, HD_AUTO, HD_AUTO_ANIM)) /* *************** CHARINFO **************** */ /* CharInfo.flag */ enum { - /* note: CU_CHINFO_WRAP, CU_CHINFO_SMALLCAPS_TEST and CU_CHINFO_TRUNCATE are set dynamically */ - CU_CHINFO_BOLD = 1 << 0, - CU_CHINFO_ITALIC = 1 << 1, - CU_CHINFO_UNDERLINE = 1 << 2, - /** wordwrap occurred here */ - CU_CHINFO_WRAP = 1 << 3, - CU_CHINFO_SMALLCAPS = 1 << 4, - /** set at runtime, checks if case switching is needed */ - CU_CHINFO_SMALLCAPS_CHECK = 1 << 5, - /** Set at runtime, indicates char that doesn't fit in text boxes. */ - CU_CHINFO_OVERFLOW = 1 << 6, + /* note: CU_CHINFO_WRAP, CU_CHINFO_SMALLCAPS_TEST and CU_CHINFO_TRUNCATE are set dynamically */ + CU_CHINFO_BOLD = 1 << 0, + CU_CHINFO_ITALIC = 1 << 1, + CU_CHINFO_UNDERLINE = 1 << 2, + /** wordwrap occurred here */ + CU_CHINFO_WRAP = 1 << 3, + CU_CHINFO_SMALLCAPS = 1 << 4, + /** set at runtime, checks if case switching is needed */ + CU_CHINFO_SMALLCAPS_CHECK = 1 << 5, + /** Set at runtime, indicates char that doesn't fit in text boxes. */ + CU_CHINFO_OVERFLOW = 1 << 6, }; /* mixed with KEY_LINEAR but define here since only curve supports */ -#define KEY_CU_EASE 3 +#define KEY_CU_EASE 3 /* indicates point has been seen during surface duplication */ -#define SURF_SEEN 4 +#define SURF_SEEN 4 #endif -- cgit v1.2.3