Merge with -r 22620:23107.
[blender.git] / source / blender / editors / space_graph / space_graph.c
index 11922a2b3836f113efacf717b745c139777fe625..8887d464f3003c4a54ebe247015ea6e9b03e5d89 100644 (file)
@@ -42,6 +42,7 @@
 #include "BLI_rand.h"
 
 #include "BKE_context.h"
+#include "BKE_fcurve.h"
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
@@ -67,23 +68,25 @@ ARegion *graph_has_buttons_region(ScrArea *sa)
 {
        ARegion *ar, *arnew;
        
-       for(ar= sa->regionbase.first; ar; ar= ar->next)
-               if(ar->regiontype==RGN_TYPE_UI)
+       for (ar= sa->regionbase.first; ar; ar= ar->next) {
+               if (ar->regiontype==RGN_TYPE_UI)
                        return ar;
+       }
        
-       /* add subdiv level; after channel */
-       for(ar= sa->regionbase.first; ar; ar= ar->next)
-               if(ar->regiontype==RGN_TYPE_CHANNELS)
+       /* add subdiv level; after main */
+       for (ar= sa->regionbase.first; ar; ar= ar->next) {
+               if (ar->regiontype==RGN_TYPE_WINDOW)
                        break;
+       }
        
        /* is error! */
-       if(ar==NULL) return NULL;
+       if (ar==NULL) return NULL;
        
-       arnew= MEM_callocN(sizeof(ARegion), "buttons for view3d");
+       arnew= MEM_callocN(sizeof(ARegion), "buttons for graph");
        
        BLI_insertlinkafter(&sa->regionbase, ar, arnew);
        arnew->regiontype= RGN_TYPE_UI;
-       arnew->alignment= RGN_ALIGN_TOP|RGN_SPLIT_PREV;
+       arnew->alignment= RGN_ALIGN_RIGHT;
        
        arnew->flag = RGN_FLAG_HIDDEN;
        
@@ -116,7 +119,7 @@ static SpaceLink *graph_new(const bContext *C)
        ar->alignment= RGN_ALIGN_BOTTOM;
        
        /* channels */
-       ar= MEM_callocN(sizeof(ARegion), "main area for graphedit");
+       ar= MEM_callocN(sizeof(ARegion), "channels area for graphedit");
        
        BLI_addtail(&sipo->regionbase, ar);
        ar->regiontype= RGN_TYPE_CHANNELS;
@@ -125,11 +128,11 @@ static SpaceLink *graph_new(const bContext *C)
        ar->v2d.scroll = (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
        
        /* ui buttons */
-       ar= MEM_callocN(sizeof(ARegion), "main area for graphedit");
+       ar= MEM_callocN(sizeof(ARegion), "buttons area for graphedit");
        
        BLI_addtail(&sipo->regionbase, ar);
        ar->regiontype= RGN_TYPE_UI;
-       ar->alignment= RGN_ALIGN_TOP|RGN_SPLIT_PREV;
+       ar->alignment= RGN_ALIGN_RIGHT;
        ar->flag = RGN_FLAG_HIDDEN;
        
        /* main area */
@@ -168,6 +171,9 @@ static void graph_free(SpaceLink *sl)
                BLI_freelistN(&si->ads->chanbase);
                MEM_freeN(si->ads);
        }
+       
+       if (si->ghostCurves.first)
+               free_fcurves(&si->ghostCurves);
 }
 
 
@@ -188,7 +194,7 @@ static SpaceLink *graph_duplicate(SpaceLink *sl)
        SpaceIpo *sipon= MEM_dupallocN(sl);
        
        /* clear or remove stuff from old */
-       //sipon->ipokey.first= sipon->ipokey.last= NULL;
+       BLI_duplicatelist(&sipon->ghostCurves, &((SpaceIpo *)sl)->ghostCurves);
        sipon->ads= MEM_dupallocN(sipon->ads);
        
        return (SpaceLink *)sipon;
