2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2008-12-12 18:47:12 +00:00
|
|
|
* ***** 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2008-12-12 18:47:12 +00:00
|
|
|
*
|
|
|
|
|
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
|
*
|
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
|
*/
|
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/space_graph/space_graph.c
|
|
|
|
|
* \ingroup spgraph
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
#include "DNA_anim_types.h"
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
#include "DNA_group_types.h"
|
2008-12-12 18:47:12 +00:00
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
2009-11-10 20:43:45 +00:00
|
|
|
#include "BLI_math.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
#include "BKE_context.h"
|
Graph Editor: Visibility toggles improved (Durian Request)
Toggling one of the visibility toggles in the Graph Editor now flushes the new value up/down the hierarchy.
- when enabling a visibility toggle, all the 'higher' up and lower down channels get their visibility turned on
- when disabling a visibility toggle, only the ones lower down get their visibility turned off (since there might still be other channels at the same level which are still enabled.
This makes showing/hiding groups of F-Curves much easier, since previously you'd have to use multiple clicks to isolate particular F-Curves. For example, to isolate only X Location curves, previously, the workflow would have been to select all AKEY, hide all VKEY, then toggle the individual X Location curves in group, then make sure the groups and objects, etc. were also visible. Now, the steps of making sure that the parents were visible too has been eliminated.
---
Also, fixed a few minor bugs with the animation-backend code for Graph Editor.
2009-10-19 02:17:57 +00:00
|
|
|
#include "BKE_global.h"
|
|
|
|
|
#include "BKE_main.h"
|
2009-04-08 01:07:46 +00:00
|
|
|
#include "BKE_fcurve.h"
|
2008-12-12 18:47:12 +00:00
|
|
|
#include "BKE_screen.h"
|
|
|
|
|
|
2011-02-14 17:55:27 +00:00
|
|
|
#include "ED_space_api.h"
|
2008-12-12 18:47:12 +00:00
|
|
|
#include "ED_screen.h"
|
2008-12-21 03:14:01 +00:00
|
|
|
#include "ED_anim_api.h"
|
|
|
|
|
#include "ED_markers.h"
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2017-02-01 23:00:39 -02:00
|
|
|
#include "GPU_immediate.h"
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
#include "WM_api.h"
|
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
|
|
|
|
#include "UI_resources.h"
|
|
|
|
|
#include "UI_view2d.h"
|
|
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
#include "graph_intern.h" // own include
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* ******************** manage regions ********************* */
|
|
|
|
|
|
|
|
|
|
ARegion *graph_has_buttons_region(ScrArea *sa)
|
|
|
|
|
{
|
|
|
|
|
ARegion *ar, *arnew;
|
|
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar = BKE_area_find_region_type(sa, RGN_TYPE_UI);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ar) return ar;
|
2011-05-20 05:27:31 +00:00
|
|
|
|
2009-08-02 06:10:24 +00:00
|
|
|
/* add subdiv level; after main */
|
2012-05-08 20:18:33 +00:00
|
|
|
ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
|
2011-05-20 05:27:31 +00:00
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* is error! */
|
2012-05-08 20:18:33 +00:00
|
|
|
if (ar == NULL) return NULL;
|
2009-02-20 19:11:35 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
arnew = MEM_callocN(sizeof(ARegion), "buttons for graph");
|
2009-02-20 19:11:35 +00:00
|
|
|
|
|
|
|
|
BLI_insertlinkafter(&sa->regionbase, ar, arnew);
|
2012-05-08 20:18:33 +00:00
|
|
|
arnew->regiontype = RGN_TYPE_UI;
|
|
|
|
|
arnew->alignment = RGN_ALIGN_RIGHT;
|
2009-02-20 19:11:35 +00:00
|
|
|
|
|
|
|
|
arnew->flag = RGN_FLAG_HIDDEN;
|
|
|
|
|
|
|
|
|
|
return arnew;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* ******************** default callbacks for ipo space ***************** */
|
|
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
static SpaceLink *graph_new(const bContext *C)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2012-05-08 20:18:33 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2008-12-12 18:47:12 +00:00
|
|
|
ARegion *ar;
|
|
|
|
|
SpaceIpo *sipo;
|
|
|
|
|
|
2009-02-09 04:39:25 +00:00
|
|
|
/* Graph Editor - general stuff */
|
2012-05-08 20:18:33 +00:00
|
|
|
sipo = MEM_callocN(sizeof(SpaceIpo), "init graphedit");
|
|
|
|
|
sipo->spacetype = SPACE_IPO;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
sipo->autosnap = SACTSNAP_FRAME;
|
2009-02-09 04:39:25 +00:00
|
|
|
|
2013-05-09 10:03:38 +00:00
|
|
|
/* allocate DopeSheet data for Graph Editor */
|
2012-05-08 20:18:33 +00:00
|
|
|
sipo->ads = MEM_callocN(sizeof(bDopeSheet), "GraphEdit DopeSheet");
|
|
|
|
|
sipo->ads->source = (ID *)scene;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2011-10-23 15:43:12 +00:00
|
|
|
/* settings for making it easier by default to just see what you're interested in tweaking */
|
2011-08-04 14:06:30 +00:00
|
|
|
sipo->ads->filterflag |= ADS_FILTER_ONLYSEL;
|
|
|
|
|
sipo->flag |= SIPO_SELVHANDLESONLY;
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* header */
|
2012-05-08 20:18:33 +00:00
|
|
|
ar = MEM_callocN(sizeof(ARegion), "header for graphedit");
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BLI_addtail(&sipo->regionbase, ar);
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->regiontype = RGN_TYPE_HEADER;
|
|
|
|
|
ar->alignment = RGN_ALIGN_BOTTOM;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
/* channels */
|
2015-11-28 17:14:45 +01:00
|
|
|
ar = MEM_callocN(sizeof(ARegion), "channels region for graphedit");
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BLI_addtail(&sipo->regionbase, ar);
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->regiontype = RGN_TYPE_CHANNELS;
|
|
|
|
|
ar->alignment = RGN_ALIGN_LEFT;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
|
2008-12-18 23:23:09 +00:00
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* ui buttons */
|
2015-11-28 17:14:45 +01:00
|
|
|
ar = MEM_callocN(sizeof(ARegion), "buttons region for graphedit");
|
2009-02-20 19:11:35 +00:00
|
|
|
|
|
|
|
|
BLI_addtail(&sipo->regionbase, ar);
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->regiontype = RGN_TYPE_UI;
|
|
|
|
|
ar->alignment = RGN_ALIGN_RIGHT;
|
2009-02-20 19:11:35 +00:00
|
|
|
ar->flag = RGN_FLAG_HIDDEN;
|
|
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
/* main region */
|
|
|
|
|
ar = MEM_callocN(sizeof(ARegion), "main region for graphedit");
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BLI_addtail(&sipo->regionbase, ar);
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->regiontype = RGN_TYPE_WINDOW;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-03-24 02:51:46 +00:00
|
|
|
ar->v2d.tot.xmin = 0.0f;
|
|
|
|
|
ar->v2d.tot.ymin = (float)scene->r.sfra - 10.0f;
|
|
|
|
|
ar->v2d.tot.xmax = (float)scene->r.efra;
|
|
|
|
|
ar->v2d.tot.ymax = 10.0f;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->v2d.cur = ar->v2d.tot;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->v2d.min[0] = FLT_MIN;
|
|
|
|
|
ar->v2d.min[1] = FLT_MIN;
|
2010-01-25 11:06:55 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->v2d.max[0] = MAXFRAMEF;
|
|
|
|
|
ar->v2d.max[1] = FLT_MAX;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->v2d.scroll = (V2D_SCROLL_BOTTOM | V2D_SCROLL_SCALE_HORIZONTAL);
|
|
|
|
|
ar->v2d.scroll |= (V2D_SCROLL_LEFT | V2D_SCROLL_SCALE_VERTICAL);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
ar->v2d.keeptot = 0;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
return (SpaceLink *)sipo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* not spacelink itself */
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
static void graph_free(SpaceLink *sl)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2012-05-08 20:18:33 +00:00
|
|
|
SpaceIpo *si = (SpaceIpo *)sl;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
if (si->ads) {
|
|
|
|
|
BLI_freelistN(&si->ads->chanbase);
|
|
|
|
|
MEM_freeN(si->ads);
|
|
|
|
|
}
|
2009-04-08 01:07:46 +00:00
|
|
|
|
|
|
|
|
if (si->ghostCurves.first)
|
|
|
|
|
free_fcurves(&si->ghostCurves);
|
2008-12-12 18:47:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* spacetype; init callback */
|
2010-10-16 08:03:28 +00:00
|
|
|
static void graph_init(struct wmWindowManager *UNUSED(wm), ScrArea *sa)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2012-05-08 20:18:33 +00:00
|
|
|
SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
|
2014-11-03 23:26:43 +01:00
|
|
|
/* init dopesheet data if non-existent (i.e. for old files) */
|
Graph Editor: Visibility toggles improved (Durian Request)
Toggling one of the visibility toggles in the Graph Editor now flushes the new value up/down the hierarchy.
- when enabling a visibility toggle, all the 'higher' up and lower down channels get their visibility turned on
- when disabling a visibility toggle, only the ones lower down get their visibility turned off (since there might still be other channels at the same level which are still enabled.
This makes showing/hiding groups of F-Curves much easier, since previously you'd have to use multiple clicks to isolate particular F-Curves. For example, to isolate only X Location curves, previously, the workflow would have been to select all AKEY, hide all VKEY, then toggle the individual X Location curves in group, then make sure the groups and objects, etc. were also visible. Now, the steps of making sure that the parents were visible too has been eliminated.
---
Also, fixed a few minor bugs with the animation-backend code for Graph Editor.
2009-10-19 02:17:57 +00:00
|
|
|
if (sipo->ads == NULL) {
|
2012-05-08 20:18:33 +00:00
|
|
|
sipo->ads = MEM_callocN(sizeof(bDopeSheet), "GraphEdit DopeSheet");
|
|
|
|
|
sipo->ads->source = (ID *)(G.main->scene.first); // FIXME: this is a really nasty hack here for now...
|
Graph Editor: Visibility toggles improved (Durian Request)
Toggling one of the visibility toggles in the Graph Editor now flushes the new value up/down the hierarchy.
- when enabling a visibility toggle, all the 'higher' up and lower down channels get their visibility turned on
- when disabling a visibility toggle, only the ones lower down get their visibility turned off (since there might still be other channels at the same level which are still enabled.
This makes showing/hiding groups of F-Curves much easier, since previously you'd have to use multiple clicks to isolate particular F-Curves. For example, to isolate only X Location curves, previously, the workflow would have been to select all AKEY, hide all VKEY, then toggle the individual X Location curves in group, then make sure the groups and objects, etc. were also visible. Now, the steps of making sure that the parents were visible too has been eliminated.
---
Also, fixed a few minor bugs with the animation-backend code for Graph Editor.
2009-10-19 02:17:57 +00:00
|
|
|
}
|
2011-07-26 13:49:39 +00:00
|
|
|
|
2012-07-03 13:47:13 +00:00
|
|
|
/* force immediate init of any invalid F-Curve colors */
|
2013-07-01 14:14:21 +00:00
|
|
|
/* XXX: but, don't do SIPO_TEMP_NEEDCHANSYNC (i.e. channel select state sync)
|
|
|
|
|
* as this is run on each region resize; setting this here will cause selection
|
|
|
|
|
* state to be lost on area/region resizing. [#35744]
|
|
|
|
|
*/
|
2009-02-15 11:41:22 +00:00
|
|
|
ED_area_tag_refresh(sa);
|
2008-12-12 18:47:12 +00:00
|
|
|
}
|
|
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
static SpaceLink *graph_duplicate(SpaceLink *sl)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2012-05-08 20:18:33 +00:00
|
|
|
SpaceIpo *sipon = MEM_dupallocN(sl);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
/* clear or remove stuff from old */
|
2009-05-29 12:26:47 +00:00
|
|
|
BLI_duplicatelist(&sipon->ghostCurves, &((SpaceIpo *)sl)->ghostCurves);
|
2012-05-08 20:18:33 +00:00
|
|
|
sipon->ads = MEM_dupallocN(sipon->ads);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
return (SpaceLink *)sipon;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* add handlers, stuff you only do once or on area/region changes */
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_main_region_init(wmWindowManager *wm, ARegion *ar)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2009-09-17 21:36:02 +00:00
|
|
|
wmKeyMap *keymap;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2008-12-17 10:25:02 +00:00
|
|
|
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
/* own keymap */
|
2012-03-24 02:51:46 +00:00
|
|
|
keymap = WM_keymap_find(wm->defaultconf, "Graph Editor", SPACE_IPO, 0);
|
2008-12-12 18:47:12 +00:00
|
|
|
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
|
2012-03-24 02:51:46 +00:00
|
|
|
keymap = WM_keymap_find(wm->defaultconf, "Graph Editor Generic", SPACE_IPO, 0);
|
2009-02-20 19:11:35 +00:00
|
|
|
WM_event_add_keymap_handler(&ar->handlers, keymap);
|
2008-12-12 18:47:12 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_main_region_draw(const bContext *C, ARegion *ar)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
|
|
|
|
/* draw entirely, view changes should be handled here */
|
2012-05-08 20:18:33 +00:00
|
|
|
SpaceIpo *sipo = CTX_wm_space_graph(C);
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
bAnimContext ac;
|
2012-05-08 20:18:33 +00:00
|
|
|
View2D *v2d = &ar->v2d;
|
2008-12-12 18:47:12 +00:00
|
|
|
View2DGrid *grid;
|
|
|
|
|
View2DScrollers *scrollers;
|
|
|
|
|
float col[3];
|
2012-05-08 20:18:33 +00:00
|
|
|
short unitx = 0, unity = V2D_UNIT_VALUES, flag = 0;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
/* clear and setup matrix */
|
|
|
|
|
UI_GetThemeColor3fv(TH_BACK, col);
|
|
|
|
|
glClearColor(col[0], col[1], col[2], 0.0);
|
|
|
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
UI_view2d_view_ortho(v2d);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
/* grid */
|
2015-10-10 18:14:11 +13:00
|
|
|
unitx = ((sipo->mode == SIPO_MODE_ANIMATION) && (sipo->flag & SIPO_DRAWTIME)) ? V2D_UNIT_SECONDS : V2D_UNIT_FRAMESCALE;
|
2012-05-08 20:18:33 +00:00
|
|
|
grid = UI_view2d_grid_calc(CTX_data_scene(C), v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP, ar->winx, ar->winy);
|
2010-10-14 01:22:14 +00:00
|
|
|
UI_view2d_grid_draw(v2d, grid, V2D_GRIDLINES_ALL);
|
2008-12-12 23:25:54 +00:00
|
|
|
|
2013-04-10 16:59:55 +00:00
|
|
|
ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
|
|
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
/* draw data */
|
2009-04-08 01:07:46 +00:00
|
|
|
if (ANIM_animdata_get_context(C, &ac)) {
|
|
|
|
|
/* draw ghost curves */
|
2010-10-16 08:03:28 +00:00
|
|
|
graph_draw_ghost_curves(&ac, sipo, ar);
|
2009-04-08 01:07:46 +00:00
|
|
|
|
|
|
|
|
/* 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);
|
2009-07-02 18:12:46 +00:00
|
|
|
|
|
|
|
|
/* XXX the slow way to set tot rect... but for nice sliders needed (ton) */
|
2014-04-01 11:34:00 +11:00
|
|
|
get_graph_keyframe_extents(&ac, &v2d->tot.xmin, &v2d->tot.xmax, &v2d->tot.ymin, &v2d->tot.ymax, false, true);
|
2009-07-12 07:28:25 +00:00
|
|
|
/* extra offset so that these items are visible */
|
|
|
|
|
v2d->tot.xmin -= 10.0f;
|
|
|
|
|
v2d->tot.xmax += 10.0f;
|
2009-04-08 01:07:46 +00:00
|
|
|
}
|
2009-03-15 10:39:02 +00:00
|
|
|
|
|
|
|
|
/* only free grid after drawing data, as we need to use it to determine sampling rate */
|
|
|
|
|
UI_view2d_grid_free(grid);
|
2016-01-22 02:44:33 -05:00
|
|
|
|
2017-02-01 23:00:39 -02:00
|
|
|
if (((sipo->flag & SIPO_NODRAWCURSOR) == 0) || (sipo->mode == SIPO_MODE_DRIVERS)) {
|
2017-06-19 20:18:04 +10:00
|
|
|
unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
|
2016-01-22 02:44:33 -05:00
|
|
|
|
2017-02-02 23:17:22 -02:00
|
|
|
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
2015-11-23 21:55:35 +11:00
|
|
|
|
2017-02-01 23:00:39 -02:00
|
|
|
/* horizontal component of value-cursor (value line before the current frame line) */
|
|
|
|
|
if ((sipo->flag & SIPO_NODRAWCURSOR) == 0) {
|
|
|
|
|
|
|
|
|
|
float y = sipo->cursorVal;
|
|
|
|
|
|
|
|
|
|
/* Draw a green line to indicate the cursor value */
|
|
|
|
|
immUniformThemeColorShadeAlpha(TH_CFRAME, -10, -50);
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
glLineWidth(2.0);
|
2015-11-23 21:55:35 +11:00
|
|
|
|
2017-06-19 20:18:04 +10:00
|
|
|
immBegin(GWN_PRIM_LINES, 2);
|
2017-02-01 23:00:39 -02:00
|
|
|
immVertex2f(pos, v2d->cur.xmin, y);
|
|
|
|
|
immVertex2f(pos, v2d->cur.xmax, y);
|
|
|
|
|
immEnd();
|
|
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* current frame or vertical component of vertical component of the cursor */
|
|
|
|
|
if (sipo->mode == SIPO_MODE_DRIVERS) {
|
|
|
|
|
/* cursor x-value */
|
|
|
|
|
float x = sipo->cursorTime;
|
|
|
|
|
|
|
|
|
|
/* to help differentiate this from the current frame, draw slightly darker like the horizontal one */
|
|
|
|
|
immUniformThemeColorShadeAlpha(TH_CFRAME, -40, -50);
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
glLineWidth(2.0);
|
|
|
|
|
|
2017-06-19 20:18:04 +10:00
|
|
|
immBegin(GWN_PRIM_LINES, 2);
|
2017-02-01 23:00:39 -02:00
|
|
|
immVertex2f(pos, x, v2d->cur.ymin);
|
|
|
|
|
immVertex2f(pos, x, v2d->cur.ymax);
|
|
|
|
|
immEnd();
|
|
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
immUnbindProgram();
|
2015-10-10 18:26:09 +13:00
|
|
|
}
|
2017-02-01 23:00:39 -02:00
|
|
|
|
|
|
|
|
if (sipo->mode != SIPO_MODE_DRIVERS) {
|
2015-10-10 18:26:09 +13:00
|
|
|
/* current frame */
|
|
|
|
|
if (sipo->flag & SIPO_DRAWTIME) flag |= DRAWCFRA_UNIT_SECONDS;
|
|
|
|
|
if ((sipo->flag & SIPO_NODRAWCFRANUM) == 0) flag |= DRAWCFRA_SHOW_NUMBOX;
|
|
|
|
|
ANIM_draw_cfra(C, v2d, flag);
|
|
|
|
|
}
|
2008-12-12 23:25:54 +00:00
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* markers */
|
2010-10-14 01:22:14 +00:00
|
|
|
UI_view2d_view_orthoSpecial(ar, v2d, 1);
|
2014-10-28 19:03:13 +01:00
|
|
|
ED_markers_draw(C, DRAW_MARKERS_MARGIN);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2008-12-21 03:14:01 +00:00
|
|
|
/* preview range */
|
2010-10-14 01:22:14 +00:00
|
|
|
UI_view2d_view_ortho(v2d);
|
2013-05-18 10:24:38 +00:00
|
|
|
ANIM_draw_previewrange(C, v2d, 0);
|
2008-12-21 03:14:01 +00:00
|
|
|
|
2013-04-10 16:59:55 +00:00
|
|
|
/* callback */
|
|
|
|
|
UI_view2d_view_ortho(v2d);
|
|
|
|
|
ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* reset view matrix */
|
|
|
|
|
UI_view2d_view_restore(C);
|
|
|
|
|
|
|
|
|
|
/* scrollers */
|
2012-05-08 20:18:33 +00:00
|
|
|
// FIXME: args for scrollers depend on the type of data being shown...
|
|
|
|
|
scrollers = UI_view2d_scrollers_calc(C, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP);
|
2008-12-12 18:47:12 +00:00
|
|
|
UI_view2d_scrollers_draw(C, v2d, scrollers);
|
|
|
|
|
UI_view2d_scrollers_free(scrollers);
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_channel_region_init(wmWindowManager *wm, ARegion *ar)
|
2008-12-18 23:23:09 +00:00
|
|
|
{
|
2009-09-17 21:36:02 +00:00
|
|
|
wmKeyMap *keymap;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
|
2012-12-26 13:05:39 +00:00
|
|
|
/* make sure we keep the hide flags */
|
2016-09-16 16:38:57 +02:00
|
|
|
ar->v2d.scroll |= V2D_SCROLL_RIGHT;
|
|
|
|
|
ar->v2d.scroll &= ~(V2D_SCROLL_LEFT | V2D_SCROLL_TOP | V2D_SCROLL_BOTTOM); /* prevent any noise of past */
|
2012-12-26 13:05:39 +00:00
|
|
|
ar->v2d.scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
|
|
|
|
|
ar->v2d.scroll |= V2D_SCROLL_VERTICAL_HIDE;
|
|
|
|
|
|
2008-12-18 23:23:09 +00:00
|
|
|
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy);
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
|
|
|
|
|
/* own keymap */
|
2012-03-24 02:51:46 +00:00
|
|
|
keymap = WM_keymap_find(wm->defaultconf, "Animation Channels", 0, 0);
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
|
2012-03-24 02:51:46 +00:00
|
|
|
keymap = WM_keymap_find(wm->defaultconf, "Graph Editor Generic", SPACE_IPO, 0);
|
2009-02-20 19:11:35 +00:00
|
|
|
WM_event_add_keymap_handler(&ar->handlers, keymap);
|
2008-12-18 23:23:09 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_channel_region_draw(const bContext *C, ARegion *ar)
|
2008-12-13 19:08:44 +00:00
|
|
|
{
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
bAnimContext ac;
|
2012-05-08 20:18:33 +00:00
|
|
|
View2D *v2d = &ar->v2d;
|
2008-12-18 23:23:09 +00:00
|
|
|
View2DScrollers *scrollers;
|
2008-12-13 19:08:44 +00:00
|
|
|
float col[3];
|
|
|
|
|
|
|
|
|
|
/* clear and setup matrix */
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
UI_GetThemeColor3fv(TH_BACK, col);
|
2008-12-13 19:08:44 +00:00
|
|
|
glClearColor(col[0], col[1], col[2], 0.0);
|
|
|
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
UI_view2d_view_ortho(v2d);
|
2008-12-18 23:23:09 +00:00
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
/* draw channels */
|
|
|
|
|
if (ANIM_animdata_get_context(C, &ac)) {
|
2012-05-08 20:18:33 +00:00
|
|
|
graph_draw_channel_names((bContext *)C, &ac, ar);
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
2008-12-18 23:23:09 +00:00
|
|
|
|
|
|
|
|
/* reset view matrix */
|
|
|
|
|
UI_view2d_view_restore(C);
|
|
|
|
|
|
|
|
|
|
/* scrollers */
|
2012-05-08 20:18:33 +00:00
|
|
|
scrollers = UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
|
2008-12-18 23:23:09 +00:00
|
|
|
UI_view2d_scrollers_draw(C, v2d, scrollers);
|
|
|
|
|
UI_view2d_scrollers_free(scrollers);
|
2008-12-13 19:08:44 +00:00
|
|
|
}
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* add handlers, stuff you only do once or on area/region changes */
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2009-12-07 11:50:05 +00:00
|
|
|
ED_region_header_init(ar);
|
2008-12-12 18:47:12 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_header_region_draw(const bContext *C, ARegion *ar)
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
2009-12-07 11:50:05 +00:00
|
|
|
ED_region_header(C, ar);
|
2008-12-12 18:47:12 +00:00
|
|
|
}
|
|
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* add handlers, stuff you only do once or on area/region changes */
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_buttons_region_init(wmWindowManager *wm, ARegion *ar)
|
2009-02-20 19:11:35 +00:00
|
|
|
{
|
2009-09-17 21:36:02 +00:00
|
|
|
wmKeyMap *keymap;
|
2009-02-20 19:11:35 +00:00
|
|
|
|
2009-05-19 17:13:33 +00:00
|
|
|
ED_region_panels_init(wm, ar);
|
2009-02-20 19:11:35 +00:00
|
|
|
|
2012-03-24 02:51:46 +00:00
|
|
|
keymap = WM_keymap_find(wm->defaultconf, "Graph Editor Generic", SPACE_IPO, 0);
|
2009-02-20 19:11:35 +00:00
|
|
|
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-28 17:14:45 +01:00
|
|
|
static void graph_buttons_region_draw(const bContext *C, ARegion *ar)
|
2009-02-20 19:11:35 +00:00
|
|
|
{
|
2015-07-01 21:48:42 +02:00
|
|
|
ED_region_panels(C, ar, NULL, -1, true);
|
2009-02-20 19:11:35 +00:00
|
|
|
}
|
|
|
|
|
|
2017-05-02 09:58:01 +10:00
|
|
|
static void graph_region_listener(
|
|
|
|
|
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
|
|
|
|
|
wmNotifier *wmn, const Scene *UNUSED(scene))
|
2008-12-12 18:47:12 +00:00
|
|
|
{
|
|
|
|
|
/* context changes */
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->category) {
|
2009-07-10 10:48:25 +00:00
|
|
|
case NC_ANIMATION:
|
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
break;
|
2008-12-27 16:09:56 +00:00
|
|
|
case NC_SCENE:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
2009-09-19 12:36:22 +00:00
|
|
|
case ND_RENDER_OPTIONS:
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
case ND_OB_ACTIVE:
|
2008-12-27 16:09:56 +00:00
|
|
|
case ND_FRAME:
|
|
|
|
|
case ND_MARKERS:
|
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
break;
|
2010-06-18 04:39:32 +00:00
|
|
|
case ND_SEQUENCER:
|
|
|
|
|
if (wmn->action == NA_SELECTED)
|
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
break;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case NC_OBJECT:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->data) {
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
case ND_BONE_ACTIVE:
|
|
|
|
|
case ND_BONE_SELECT:
|
2009-01-28 18:26:47 +00:00
|
|
|
case ND_KEYS:
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
break;
|
2009-12-13 23:51:41 +00:00
|
|
|
case ND_MODIFIER:
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wmn->action == NA_RENAME)
|
2009-12-13 23:51:41 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
break;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
|
|
|
|
break;
|
2009-11-11 09:11:21 +00:00
|
|
|
case NC_NODE:
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (wmn->action) {
|
2009-11-11 09:11:21 +00:00
|
|
|
case NA_EDITED:
|
2010-06-18 04:39:32 +00:00
|
|
|
case NA_SELECTED:
|
2009-11-11 09:11:21 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2009-12-10 09:58:10 +00:00
|
|
|
case NC_ID:
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wmn->action == NA_RENAME)
|
2009-12-13 23:51:41 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
2009-12-10 09:58:10 +00:00
|
|
|
break;
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
case NC_SCREEN:
|
|
|
|
|
if (ELEM(wmn->data, ND_LAYER)) {
|
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2009-01-28 18:26:47 +00:00
|
|
|
default:
|
2012-05-08 20:18:33 +00:00
|
|
|
if (wmn->data == ND_KEYS)
|
2009-01-28 18:26:47 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
2013-07-21 08:16:37 +00:00
|
|
|
break;
|
2009-01-28 18:26:47 +00:00
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* editor level listener */
|
2017-10-16 17:15:03 -02:00
|
|
|
static void graph_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
|
|
|
|
|
WorkSpace *UNUSED(workspace))
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
{
|
2012-05-08 20:18:33 +00:00
|
|
|
SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
|
2009-12-23 11:22:30 +00:00
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
/* context changes */
|
|
|
|
|
switch (wmn->category) {
|
2009-07-10 10:48:25 +00:00
|
|
|
case NC_ANIMATION:
|
2009-12-23 11:22:30 +00:00
|
|
|
/* for selection changes of animation data, we can just redraw... otherwise autocolor might need to be done again */
|
2010-06-18 04:39:32 +00:00
|
|
|
if (ELEM(wmn->data, ND_KEYFRAME, ND_ANIMCHAN) && (wmn->action == NA_SELECTED))
|
2009-12-23 11:22:30 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
|
else
|
|
|
|
|
ED_area_tag_refresh(sa);
|
2009-07-10 10:48:25 +00:00
|
|
|
break;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
case NC_SCENE:
|
2012-10-21 05:46:41 +00:00
|
|
|
switch (wmn->data) {
|
2012-05-08 20:18:33 +00:00
|
|
|
case ND_OB_ACTIVE: /* selection changed, so force refresh to flush (needs flag set to do syncing) */
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
case ND_OB_SELECT:
|
2009-12-23 11:22:30 +00:00
|
|
|
sipo->flag |= SIPO_TEMP_NEEDCHANSYNC;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
ED_area_tag_refresh(sa);
|
|
|
|
|
break;
|
2009-12-21 09:52:43 +00:00
|
|
|
|
|
|
|
|
default: /* just redrawing the view will do */
|
|
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
|
break;
|
|
|
|
|
}
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
break;
|
|
|
|
|
case NC_OBJECT:
|
2009-12-21 09:52:43 +00:00
|
|
|
switch (wmn->data) {
|
2012-05-08 20:18:33 +00:00
|
|
|
case ND_BONE_SELECT: /* selection changed, so force refresh to flush (needs flag set to do syncing) */
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
case ND_BONE_ACTIVE:
|
2009-12-23 11:22:30 +00:00
|
|
|
sipo->flag |= SIPO_TEMP_NEEDCHANSYNC;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
ED_area_tag_refresh(sa);
|
|
|
|
|
break;
|
2010-01-25 19:42:33 +00:00
|
|
|
case ND_TRANSFORM:
|
2012-10-21 05:46:41 +00:00
|
|
|
break; /*do nothing*/
|
2009-12-21 09:52:43 +00:00
|
|
|
|
|
|
|
|
default: /* just redrawing the view will do */
|
|
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2008-12-16 18:42:12 +00:00
|
|
|
break;
|
2011-06-27 04:24:59 +00:00
|
|
|
case NC_NODE:
|
|
|
|
|
if (wmn->action == NA_SELECTED) {
|
|
|
|
|
/* selection changed, so force refresh to flush (needs flag set to do syncing) */
|
|
|
|
|
sipo->flag |= SIPO_TEMP_NEEDCHANSYNC;
|
|
|
|
|
ED_area_tag_refresh(sa);
|
|
|
|
|
}
|
2012-05-08 20:18:33 +00:00
|
|
|
break;
|
2.5
Notifiers
---------
Various fixes for wrong use of notifiers, and some new notifiers
to make things a bit more clear and consistent, with two notable
changes:
* Geometry changes are now done with NC_GEOM, rather than
NC_OBJECT|ND_GEOM_, so an object does need to be available.
* Space data now use NC_SPACE|ND_SPACE_*, instead of data
notifiers or even NC_WINDOW in some cases. Note that NC_SPACE
should only be used for notifying about changes in space data,
we don't want to go back to allqueue(REDRAW..).
Depsgraph
---------
The dependency graph now has a different flush call:
DAG_object_flush_update(scene, ob, flag)
is replaced by:
DAG_id_flush_update(id, flag)
It still works basically the same, one difference is that it now
also accepts object data (e.g. Mesh), again to avoid requiring an
Object to be available. Other ID types will simply do nothing at
the moment.
Docs
----
I made some guidelines for how/when to do which kinds of updates
and notifiers. I can't specify totally exact how to make these
decisions, but these are basically the guidelines I use. So, new
and updated docs are here:
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/NotifiersUpdates
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataNotifiers
2009-09-04 20:51:09 +00:00
|
|
|
case NC_SPACE:
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wmn->data == ND_SPACE_GRAPH)
|
2.5
Notifiers
---------
Various fixes for wrong use of notifiers, and some new notifiers
to make things a bit more clear and consistent, with two notable
changes:
* Geometry changes are now done with NC_GEOM, rather than
NC_OBJECT|ND_GEOM_, so an object does need to be available.
* Space data now use NC_SPACE|ND_SPACE_*, instead of data
notifiers or even NC_WINDOW in some cases. Note that NC_SPACE
should only be used for notifying about changes in space data,
we don't want to go back to allqueue(REDRAW..).
Depsgraph
---------
The dependency graph now has a different flush call:
DAG_object_flush_update(scene, ob, flag)
is replaced by:
DAG_id_flush_update(id, flag)
It still works basically the same, one difference is that it now
also accepts object data (e.g. Mesh), again to avoid requiring an
Object to be available. Other ID types will simply do nothing at
the moment.
Docs
----
I made some guidelines for how/when to do which kinds of updates
and notifiers. I can't specify totally exact how to make these
decisions, but these are basically the guidelines I use. So, new
and updated docs are here:
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/NotifiersUpdates
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataNotifiers
2009-09-04 20:51:09 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
|
break;
|
2012-07-03 13:47:13 +00:00
|
|
|
case NC_WINDOW:
|
|
|
|
|
if (sipo->flag & SIPO_TEMP_NEEDCHANSYNC) {
|
|
|
|
|
/* force redraw/refresh after undo/redo - prevents "black curve" problem */
|
|
|
|
|
ED_area_tag_refresh(sa);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
// XXX: restore the case below if not enough updates occur...
|
|
|
|
|
//default:
|
2012-08-04 12:30:16 +00:00
|
|
|
// if (wmn->data == ND_KEYS)
|
2012-05-08 20:18:33 +00:00
|
|
|
// ED_area_tag_redraw(sa);
|
2008-12-16 18:42:12 +00:00
|
|
|
}
|
2008-12-12 18:47:12 +00:00
|
|
|
}
|
|
|
|
|
|
2016-07-08 01:37:41 +12:00
|
|
|
/* Update F-Curve colors */
|
|
|
|
|
static void graph_refresh_fcurve_colors(const bContext *C)
|
|
|
|
|
{
|
|
|
|
|
bAnimContext ac;
|
|
|
|
|
|
|
|
|
|
ListBase anim_data = {NULL, NULL};
|
|
|
|
|
bAnimListElem *ale;
|
|
|
|
|
size_t items;
|
|
|
|
|
int filter;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (ANIM_animdata_get_context(C, &ac) == false)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
UI_SetTheme(SPACE_IPO, RGN_TYPE_WINDOW);
|
|
|
|
|
|
|
|
|
|
/* build list of F-Curves which will be visible as channels in channel-region
|
|
|
|
|
* - we don't include ANIMFILTER_CURVEVISIBLE filter, as that will result in a
|
|
|
|
|
* mismatch between channel-colors and the drawn curves
|
|
|
|
|
*/
|
|
|
|
|
filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS);
|
|
|
|
|
items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
|
|
|
|
|
|
|
|
|
|
/* loop over F-Curves, assigning colors */
|
|
|
|
|
for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {
|
|
|
|
|
FCurve *fcu = (FCurve *)ale->data;
|
|
|
|
|
|
|
|
|
|
/* set color of curve here */
|
|
|
|
|
switch (fcu->color_mode) {
|
|
|
|
|
case FCURVE_COLOR_CUSTOM:
|
|
|
|
|
{
|
|
|
|
|
/* User has defined a custom color for this curve already (we assume it's not going to cause clashes with text colors),
|
|
|
|
|
* which should be left alone... Nothing needs to be done here.
|
|
|
|
|
*/
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case FCURVE_COLOR_AUTO_RGB:
|
|
|
|
|
{
|
|
|
|
|
/* F-Curve's array index is automatically mapped to RGB values. This works best of 3-value vectors.
|
|
|
|
|
* TODO: find a way to module the hue so that not all curves have same color...
|
|
|
|
|
*/
|
|
|
|
|
float *col = fcu->color;
|
|
|
|
|
|
|
|
|
|
switch (fcu->array_index) {
|
|
|
|
|
case 0:
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_X, col);
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_Y, col);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_Z, col);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* 'unknown' color - bluish so as to not conflict with handles */
|
|
|
|
|
col[0] = 0.3f; col[1] = 0.8f; col[2] = 1.0f;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case FCURVE_COLOR_AUTO_YRGB:
|
|
|
|
|
{
|
|
|
|
|
/* Like FCURVE_COLOR_AUTO_RGB, except this is for quaternions... */
|
|
|
|
|
float *col = fcu->color;
|
|
|
|
|
|
|
|
|
|
switch (fcu->array_index) {
|
|
|
|
|
case 1:
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_X, col);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_Y, col);
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_Z, col);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0:
|
|
|
|
|
{
|
|
|
|
|
/* Special Case: "W" channel should be yellowish, so blend X and Y channel colors... */
|
|
|
|
|
float c1[3], c2[3];
|
|
|
|
|
float h1[3], h2[3];
|
|
|
|
|
float hresult[3];
|
|
|
|
|
|
|
|
|
|
/* - get colors (rgb) */
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_X, c1);
|
|
|
|
|
UI_GetThemeColor3fv(TH_AXIS_Y, c2);
|
|
|
|
|
|
|
|
|
|
/* - perform blending in HSV space (to keep brightness similar) */
|
|
|
|
|
rgb_to_hsv_v(c1, h1);
|
|
|
|
|
rgb_to_hsv_v(c2, h2);
|
|
|
|
|
|
|
|
|
|
interp_v3_v3v3(hresult, h1, h2, 0.5f);
|
|
|
|
|
|
|
|
|
|
/* - convert back to RGB for display */
|
|
|
|
|
hsv_to_rgb_v(hresult, col);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* 'unknown' color - bluish so as to not conflict with handles */
|
|
|
|
|
col[0] = 0.3f; col[1] = 0.8f; col[2] = 1.0f;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case FCURVE_COLOR_AUTO_RAINBOW:
|
|
|
|
|
default:
|
|
|
|
|
{
|
|
|
|
|
/* determine color 'automatically' using 'magic function' which uses the given args
|
|
|
|
|
* of current item index + total items to determine some RGB color
|
|
|
|
|
*/
|
|
|
|
|
getcolor_fcurve_rainbow(i, items, fcu->color);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* free temp list */
|
|
|
|
|
ANIM_animdata_freelist(&anim_data);
|
|
|
|
|
}
|
2009-02-15 10:58:24 +00:00
|
|
|
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
static void graph_refresh(const bContext *C, ScrArea *sa)
|
|
|
|
|
{
|
|
|
|
|
SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
|
|
|
|
|
|
|
|
|
|
/* updates to data needed depends on Graph Editor mode... */
|
|
|
|
|
switch (sipo->mode) {
|
|
|
|
|
case SIPO_MODE_ANIMATION: /* all animation */
|
|
|
|
|
{
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case SIPO_MODE_DRIVERS: /* drivers only */
|
|
|
|
|
{
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* region updates? */
|
2012-03-08 04:12:11 +00:00
|
|
|
// XXX re-sizing y-extents of tot should go here?
|
2009-02-15 10:58:24 +00:00
|
|
|
|
2009-12-23 11:22:30 +00:00
|
|
|
/* update the state of the animchannels in response to changes from the data they represent
|
|
|
|
|
* NOTE: the temp flag is used to indicate when this needs to be done, and will be cleared once handled
|
|
|
|
|
*/
|
|
|
|
|
if (sipo->flag & SIPO_TEMP_NEEDCHANSYNC) {
|
|
|
|
|
ANIM_sync_animchannels_to_data(C);
|
|
|
|
|
sipo->flag &= ~SIPO_TEMP_NEEDCHANSYNC;
|
2012-04-29 13:24:10 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
2009-12-23 11:22:30 +00:00
|
|
|
}
|
2009-12-21 09:52:43 +00:00
|
|
|
|
2009-02-15 10:58:24 +00:00
|
|
|
/* init/adjust F-Curve colors */
|
2016-07-08 01:37:41 +12:00
|
|
|
graph_refresh_fcurve_colors(C);
|
Animato/2.5 - Graph Editor (i.e. the new 'IPO Editor')
This commit brings back the drawing code for the 'Graph Editor'. I've decided to call it this, as currently it can show either F-Curves for Animation stored in Actions, or F-Curves for Drivers.
Currently, it shows all curves, since some of the necessary filtering code (i.e. for limiting curve visibility) hasn't been put in place yet. At least this serves as good proof that we can have F-Curves from multiple sources at least.
It should be noted that the code still has to be modified to work with some of the new Animato features, such as F-Curve Modifiers (cycles are an example of one of the features that use this). Also, a nicer way to set the colours of the curves needs to be investigated.
Notes:
* Fixed a few bugs in RNA User-Preferences wrapping
* The keyframe drawing uses the new-style drawing for handles from AnimSys2. There's a minor bug that sometimes occurs, where a distorted handle gets drawn at the origin of the grid on the first run. Hints anyone?
* Removed most of the old data from SpaceIpo struct, as the new code uses that. Maybe later, the directories/files at least should get renamed.
* Removed ancient hack for NVidia/TNT drivers. It is probably no longer needed, but could be restored if someone needs it.
2009-01-26 11:33:16 +00:00
|
|
|
}
|
|
|
|
|
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
static void graph_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id)
|
|
|
|
|
{
|
|
|
|
|
SpaceIpo *sgraph = (SpaceIpo *)slink;
|
2018-04-12 15:42:55 +02:00
|
|
|
|
|
|
|
|
if (sgraph->ads) {
|
|
|
|
|
if ((ID *)sgraph->ads->filter_grp == old_id) {
|
|
|
|
|
sgraph->ads->filter_grp = (Group *)new_id;
|
|
|
|
|
}
|
|
|
|
|
if ((ID *)sgraph->ads->source == old_id) {
|
|
|
|
|
sgraph->ads->source = new_id;
|
|
|
|
|
}
|
2018-02-15 15:45:08 +13:00
|
|
|
}
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
}
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* only called once, from space/spacetypes.c */
|
|
|
|
|
void ED_spacetype_ipo(void)
|
|
|
|
|
{
|
2012-05-08 20:18:33 +00:00
|
|
|
SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype ipo");
|
2008-12-12 18:47:12 +00:00
|
|
|
ARegionType *art;
|
|
|
|
|
|
2012-05-08 20:18:33 +00:00
|
|
|
st->spaceid = SPACE_IPO;
|
2009-12-19 22:37:51 +00:00
|
|
|
strncpy(st->name, "Graph", BKE_ST_MAXNAME);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
2012-04-29 13:20:28 +00:00
|
|
|
st->new = graph_new;
|
|
|
|
|
st->free = graph_free;
|
|
|
|
|
st->init = graph_init;
|
|
|
|
|
st->duplicate = graph_duplicate;
|
|
|
|
|
st->operatortypes = graphedit_operatortypes;
|
|
|
|
|
st->keymap = graphedit_keymap;
|
|
|
|
|
st->listener = graph_listener;
|
|
|
|
|
st->refresh = graph_refresh;
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
st->id_remap = graph_id_remap;
|
|
|
|
|
|
2008-12-12 18:47:12 +00:00
|
|
|
/* regions: main window */
|
2012-04-29 13:20:28 +00:00
|
|
|
art = MEM_callocN(sizeof(ARegionType), "spacetype graphedit region");
|
2008-12-12 18:47:12 +00:00
|
|
|
art->regionid = RGN_TYPE_WINDOW;
|
2015-11-28 17:14:45 +01:00
|
|
|
art->init = graph_main_region_init;
|
|
|
|
|
art->draw = graph_main_region_draw;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->listener = graph_region_listener;
|
2012-05-08 20:18:33 +00:00
|
|
|
art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BLI_addhead(&st->regiontypes, art);
|
|
|
|
|
|
|
|
|
|
/* regions: header */
|
2012-04-29 13:20:28 +00:00
|
|
|
art = MEM_callocN(sizeof(ARegionType), "spacetype graphedit region");
|
2008-12-12 18:47:12 +00:00
|
|
|
art->regionid = RGN_TYPE_HEADER;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->prefsizey = HEADERY;
|
2012-05-08 20:18:33 +00:00
|
|
|
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->listener = graph_region_listener;
|
2015-11-28 17:14:45 +01:00
|
|
|
art->init = graph_header_region_init;
|
|
|
|
|
art->draw = graph_header_region_draw;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BLI_addhead(&st->regiontypes, art);
|
|
|
|
|
|
|
|
|
|
/* regions: channels */
|
2012-04-29 13:20:28 +00:00
|
|
|
art = MEM_callocN(sizeof(ARegionType), "spacetype graphedit region");
|
2008-12-12 18:47:12 +00:00
|
|
|
art->regionid = RGN_TYPE_CHANNELS;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->prefsizex = 200 + V2D_SCROLL_WIDTH; /* 200 is the 'standard', but due to scrollers, we want a bit more to fit the lock icons in */
|
2012-05-08 20:18:33 +00:00
|
|
|
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->listener = graph_region_listener;
|
2015-11-28 17:14:45 +01:00
|
|
|
art->init = graph_channel_region_init;
|
|
|
|
|
art->draw = graph_channel_region_draw;
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BLI_addhead(&st->regiontypes, art);
|
|
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* regions: UI buttons */
|
2012-04-29 13:20:28 +00:00
|
|
|
art = MEM_callocN(sizeof(ARegionType), "spacetype graphedit region");
|
2009-02-20 19:11:35 +00:00
|
|
|
art->regionid = RGN_TYPE_UI;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->prefsizex = 200;
|
2015-10-29 20:50:30 +01:00
|
|
|
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
|
2012-04-29 13:20:28 +00:00
|
|
|
art->listener = graph_region_listener;
|
2015-11-28 17:14:45 +01:00
|
|
|
art->init = graph_buttons_region_init;
|
|
|
|
|
art->draw = graph_buttons_region_draw;
|
2009-02-20 19:11:35 +00:00
|
|
|
|
|
|
|
|
BLI_addhead(&st->regiontypes, art);
|
2009-05-19 17:13:33 +00:00
|
|
|
|
|
|
|
|
graph_buttons_register(art);
|
2008-12-12 18:47:12 +00:00
|
|
|
|
|
|
|
|
BKE_spacetype_register(st);
|
|
|
|
|
}
|
|
|
|
|
|