[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51211] trunk/blender/source/blender/ makesdna/DNA_userdef_types.h: Style cleanup - replace #define lists with enums
Joshua Leung
aligorith at gmail.com
Tue Oct 9 12:20:25 CEST 2012
Revision: 51211
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51211
Author: aligorith
Date: 2012-10-09 10:20:25 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Style cleanup - replace #define lists with enums
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2012-10-09 09:42:18 UTC (rev 51210)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2012-10-09 10:20:25 UTC (rev 51211)
@@ -49,11 +49,14 @@
#define MAX_STYLE_NAME 64
/* default uifont_id offered by Blender */
-#define UIFONT_DEFAULT 0
-/*#define UIFONT_BITMAP 1*/ /*UNUSED*/
-/* free slots */
-#define UIFONT_CUSTOM1 2
-#define UIFONT_CUSTOM2 3
+typedef enum eUIFont_ID {
+ UIFONT_DEFAULT = 0,
+/* UIFONT_BITMAP = 1 */ /* UNUSED */
+
+ /* free slots */
+ UIFONT_CUSTOM1 = 2,
+ UIFONT_CUSTOM2 = 3
+} eUIFont_ID;
/* default fonts to load/initalize */
/* first font is the default (index 0), others optional */
@@ -64,7 +67,6 @@
short uifont_id; /* own id */
short r_to_l; /* fonts that read from left to right */
short pad;
-
} uiFont;
/* this state defines appearance of text */
@@ -79,13 +81,14 @@
short align; /* text align hint */
float shadowalpha; /* total alpha */
float shadowcolor; /* 1 value, typically white or black anyway */
-
} uiFontStyle;
/* uiFontStyle->align */
-#define UI_STYLE_TEXT_LEFT 0
-#define UI_STYLE_TEXT_CENTER 1
-#define UI_STYLE_TEXT_RIGHT 2
+typedef enum eFontStyle_Align {
+ UI_STYLE_TEXT_LEFT = 0,
+ UI_STYLE_TEXT_CENTER = 1,
+ UI_STYLE_TEXT_RIGHT = 2
+} eFontStyle_Align;
/* this is fed to the layout engine and widget code */
@@ -145,7 +148,6 @@
} uiPanelColors;
typedef struct ThemeUI {
-
/* Interface Elements (buttons, menus, icons) */
uiWidgetColors wcol_regular, wcol_tool, wcol_text;
uiWidgetColors wcol_radio, wcol_option, wcol_toggle;
@@ -209,8 +211,8 @@
char vertex[4], vertex_select[4];
char edge[4], edge_select[4];
char edge_seam[4], edge_sharp[4], edge_facesel[4], edge_crease[4];
- char face[4], face_select[4]; // solid faces
- char face_dot[4]; // selected color
+ char face[4], face_select[4]; /* solid faces */
+ char face_dot[4]; /* selected color */
char extra_edge_len[4], extra_face_angle[4], extra_face_area[4], pad3[4];
char normal[4];
char vertex_normal[4];
@@ -224,7 +226,7 @@
char handle_free[4], handle_auto[4], handle_vect[4], handle_align[4], handle_auto_clamped[4];
char handle_sel_free[4], handle_sel_auto[4], handle_sel_vect[4], handle_sel_align[4], handle_sel_auto_clamped[4];
- char ds_channel[4], ds_subchannel[4]; // dopesheet
+ char ds_channel[4], ds_subchannel[4]; /* dopesheet */
char console_output[4], console_input[4], console_info[4], console_error[4];
char console_cursor[4];
@@ -232,10 +234,10 @@
char vertex_size, outline_width, facedot_size;
char noodle_curving;
- char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
+ char syntaxl[4], syntaxn[4], syntaxb[4]; /* syntax for textwindow and nodes */
char syntaxv[4], syntaxc[4];
- char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4]; // for sequence editor
+ char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4]; /* for sequence editor */
char effect[4], hpad0[4], transition[4], meta[4];
char editmesh_active[4];
@@ -287,8 +289,10 @@
} ThemeWireColor;
/* flags for ThemeWireColor */
-#define TH_WIRECOLOR_CONSTCOLS (1<<0)
-#define TH_WIRECOLOR_TEXTCOLS (1<<1)
+typedef enum eWireColor_Flags {
+ TH_WIRECOLOR_CONSTCOLS = (1 << 0),
+ TH_WIRECOLOR_TEXTCOLS = (1 << 1),
+} eWireColor_Flags;
/* A theme */
typedef struct bTheme {
@@ -321,7 +325,6 @@
/*ThemeWireColor tobj[20];*/
int active_theme_area, pad;
-
} bTheme;
/* for the moment only the name. may want to store options with this later */
@@ -345,8 +348,8 @@
char pythondir[768];
char sounddir[768];
char i18ndir[768];
- char image_editor[1024]; /* 1024 = FILE_MAX */
- char anim_player[1024]; /* 1024 = FILE_MAX */
+ char image_editor[1024]; /* 1024 = FILE_MAX */
+ char anim_player[1024]; /* 1024 = FILE_MAX */
int anim_player_preset;
short v2d_min_gridsize; /* minimum spacing between gridlines in View2D grids */
@@ -393,7 +396,7 @@
int memcachelimit;
int prefetchframes;
short frameserverport;
- short pad_rot_angle; /*control the rotation step of the view when PAD2, PAD4, PAD6&PAD8 is use*/
+ short pad_rot_angle; /* control the rotation step of the view when PAD2, PAD4, PAD6&PAD8 is use */
short obcenter_dia;
short rvisize; /* rotating view icon size */
short rvibright; /* rotating view icon brightness */
@@ -422,7 +425,7 @@
short autokey_mode; /* autokeying mode */
short autokey_flag; /* flags for autokeying */
- short text_render, pad9; /*options for text rendering*/
+ short text_render, pad9; /* options for text rendering */
struct ColorBand coba_weight; /* from texture.h */
@@ -445,218 +448,258 @@
/* ***************** USERDEF ****************** */
/* userpref/section */
-#define USER_SECTION_INTERFACE 0
-#define USER_SECTION_EDIT 1
-#define USER_SECTION_FILE 2
-#define USER_SECTION_SYSTEM 3
-#define USER_SECTION_THEME 4
-#define USER_SECTION_INPUT 5
-#define USER_SECTION_ADDONS 6
+typedef enum eUserPref_Section {
+ USER_SECTION_INTERFACE = 0,
+ USER_SECTION_EDIT = 1,
+ USER_SECTION_FILE = 2,
+ USER_SECTION_SYSTEM = 3,
+ USER_SECTION_THEME = 4,
+ USER_SECTION_INPUT = 5,
+ USER_SECTION_ADDONS = 6,
+} eUserPref_Section;
/* flag */
-#define USER_AUTOSAVE (1 << 0)
-/*#define USER_AUTOGRABGRID (1 << 1) deprecated */
-/*#define USER_AUTOROTGRID (1 << 2) deprecated */
-/*#define USER_AUTOSIZEGRID (1 << 3) deprecated */
-#define USER_SCENEGLOBAL (1 << 4)
-#define USER_TRACKBALL (1 << 5)
-/*#define USER_DUPLILINK (1 << 6) deprecated */
-/*#define USER_FSCOLLUM (1 << 7) deprecated */
-#define USER_MAT_ON_OB (1 << 8)
-/*#define USER_NO_CAPSLOCK (1 << 9)*/ /* not used anywhere */
-/*#define USER_VIEWMOVE (1 << 10)*/ /* not used anywhere */
-#define USER_TOOLTIPS (1 << 11)
-#define USER_TWOBUTTONMOUSE (1 << 12)
-#define USER_NONUMPAD (1 << 13)
-#define USER_LMOUSESELECT (1 << 14)
-#define USER_FILECOMPRESS (1 << 15)
-#define USER_SAVE_PREVIEWS (1 << 16)
-#define USER_CUSTOM_RANGE (1 << 17)
-#define USER_ADD_EDITMODE (1 << 18)
-#define USER_ADD_VIEWALIGNED (1 << 19)
-#define USER_RELPATHS (1 << 20)
-#define USER_RELEASECONFIRM (1 << 21)
-#define USER_SCRIPT_AUTOEXEC_DISABLE (1 << 22)
-#define USER_FILENOUI (1 << 23)
-#define USER_NONEGFRAMES (1 << 24)
-#define USER_TXT_TABSTOSPACES_DISABLE (1 << 25)
-#define USER_TOOLTIPS_PYTHON (1 << 26)
-
+typedef enum eUserPref_Flag {
+ USER_AUTOSAVE = (1 << 0),
+/* USER_AUTOGRABGRID = (1 << 1), deprecated */
+/* USER_AUTOROTGRID = (1 << 2), deprecated */
+/* USER_AUTOSIZEGRID = (1 << 3), deprecated */
+ USER_SCENEGLOBAL = (1 << 4),
+ USER_TRACKBALL = (1 << 5),
+/* USER_DUPLILINK = (1 << 6), deprecated */
+/* USER_FSCOLLUM = (1 << 7), deprecated */
+ USER_MAT_ON_OB = (1 << 8),
+/* USER_NO_CAPSLOCK = (1 << 9), */ /* not used anywhere */
+/* USER_VIEWMOVE = (1 << 10), */ /* not used anywhere */
+ USER_TOOLTIPS = (1 << 11),
+ USER_TWOBUTTONMOUSE = (1 << 12),
+ USER_NONUMPAD = (1 << 13),
+ USER_LMOUSESELECT = (1 << 14),
+ USER_FILECOMPRESS = (1 << 15),
+ USER_SAVE_PREVIEWS = (1 << 16),
+ USER_CUSTOM_RANGE = (1 << 17),
+ USER_ADD_EDITMODE = (1 << 18),
+ USER_ADD_VIEWALIGNED = (1 << 19),
+ USER_RELPATHS = (1 << 20),
+ USER_RELEASECONFIRM = (1 << 21),
+ USER_SCRIPT_AUTOEXEC_DISABLE = (1 << 22),
+ USER_FILENOUI = (1 << 23),
+ USER_NONEGFRAMES = (1 << 24),
+ USER_TXT_TABSTOSPACES_DISABLE = (1 << 25),
+ USER_TOOLTIPS_PYTHON = (1 << 26),
+} eUserPref_Flag;
+
/* helper macro for checking frame clamping */
#define FRAMENUMBER_MIN_CLAMP(cfra) { \
if ((U.flag & USER_NONEGFRAMES) && (cfra < 0)) \
cfra = 0; \
} (void)0
-/* viewzom */
-#define USER_ZOOM_CONT 0
-#define USER_ZOOM_SCALE 1
-#define USER_ZOOM_DOLLY 2
+/* viewzoom */
+typedef enum eViewZoom_Style {
+ USER_ZOOM_CONT = 0,
+ USER_ZOOM_SCALE = 1,
+ USER_ZOOM_DOLLY = 2
+} eViewZoom_Style;
/* uiflag */
-// old flag for #define USER_KEYINSERTACT (1 << 0)
-// old flag for #define USER_KEYINSERTOBJ (1 << 1)
-#define USER_WHEELZOOMDIR (1 << 2)
-#define USER_FILTERFILEEXTS (1 << 3)
-#define USER_DRAWVIEWINFO (1 << 4)
-#define USER_PLAINMENUS (1 << 5) // old EVTTOCONSOLE print ghost events, here for tuhopuu compat. --phase
- // old flag for hide pulldown was here
-/*#define USER_FLIPFULLSCREEN (1 << 7)*/ /* deprecated */
-#define USER_ALLWINCODECS (1 << 8)
-#define USER_MENUOPENAUTO (1 << 9)
-#define USER_ZBUF_CURSOR (1 << 10)
-#define USER_AUTOPERSP (1 << 11)
-#define USER_LOCKAROUND (1 << 12)
-#define USER_GLOBALUNDO (1 << 13)
-#define USER_ORBIT_SELECTION (1 << 14)
-#define USER_ZBUF_ORBIT (1 << 15)
-#define USER_HIDE_DOT (1 << 16)
-#define USER_SHOW_ROTVIEWICON (1 << 17)
-#define USER_SHOW_VIEWPORTNAME (1 << 18)
-#define USER_CAM_LOCK_NO_PARENT (1 << 19)
-#define USER_ZOOM_TO_MOUSEPOS (1 << 20)
-#define USER_SHOW_FPS (1 << 21)
-#define USER_MMB_PASTE (1 << 22)
-#define USER_MENUFIXEDORDER (1 << 23)
-#define USER_CONTINUOUS_MOUSE (1 << 24)
-#define USER_ZOOM_INVERT (1 << 25)
-#define USER_ZOOM_HORIZ (1 << 26) /* for CONTINUE and DOLLY zoom */
-#define USER_SPLASH_DISABLE (1 << 27)
-#define USER_HIDE_RECENT (1 << 28)
-#define USER_SHOW_THUMBNAILS (1 << 29)
-#define USER_QUIT_PROMPT (1 << 30)
+typedef enum eUserpref_UI_Flag {
+ /* flags 0 and 1 were old flags (for autokeying) that aren't used anymore */
+ USER_WHEELZOOMDIR = (1 << 2),
+ USER_FILTERFILEEXTS = (1 << 3),
+ USER_DRAWVIEWINFO = (1 << 4),
+ USER_PLAINMENUS = (1 << 5),
+ /* flags 6 and 7 were old flags that are no-longer used */
+ USER_ALLWINCODECS = (1 << 8),
+ USER_MENUOPENAUTO = (1 << 9),
+ USER_ZBUF_CURSOR = (1 << 10),
+ USER_AUTOPERSP = (1 << 11),
+ USER_LOCKAROUND = (1 << 12),
+ USER_GLOBALUNDO = (1 << 13),
+ USER_ORBIT_SELECTION = (1 << 14),
+ USER_ZBUF_ORBIT = (1 << 15),
+ USER_HIDE_DOT = (1 << 16),
+ USER_SHOW_ROTVIEWICON = (1 << 17),
+ USER_SHOW_VIEWPORTNAME = (1 << 18),
+ USER_CAM_LOCK_NO_PARENT = (1 << 19),
+ USER_ZOOM_TO_MOUSEPOS = (1 << 20),
+ USER_SHOW_FPS = (1 << 21),
+ USER_MMB_PASTE = (1 << 22),
+ USER_MENUFIXEDORDER = (1 << 23),
+ USER_CONTINUOUS_MOUSE = (1 << 24),
+ USER_ZOOM_INVERT = (1 << 25),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list