diff options
author | Ton Roosendaal <ton@blender.org> | 2006-12-20 20:57:56 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-12-20 20:57:56 +0300 |
commit | 253432bfc7c2a1dae224a03fb3055de19743ec67 (patch) | |
tree | 2cea30606f9f29be51d5366ddf0d3747b9649b90 /source/blender/include | |
parent | 0a0753b409221b66f5003d8c257426043ada227e (diff) |
The Big Image refactor!
Please read:
http://www.blender3d.org/cms/Imaging.834.0.html
Or in short:
- adding MultiLayer Image support
- recoded entire Image API
- better integration of movie/sequence Images
Was a whole load of work... went down for a week to do this. So, will need
a lot of testing! Will be in irc all evening.
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BIF_butspace.h | 2 | ||||
-rw-r--r-- | source/blender/include/BIF_drawimage.h | 10 | ||||
-rw-r--r-- | source/blender/include/BIF_editsima.h | 3 | ||||
-rw-r--r-- | source/blender/include/BIF_renderwin.h | 1 | ||||
-rw-r--r-- | source/blender/include/BIF_space.h | 1 | ||||
-rw-r--r-- | source/blender/include/BIF_writeimage.h | 2 | ||||
-rw-r--r-- | source/blender/include/BSE_filesel.h | 8 | ||||
-rw-r--r-- | source/blender/include/BSE_node.h | 8 | ||||
-rw-r--r-- | source/blender/include/blendef.h | 10 | ||||
-rw-r--r-- | source/blender/include/butspace.h | 32 |
10 files changed, 55 insertions, 22 deletions
diff --git a/source/blender/include/BIF_butspace.h b/source/blender/include/BIF_butspace.h index f5ae79fcd80..f87e9797cb3 100644 --- a/source/blender/include/BIF_butspace.h +++ b/source/blender/include/BIF_butspace.h @@ -42,6 +42,8 @@ struct ID; extern void do_butspace(unsigned short event); extern void redraw_test_buttons(struct Object *new); +extern char *image_type_pup(void); + /* buttons_editing.c */ extern void validate_editbonebutton_cb(void *bonev, void *namev); diff --git a/source/blender/include/BIF_drawimage.h b/source/blender/include/BIF_drawimage.h index a3b12b7bafd..5c289cfc2a4 100644 --- a/source/blender/include/BIF_drawimage.h +++ b/source/blender/include/BIF_drawimage.h @@ -36,6 +36,9 @@ struct ScrArea; struct SpaceImage; struct Render; +struct Image; +struct ImBuf; +struct uiBlock; void do_imagebuts(unsigned short event); void calc_image_view(struct SpaceImage *sima, char mode); @@ -51,8 +54,15 @@ void uvco_to_areaco_noclip(float *vec, int *mval); void what_image(struct SpaceImage *sima); void image_preview_event(int event); +void image_info(struct Image *ima, struct ImBuf *ibuf, char *str); +void imagespace_composite_flipbook(struct ScrArea *sa); + void imagewindow_render_callbacks(struct Render *re); void imagewindow_toggle_render(void); +void imagewindow_swap_render_rects(void); +void imagewin_store_spare(void); + +void image_editvertex_buts(struct uiBlock *block); #endif diff --git a/source/blender/include/BIF_editsima.h b/source/blender/include/BIF_editsima.h index 46444c88ae3..6a67ebc7009 100644 --- a/source/blender/include/BIF_editsima.h +++ b/source/blender/include/BIF_editsima.h @@ -76,7 +76,10 @@ void new_image_sima(void); void reload_image_sima(void); void save_image_sima(void); void save_as_image_sima(void); +void save_image_sequence_sima(void); void replace_image_sima(short imageselect); void open_image_sima(short imageselect); void pack_image_sima(void); +/* checks images for forced updates on frame change */ +void BIF_image_update_frame(void); diff --git a/source/blender/include/BIF_renderwin.h b/source/blender/include/BIF_renderwin.h index a997efb336d..789c3661db7 100644 --- a/source/blender/include/BIF_renderwin.h +++ b/source/blender/include/BIF_renderwin.h @@ -50,6 +50,7 @@ void BIF_renderwin_set_custom_cursor(unsigned char mask[16][2], unsigned char bi void BIF_redraw_render_rect(void); void BIF_swap_render_rects(void); +void BIF_store_spare(void); void BIF_toggle_render_display(void); void BIF_init_render_callbacks(struct Render *re, int do_display); diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h index 7bf0814b82e..1e84dba39cb 100644 --- a/source/blender/include/BIF_space.h +++ b/source/blender/include/BIF_space.h @@ -64,6 +64,7 @@ struct SpaceOops; #define IMAGE_HANDLER_PAINT 31 #define IMAGE_HANDLER_CURVES 32 #define IMAGE_HANDLER_PREVIEW 33 +#define IMAGE_HANDLER_GAME_PROPERTIES 34 /* action handler codes */ #define ACTION_HANDLER_PROPERTIES 40 diff --git a/source/blender/include/BIF_writeimage.h b/source/blender/include/BIF_writeimage.h index 002d382be5b..70978a033c2 100644 --- a/source/blender/include/BIF_writeimage.h +++ b/source/blender/include/BIF_writeimage.h @@ -37,7 +37,7 @@ struct ImBuf; struct EnvMap; void BIF_save_rendered_image(char *name); -void BIF_save_rendered_image_fs(int zbuf); +void BIF_save_rendered_image_fs(void); void BIF_save_envmap(struct EnvMap *env, char *str); void save_image_filesel_str(char *str); diff --git a/source/blender/include/BSE_filesel.h b/source/blender/include/BSE_filesel.h index 29f9c52f79f..6934899062e 100644 --- a/source/blender/include/BSE_filesel.h +++ b/source/blender/include/BSE_filesel.h @@ -40,7 +40,6 @@ struct ID; struct ScrArea; struct BWinEvent; -void clear_global_filesel_vars(void); void filesel_statistics(struct SpaceFile *sfile, int *totfile, int *selfile, float *totlen, float *sellen); void test_flags_file(struct SpaceFile *sfile); void sort_filelist(struct SpaceFile *sfile); @@ -49,9 +48,16 @@ void freefilelist(struct SpaceFile *sfile); void parent(struct SpaceFile *sfile); void swapselect_file(struct SpaceFile *sfile); void drawfilespace(struct ScrArea *sa, void *spacedata); + void activate_fileselect(int type, char *title, char *file, void (*func)(char *)); +void activate_fileselect_menu(int type, char *title, char *file, char *pupmenu, short *menup, void (*func)(char *)); +void activate_fileselect_args(int type, char *title, char *file, void (*func)(char *, void *, void *), void *arg1, void *arg2); + void activate_imageselect(int type, char *title, char *file, void (*func)(char *)); + void activate_databrowse(struct ID *id, int idcode, int fromcode, int retval, short *menup, void (*func)(unsigned short)); +void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2); + void filesel_prevspace(void); void free_filesel_spec(char *dir); void winqreadfilespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); diff --git a/source/blender/include/BSE_node.h b/source/blender/include/BSE_node.h index 626c9e75cbc..bbe79c1e8ff 100644 --- a/source/blender/include/BSE_node.h +++ b/source/blender/include/BSE_node.h @@ -44,6 +44,8 @@ struct bNodeTree; struct Material; struct ID; struct Scene; +struct Image; +struct ImageUser; /* ************* API for editnode.c *********** */ @@ -82,6 +84,12 @@ void node_adduplicate(struct SpaceNode *snode); void snode_autoconnect(struct SpaceNode *snode, struct bNode *node_to, int flag); void node_select_linked(struct SpaceNode *snode, int out); +struct ImageUser *ntree_get_active_iuser(struct bNodeTree *ntree); + +void imagepaint_composite_tags(struct bNodeTree *ntree, struct Image *image, struct ImageUser *iuser); + + + /* ************* drawnode.c *************** */ struct SpaceNode; struct bNodeLink; diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index fee04ac50a8..aaad17453ef 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -44,8 +44,7 @@ /* max length material array, 16 because of bits in matfrom */ #define MAXPICKBUF 10000 #define MAXSEQ 32 -/* in Image struct */ -#define MAXMIPMAP 10 + /* in buttons.c */ #define MAX_EFFECT 20 @@ -326,6 +325,13 @@ #define B_SIMABRUSHCHANGE 377 #define B_SIMABTEXBROWSE 378 #define B_SIMABTEXDELETE 379 +#define B_SIMARELOAD 380 +#define B_SIMANAME 381 +#define B_SIMAMULTI 382 +#define B_TRANS_IMAGE 383 +#define B_SIMA_REPACK 384 +#define B_SIMA_PLAY 385 +#define B_SIMA_RECORD 386 /* BUTS: 400 */ #define B_BUTSHOME 401 diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h index bd0b2adaa31..75bc8ff6ed3 100644 --- a/source/blender/include/butspace.h +++ b/source/blender/include/butspace.h @@ -41,6 +41,8 @@ struct ColorBand; struct uiBlock; struct rctf; struct CurveMap; +struct ImageUser; +struct RenderResult; /* buts->scaflag */ #define BUTS_SENS_SEL 1 @@ -115,6 +117,10 @@ extern void radio_panels(void); extern void do_radiobuts(unsigned short event); extern void texture_panels(void); extern void do_texbuts(unsigned short event); +void uiblock_image_panel(struct uiBlock *block, struct Image **ima_pp, struct ImageUser *iuser, + short redraw, short imagechanged); +void uiblock_layer_pass_buttons(struct uiBlock *block, struct RenderResult *rr, + struct ImageUser *iuser, int event, int x, int y, int w); /* logic */ extern void do_logic_buts(unsigned short event); @@ -151,18 +157,11 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la /* *********************** */ #define B_VIEWBUTS 1100 -#define B_LOADBGPIC 1001 -#define B_BLENDBGPIC 1002 -#define B_BGPICBROWSE 1003 -#define B_BGPICTEX 1004 -#define B_BGPICCLEAR 1005 -#define B_BGPICTEXCLEAR 1006 - #define B_OBJECTPANELROT 1007 -#define B_OBJECTPANELMEDIAN 1008 +#define B_OBJECTPANELMEDIAN 1008 #define B_ARMATUREPANEL1 1009 #define B_ARMATUREPANEL2 1010 -#define B_OBJECTPANELPARENT 1011 +#define B_OBJECTPANELPARENT 1011 #define B_OBJECTPANEL 1012 #define B_ARMATUREPANEL3 1013 #define B_OBJECTPANELSCALE 1014 @@ -213,13 +212,12 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la #define B_TEXTYPE 1301 #define B_DEFTEXVAR 1302 -#define B_LOADTEXIMA 1303 + #define B_NAMEIMA 1304 #define B_TEXCHANNEL 1305 #define B_TEXREDR_PRV 1306 -#define B_TEXIMABROWSE 1307 -#define B_IMAPTEST 1308 -#define B_RELOADIMA 1309 +#define B_IMAGECHANGED 1307 + #define B_LOADPLUGIN 1310 #define B_NAMEPLUGIN 1311 #define B_COLORBAND 1312 @@ -233,20 +231,18 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la #define B_LOADTEXIMA1 1320 #define B_TEXPRV 1321 + #define B_PLUGBUT 1325 /* B_PLUGBUT reserves 24 buttons at least! */ #define B_ENV_MAKE 1350 #define B_ENV_FREE 1351 -#define B_ENV_DELETE 1352 +#define B_ENV_DELETE 1352 #define B_ENV_SAVE 1353 #define B_ENV_OB 1354 -#define B_PACKIMA 1355 -#define B_TEXSETFRAMES 1356 +#define B_ENV_FREE_ALL 1357 -#define B_ENV_FREE_ALL 1357 -#define B_UNLINKIMA 1358 /* **************** animbuts = object buttons ******* */ #define B_ANIMBUTS 1500 |