archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5 - Assorted tweaks for anim editors before porting AnimSys2 stuff over to this branch

Browse Source
This commit is contained in:
Joshua Leung
2008-12-18 23:23:09 +00:00
parent 54cc5c493d
commit 1dcbafa4e4
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/readfile.c
View File

@@ -5086,14 +5086,14 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
BLI_addtail(lb, ar);
ar->regiontype= RGN_TYPE_CHANNELS;
ar->alignment= RGN_ALIGN_LEFT;
ar->v2d.scroll= (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
ar->v2d.scroll= V2D_SCROLL_BOTTOM;
break;
case SPACE_NLA:
ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
BLI_addtail(lb, ar);
ar->regiontype= RGN_TYPE_CHANNELS;
ar->alignment= RGN_ALIGN_LEFT;
ar->v2d.scroll= (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
ar->v2d.scroll= V2D_SCROLL_BOTTOM;
break;
}
}
@@ -5163,6 +5163,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
ar->v2d.scroll |= (V2D_SCROLL_RIGHT);
ar->v2d.align = V2D_ALIGN_NO_POS_Y;
//ar->v2d.flag |= V2D_IS_INITIALISED;
break;
}
@@ -5173,6 +5174,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
ar->v2d.scroll |= (V2D_SCROLL_RIGHT);
ar->v2d.align = V2D_ALIGN_NO_POS_Y;
//ar->v2d.flag |= V2D_IS_INITIALISED;
break;
}

4
source/blender/editors/space_action/space_action.c
View File

@@ -87,7 +87,7 @@ static SpaceLink *action_new(void)
ar->alignment= RGN_ALIGN_LEFT;
/* only need to set scroll settings, as this will use 'listview' v2d configuration */
ar->v2d.scroll = (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
ar->v2d.scroll = V2D_SCROLL_BOTTOM;
ar->v2d.flag = V2D_VIEWSYNC_Y;
/* main area */
@@ -104,7 +104,7 @@ static SpaceLink *action_new(void)
ar->v2d.cur.xmin= -2.0f;
ar->v2d.cur.ymin= -200.0f;
ar->v2d.cur.xmax= 100.0f;
ar->v2d.cur.ymax= 0.0f;
ar->v2d.cur.ymax= -20.0f;
ar->v2d.min[0]= 0.0f;
ar->v2d.min[1]= 0.0f;

23
source/blender/editors/space_ipo/space_ipo.c
View File

@@ -85,6 +85,8 @@ static SpaceLink *ipo_new(void)
ar->regiontype= RGN_TYPE_CHANNELS;
ar->alignment= RGN_ALIGN_LEFT;
ar->v2d.scroll = (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
/* XXX view2d init for channels */
/* main area */
@@ -251,8 +253,16 @@ void ipo_keymap(struct wmWindowManager *wm)
{
}
static void ipo_channel_area_init(wmWindowManager *wm, ARegion *ar)
{
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy);
}
static void ipo_channel_area_draw(const bContext *C, ARegion *ar)
{
//SpaceIpo *sipo= C->area->spacedata.first;
View2D *v2d= &ar->v2d;
View2DScrollers *scrollers;
float col[3];
/* clear and setup matrix */
@@ -260,6 +270,17 @@ static void ipo_channel_area_draw(const bContext *C, ARegion *ar)
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 */
scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
UI_view2d_scrollers_draw(C, v2d, scrollers);
UI_view2d_scrollers_free(scrollers);
}
/* add handlers, stuff you only do once or on area/region changes */
@@ -343,7 +364,7 @@ void ED_spacetype_ipo(void)
art->minsizex= 200;
art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
// art->init= ipo_channel_area_init;
art->init= ipo_channel_area_init;
art->draw= ipo_channel_area_draw;
BLI_addhead(&st->regiontypes, art);