diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-15 07:38:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-15 07:38:18 +0300 |
commit | 52135dd4fac718b31b7653e42a7e4b332b2814f3 (patch) | |
tree | 185960d4d631f99e2aa0bc232acff9b8ba2dc63e /source/blender/editors/space_image/image_intern.h | |
parent | 2213fa1c528027d363a546fe3a5377f65b5a6d26 (diff) |
2.5: Space Image ported back
Organized as follows:
uvedit/
uv editing related code
uvedit_draw.c: drawing code
uvedit_ops.c: operators, just a few done
uvedit_unwrap_ops.c: will be operators for unwrapping
uvedit_paramatrizer.c: lscm/abf/stretch/pack
space_image/
space_image.c: registration and common getter/setters
image_draw.c: drawing code, mostly functional
image_panels.c: panels, all commented out
image_render.c: render callbacks, non functional
image_ops.c: operators, only view navigation done
image_header.c: header, menus mostly done but missing buttons
Notes:
* Header menus consist only of Operator and RNA buttons, if they
are not implemented they're displayed grayed out. Ideally the full
header could work like this, but std_libbuttons looks problematic.
* Started using view2d code more than the old code, but for now it
still does own view2d management due to some very specific
requirements that the image window has. The drawing code however
is more clear hopefully, it only uses view2d, and there is no
switching between 'p' and 'f' view2d's anymore, it is always 'f'.
* In order to make uvedit operators more independent I move some
image space settings to scene toolsettings, and the current image
and its buffer is in the context. Especially sync selection and
select mode belonged there anyway as this cannot work correct with
different spaces having different settings anyway.
* Image paint is not back yet, did not want to put that together with
uvedit because there's really no code sharing.. perhaps vertex paint,
image paint and sculpt would be good to have in one module to share
brush code, partial redraw, etc better.
Diffstat (limited to 'source/blender/editors/space_image/image_intern.h')
-rw-r--r-- | source/blender/editors/space_image/image_intern.h | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index 42187447445..85d4c476150 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -25,15 +25,51 @@ * * ***** END GPL LICENSE BLOCK ***** */ + #ifndef ED_IMAGE_INTERN_H #define ED_IMAGE_INTERN_H /* internal exports only */ +struct bContext; +struct ARegion; +struct SpaceImage; +struct Object; +struct Image; +struct ImBuf; +struct wmOperatorType; +struct Scene; + +/* space_image.c */ +struct Image *get_space_image(struct SpaceImage *sima); +void set_space_image(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima); + +struct ImBuf *get_space_image_buffer(struct SpaceImage *sima); +void get_space_image_size(struct SpaceImage *sima, int *width, int *height); +void get_space_image_aspect(struct SpaceImage *sima, float *aspx, float *aspy); +void get_space_image_zoom(struct SpaceImage *sima, struct ARegion *ar, float *zoomx, float *zoomy); +int get_space_image_show_render(struct SpaceImage *sima); +int get_space_image_show_paint(struct SpaceImage *sima); +int get_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit); +int get_space_image_show_uvshadow(struct SpaceImage *sima, struct Object *obedit); /* image_header.c */ -void image_header_buttons(const bContext *C, ARegion *ar); +void image_header_buttons(const struct bContext *C, struct ARegion *ar); + +/* image_draw.c */ +void draw_image_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene); + +/* image_ops.c */ +void IMAGE_OT_view_all(struct wmOperatorType *ot); +void IMAGE_OT_view_pan(struct wmOperatorType *ot); +void IMAGE_OT_view_selected(struct wmOperatorType *ot); +void IMAGE_OT_view_zoom(struct wmOperatorType *ot); +void IMAGE_OT_view_zoom_in(struct wmOperatorType *ot); +void IMAGE_OT_view_zoom_out(struct wmOperatorType *ot); +void IMAGE_OT_view_zoom_ratio(struct wmOperatorType *ot); +/* uvedit_draw.c */ +void draw_uvedit_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene, struct Object *obedit); #endif /* ED_IMAGE_INTERN_H */ |