diff options
author | Joshua Leung <aligorith@gmail.com> | 2012-05-24 08:46:01 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2012-05-24 08:46:01 +0400 |
commit | c52a85fa7b1c16fa086aba8e81c69f21ba79259c (patch) | |
tree | 22ee43635a37f8b2145d92f3373d6133ed09fca0 /source | |
parent | 8bce17877b30e10f4058048de7a107b40bb22f1e (diff) |
Code Cleanup - DNA_space_types.h - Part 2 - Rearranging Stuff
* Moved all enums to immediately follow the struct(s) that they are used for/by.
Less jumping around the file to find these
* Reshuffled the order of a few structs/editor groupings. For example, now all
animation editors are grouped together, and most general/property editors are
grouped together.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 1053 |
1 files changed, 555 insertions, 498 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index f8081d78031..8f3062655b7 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -68,12 +68,14 @@ struct wmTimer; struct MovieClip; struct MovieClipScopes; - /** - * The base structure all the other spaces - * are derived (implicitly) from. Would be - * good to make this explicit. - */ +/* SpaceLink (Base) ==================================== */ + +/** + * The base structure all the other spaces + * are derived (implicitly) from. Would be + * good to make this explicit. + */ typedef struct SpaceLink { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ @@ -82,17 +84,19 @@ typedef struct SpaceLink { short blockhandler[8] DNA_DEPRECATED; /* XXX make deprecated */ } SpaceLink; + +/* Space Info ========================================== */ + +/* Info Header */ typedef struct SpaceInfo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; /* XXX make deprecated */ char rpt_mask; char pad[7]; - } SpaceInfo; /* SpaceInfo.rpt_mask */ @@ -104,14 +108,194 @@ typedef enum eSpaceInfo_RptMask { INFO_RPT_ERR = (1 << 4), } eSpaceInfo_RptMask; + +/* Properties Editor ==================================== */ + +/* Properties Editor */ +typedef struct SpaceButs { + SpaceLink *next, *prev; + ListBase regionbase; /* storage of regions for inactive spaces */ + int spacetype; + float blockscale DNA_DEPRECATED; + + short blockhandler[8] DNA_DEPRECATED; + + View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ + + short mainb, mainbo, mainbuser; /* context tabs */ + short re_align, align; /* align for panels */ + short preview; /* preview is signal to refresh */ + short texture_context; /* texture context selector (material, world, brush)*/ + char flag, pad; + + void *path; /* runtime */ + int pathflag, dataicon; /* runtime */ + ID *pinid; + + void *texuser; +} SpaceButs; + +/* button defines (deprecated) */ +/* warning: the values of these defines are used in sbuts->tabs[8] */ +/* sbuts->mainb new */ +#define CONTEXT_SCENE 0 +#define CONTEXT_OBJECT 1 +#define CONTEXT_TYPES 2 +#define CONTEXT_SHADING 3 +#define CONTEXT_EDITING 4 +#define CONTEXT_SCRIPT 5 +#define CONTEXT_LOGIC 6 + +/* sbuts->mainb old (deprecated) */ +#define BUTS_VIEW 0 +#define BUTS_LAMP 1 +#define BUTS_MAT 2 +#define BUTS_TEX 3 +#define BUTS_ANIM 4 +#define BUTS_WORLD 5 +#define BUTS_RENDER 6 +#define BUTS_EDIT 7 +#define BUTS_GAME 8 +#define BUTS_FPAINT 9 +#define BUTS_RADIO 10 +#define BUTS_SCRIPT 11 +#define BUTS_SOUND 12 +#define BUTS_CONSTRAINT 13 +#define BUTS_EFFECTS 14 + +/* buts->mainb new */ +typedef enum eSpaceButtons_Context { + BCONTEXT_RENDER = 0, + BCONTEXT_SCENE, + BCONTEXT_WORLD, + BCONTEXT_OBJECT, + BCONTEXT_DATA, + BCONTEXT_MATERIAL, + BCONTEXT_TEXTURE, + BCONTEXT_PARTICLE, + BCONTEXT_PHYSICS, + BCONTEXT_BONE, + BCONTEXT_MODIFIER, + BCONTEXT_CONSTRAINT, + BCONTEXT_BONE_CONSTRAINT, + + /* always as last... */ + BCONTEXT_TOT +} eSpaceButtons_Context; + +/* sbuts->flag */ +#define SB_PRV_OSA 1 +#define SB_PIN_CONTEXT 2 +//#define SB_WORLD_TEX 4 //not used anymore +//#define SB_BRUSH_TEX 8 //not used anymore +#define SB_SHADING_CONTEXT 16 + +/* sbuts->texture_context */ +typedef enum eSpaceButtons_Texture_Context { + SB_TEXC_MAT_OR_LAMP = 0, + SB_TEXC_WORLD, + SB_TEXC_BRUSH, + SB_TEXC_PARTICLES, +} eSpaceButtons_Texture_Context; + +/* sbuts->align */ +typedef enum eSpaceButtons_Align { + BUT_FREE = 0, + BUT_HORIZONTAL, + BUT_VERTICAL, + BUT_AUTO, +} eSpaceButtons_Align; + +/* sbuts->scaflag */ +#define BUTS_SENS_SEL 1 +#define BUTS_SENS_ACT 2 +#define BUTS_SENS_LINK 4 +#define BUTS_CONT_SEL 8 +#define BUTS_CONT_ACT 16 +#define BUTS_CONT_LINK 32 +#define BUTS_ACT_SEL 64 +#define BUTS_ACT_ACT 128 +#define BUTS_ACT_LINK 256 +#define BUTS_SENS_STATE 512 +#define BUTS_ACT_STATE 1024 +#define BUTS_CONT_INIT_STATE 2048 + + +/* Outliner =============================================== */ + +/* Outliner */ +typedef struct SpaceOops { + SpaceLink *next, *prev; + ListBase regionbase; /* storage of regions for inactive spaces */ + int spacetype; + float blockscale DNA_DEPRECATED; + short blockhandler[8] DNA_DEPRECATED; + + View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ + + ListBase tree; + struct TreeStore *treestore; + + /* search stuff */ + char search_string[32]; + struct TreeStoreElem search_tse; + + short flag, outlinevis, storeflag, search_flags; +} SpaceOops; + + +/* SpaceOops->flag */ +typedef enum eSpaceOutliner_Flag { + SO_TESTBLOCKS = (1 << 0), + SO_NEWSELECTED = (1 << 1), + SO_HIDE_RESTRICTCOLS = (1 << 2), + SO_HIDE_KEYINGSETINFO = (1 << 3), +} eSpaceOutliner_Flag; + +/* SpaceOops->outlinevis */ +typedef enum eSpaceOutliner_Mode { + SO_ALL_SCENES = 0, + SO_CUR_SCENE, + SO_VISIBLE, + SO_SELECTED, + SO_ACTIVE, + SO_SAME_TYPE, + SO_GROUPS, + SO_LIBRARIES, + SO_VERSE_SESSION, + SO_VERSE_MS, + SO_SEQUENCE, + SO_DATABLOCKS, + SO_USERDEF, + SO_KEYMAP, +} eSpaceOutliner_Mode; + +/* SpaceOops->storeflag */ +typedef enum eSpaceOutliner_StoreFlag { + /* rebuild tree */ + SO_TREESTORE_CLEANUP = (1 << 0), + /* if set, it allows redraws. gets set for some allqueue events */ + SO_TREESTORE_REDRAW = (1 << 1), +} eSpaceOutliner_StoreFlag; + +/* outliner search flags (SpaceOops->search_flags) */ +typedef enum eSpaceOutliner_Search_Flags { + SO_FIND_CASE_SENSITIVE = (1 << 0), + SO_FIND_COMPLETE = (1 << 1), + SO_SEARCH_RECURSIVE = (1 << 2), +} eSpaceOutliner_Search_Flags; + + +/* Graph Editor ========================================= */ + /* 'Graph' Editor (formerly known as the IPO Editor) */ typedef struct SpaceIpo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ struct bDopeSheet *ads; /* settings for filtering animation data (NOTE: we use a pointer due to code-linking issues) */ @@ -126,29 +310,147 @@ typedef struct SpaceIpo { int around; /* pivot point for transforms */ } SpaceIpo; -typedef struct SpaceButs { - SpaceLink *next, *prev; + +/* SpaceIpo->flag (Graph Editor Settings) */ +typedef enum eGraphEdit_Flag { + /* OLD DEPRECEATED SETTING */ + /* SIPO_LOCK_VIEW = (1 << 0), */ + + /* don't merge keyframes on the same frame after a transform */ + SIPO_NOTRANSKEYCULL = (1 << 1), + /* don't show any keyframe handles at all */ + SIPO_NOHANDLES = (1 << 2), + /* don't show current frame number beside indicator line */ + SIPO_NODRAWCFRANUM = (1 << 3), + /* show timing in seconds instead of frames */ + SIPO_DRAWTIME = (1 << 4), + /* only show keyframes for selected F-Curves */ + SIPO_SELCUVERTSONLY = (1 << 5), + /* draw names of F-Curves beside the respective curves */ + /* NOTE: currently not used */ + SIPO_DRAWNAMES = (1 << 6), + /* show sliders in channels list */ + SIPO_SLIDERS = (1 << 7), + /* don't show the horizontal component of the cursor */ + SIPO_NODRAWCURSOR = (1 << 8), + /* only show handles of selected keyframes */ + SIPO_SELVHANDLESONLY = (1 << 9), + /* temporary flag to force channel selections to be synced with main */ + SIPO_TEMP_NEEDCHANSYNC = (1 << 10), + /* don't perform realtime updates */ + SIPO_NOREALTIMEUPDATES = (1 << 11), + /* don't draw curves with AA ("beauty-draw") for performance */ + SIPO_BEAUTYDRAW_OFF = (1 << 12), + /* draw grouped channels with colors set in group */ + SIPO_NODRAWGCOLORS = (1 << 13), +} eGraphEdit_Flag; + +/* SpaceIpo->mode (Graph Editor Mode) */ +typedef enum eGraphEdit_Mode { + /* all animation curves (from all over Blender) */ + SIPO_MODE_ANIMATION = 0, + /* drivers only */ + SIPO_MODE_DRIVERS, +} eGraphEdit_Mode; + + +/* NLA Editor ============================================= */ + +/* NLA Editor */ +typedef struct SpaceNla { + struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; - View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ + short autosnap; /* this uses the same settings as autosnap for Action Editor */ + short flag; + int pad; - short mainb, mainbo, mainbuser; /* context tabs */ - short re_align, align; /* align for panels */ - short preview; /* preview is signal to refresh */ - short texture_context; /* texture context selector (material, world, brush)*/ - char flag, pad; + struct bDopeSheet *ads; + View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ +} SpaceNla; + +/* nla->flag */ +typedef enum eSpaceNla_Flag { + /* flags (1<<0), (1<<1), and (1<<3) are depreceated flags from old verisons */ + + /* draw timing in seconds instead of frames */ + SNLA_DRAWTIME = (1 << 2), + /* don't draw frame number beside frame indicator */ + SNLA_NODRAWCFRANUM = (1 << 4), + /* don't draw influence curves on strips */ + SNLA_NOSTRIPCURVES = (1 << 5), + /* don't perform realtime updates */ + SNLA_NOREALTIMEUPDATES = (1 << 6), +} eSpaceNla_Flag; + + +/* Timeline =============================================== */ + +/* Pointcache drawing data */ +# /* Only store the data array in the cache to avoid constant reallocation. */ +# /* No need to store when saved. */ +typedef struct SpaceTimeCache { + struct SpaceTimeCache *next, *prev; + float *array; +} SpaceTimeCache; + +/* Timeline View */ +typedef struct SpaceTime { + SpaceLink *next, *prev; + ListBase regionbase; /* storage of regions for inactive spaces */ + int spacetype; + float blockscale DNA_DEPRECATED; - void *path; /* runtime */ - int pathflag, dataicon; /* runtime */ - ID *pinid; + View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ - void *texuser; -} SpaceButs; + ListBase caches; + + int cache_display; + int flag; +} SpaceTime; + + +/* time->flag */ +typedef enum eTimeline_Flag { + /* show timing in frames instead of in seconds */ + TIME_DRAWFRAMES = (1 << 0), + /* show time indicator box beside the frame number */ + TIME_CFRA_NUM = (1 << 1), + /* only keyframes from active/selected channels get shown */ + TIME_ONLYACTSEL = (1 << 2), +} eTimeline_Flag; + +/* time->redraws (now screen->redraws_flag) */ +typedef enum eScreen_Redraws_Flag { + TIME_REGION = (1 << 0), + TIME_ALL_3D_WIN = (1 << 1), + TIME_ALL_ANIM_WIN = (1 << 2), + TIME_ALL_BUTS_WIN = (1 << 3), + TIME_WITH_SEQ_AUDIO = (1 << 4), /* DEPRECATED */ + TIME_SEQ = (1 << 5), + TIME_ALL_IMAGE_WIN = (1 << 6), + TIME_CONTINUE_PHYSICS = (1 << 7), + TIME_NODES = (1 << 8), + TIME_CLIPS = (1 << 9), +} eScreen_Redraws_Flag; + +/* time->cache */ +typedef enum eTimeline_Cache_Flag { + TIME_CACHE_DISPLAY = (1 << 0), + TIME_CACHE_SOFTBODY = (1 << 1), + TIME_CACHE_PARTICLES = (1 << 2), + TIME_CACHE_CLOTH = (1 << 3), + TIME_CACHE_SMOKE = (1 << 4), + TIME_CACHE_DYNAMICPAINT = (1 << 5), +} eTimeline_Cache_Flag; + + +/* Sequence Editor ======================================= */ +/* Sequencer */ typedef struct SpaceSeq { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ @@ -172,6 +474,48 @@ typedef struct SpaceSeq { struct bGPdata *gpd; /* grease-pencil data */ } SpaceSeq; + +/* sseq->mainb */ +typedef enum eSpaceSeq_RegionType { + SEQ_DRAW_SEQUENCE = 0, + SEQ_DRAW_IMG_IMBUF, + SEQ_DRAW_IMG_WAVEFORM, + SEQ_DRAW_IMG_VECTORSCOPE, + SEQ_DRAW_IMG_HISTOGRAM, +} eSpaceSeq_RegionType; + +/* sseq->flag */ +typedef enum eSpaceSeq_Flag { + SEQ_DRAWFRAMES = (1 << 0), + SEQ_MARKER_TRANS = (1 << 1), + SEQ_DRAW_COLOR_SEPARATED = (1 << 2), + SEQ_DRAW_SAFE_MARGINS = (1 << 3), + SEQ_DRAW_GPENCIL = (1 << 4), /* DEPRECATED */ + SEQ_NO_DRAW_CFRANUM = (1 << 5), +} eSpaceSeq_Flag; + +/* sseq->view */ +typedef enum eSpaceSeq_Displays { + SEQ_VIEW_SEQUENCE = 1, + SEQ_VIEW_PREVIEW, + SEQ_VIEW_SEQUENCE_PREVIEW, +} eSpaceSeq_Dispays; + +/* sseq->render_size */ +typedef enum eSpaceSeq_Proxy_RenderSize { + SEQ_PROXY_RENDER_SIZE_NONE = -1, + SEQ_PROXY_RENDER_SIZE_SCENE = 0, + SEQ_PROXY_RENDER_SIZE_25 = 25, + SEQ_PROXY_RENDER_SIZE_50 = 50, + SEQ_PROXY_RENDER_SIZE_75 = 75, + SEQ_PROXY_RENDER_SIZE_100 = 99, + SEQ_PROXY_RENDER_SIZE_FULL = 100 +} eSpaceSeq_Proxy_RenderSize; + + +/* File Selector ========================================== */ + +/* Config and Input for File Selector */ typedef struct FileSelectParams { char title[32]; /* title, also used for the text of the execute button */ char dir[1056]; /* directory, FILE_MAX_LIBEXTRA, 1024 + 32, this is for extreme case when 1023 length path @@ -200,11 +544,12 @@ typedef struct FileSelectParams { /* XXX --- end unused -- */ } FileSelectParams; - +/* File Browser */ typedef struct SpaceFile { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; + int scroll_offset; struct FileSelectParams *params; /* config and input for file select */ @@ -229,26 +574,91 @@ typedef struct SpaceFile { short systemnr, pad2; } SpaceFile; -typedef struct SpaceOops { - SpaceLink *next, *prev; - ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; +/* FileSelectParams.display */ +enum FileDisplayTypeE { + FILE_DEFAULTDISPLAY = 0, + FILE_SHORTDISPLAY, + FILE_LONGDISPLAY, + FILE_IMGDISPLAY +}; - View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ - - ListBase tree; - struct TreeStore *treestore; - - /* search stuff */ - char search_string[32]; - struct TreeStoreElem search_tse; +/* FileSelectParams.sort */ +enum FileSortTypeE { + FILE_SORT_NONE = 0, + FILE_SORT_ALPHA = 1, + FILE_SORT_EXTENSION, + FILE_SORT_TIME, + FILE_SORT_SIZE +}; - short flag, outlinevis, storeflag, search_flags; -} SpaceOops; +/* these values need to be hardcoded in structs, dna does not recognize defines */ +/* also defined in BKE */ +#define FILE_MAXDIR 768 +#define FILE_MAXFILE 256 +#define FILE_MAX 1024 + +#define FILE_MAX_LIBEXTRA (FILE_MAX + 32) + +/* filesel types */ +#define FILE_UNIX 8 +#define FILE_BLENDER 8 /* don't display relative paths */ +#define FILE_SPECIAL 9 + +#define FILE_LOADLIB 1 +#define FILE_MAIN 2 +#define FILE_LOADFONT 3 + +/* filesel op property -> action */ +typedef enum eFileSel_Action { + FILE_OPENFILE = 0, + FILE_SAVE, +} eFileSel_Action; + +/* sfile->params->flag and simasel->flag */ +typedef enum eFileSel_Params_Flag { + FILE_SHOWSHORT = (1 << 0), + FILE_RELPATH = (1 << 1), /* was FILE_STRINGCODE */ + FILE_LINK = (1 << 2), + FILE_HIDE_DOT = (1 << 3), + FILE_AUTOSELECT = (1 << 4), + FILE_ACTIVELAY = (1 << 5), +/* FILE_ATCURSOR = (1 << 6), */ /* deprecated */ + FILE_DIRSEL_ONLY = (1 << 7), + FILE_FILTER = (1 << 8), + FILE_BOOKMARKS = (1 << 9), + FILE_GROUP_INSTANCE = (1 << 10), +} eFileSel_Params_Flag; + + +/* files in filesel list: file types */ +typedef enum eFileSel_File_Types { + BLENDERFILE = (1 << 2), + BLENDERFILE_BACKUP = (1 << 3), + IMAGEFILE = (1 << 4), + MOVIEFILE = (1 << 5), + PYSCRIPTFILE = (1 << 6), + FTFONTFILE = (1 << 7), + SOUNDFILE = (1 << 8), + TEXTFILE = (1 << 9), + MOVIEFILE_ICON = (1 << 10), /* movie file that preview can't load */ + FOLDERFILE = (1 << 11), /* represents folders for filtering */ + BTXFILE = (1 << 12), + COLLADAFILE = (1 << 13), + OPERATORFILE = (1 << 14), /* from filter_glob operator property */ +} eFileSel_File_Types; + +/* Selection Flags in filesel: struct direntry, unsigned char selflag */ +typedef enum eDirEntry_SelectFlag { +/* ACTIVE_FILE = (1 << 1), */ /* UNUSED */ + HILITED_FILE = (1 << 2), + SELECTED_FILE = (1 << 3), + EDITING_FILE = (1 << 4), +} eDirEntry_SelectFlag; +/* Image/UV Editor ======================================== */ + +/* Image/UV Editor */ typedef struct SpaceImage { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ @@ -280,28 +690,75 @@ typedef struct SpaceImage { char around; } SpaceImage; -typedef struct SpaceNla { - struct SpaceLink *next, *prev; - ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; +/* SpaceImage->dt_uv */ +typedef enum eSpaceImage_UVDT { + SI_UVDT_OUTLINE = 0, + SI_UVDT_DASH, + SI_UVDT_BLACK, + SI_UVDT_WHITE, +} eSpaceImage_UVDT; - short autosnap; /* this uses the same settings as autosnap for Action Editor */ - short flag; - int pad; +/* SpaceImage->dt_uvstretch */ +typedef enum eSpaceImage_UVDT_Stretch { + SI_UVDT_STRETCH_ANGLE = 0, + SI_UVDT_STRETCH_AREA, +} eSpaceImage_UVDT_Stretch; + +/* SpaceImage->sticky + * Note DISABLE should be 0, however would also need to re-arrange icon order, + * also, sticky loc is the default mode so this means we don't need to 'do_versons' */ +typedef enum eSpaceImage_Sticky { + SI_STICKY_LOC = 0, + SI_STICKY_DISABLE = 1, + SI_STICKY_VERTEX = 2, +} eSpaceImage_Sticky; + +/* SpaceImage->flag */ +typedef enum eSpaceImage_Flag { + SI_BE_SQUARE = (1 << 0), + SI_EDITTILE = (1 << 1), + SI_CLIP_UV = (1 << 2), + SI_DRAWTOOL = (1 << 3), + SI_NO_DRAWFACES = (1 << 4), + SI_DRAWSHADOW = (1 << 5), +/* SI_SELACTFACE = (1 << 6), */ /* deprecated */ + SI_DEPRECATED2 = (1 << 7), + SI_DEPRECATED3 = (1 << 8), /* stick UV selection to mesh vertex (UVs wont always be touching) */ + SI_COORDFLOATS = (1 << 9), + SI_PIXELSNAP = (1 << 10), + SI_LIVE_UNWRAP = (1 << 11), + SI_USE_ALPHA = (1 << 12), + SI_SHOW_ALPHA = (1 << 13), + SI_SHOW_ZBUF = (1 << 14), - struct bDopeSheet *ads; - View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ -} SpaceNla; + /* next two for render window display */ + SI_PREVSPACE = (1 << 15), + SI_FULLWINDOW = (1 << 16), + + SI_DEPRECATED4 = (1 << 17), + SI_DEPRECATED5 = (1 << 18), + + /* this means that the image is drawn until it reaches the view edge, + * in the image view, its unrelated to the 'tile' mode for texface + */ + SI_DRAW_TILE = (1 << 19), + SI_SMOOTH_UV = (1 << 20), + SI_DRAW_STRETCH = (1 << 21), + SI_DISPGP = (1 << 22), /* DEPRECATED */ + SI_DRAW_OTHER = (1 << 23), + + SI_COLOR_CORRECTION = (1 << 24), +} eSpaceImage_Flag; + +/* Text Editor ============================================ */ +/* Text Editor */ typedef struct SpaceText { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; struct Text *text; @@ -334,6 +791,26 @@ typedef struct SpaceText { void *drawcache; /* cache for faster drawing */ } SpaceText; + +/* SpaceText flags (moved from DNA_text_types.h) */ +typedef enum eSpaceText_Flags { + /* scrollable */ + ST_SCROLL_SELECT = (1 << 0), + /* clear namespace after script execution (BPY_main.c) */ + ST_CLEAR_NAMESPACE = (1 << 4), + + ST_FIND_WRAP = (1 << 5), + ST_FIND_ALL = (1 << 6), + ST_SHOW_MARGIN = (1 << 7), + ST_MATCH_CASE = (1 << 8), +} eSpaceText_Flags; + +/* stext->findstr/replacestr */ +#define ST_MAX_FIND_STR 256 + +/* Script View (Obsolete) ================================== */ + +/* Script Runtime Data - Obsolete (pre 2.5) */ typedef struct Script { ID id; @@ -350,6 +827,7 @@ typedef struct Script { } Script; #define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0 +/* Script View - Obsolete (pre 2.5) */ typedef struct SpaceScript { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ @@ -363,33 +841,14 @@ typedef struct SpaceScript { void *but_refs; } SpaceScript; -# /* Only store the data array in the cache to avoid constant reallocation. */ -# /* No need to store when saved. */ -typedef struct SpaceTimeCache { - struct SpaceTimeCache *next, *prev; - float *array; -} SpaceTimeCache; - -typedef struct SpaceTime { - SpaceLink *next, *prev; - ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - - View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ - - ListBase caches; - - int cache_display; - int flag; -} SpaceTime; +/* Nodes Editor =========================================== */ +/* Node Editor */ typedef struct SpaceNode { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -435,6 +894,8 @@ typedef enum eSpaceNode_ShaderFrom { SNODE_SHADER_WORLD, } eSpaceNode_ShaderFrom; +/* Game Logic Editor ===================================== */ + /* Logic Editor */ typedef struct SpaceLogic { SpaceLink *next, *prev; @@ -450,6 +911,9 @@ typedef struct SpaceLogic { struct bGPdata *gpd; /* grease-pencil data */ } SpaceLogic; +/* Console ================================================ */ + +/* Console content */ typedef struct ConsoleLine { struct ConsoleLine *next, *prev; @@ -464,18 +928,19 @@ typedef struct ConsoleLine { /* ConsoleLine.type */ typedef enum eConsoleLine_Type { - CONSOLE_LINE_OUTPUT=0, + CONSOLE_LINE_OUTPUT = 0, CONSOLE_LINE_INPUT, CONSOLE_LINE_INFO, /* autocomp feedback */ CONSOLE_LINE_ERROR } eConsoleLine_Type; + +/* Console View */ typedef struct SpaceConsole { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; float blockscale DNA_DEPRECATED; // XXX are these needed? - short blockhandler[8] DNA_DEPRECATED; // XXX are these needed? /* space vars */ @@ -490,16 +955,23 @@ typedef struct SpaceConsole { int sel_end; } SpaceConsole; + +/* User Preferences ======================================= */ + +/* User Preferences View */ typedef struct SpaceUserPref { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; - + int pad; char filter[64]; /* search term for filtering in the UI */ } SpaceUserPref; +/* Motion Tracking ======================================== */ + +/* Clip Editor */ typedef struct SpaceClip { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ @@ -537,428 +1009,6 @@ typedef struct SpaceClip { int pad3; } SpaceClip; -/* view3d Now in DNA_view3d_types.h */ - - - -/* **************** SPACE DEFINES ********************* */ - -/* button defines (deprecated) */ -/* warning: the values of these defines are used in sbuts->tabs[8] */ -/* sbuts->mainb new */ -#define CONTEXT_SCENE 0 -#define CONTEXT_OBJECT 1 -#define CONTEXT_TYPES 2 -#define CONTEXT_SHADING 3 -#define CONTEXT_EDITING 4 -#define CONTEXT_SCRIPT 5 -#define CONTEXT_LOGIC 6 - -/* sbuts->mainb old (deprecated) */ -#define BUTS_VIEW 0 -#define BUTS_LAMP 1 -#define BUTS_MAT 2 -#define BUTS_TEX 3 -#define BUTS_ANIM 4 -#define BUTS_WORLD 5 -#define BUTS_RENDER 6 -#define BUTS_EDIT 7 -#define BUTS_GAME 8 -#define BUTS_FPAINT 9 -#define BUTS_RADIO 10 -#define BUTS_SCRIPT 11 -#define BUTS_SOUND 12 -#define BUTS_CONSTRAINT 13 -#define BUTS_EFFECTS 14 - -/* buts->mainb new */ -typedef enum eSpaceButtons_Context { - BCONTEXT_RENDER = 0, - BCONTEXT_SCENE, - BCONTEXT_WORLD, - BCONTEXT_OBJECT, - BCONTEXT_DATA, - BCONTEXT_MATERIAL, - BCONTEXT_TEXTURE, - BCONTEXT_PARTICLE, - BCONTEXT_PHYSICS, - BCONTEXT_BONE, - BCONTEXT_MODIFIER, - BCONTEXT_CONSTRAINT, - BCONTEXT_BONE_CONSTRAINT, - - /* always as last... */ - BCONTEXT_TOT -} eSpaceButtons_Context; - -/* sbuts->flag */ -#define SB_PRV_OSA 1 -#define SB_PIN_CONTEXT 2 -//#define SB_WORLD_TEX 4 //not used anymore -//#define SB_BRUSH_TEX 8 //not used anymore -#define SB_SHADING_CONTEXT 16 - -/* sbuts->texture_context */ -typedef enum eSpaceButtons_Texture_Context { - SB_TEXC_MAT_OR_LAMP = 0, - SB_TEXC_WORLD, - SB_TEXC_BRUSH, - SB_TEXC_PARTICLES, -} eSpaceButtons_Texture_Context; - -/* sbuts->align */ -typedef enum eSpaceButtons_Align { - BUT_FREE = 0, - BUT_HORIZONTAL, - BUT_VERTICAL, - BUT_AUTO, -} eSpaceButtons_Align; - -/* sbuts->scaflag */ -#define BUTS_SENS_SEL 1 -#define BUTS_SENS_ACT 2 -#define BUTS_SENS_LINK 4 -#define BUTS_CONT_SEL 8 -#define BUTS_CONT_ACT 16 -#define BUTS_CONT_LINK 32 -#define BUTS_ACT_SEL 64 -#define BUTS_ACT_ACT 128 -#define BUTS_ACT_LINK 256 -#define BUTS_SENS_STATE 512 -#define BUTS_ACT_STATE 1024 -#define BUTS_CONT_INIT_STATE 2048 - -/* FileSelectParams.display */ -enum FileDisplayTypeE { - FILE_DEFAULTDISPLAY = 0, - FILE_SHORTDISPLAY, - FILE_LONGDISPLAY, - FILE_IMGDISPLAY -}; - -/* FileSelectParams.sort */ -enum FileSortTypeE { - FILE_SORT_NONE = 0, - FILE_SORT_ALPHA = 1, - FILE_SORT_EXTENSION, - FILE_SORT_TIME, - FILE_SORT_SIZE -}; - -/* these values need to be hardcoded in structs, dna does not recognize defines */ -/* also defined in BKE */ -#define FILE_MAXDIR 768 -#define FILE_MAXFILE 256 -#define FILE_MAX 1024 - -#define FILE_MAX_LIBEXTRA (FILE_MAX + 32) - -/* filesel types */ -#define FILE_UNIX 8 -#define FILE_BLENDER 8 /* don't display relative paths */ -#define FILE_SPECIAL 9 - -#define FILE_LOADLIB 1 -#define FILE_MAIN 2 -#define FILE_LOADFONT 3 - -/* filesel op property -> action */ -typedef enum eFileSel_Action { - FILE_OPENFILE = 0, - FILE_SAVE, -} eFileSel_Action; - -/* sfile->params->flag and simasel->flag */ -typedef enum eFileSel_Params_Flag { - FILE_SHOWSHORT = (1 << 0), - FILE_RELPATH = (1 << 1), /* was FILE_STRINGCODE */ - FILE_LINK = (1 << 2), - FILE_HIDE_DOT = (1 << 3), - FILE_AUTOSELECT = (1 << 4), - FILE_ACTIVELAY = (1 << 5), -/* FILE_ATCURSOR = (1 << 6), */ /* deprecated */ - FILE_DIRSEL_ONLY = (1 << 7), - FILE_FILTER = (1 << 8), - FILE_BOOKMARKS = (1 << 9), - FILE_GROUP_INSTANCE = (1 << 10), -} eFileSel_Params_Flag; - - -/* files in filesel list: file types */ -typedef enum eFileSel_File_Types { - BLENDERFILE = (1 << 2), - BLENDERFILE_BACKUP = (1 << 3), - IMAGEFILE = (1 << 4), - MOVIEFILE = (1 << 5), - PYSCRIPTFILE = (1 << 6), - FTFONTFILE = (1 << 7), - SOUNDFILE = (1 << 8), - TEXTFILE = (1 << 9), - MOVIEFILE_ICON = (1 << 10), /* movie file that preview can't load */ - FOLDERFILE = (1 << 11), /* represents folders for filtering */ - BTXFILE = (1 << 12), - COLLADAFILE = (1 << 13), - OPERATORFILE = (1 << 14), /* from filter_glob operator property */ -} eFileSel_File_Types; - -/* Selection Flags in filesel: struct direntry, unsigned char selflag */ -typedef enum eDirEntry_SelectFlag { -/* ACTIVE_FILE = (1 << 1), */ /* UNUSED */ - HILITED_FILE = (1 << 2), - SELECTED_FILE = (1 << 3), - EDITING_FILE = (1 << 4), -} eDirEntry_SelectFlag; - -/* SpaceImage->dt_uv */ -typedef enum eSpaceImage_UVDT { - SI_UVDT_OUTLINE = 0, - SI_UVDT_DASH, - SI_UVDT_BLACK, - SI_UVDT_WHITE, -} eSpaceImage_UVDT; - -/* SpaceImage->dt_uvstretch */ -typedef enum eSpaceImage_UVDT_Stretch { - SI_UVDT_STRETCH_ANGLE = 0, - SI_UVDT_STRETCH_AREA, -} eSpaceImage_UVDT_Stretch; - -/* SpaceImage->sticky - * Note DISABLE should be 0, however would also need to re-arrange icon order, - * also, sticky loc is the default mode so this means we don't need to 'do_versons' */ -typedef enum eSpaceImage_Sticky { - SI_STICKY_LOC = 0, - SI_STICKY_DISABLE = 1, - SI_STICKY_VERTEX = 2, -} eSpaceImage_Sticky; - -/* SpaceImage->flag */ -typedef enum eSpaceImage_Flag { - SI_BE_SQUARE = (1 << 0), - SI_EDITTILE = (1 << 1), - SI_CLIP_UV = (1 << 2), - SI_DRAWTOOL = (1 << 3), - SI_NO_DRAWFACES = (1 << 4), - SI_DRAWSHADOW = (1 << 5), -/* SI_SELACTFACE = (1 << 6), */ /* deprecated */ - SI_DEPRECATED2 = (1 << 7), - SI_DEPRECATED3 = (1 << 8), /* stick UV selection to mesh vertex (UVs wont always be touching) */ - SI_COORDFLOATS = (1 << 9), - SI_PIXELSNAP = (1 << 10), - SI_LIVE_UNWRAP = (1 << 11), - SI_USE_ALPHA = (1 << 12), - SI_SHOW_ALPHA = (1 << 13), - SI_SHOW_ZBUF = (1 << 14), - - /* next two for render window display */ - SI_PREVSPACE = (1 << 15), - SI_FULLWINDOW = (1 << 16), - - SI_DEPRECATED4 = (1 << 17), - SI_DEPRECATED5 = (1 << 18), - - /* this means that the image is drawn until it reaches the view edge, - * in the image view, its unrelated to the 'tile' mode for texface - */ - SI_DRAW_TILE = (1 << 19), - SI_SMOOTH_UV = (1 << 20), - SI_DRAW_STRETCH = (1 << 21), - SI_DISPGP = (1 << 22), /* DEPRECATED */ - SI_DRAW_OTHER = (1 << 23), - - SI_COLOR_CORRECTION = (1 << 24), -} eSpaceImage_Flag; - -/* SpaceIpo->flag (Graph Editor Settings) */ -typedef enum eGraphEdit_Flag { - /* OLD DEPRECEATED SETTING */ - /* SIPO_LOCK_VIEW = (1 << 0), */ - - /* don't merge keyframes on the same frame after a transform */ - SIPO_NOTRANSKEYCULL = (1 << 1), - /* don't show any keyframe handles at all */ - SIPO_NOHANDLES = (1 << 2), - /* don't show current frame number beside indicator line */ - SIPO_NODRAWCFRANUM = (1 << 3), - /* show timing in seconds instead of frames */ - SIPO_DRAWTIME = (1 << 4), - /* only show keyframes for selected F-Curves */ - SIPO_SELCUVERTSONLY = (1 << 5), - /* draw names of F-Curves beside the respective curves */ - /* NOTE: currently not used */ - SIPO_DRAWNAMES = (1 << 6), - /* show sliders in channels list */ - SIPO_SLIDERS = (1 << 7), - /* don't show the horizontal component of the cursor */ - SIPO_NODRAWCURSOR = (1 << 8), - /* only show handles of selected keyframes */ - SIPO_SELVHANDLESONLY = (1 << 9), - /* temporary flag to force channel selections to be synced with main */ - SIPO_TEMP_NEEDCHANSYNC = (1 << 10), - /* don't perform realtime updates */ - SIPO_NOREALTIMEUPDATES = (1 << 11), - /* don't draw curves with AA ("beauty-draw") for performance */ - SIPO_BEAUTYDRAW_OFF = (1 << 12), - /* draw grouped channels with colors set in group */ - SIPO_NODRAWGCOLORS = (1 << 13), -} eGraphEdit_Flag; - -/* SpaceIpo->mode (Graph Editor Mode) */ -typedef enum eGraphEdit_Mode { - /* all animation curves (from all over Blender) */ - SIPO_MODE_ANIMATION = 0, - /* drivers only */ - SIPO_MODE_DRIVERS, -} eGraphEdit_Mode; - -/* SpaceText flags (moved from DNA_text_types.h) */ -typedef enum eSpaceText_Flags { - /* scrollable */ - ST_SCROLL_SELECT = (1 << 0), - /* clear namespace after script execution (BPY_main.c) */ - ST_CLEAR_NAMESPACE = (1 << 4), - - ST_FIND_WRAP = (1 << 5), - ST_FIND_ALL = (1 << 6), - ST_SHOW_MARGIN = (1 << 7), - ST_MATCH_CASE = (1 << 8), -} eSpaceText_Flags; - -/* stext->findstr/replacestr */ -#define ST_MAX_FIND_STR 256 - - -/* SpaceOops->flag */ -typedef enum eSpaceOutliner_Flag { - SO_TESTBLOCKS = (1 << 0), - SO_NEWSELECTED = (1 << 1), - SO_HIDE_RESTRICTCOLS = (1 << 2), - SO_HIDE_KEYINGSETINFO = (1 << 3), -} eSpaceOutliner_Flag; - -/* SpaceOops->outlinevis */ -typedef enum eSpaceOutliner_Mode { - SO_ALL_SCENES = 0, - SO_CUR_SCENE, - SO_VISIBLE, - SO_SELECTED, - SO_ACTIVE, - SO_SAME_TYPE, - SO_GROUPS, - SO_LIBRARIES, - SO_VERSE_SESSION, - SO_VERSE_MS, - SO_SEQUENCE, - SO_DATABLOCKS, - SO_USERDEF, - SO_KEYMAP, -} eSpaceOutliner_Mode; - -/* SpaceOops->storeflag */ -typedef enum eSpaceOutliner_StoreFlag { - /* rebuild tree */ - SO_TREESTORE_CLEANUP = (1 << 0), - /* if set, it allows redraws. gets set for some allqueue events */ - SO_TREESTORE_REDRAW = (1 << 1), -} eSpaceOutliner_StoreFlag; - -/* outliner search flags (SpaceOops->search_flags) */ -typedef enum eSpaceOutliner_Search_Flags { - SO_FIND_CASE_SENSITIVE = (1 << 0), - SO_FIND_COMPLETE = (1 << 1), - SO_SEARCH_RECURSIVE = (1 << 2), -} eSpaceOutliner_Search_Flags; - -/* headerbuttons: 450-499 */ - -#define B_IMASELHOME 451 -#define B_IMASELREMOVEBIP 452 - -/* nla->flag */ -typedef enum eSpaceNla_Flag { - /* flags (1<<0), (1<<1), and (1<<3) are depreceated flags from old verisons */ - - /* draw timing in seconds instead of frames */ - SNLA_DRAWTIME = (1 << 2), - /* don't draw frame number beside frame indicator */ - SNLA_NODRAWCFRANUM = (1 << 4), - /* don't draw influence curves on strips */ - SNLA_NOSTRIPCURVES = (1 << 5), - /* don't perform realtime updates */ - SNLA_NOREALTIMEUPDATES = (1 << 6), -} eSpaceNla_Flag; - -/* time->flag */ -typedef enum eTimeline_Flag { - /* show timing in frames instead of in seconds */ - TIME_DRAWFRAMES = (1 << 0), - /* show time indicator box beside the frame number */ - TIME_CFRA_NUM = (1 << 1), - /* only keyframes from active/selected channels get shown */ - TIME_ONLYACTSEL = (1 << 2), -} eTimeline_Flag; - -/* time->redraws (now screen->redraws_flag) */ -typedef enum eScreen_Redraws_Flag { - TIME_REGION = (1 << 0), - TIME_ALL_3D_WIN = (1 << 1), - TIME_ALL_ANIM_WIN = (1 << 2), - TIME_ALL_BUTS_WIN = (1 << 3), - TIME_WITH_SEQ_AUDIO = (1 << 4), /* DEPRECATED */ - TIME_SEQ = (1 << 5), - TIME_ALL_IMAGE_WIN = (1 << 6), - TIME_CONTINUE_PHYSICS = (1 << 7), - TIME_NODES = (1 << 8), - TIME_CLIPS = (1 << 9), -} eScreen_Redraws_Flag; - -/* time->cache */ -typedef enum eTimeline_Cache_Flag { - TIME_CACHE_DISPLAY = (1 << 0), - TIME_CACHE_SOFTBODY = (1 << 1), - TIME_CACHE_PARTICLES = (1 << 2), - TIME_CACHE_CLOTH = (1 << 3), - TIME_CACHE_SMOKE = (1 << 4), - TIME_CACHE_DYNAMICPAINT = (1 << 5), -} eTimeline_Cache_Flag; - -/* sseq->mainb */ -typedef enum eSpaceSeq_RegionType { - SEQ_DRAW_SEQUENCE = 0, - SEQ_DRAW_IMG_IMBUF, - SEQ_DRAW_IMG_WAVEFORM, - SEQ_DRAW_IMG_VECTORSCOPE, - SEQ_DRAW_IMG_HISTOGRAM, -} eSpaceSeq_RegionType; - -/* sseq->flag */ -typedef enum eSpaceSeq_Flag { - SEQ_DRAWFRAMES = (1 << 0), - SEQ_MARKER_TRANS = (1 << 1), - SEQ_DRAW_COLOR_SEPARATED = (1 << 2), - SEQ_DRAW_SAFE_MARGINS = (1 << 3), - SEQ_DRAW_GPENCIL = (1 << 4), /* DEPRECATED */ - SEQ_NO_DRAW_CFRANUM = (1 << 5), -} eSpaceSeq_Flag; - -/* sseq->view */ -typedef enum eSpaceSeq_Displays { - SEQ_VIEW_SEQUENCE = 1, - SEQ_VIEW_PREVIEW, - SEQ_VIEW_SEQUENCE_PREVIEW, -} eSpaceSeq_Dispays; - -/* sseq->render_size */ -typedef enum eSpaceSeq_Proxy_RenderSize { - SEQ_PROXY_RENDER_SIZE_NONE = -1, - SEQ_PROXY_RENDER_SIZE_SCENE = 0, - SEQ_PROXY_RENDER_SIZE_25 = 25, - SEQ_PROXY_RENDER_SIZE_50 = 50, - SEQ_PROXY_RENDER_SIZE_75 = 75, - SEQ_PROXY_RENDER_SIZE_100 = 99, - SEQ_PROXY_RENDER_SIZE_FULL = 100 -} eSpaceSeq_Proxy_RenderSize; - /* SpaceClip->flag */ typedef enum eSpaceClip_Flag { SC_SHOW_MARKER_PATTERN = (1 << 0), @@ -1008,6 +1058,13 @@ typedef enum eSpaceClip_Dopesheet_Flag { SC_DOPE_SORT_INVERSE = (1 << 0), } eSpaceClip_Dopesheet_Flag; +/* **************** SPACE DEFINES ********************* */ + +/* headerbuttons: 450-499 */ +#define B_IMASELHOME 451 +#define B_IMASELREMOVEBIP 452 + + /* space types, moved from DNA_screen_types.h */ /* Do NOT change order, append on end. types are hardcoded needed */ typedef enum eSpace_Type { |