diff options
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/editors/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/editors/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_space_api.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_image/Makefile | 53 | ||||
| -rw-r--r-- | source/blender/editors/space_image/SConscript | 9 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_header.c | 166 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_intern.h | 39 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 276 |
10 files changed, 548 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index b38d5de936c..f736f5b4f59 100644 --- a/source/Makefile +++ b/source/Makefile @@ -235,6 +235,7 @@ PULIB = $(NAN_MOTO)/lib/libmoto.a PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a PULIB += $(OCGDIR)/blender/ed_space/libed_space.a +PULIB += $(OCGDIR)/blender/ed_image/libed_image.a PULIB += $(OCGDIR)/blender/ed_ipo/libed_ipo.a PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a PULIB += $(OCGDIR)/blender/ed_time/libed_time.a diff --git a/source/blender/editors/Makefile b/source/blender/editors/Makefile index 8422370308c..d7d96ac63d9 100644 --- a/source/blender/editors/Makefile +++ b/source/blender/editors/Makefile @@ -29,6 +29,6 @@ # Bounces make to subdirectories. SOURCEDIR = source/blender/editors -DIRS = datafiles screen space_outliner space_time space_view3d interface util space_api space_ipo +DIRS = datafiles screen space_outliner space_time space_view3d interface util space_api space_ipo space_image include nan_subdirs.mk diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript index a0205aaefb0..af6e157e1ed 100644 --- a/source/blender/editors/SConscript +++ b/source/blender/editors/SConscript @@ -12,5 +12,6 @@ SConscript(['datafiles/SConscript', 'space_time/SConscript', 'space_view3d/SConscript', 'space_ipo/SConscript', + 'space_image/SConscript', 'transform/SConscript', 'screen/SConscript']) diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h index aea5b1b9502..ef04da0e3ea 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.h @@ -36,6 +36,7 @@ void ED_spacetype_outliner(void); void ED_spacetype_time(void); void ED_spacetype_view3d(void); void ED_spacetype_ipo(void); +void ED_spacetype_image(void); #endif /* ED_AREA_H */ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 6b13bcad3d6..138a4d72d83 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -65,6 +65,7 @@ void ED_spacetypes_init(void) ED_spacetype_time(); ED_spacetype_view3d(); ED_spacetype_ipo(); + ED_spacetype_image(); // ... /* register operator types for screen and all spaces */ diff --git a/source/blender/editors/space_image/Makefile b/source/blender/editors/space_image/Makefile new file mode 100644 index 00000000000..8110bd1c2a3 --- /dev/null +++ b/source/blender/editors/space_image/Makefile @@ -0,0 +1,53 @@ +# +# $Id: Makefile 14 2002-10-13 15:57:19Z hans $ +# +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2007 Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Makes module object directory and bounces make to subdirectories. + +LIBNAME = ed_image +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I$(NAN_GLEW)/include +CPPFLAGS += -I$(OPENGL_HEADERS) + +# not very neat.... +CPPFLAGS += -I../../windowmanager +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../imbuf +CPPFLAGS += -I../../python +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +# own include + +CPPFLAGS += -I../include diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript new file mode 100644 index 00000000000..6ecba4acb03 --- /dev/null +++ b/source/blender/editors/space_image/SConscript @@ -0,0 +1,9 @@ +#!/usr/bin/python +Import ('env') + +sources = env.Glob('*.c') + +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' + +env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c new file mode 100644 index 00000000000..9153cc44d8f --- /dev/null +++ b/source/blender/editors/space_image/image_header.c @@ -0,0 +1,166 @@ +/** + * $Id$ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include <string.h> +#include <stdio.h> + +#include "DNA_space_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_windowmanager_types.h" + +#include "MEM_guardedalloc.h" + +#include "BLI_blenlib.h" + +#include "BKE_global.h" +#include "BKE_screen.h" + +#include "ED_screen.h" +#include "ED_util.h" + +#include "WM_api.h" +#include "WM_types.h" + +#include "BIF_gl.h" +#include "BIF_glutil.h" + +#include "UI_interface.h" +#include "UI_resources.h" +#include "UI_view2d.h" + +#include "image_intern.h" + + +/* ************************ header area region *********************** */ + +static void do_viewmenu(bContext *C, void *arg, int event) +{ + +} + +static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused) +{ + ScrArea *curarea= C->area; + uiBlock *block; + short yco= 0, menuwidth=120; + + block= uiBeginBlock(C, handle->region, "dummy_viewmenu", UI_EMBOSSP, UI_HELV); + uiBlockSetButmFunc(block, do_viewmenu, NULL); + + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); + + if(curarea->headertype==HEADERTOP) { + uiBlockSetDirection(block, UI_DOWN); + } + else { + uiBlockSetDirection(block, UI_TOP); + uiBlockFlipOrder(block); + } + + uiTextBoundsBlock(block, 50); + uiEndBlock(C, block); + + return block; +} + +#define B_NEWSPACE 100 + +static void do_image_buttons(bContext *C, void *arg, int event) +{ + switch(event) { + case B_NEWSPACE: + ED_newspace(C->area, C->area->butspacetype); + WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL); + break; + } +} + + +void image_header_buttons(const bContext *C, ARegion *ar) +{ + ScrArea *sa= C->area; + uiBlock *block; + int xco, yco= 3; + + block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV); + uiBlockSetHandleFunc(block, do_image_buttons, NULL); + + if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER); + else uiBlockSetCol(block, TH_HEADERDESEL); + + xco = 8; + + uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, + windowtype_pup(), xco, yco, XIC+10, YIC, + &(C->area->butspacetype), 1.0, SPACEICONMAX, 0, 0, + "Displays Current Window Type. " + "Click for menu of available types."); + + xco += XIC + 14; + + uiBlockSetEmboss(block, UI_EMBOSSN); + if (sa->flag & HEADER_NO_PULLDOWN) { + uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, + ICON_DISCLOSURE_TRI_RIGHT, + xco,yco,XIC,YIC-2, + &(sa->flag), 0, 0, 0, 0, + "Show pulldown menus"); + } + else { + uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, + ICON_DISCLOSURE_TRI_DOWN, + xco,yco,XIC,YIC-2, + &(sa->flag), 0, 0, 0, 0, + "Hide pulldown menus"); + } + uiBlockSetEmboss(block, UI_EMBOSS); + xco+=XIC; + + if((sa->flag & HEADER_NO_PULLDOWN)==0) { + int xmax; + + /* pull down menus */ + uiBlockSetEmboss(block, UI_EMBOSSP); + + xmax= GetButStringLength("View"); + uiDefPulldownBut(block, dummy_viewmenu, C->area, + "View", xco, yco-2, xmax-3, 24, ""); + } + + uiBlockSetEmboss(block, UI_EMBOSS); + + /* always as last */ + sa->headbutlen= xco+XIC+80; // +80 because the last button is not an icon + + uiEndBlock(C, block); + uiDrawBlock(block); +} + + diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h new file mode 100644 index 00000000000..42187447445 --- /dev/null +++ b/source/blender/editors/space_image/image_intern.h @@ -0,0 +1,39 @@ +/** + * $Id: + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_IMAGE_INTERN_H +#define ED_IMAGE_INTERN_H + +/* internal exports only */ + + +/* image_header.c */ +void image_header_buttons(const bContext *C, ARegion *ar); + + +#endif /* ED_IMAGE_INTERN_H */ + diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c new file mode 100644 index 00000000000..c876b7e31f2 --- /dev/null +++ b/source/blender/editors/space_image/space_image.c @@ -0,0 +1,276 @@ +/** + * $Id: + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include <string.h> +#include <stdio.h> + +#include "DNA_image_types.h" +#include "DNA_object_types.h" +#include "DNA_space_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" + +#include "MEM_guardedalloc.h" + +#include "BLI_blenlib.h" +#include "BLI_arithb.h" +#include "BLI_rand.h" + +#include "BKE_colortools.h" +#include "BKE_global.h" +#include "BKE_screen.h" + +#include "ED_space_api.h" +#include "ED_screen.h" + +#include "BIF_gl.h" + +#include "WM_api.h" +#include "WM_types.h" + +#include "UI_interface.h" +#include "UI_resources.h" +#include "UI_view2d.h" + +#include "ED_markers.h" + +#include "image_intern.h" // own include + +/* ******************** default callbacks for image space ***************** */ + +static SpaceLink *image_new(void) +{ + ARegion *ar; + SpaceImage *simage; + + simage= MEM_callocN(sizeof(SpaceImage), "initimage"); + simage->spacetype= SPACE_IMAGE; + simage->zoom= 1; + + simage->iuser.ok= 1; + simage->iuser.fie_ima= 2; + simage->iuser.frames= 100; + + + /* header */ + ar= MEM_callocN(sizeof(ARegion), "header for image"); + + BLI_addtail(&simage->regionbase, ar); + ar->regiontype= RGN_TYPE_HEADER; + ar->alignment= RGN_ALIGN_BOTTOM; + UI_view2d_header_default(&ar->v2d); + + /* main area */ + ar= MEM_callocN(sizeof(ARegion), "main area for image"); + + BLI_addtail(&simage->regionbase, ar); + ar->regiontype= RGN_TYPE_WINDOW; + + ar->v2d.tot.xmin= 0.0f; + ar->v2d.tot.ymin= -10.0f; + ar->v2d.tot.xmax= 250.0; + ar->v2d.tot.ymax= 10.0f; + + ar->v2d.cur= ar->v2d.tot; + + ar->v2d.min[0]= 0.01f; + ar->v2d.min[1]= 0.01f; + + ar->v2d.max[0]= MAXFRAMEF; + ar->v2d.max[1]= 10000.0f; + + ar->v2d.scroll= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); + ar->v2d.scroll |= (V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_LEFT); + + ar->v2d.keeptot= 0; + + /* channel list region XXX */ + + + return (SpaceLink *)simage; +} + +/* not spacelink itself */ +static void image_free(SpaceLink *sl) +{ + SpaceImage *simage= (SpaceImage*) sl; + + if(simage->cumap) + curvemapping_free(simage->cumap); +// if(simage->gpd) +// XXX free_gpencil_data(simage->gpd); + +} + + +/* spacetype; init callback */ +static void image_init(struct wmWindowManager *wm, ScrArea *sa) +{ + +} + +static SpaceLink *image_duplicate(SpaceLink *sl) +{ + SpaceImage *simagen= MEM_dupallocN(sl); + + /* clear or remove stuff from old */ + + return (SpaceLink *)simagen; +} + + + +/* add handlers, stuff you only do once or on area/region changes */ +static void image_main_area_init(wmWindowManager *wm, ARegion *ar) +{ + ListBase *keymap; + + UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy); + + /* own keymap */ + keymap= WM_keymap_listbase(wm, "Image", SPACE_IMAGE, 0); /* XXX weak? */ + WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); +} + +static void image_main_area_draw(const bContext *C, ARegion *ar) +{ + /* draw entirely, view changes should be handled here */ + // SpaceImage *simage= C->area->spacedata.first; + View2D *v2d= &ar->v2d; + float col[3]; + + /* clear and setup matrix */ + UI_GetThemeColor3fv(TH_BACK, col); + glClearColor(col[0], col[1], col[2], 0.0); + glClear(GL_COLOR_BUFFER_BIT); + + UI_view2d_view_ortho(C, v2d); + + /* data... */ + + + /* reset view matrix */ + UI_view2d_view_restore(C); + + /* scrollers? */ +} + +void image_operatortypes(void) +{ + +} + +void image_keymap(struct wmWindowManager *wm) +{ + +} + +/* add handlers, stuff you only do once or on area/region changes */ +static void image_header_area_init(wmWindowManager *wm, ARegion *ar) +{ + UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy); +} + +static void image_header_area_draw(const bContext *C, ARegion *ar) +{ + float col[3]; + + /* clear */ + if(ED_screen_area_active(C)) + UI_GetThemeColor3fv(TH_HEADER, col); + else + UI_GetThemeColor3fv(TH_HEADERDESEL, col); + + glClearColor(col[0], col[1], col[2], 0.0); + glClear(GL_COLOR_BUFFER_BIT); + + /* set view2d view matrix for scrolling (without scrollers) */ + UI_view2d_view_ortho(C, &ar->v2d); + + image_header_buttons(C, ar); + + /* restore view matrix? */ + UI_view2d_view_restore(C); +} + +static void image_main_area_listener(ARegion *ar, wmNotifier *wmn) +{ + /* context changes */ +} + +/* only called once, from space/spacetypes.c */ +void ED_spacetype_image(void) +{ + SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype image"); + ARegionType *art; + + st->spaceid= SPACE_IMAGE; + + st->new= image_new; + st->free= image_free; + st->init= image_init; + st->duplicate= image_duplicate; + st->operatortypes= image_operatortypes; + st->keymap= image_keymap; + + /* regions: main window */ + art= MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_WINDOW; + art->init= image_main_area_init; + art->draw= image_main_area_draw; + art->listener= image_main_area_listener; + art->keymapflag= ED_KEYMAP_VIEW2D; + + BLI_addhead(&st->regiontypes, art); + + /* regions: header */ + art= MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_HEADER; + art->minsizey= HEADERY; + art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D; + + art->init= image_header_area_init; + art->draw= image_header_area_draw; + + BLI_addhead(&st->regiontypes, art); + + /* regions: channels */ + art= MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_CHANNELS; + art->minsizex= 80; + art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D; + +// art->init= image_channel_area_init; +// art->draw= image_channel_area_draw; + + BLI_addhead(&st->regiontypes, art); + + + BKE_spacetype_register(st); +} + |