@@ -211,7 +217,7 @@ static void graph_main_area_init(wmWindowManager *wm, ARegion *ar)
 static void graph_main_area_draw(const bContext *C, ARegion *ar)
 {
        /* draw entirely, view changes should be handled here */
-       SpaceIpo *sipo= (SpaceIpo*)CTX_wm_space_data(C);
+       SpaceIpo *sipo= CTX_wm_space_graph(C);
        bAnimContext ac;
        View2D *v2d= &ar->v2d;
        View2DGrid *grid;
@@ -227,16 +233,29 @@ static void graph_main_area_draw(const bContext *C, ARegion *ar)
        UI_view2d_view_ortho(C, v2d);
        
        /* grid */
-       unitx= (sipo->flag & SIPO_DRAWTIME)? V2D_UNIT_SECONDS : V2D_UNIT_FRAMES;
+       unitx= (sipo->flag & SIPO_DRAWTIME)? V2D_UNIT_SECONDS : V2D_UNIT_FRAMESCALE;
        grid= UI_view2d_grid_calc(C, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP, ar->winx, ar->winy);
        UI_view2d_grid_draw(C, v2d, grid, V2D_GRIDLINES_ALL);
-       UI_view2d_grid_free(grid);
        
        /* draw data */
        if (ANIM_animdata_get_context(C, &ac)) {
-               graph_draw_curves(&ac, sipo, ar);
+               /* draw ghost curves */
+               graph_draw_ghost_curves(&ac, sipo, ar, grid);
+               
+               /* draw curves twice - unselected, then selected, so that the are fewer occlusion problems */
+               graph_draw_curves(&ac, sipo, ar, grid, 0);
+               graph_draw_curves(&ac, sipo, ar, grid, 1);
+               
+               /* XXX the slow way to set tot rect... but for nice sliders needed (ton) */
+               get_graph_keyframe_extents(&ac, &v2d->tot.xmin, &v2d->tot.xmax, &v2d->tot.ymin, &v2d->tot.ymax);
+               /* extra offset so that these items are visible */
+               v2d->tot.xmin -= 10.0f;
+               v2d->tot.xmax += 10.0f;
        }
        
+       /* only free grid after drawing data, as we need to use it to determine sampling rate */
+       UI_view2d_grid_free(grid);
+       
        /* current frame */
        if (sipo->flag & SIPO_DRAWTIME)         flag |= DRAWCFRA_UNIT_SECONDS;
        if ((sipo->flag & SIPO_NODRAWCFRANUM)==0)  flag |= DRAWCFRA_SHOW_NUMBOX;
@@ -275,14 +294,14 @@ static void graph_channel_area_init(wmWindowManager *wm, ARegion *ar)
 
 static void graph_channel_area_draw(const bContext *C, ARegion *ar)
 {
-       SpaceIpo *sipo= (SpaceIpo *)CTX_wm_space_data(C);
+       SpaceIpo *sipo= CTX_wm_space_graph(C);
        bAnimContext ac;
        View2D *v2d= &ar->v2d;
        View2DScrollers *scrollers;
        float col[3];
        
        /* clear and setup matrix */
-       UI_GetThemeColor3fv(TH_SHADE2, col);
+       UI_GetThemeColor3fv(TH_BACK, col);
        glClearColor(col[0], col[1], col[2], 0.0);
        glClear(GL_COLOR_BUFFER_BIT);
        
@@ -290,7 +309,7 @@ static void graph_channel_area_draw(const bContext *C, ARegion *ar)
        
        /* draw channels */
        if (ANIM_animdata_get_context(C, &ac)) {
-               graph_draw_channel_names(&ac, sipo, ar);
+               graph_draw_channel_names((bContext*)C, &ac, sipo, ar);
        }
        
        /* reset view matrix */
@@ -335,7 +354,7 @@ static void graph_buttons_area_init(wmWindowManager *wm, ARegion *ar)
 {
        ListBase *keymap;
        
-       UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST_UI, ar->winx, ar->winy);
+       ED_region_panels_init(wm, ar);
 
        keymap= WM_keymap_listbase(wm, "GraphEdit Generic", SPACE_IPO, 0);
        WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
@@ -343,28 +362,16 @@ static void graph_buttons_area_init(wmWindowManager *wm, ARegion *ar)
 
 static void graph_buttons_area_draw(const bContext *C, ARegion *ar)
 {
-       float col[3];
-       
-       /* clear */
-       UI_GetThemeColor3fv(TH_HEADER, 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);
-       
-       graph_region_buttons(C, ar);
-       
-       /* restore view matrix? */
-       UI_view2d_view_restore(C);
+       ED_region_panels(C, ar, 1, NULL, -1);
 }
 
-
 static void graph_region_listener(ARegion *ar, wmNotifier *wmn)
 {
        /* context changes */
        switch(wmn->category) {
+               case NC_ANIMATION:
+                       ED_region_tag_redraw(ar);
+                       break;
                case NC_SCENE:
                        switch(wmn->data) {
                                case ND_OB_ACTIVE:
@@ -395,6 +402,9 @@ static void graph_listener(ScrArea *sa, wmNotifier *wmn)
 {
        /* context changes */
        switch (wmn->category) {
+               case NC_ANIMATION:
+                       ED_area_tag_refresh(sa);
+                       break;
                case NC_SCENE:
                        /*switch (wmn->data) {
                                case ND_OB_ACTIVE:
@@ -413,6 +423,10 @@ static void graph_listener(ScrArea *sa, wmNotifier *wmn)
                        }*/
                        ED_area_tag_refresh(sa);
                        break;
+               case NC_SPACE:
+                       if(wmn->data == ND_SPACE_GRAPH)
+                               ED_area_tag_redraw(sa);
+                       break;
                default:
                        if(wmn->data==ND_KEYS)
                                ED_area_tag_refresh(sa);
@@ -566,13 +580,15 @@ void ED_spacetype_ipo(void)
        /* regions: UI buttons */
        art= MEM_callocN(sizeof(ARegionType), "spacetype graphedit region");
        art->regionid = RGN_TYPE_UI;
-       art->minsizey= 160;
-       art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES;
-       art->listener= NULL; // graph_region_listener;
+       art->minsizex= 200;
+       art->keymapflag= ED_KEYMAP_UI;
+       art->listener= graph_region_listener;
        art->init= graph_buttons_area_init;
        art->draw= graph_buttons_area_draw;
        
        BLI_addhead(&st->regiontypes, art);
+
+       graph_buttons_register(art);
        
        BKE_spacetype_register(st);
 }