2009-01-09 06:25:14 +00:00
|
|
|
/**
|
2009-06-23 00:09:26 +00:00
|
|
|
* $Id$
|
2009-01-09 06:25:14 +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,
|
|
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) Blender Foundation
|
|
|
|
*
|
|
|
|
* Contributor(s): Joshua Leung (2009 Recode)
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <string.h>
|
2009-03-15 10:39:02 +00:00
|
|
|
#include <float.h>
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef _WIN32
|
|
|
|
#include <unistd.h>
|
|
|
|
#else
|
|
|
|
#include <io.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
|
|
|
#include "BLI_arithb.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"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "DNA_action_types.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_camera_types.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "DNA_curve_types.h"
|
|
|
|
#include "DNA_key_types.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_lamp_types.h"
|
|
|
|
#include "DNA_material_types.h"
|
2009-08-03 13:09:23 +00:00
|
|
|
#include "DNA_meta_types.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "DNA_object_types.h"
|
2009-07-24 19:36:08 +00:00
|
|
|
#include "DNA_particle_types.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "DNA_space_types.h"
|
|
|
|
#include "DNA_sequence_types.h"
|
|
|
|
#include "DNA_userdef_types.h"
|
|
|
|
#include "DNA_view2d_types.h"
|
|
|
|
#include "DNA_windowmanager_types.h"
|
2009-02-13 06:33:07 +00:00
|
|
|
#include "DNA_world_types.h"
|
2009-01-09 06:25:14 +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
|
|
|
#include "BKE_animsys.h"
|
|
|
|
#include "BKE_context.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "BKE_curve.h"
|
|
|
|
#include "BKE_depsgraph.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 "BKE_fcurve.h"
|
|
|
|
#include "BKE_global.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "BKE_key.h"
|
|
|
|
#include "BKE_object.h"
|
2009-01-28 18:26:47 +00:00
|
|
|
#include "BKE_screen.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "BKE_utildefines.h"
|
|
|
|
|
|
|
|
#include "BIF_gl.h"
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
|
|
|
#include "ED_anim_api.h"
|
|
|
|
#include "ED_util.h"
|
|
|
|
|
2009-02-03 12:04:05 +00:00
|
|
|
#include "graph_intern.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 "UI_interface.h"
|
|
|
|
#include "UI_interface_icons.h"
|
2009-01-09 06:25:14 +00:00
|
|
|
#include "UI_resources.h"
|
|
|
|
#include "UI_view2d.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
|
|
|
/* XXX */
|
|
|
|
extern void gl_round_box(int mode, float minx, float miny, float maxx, float maxy, float rad);
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-09-25 10:52:29 +00:00
|
|
|
/* *************************** */
|
|
|
|
/* Utility Drawing Defines */
|
|
|
|
|
|
|
|
/* determine the alpha value that should be used when
|
|
|
|
* drawing components for some F-Curve (fcu)
|
|
|
|
* - selected F-Curves should be more visible than partially visible ones
|
|
|
|
*/
|
|
|
|
#define drawFCurveFade(fcu) ( ((fcu)->flag & FCURVE_SELECTED)? 1.0f : 0.5f )
|
|
|
|
|
|
|
|
/* set the colour for some point from some value given packed into an int
|
|
|
|
* - intV: integer value containing color info packed into an int
|
|
|
|
* - alpha: float value describing the
|
|
|
|
*/
|
|
|
|
#define cpackA(intVC, alpha) \
|
|
|
|
{ \
|
|
|
|
float _cpackCol[3]; \
|
|
|
|
cpack_to_rgb(intVC, &_cpackCol[0], &_cpackCol[1], &_cpackCol[2]); \
|
|
|
|
glColor4f(_cpackCol[0], _cpackCol[1], _cpackCol[2], alpha); \
|
|
|
|
}
|
|
|
|
|
2009-01-09 06:25:14 +00:00
|
|
|
/* *************************** */
|
2009-03-21 03:49:22 +00:00
|
|
|
/* F-Curve Modifier Drawing */
|
|
|
|
|
|
|
|
/* Envelope -------------- */
|
|
|
|
|
2009-03-22 09:54:13 +00:00
|
|
|
// TODO: draw a shaded poly showing the region of influence too!!!
|
2009-03-21 03:49:22 +00:00
|
|
|
static void draw_fcurve_modifier_controls_envelope (FCurve *fcu, FModifier *fcm, View2D *v2d)
|
|
|
|
{
|
|
|
|
FMod_Envelope *env= (FMod_Envelope *)fcm->data;
|
|
|
|
FCM_EnvelopeData *fed;
|
|
|
|
const float fac= 0.05f * (v2d->cur.xmax - v2d->cur.xmin);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* draw two black lines showing the standard reference levels */
|
|
|
|
glColor3f(0.0f, 0.0f, 0.0f);
|
|
|
|
setlinestyle(5);
|
|
|
|
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
glVertex2f(v2d->cur.xmin, env->midval+env->min);
|
|
|
|
glVertex2f(v2d->cur.xmax, env->midval+env->min);
|
|
|
|
|
|
|
|
glVertex2f(v2d->cur.xmin, env->midval+env->max);
|
|
|
|
glVertex2f(v2d->cur.xmax, env->midval+env->max);
|
|
|
|
glEnd(); // GL_LINES
|
|
|
|
setlinestyle(0);
|
|
|
|
|
|
|
|
/* set size of vertices (non-adjustable for now) */
|
|
|
|
glPointSize(2.0f);
|
|
|
|
|
|
|
|
// for now, point color is fixed, and is white
|
|
|
|
glColor3f(1.0f, 1.0f, 1.0f);
|
|
|
|
|
|
|
|
/* we use bgl points not standard gl points, to workaround vertex
|
|
|
|
* drawing bugs that some drivers have (probably legacy ones only though)
|
|
|
|
*/
|
|
|
|
bglBegin(GL_POINTS);
|
|
|
|
for (i=0, fed=env->data; i < env->totvert; i++, fed++) {
|
|
|
|
/* only draw if visible
|
|
|
|
* - min/max here are fixed, not relative
|
|
|
|
*/
|
|
|
|
if IN_RANGE(fed->time, (v2d->cur.xmin - fac), (v2d->cur.xmax + fac)) {
|
|
|
|
glVertex2f(fed->time, fed->min);
|
|
|
|
glVertex2f(fed->time, fed->max);
|
|
|
|
}
|
|
|
|
}
|
2009-10-16 10:01:15 +00:00
|
|
|
bglEnd(); // GL_POINTS
|
2009-03-21 03:49:22 +00:00
|
|
|
|
|
|
|
glPointSize(1.0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *************************** */
|
|
|
|
/* F-Curve Drawing */
|
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
|
|
|
|
|
|
|
/* Points ---------------- */
|
2009-01-09 06:25:14 +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
|
|
|
/* helper func - draw keyframe vertices only for an F-Curve */
|
|
|
|
static void draw_fcurve_vertices_keyframes (FCurve *fcu, View2D *v2d, short edit, short sel)
|
2009-01-09 06:25:14 +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
|
|
|
BezTriple *bezt= fcu->bezt;
|
2009-01-29 03:43:04 +00:00
|
|
|
const float fac= 0.05f * (v2d->cur.xmax - v2d->cur.xmin);
|
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
|
|
|
int i;
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-01-29 03:43:04 +00:00
|
|
|
/* we use bgl points not standard gl points, to workaround vertex
|
|
|
|
* drawing bugs that some drivers have (probably legacy ones only though)
|
|
|
|
*/
|
2009-01-09 06:25:14 +00:00
|
|
|
bglBegin(GL_POINTS);
|
|
|
|
|
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
|
|
|
for (i = 0; i < fcu->totvert; i++, bezt++) {
|
2009-01-29 03:43:04 +00:00
|
|
|
/* as an optimisation step, only draw those in view
|
|
|
|
* - we apply a correction factor to ensure that points don't pop in/out due to slight twitches of view size
|
|
|
|
*/
|
|
|
|
if IN_RANGE(bezt->vec[1][0], (v2d->cur.xmin - fac), (v2d->cur.xmax + fac)) {
|
|
|
|
if (edit) {
|
|
|
|
/* 'Keyframe' vertex only, as handle lines and handles have already been drawn
|
|
|
|
* - only draw those with correct selection state for the current drawing color
|
|
|
|
* -
|
|
|
|
*/
|
|
|
|
if ((bezt->f2 & SELECT) == sel)
|
|
|
|
bglVertex3fv(bezt->vec[1]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* no check for selection here, as curve is not editable... */
|
|
|
|
// XXX perhaps we don't want to even draw points? maybe add an option for that later
|
2009-01-09 06:25:14 +00:00
|
|
|
bglVertex3fv(bezt->vec[1]);
|
2009-01-29 03:43:04 +00:00
|
|
|
}
|
2009-01-09 06:25:14 +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
|
|
|
|
2009-10-16 10:01:15 +00:00
|
|
|
bglEnd(); // GL_POINTS
|
2009-01-09 06:25:14 +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
|
|
|
|
|
|
|
/* helper func - draw handle vertex for an F-Curve as a round unfilled circle */
|
|
|
|
static void draw_fcurve_handle_control (float x, float y, float xscale, float yscale, float hsize)
|
2009-01-09 06:25:14 +00:00
|
|
|
{
|
|
|
|
static GLuint displist=0;
|
|
|
|
|
|
|
|
/* initialise round circle shape */
|
|
|
|
if (displist == 0) {
|
|
|
|
GLUquadricObj *qobj;
|
|
|
|
|
|
|
|
displist= glGenLists(1);
|
2009-01-27 05:04:23 +00:00
|
|
|
glNewList(displist, GL_COMPILE);
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
qobj = gluNewQuadric();
|
|
|
|
gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
|
2009-01-27 05:04:23 +00:00
|
|
|
gluDisk(qobj, 0, 0.7, 8, 1);
|
2009-01-09 06:25:14 +00:00
|
|
|
gluDeleteQuadric(qobj);
|
|
|
|
|
|
|
|
glEndList();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* adjust view transform before starting */
|
|
|
|
glTranslatef(x, y, 0.0f);
|
2009-01-29 10:19:43 +00:00
|
|
|
glScalef(1.0f/xscale*hsize, 1.0f/yscale*hsize, 1.0f);
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-02-09 23:46:13 +00:00
|
|
|
/* anti-aliased lines for more consistent appearance */
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
2009-01-09 06:25:14 +00:00
|
|
|
/* draw! */
|
|
|
|
glCallList(displist);
|
|
|
|
|
2009-02-09 23:46:13 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
2009-01-09 06:25:14 +00:00
|
|
|
/* restore view transform */
|
|
|
|
glScalef(xscale/hsize, yscale/hsize, 1.0);
|
|
|
|
glTranslatef(-x, -y, 0.0f);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/* helper func - draw handle vertices only for an F-Curve (if it is not protected) */
|
|
|
|
static void draw_fcurve_vertices_handles (FCurve *fcu, View2D *v2d, short sel)
|
2009-01-09 06:25:14 +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
|
|
|
BezTriple *bezt= fcu->bezt;
|
2009-01-09 06:25:14 +00:00
|
|
|
BezTriple *prevbezt = NULL;
|
|
|
|
float hsize, xscale, yscale;
|
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
|
|
|
int i;
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
/* get view settings */
|
|
|
|
hsize= UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE);
|
|
|
|
UI_view2d_getscale(v2d, &xscale, &yscale);
|
|
|
|
|
|
|
|
/* set handle color */
|
|
|
|
if (sel) UI_ThemeColor(TH_HANDLE_VERTEX_SELECT);
|
|
|
|
else UI_ThemeColor(TH_HANDLE_VERTEX);
|
|
|
|
|
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
|
|
|
for (i=0; i < fcu->totvert; i++, prevbezt=bezt, bezt++) {
|
|
|
|
/* Draw the editmode handels for a bezier curve (others don't have handles)
|
|
|
|
* if their selection status matches the selection status we're drawing for
|
|
|
|
* - first handle only if previous beztriple was bezier-mode
|
|
|
|
* - second handle only if current beztriple is bezier-mode
|
|
|
|
*/
|
|
|
|
if ( (!prevbezt && (bezt->ipo==BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo==BEZT_IPO_BEZ)) ) {
|
|
|
|
if ((bezt->f1 & SELECT) == sel)/* && v2d->cur.xmin < bezt->vec[0][0] < v2d->cur.xmax)*/
|
|
|
|
draw_fcurve_handle_control(bezt->vec[0][0], bezt->vec[0][1], xscale, yscale, hsize);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bezt->ipo==BEZT_IPO_BEZ) {
|
|
|
|
if ((bezt->f3 & SELECT) == sel)/* && v2d->cur.xmin < bezt->vec[2][0] < v2d->cur.xmax)*/
|
|
|
|
draw_fcurve_handle_control(bezt->vec[2][0], bezt->vec[2][1], xscale, yscale, hsize);
|
2009-01-09 06:25:14 +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
|
|
|
/* helper func - set color to draw F-Curve data with */
|
|
|
|
static void set_fcurve_vertex_color (SpaceIpo *sipo, FCurve *fcu, short sel)
|
|
|
|
{
|
2009-09-25 10:52:29 +00:00
|
|
|
/* Fade the 'intensity' of the vertices based on the selection of the curves too */
|
|
|
|
int alphaOffset= (int)((drawFCurveFade(fcu) - 1.0f) * 255);
|
|
|
|
|
|
|
|
/* Set color of curve vertex based on state of curve (i.e. 'Edit' Mode) */
|
|
|
|
if ((fcu->flag & FCURVE_PROTECTED)==0) {
|
|
|
|
/* Curve's points ARE BEING edited */
|
|
|
|
if (sel) UI_ThemeColorShadeAlpha(TH_VERTEX_SELECT, 0, alphaOffset);
|
|
|
|
else UI_ThemeColorShadeAlpha(TH_VERTEX, 0, alphaOffset);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Curve's points CANNOT BE edited */
|
|
|
|
if (sel) UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, alphaOffset);
|
|
|
|
else UI_ThemeColorShadeAlpha(TH_TEXT, 0, alphaOffset);
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void draw_fcurve_vertices (SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
|
2009-01-09 06:25:14 +00:00
|
|
|
{
|
|
|
|
View2D *v2d= &ar->v2d;
|
|
|
|
|
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
|
|
|
/* only draw points if curve is visible
|
|
|
|
* - draw unselected points before selected points as separate passes to minimise color-changing overhead
|
|
|
|
* (XXX dunno if this is faster than drawing all in one pass though)
|
|
|
|
* and also to make sure in the case of overlapping points that the selected is always visible
|
|
|
|
* - draw handles before keyframes, so that keyframes will overlap handles (keyframes are more important for users)
|
|
|
|
*/
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
|
|
|
|
|
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 the two handles first (if they're shown, and if curve is being edited) */
|
2009-02-13 06:33:07 +00:00
|
|
|
if ((fcu->flag & FCURVE_PROTECTED)==0 && (fcu->flag & FCURVE_INT_VALUES)==0 && (sipo->flag & SIPO_NOHANDLES)==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
|
|
|
set_fcurve_vertex_color(sipo, fcu, 0);
|
|
|
|
draw_fcurve_vertices_handles(fcu, v2d, 0);
|
|
|
|
|
|
|
|
set_fcurve_vertex_color(sipo, fcu, 1);
|
|
|
|
draw_fcurve_vertices_handles(fcu, v2d, 1);
|
2009-01-09 06:25:14 +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 keyframes over the handles */
|
|
|
|
set_fcurve_vertex_color(sipo, fcu, 0);
|
|
|
|
draw_fcurve_vertices_keyframes(fcu, v2d, !(fcu->flag & FCURVE_PROTECTED), 0);
|
2009-01-09 06:25:14 +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
|
|
|
set_fcurve_vertex_color(sipo, fcu, 1);
|
|
|
|
draw_fcurve_vertices_keyframes(fcu, v2d, !(fcu->flag & FCURVE_PROTECTED), 1);
|
|
|
|
|
|
|
|
glPointSize(1.0f);
|
2009-01-09 06:25:14 +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
|
|
|
/* Handles ---------------- */
|
|
|
|
|
|
|
|
/* draw lines for F-Curve handles only (this is only done in EditMode) */
|
|
|
|
static void draw_fcurve_handles (SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
|
2009-01-09 06:25:14 +00:00
|
|
|
{
|
|
|
|
extern unsigned int nurbcol[];
|
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
|
|
|
int sel, b;
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
/* don't draw handle lines if handles are not shown */
|
2009-02-13 06:33:07 +00:00
|
|
|
if ((sipo->flag & SIPO_NOHANDLES) || (fcu->flag & FCURVE_PROTECTED) || (fcu->flag & FCURVE_INT_VALUES))
|
2009-01-09 06:25:14 +00:00
|
|
|
return;
|
|
|
|
|
2009-10-16 10:01:15 +00:00
|
|
|
/* a single call to GL_LINES here around these calls should be sufficient to still
|
|
|
|
* get separate line segments, but which aren't wrapped with GL_LINE_STRIP everytime we
|
|
|
|
* want a single line
|
|
|
|
*/
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
|
2009-09-25 10:52:29 +00:00
|
|
|
/* slightly hacky, but we want to draw unselected points before selected ones */
|
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
|
|
|
for (sel= 0; sel < 2; sel++) {
|
2009-01-26 23:18:27 +00:00
|
|
|
BezTriple *bezt=fcu->bezt, *prevbezt=NULL;
|
2009-10-16 10:01:15 +00:00
|
|
|
unsigned int *col= (sel)? (nurbcol+4) : (nurbcol);
|
2009-01-26 23:18:27 +00:00
|
|
|
float *fp;
|
|
|
|
|
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
|
|
|
for (b= 0; b < fcu->totvert; b++, prevbezt=bezt, bezt++) {
|
|
|
|
if ((bezt->f2 & SELECT)==sel) {
|
|
|
|
fp= bezt->vec[0];
|
2009-01-09 06:25:14 +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
|
|
|
/* only draw first handle if previous segment had handles */
|
|
|
|
if ( (!prevbezt && (bezt->ipo==BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo==BEZT_IPO_BEZ)) )
|
|
|
|
{
|
2009-09-25 10:52:29 +00:00
|
|
|
cpackA(col[(unsigned char)bezt->h1], drawFCurveFade(fcu));
|
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
|
|
|
|
2009-10-16 10:01:15 +00:00
|
|
|
glVertex2fv(fp); glVertex2fv(fp+3);
|
2009-01-09 06:25:14 +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
|
|
|
/* only draw second handle if this segment is bezier */
|
|
|
|
if (bezt->ipo == BEZT_IPO_BEZ)
|
|
|
|
{
|
2009-09-25 10:52:29 +00:00
|
|
|
cpackA(col[(unsigned char)bezt->h2], drawFCurveFade(fcu));
|
2009-10-16 10:01:15 +00:00
|
|
|
glVertex2fv(fp+3); glVertex2fv(fp+6);
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* only draw first handle if previous segment was had handles, and selection is ok */
|
|
|
|
if ( ((bezt->f1 & SELECT)==sel) &&
|
|
|
|
( (!prevbezt && (bezt->ipo==BEZT_IPO_BEZ)) || (prevbezt && (prevbezt->ipo==BEZT_IPO_BEZ)) ) )
|
|
|
|
{
|
|
|
|
fp= bezt->vec[0];
|
2009-09-25 10:52:29 +00:00
|
|
|
cpackA(col[(unsigned char)bezt->h1], drawFCurveFade(fcu));
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-10-16 10:01:15 +00:00
|
|
|
glVertex2fv(fp); glVertex2fv(fp+3);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/* only draw second handle if this segment is bezier, and selection is ok */
|
|
|
|
if ( ((bezt->f3 & SELECT)==sel) &&
|
|
|
|
(bezt->ipo == BEZT_IPO_BEZ) )
|
|
|
|
{
|
|
|
|
fp= bezt->vec[1];
|
2009-09-25 10:52:29 +00:00
|
|
|
cpackA(col[(unsigned char)bezt->h2], drawFCurveFade(fcu));
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-10-16 10:01:15 +00:00
|
|
|
glVertex2fv(fp); glVertex2fv(fp+3);
|
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
|
|
|
}
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-10-16 10:01:15 +00:00
|
|
|
|
|
|
|
glEnd(); // GL_LINES
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|
|
|
|
|
2009-02-09 23:46:13 +00:00
|
|
|
/* Samples ---------------- */
|
|
|
|
|
|
|
|
/* helper func - draw sample-range marker for an F-Curve as a cross */
|
|
|
|
static void draw_fcurve_sample_control (float x, float y, float xscale, float yscale, float hsize)
|
|
|
|
{
|
|
|
|
static GLuint displist=0;
|
|
|
|
|
|
|
|
/* initialise X shape */
|
|
|
|
if (displist == 0) {
|
|
|
|
displist= glGenLists(1);
|
|
|
|
glNewList(displist, GL_COMPILE);
|
|
|
|
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
glVertex2f(-0.7f, -0.7f);
|
|
|
|
glVertex2f(+0.7f, +0.7f);
|
|
|
|
|
|
|
|
glVertex2f(-0.7f, +0.7f);
|
|
|
|
glVertex2f(+0.7f, -0.7f);
|
|
|
|
glEnd(); // GL_LINES
|
|
|
|
|
|
|
|
glEndList();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* adjust view transform before starting */
|
|
|
|
glTranslatef(x, y, 0.0f);
|
|
|
|
glScalef(1.0f/xscale*hsize, 1.0f/yscale*hsize, 1.0f);
|
|
|
|
|
|
|
|
/* anti-aliased lines for more consistent appearance */
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
|
|
|
/* draw! */
|
|
|
|
glCallList(displist);
|
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
/* restore view transform */
|
|
|
|
glScalef(xscale/hsize, yscale/hsize, 1.0);
|
|
|
|
glTranslatef(-x, -y, 0.0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* helper func - draw keyframe vertices only for an F-Curve */
|
|
|
|
static void draw_fcurve_samples (SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
|
|
|
|
{
|
|
|
|
FPoint *first, *last;
|
|
|
|
float hsize, xscale, yscale;
|
|
|
|
|
|
|
|
/* get view settings */
|
|
|
|
hsize= UI_GetThemeValuef(TH_VERTEX_SIZE);
|
|
|
|
UI_view2d_getscale(&ar->v2d, &xscale, &yscale);
|
|
|
|
|
|
|
|
/* set vertex color */
|
|
|
|
if (fcu->flag & (FCURVE_ACTIVE|FCURVE_SELECTED)) UI_ThemeColor(TH_TEXT_HI);
|
|
|
|
else UI_ThemeColor(TH_TEXT);
|
|
|
|
|
|
|
|
/* get verts */
|
|
|
|
first= fcu->fpt;
|
2009-03-02 00:55:10 +00:00
|
|
|
last= (first) ? (first + (fcu->totvert-1)) : (NULL);
|
2009-02-09 23:46:13 +00:00
|
|
|
|
|
|
|
/* draw */
|
|
|
|
if (first && last) {
|
|
|
|
draw_fcurve_sample_control(first->vec[0], first->vec[1], xscale, yscale, hsize);
|
|
|
|
draw_fcurve_sample_control(last->vec[0], last->vec[1], xscale, yscale, hsize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/* Curve ---------------- */
|
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
/* minimum pixels per gridstep
|
|
|
|
* XXX: defined in view2d.c - must keep these in sync or relocate to View2D header!
|
|
|
|
*/
|
|
|
|
#define MINGRIDSTEP 35
|
|
|
|
|
|
|
|
/* helper func - just draw the F-Curve by sampling the visible region (for drawing curves with modifiers) */
|
|
|
|
static void draw_fcurve_curve (FCurve *fcu, SpaceIpo *sipo, View2D *v2d, View2DGrid *grid)
|
|
|
|
{
|
|
|
|
ChannelDriver *driver;
|
|
|
|
float samplefreq, ctime;
|
|
|
|
float stime, etime;
|
|
|
|
|
|
|
|
/* disable any drivers temporarily */
|
|
|
|
driver= fcu->driver;
|
|
|
|
fcu->driver= NULL;
|
|
|
|
|
|
|
|
|
|
|
|
/* Note about sampling frequency:
|
|
|
|
* Ideally, this is chosen such that we have 1-2 pixels = 1 segment
|
|
|
|
* which means that our curves can be as smooth as possible. However,
|
|
|
|
* this does mean that curves may not be fully accurate (i.e. if they have
|
|
|
|
* sudden spikes which happen at the sampling point, we may have problems).
|
|
|
|
* Also, this may introduce lower performance on less densely detailed curves,'
|
|
|
|
* though it is impossible to predict this from the modifiers!
|
|
|
|
*
|
|
|
|
* If the automatically determined sampling frequency is likely to cause an infinite
|
|
|
|
* loop (i.e. too close to FLT_EPSILON), fall back to default of 0.001
|
|
|
|
*/
|
|
|
|
/* grid->dx is the first float in View2DGrid struct, so just cast to float pointer, and use it
|
|
|
|
* It represents the number of 'frames' between gridlines, but we divide by MINGRIDSTEP to get pixels-steps
|
|
|
|
*/
|
|
|
|
// TODO: perhaps we should have 1.0 frames as upper limit so that curves don't get too distorted?
|
|
|
|
samplefreq= *((float *)grid) / MINGRIDSTEP;
|
|
|
|
if (IS_EQ(samplefreq, 0)) samplefreq= 0.001f;
|
|
|
|
|
|
|
|
|
|
|
|
/* the start/end times are simply the horizontal extents of the 'cur' rect */
|
|
|
|
stime= v2d->cur.xmin;
|
|
|
|
etime= v2d->cur.xmax;
|
|
|
|
|
|
|
|
|
|
|
|
/* at each sampling interval, add a new vertex */
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
|
|
|
|
for (ctime= stime; ctime <= etime; ctime += samplefreq)
|
|
|
|
glVertex2f( ctime, evaluate_fcurve(fcu, ctime) );
|
|
|
|
|
|
|
|
glEnd();
|
|
|
|
|
|
|
|
/* restore driver */
|
|
|
|
fcu->driver= driver;
|
|
|
|
}
|
|
|
|
|
2009-03-01 11:47:29 +00:00
|
|
|
/* helper func - draw a samples-based F-Curve */
|
2009-03-15 10:39:02 +00:00
|
|
|
static void draw_fcurve_curve_samples (FCurve *fcu, View2D *v2d)
|
2009-03-01 11:47:29 +00:00
|
|
|
{
|
|
|
|
FPoint *prevfpt= fcu->fpt;
|
|
|
|
FPoint *fpt= prevfpt + 1;
|
|
|
|
float fac, v[2];
|
|
|
|
int b= fcu->totvert-1;
|
|
|
|
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
/* extrapolate to left? - left-side of view comes before first keyframe? */
|
|
|
|
if (prevfpt->vec[0] > v2d->cur.xmin) {
|
|
|
|
v[0]= v2d->cur.xmin;
|
|
|
|
|
|
|
|
/* y-value depends on the interpolation */
|
|
|
|
if ((fcu->extend==FCURVE_EXTRAPOLATE_CONSTANT) || (fcu->flag & FCURVE_INT_VALUES) || (fcu->totvert==1)) {
|
|
|
|
/* just extend across the first keyframe's value */
|
|
|
|
v[1]= prevfpt->vec[1];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* extrapolate linear dosnt use the handle, use the next points center instead */
|
|
|
|
fac= (prevfpt->vec[0]-fpt->vec[0])/(prevfpt->vec[0]-v[0]);
|
|
|
|
if (fac) fac= 1.0f/fac;
|
|
|
|
v[1]= prevfpt->vec[1]-fac*(prevfpt->vec[1]-fpt->vec[1]);
|
2009-03-01 11:47:29 +00:00
|
|
|
}
|
2009-03-15 10:39:02 +00:00
|
|
|
|
|
|
|
glVertex2fv(v);
|
2009-03-01 11:47:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if only one sample, add it now */
|
|
|
|
if (fcu->totvert == 1)
|
|
|
|
glVertex2fv(prevfpt->vec);
|
|
|
|
|
|
|
|
/* loop over samples, drawing segments */
|
|
|
|
/* draw curve between first and last keyframe (if there are enough to do so) */
|
|
|
|
while (b--) {
|
|
|
|
/* Linear interpolation: just add one point (which should add a new line segment) */
|
|
|
|
glVertex2fv(prevfpt->vec);
|
|
|
|
|
|
|
|
/* get next pointers */
|
|
|
|
prevfpt= fpt;
|
|
|
|
fpt++;
|
|
|
|
|
|
|
|
/* last point? */
|
|
|
|
if (b == 0)
|
|
|
|
glVertex2fv(prevfpt->vec);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* extrapolate to right? (see code for left-extrapolation above too) */
|
2009-03-15 10:39:02 +00:00
|
|
|
if (prevfpt->vec[0] < v2d->cur.xmax) {
|
|
|
|
v[0]= v2d->cur.xmax;
|
|
|
|
|
|
|
|
/* y-value depends on the interpolation */
|
|
|
|
if ((fcu->extend==FCURVE_EXTRAPOLATE_CONSTANT) || (fcu->flag & FCURVE_INT_VALUES) || (fcu->totvert==1)) {
|
|
|
|
/* based on last keyframe's value */
|
|
|
|
v[1]= prevfpt->vec[1];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* extrapolate linear dosnt use the handle, use the previous points center instead */
|
|
|
|
fpt = prevfpt-1;
|
|
|
|
fac= (prevfpt->vec[0]-fpt->vec[0])/(prevfpt->vec[0]-v[0]);
|
|
|
|
if (fac) fac= 1.0f/fac;
|
|
|
|
v[1]= prevfpt->vec[1]-fac*(prevfpt->vec[1]-fpt->vec[1]);
|
2009-03-01 11:47:29 +00:00
|
|
|
}
|
2009-03-15 10:39:02 +00:00
|
|
|
|
|
|
|
glVertex2fv(v);
|
2009-03-01 11:47:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/* helper func - draw one repeat of an F-Curve */
|
2009-03-15 10:39:02 +00:00
|
|
|
static void draw_fcurve_curve_bezts (FCurve *fcu, View2D *v2d, View2DGrid *grid)
|
2009-01-09 06:25:14 +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
|
|
|
BezTriple *prevbezt= fcu->bezt;
|
2009-01-09 06:25:14 +00:00
|
|
|
BezTriple *bezt= prevbezt+1;
|
|
|
|
float v1[2], v2[2], v3[2], v4[2];
|
|
|
|
float *fp, data[120];
|
2009-03-15 10:39:02 +00:00
|
|
|
float fac= 0.0f;
|
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
|
|
|
int b= fcu->totvert-1;
|
2009-01-09 06:25:14 +00:00
|
|
|
int resol;
|
|
|
|
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
|
|
|
|
/* extrapolate to left? */
|
2009-03-15 10:39:02 +00:00
|
|
|
if (prevbezt->vec[1][0] > v2d->cur.xmin) {
|
2009-01-09 06:25:14 +00:00
|
|
|
/* left-side of view comes before first keyframe, so need to extend as not cyclic */
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= v2d->cur.xmin;
|
|
|
|
|
|
|
|
/* y-value depends on the interpolation */
|
2009-03-18 10:58:18 +00:00
|
|
|
if ((fcu->extend==FCURVE_EXTRAPOLATE_CONSTANT) || (prevbezt->ipo==BEZT_IPO_CONST) || (fcu->totvert==1)) {
|
2009-03-15 10:39:02 +00:00
|
|
|
/* just extend across the first keyframe's value */
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
|
|
|
}
|
|
|
|
else if (prevbezt->ipo==BEZT_IPO_LIN) {
|
|
|
|
/* extrapolate linear dosnt use the handle, use the next points center instead */
|
|
|
|
fac= (prevbezt->vec[1][0]-bezt->vec[1][0])/(prevbezt->vec[1][0]-v1[0]);
|
|
|
|
if (fac) fac= 1.0f/fac;
|
|
|
|
v1[1]= prevbezt->vec[1][1]-fac*(prevbezt->vec[1][1]-bezt->vec[1][1]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* based on angle of handle 1 (relative to keyframe) */
|
|
|
|
fac= (prevbezt->vec[0][0]-prevbezt->vec[1][0])/(prevbezt->vec[1][0]-v1[0]);
|
|
|
|
if (fac) fac= 1.0f/fac;
|
|
|
|
v1[1]= prevbezt->vec[1][1]-fac*(prevbezt->vec[0][1]-prevbezt->vec[1][1]);
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|
2009-03-15 10:39:02 +00:00
|
|
|
|
|
|
|
glVertex2fv(v1);
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if only one keyframe, add it now */
|
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 (fcu->totvert == 1) {
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= prevbezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
glVertex2fv(v1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* draw curve between first and last keyframe (if there are enough to do so) */
|
|
|
|
while (b--) {
|
2009-03-18 10:58:18 +00:00
|
|
|
if (prevbezt->ipo==BEZT_IPO_CONST) {
|
2009-01-09 06:25:14 +00:00
|
|
|
/* Constant-Interpolation: draw segment between previous keyframe and next, but holding same value */
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= prevbezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
glVertex2fv(v1);
|
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= bezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
glVertex2fv(v1);
|
|
|
|
}
|
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
|
|
|
else if (prevbezt->ipo==BEZT_IPO_LIN) {
|
2009-01-09 06:25:14 +00:00
|
|
|
/* Linear interpolation: just add one point (which should add a new line segment) */
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= prevbezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
glVertex2fv(v1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Bezier-Interpolation: draw curve as series of segments between keyframes
|
|
|
|
* - resol determines number of points to sample in between keyframes
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* resol not depending on horizontal resolution anymore, drivers for example... */
|
2009-09-25 10:52:29 +00:00
|
|
|
// TODO: would be nice to make this depend on the scale of the graph too...
|
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 (fcu->driver)
|
2009-01-09 06:25:14 +00:00
|
|
|
resol= 32;
|
|
|
|
else
|
2009-01-29 10:19:43 +00:00
|
|
|
resol= (int)(3.0*sqrt(bezt->vec[1][0] - prevbezt->vec[1][0]));
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
if (resol < 2) {
|
|
|
|
/* only draw one */
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= prevbezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
glVertex2fv(v1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* clamp resolution to max of 32 */
|
|
|
|
if (resol > 32) resol= 32;
|
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= prevbezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
|
|
|
v2[0]= prevbezt->vec[2][0];
|
|
|
|
v2[1]= prevbezt->vec[2][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
v3[0]= bezt->vec[0][0];
|
|
|
|
v3[1]= bezt->vec[0][1];
|
|
|
|
v4[0]= bezt->vec[1][0];
|
|
|
|
v4[1]= bezt->vec[1][1];
|
2009-01-09 06:25:14 +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
|
|
|
correct_bezpart(v1, v2, v3, v4);
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-09-11 14:56:54 +00:00
|
|
|
forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, sizeof(float)*3);
|
|
|
|
forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, sizeof(float)*3);
|
2009-01-09 06:25:14 +00:00
|
|
|
|
|
|
|
for (fp= data; resol; resol--, fp+= 3)
|
|
|
|
glVertex2fv(fp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get next pointers */
|
|
|
|
prevbezt= bezt;
|
|
|
|
bezt++;
|
|
|
|
|
|
|
|
/* last point? */
|
|
|
|
if (b == 0) {
|
2009-03-15 10:39:02 +00:00
|
|
|
v1[0]= prevbezt->vec[1][0];
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
2009-01-09 06:25:14 +00:00
|
|
|
glVertex2fv(v1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* extrapolate to right? (see code for left-extrapolation above too) */
|
2009-03-15 10:39:02 +00:00
|
|
|
if (prevbezt->vec[1][0] < v2d->cur.xmax) {
|
|
|
|
v1[0]= v2d->cur.xmax;
|
|
|
|
|
|
|
|
/* y-value depends on the interpolation */
|
|
|
|
if ((fcu->extend==FCURVE_EXTRAPOLATE_CONSTANT) || (fcu->flag & FCURVE_INT_VALUES) || (prevbezt->ipo==BEZT_IPO_CONST) || (fcu->totvert==1)) {
|
|
|
|
/* based on last keyframe's value */
|
|
|
|
v1[1]= prevbezt->vec[1][1];
|
|
|
|
}
|
|
|
|
else if (prevbezt->ipo==BEZT_IPO_LIN) {
|
|
|
|
/* extrapolate linear dosnt use the handle, use the previous points center instead */
|
|
|
|
bezt = prevbezt-1;
|
|
|
|
fac= (prevbezt->vec[1][0]-bezt->vec[1][0])/(prevbezt->vec[1][0]-v1[0]);
|
|
|
|
if (fac) fac= 1.0f/fac;
|
|
|
|
v1[1]= prevbezt->vec[1][1]-fac*(prevbezt->vec[1][1]-bezt->vec[1][1]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* based on angle of handle 1 (relative to keyframe) */
|
|
|
|
fac= (prevbezt->vec[2][0]-prevbezt->vec[1][0])/(prevbezt->vec[1][0]-v1[0]);
|
|
|
|
if (fac) fac= 1.0f/fac;
|
|
|
|
v1[1]= prevbezt->vec[1][1]-fac*(prevbezt->vec[2][1]-prevbezt->vec[1][1]);
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|
2009-03-15 10:39:02 +00:00
|
|
|
|
|
|
|
glVertex2fv(v1);
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
/* Public Curve-Drawing API ---------------- */
|
|
|
|
|
2009-04-08 01:07:46 +00:00
|
|
|
/* Draw the 'ghost' F-Curves (i.e. snapshots of the curve) */
|
|
|
|
void graph_draw_ghost_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid *grid)
|
|
|
|
{
|
|
|
|
FCurve *fcu;
|
|
|
|
|
|
|
|
/* draw with thick dotted lines */
|
2009-05-28 01:57:29 +00:00
|
|
|
setlinestyle(10);
|
2009-04-08 01:07:46 +00:00
|
|
|
glLineWidth(3.0f);
|
|
|
|
|
|
|
|
/* anti-aliased lines for less jagged appearance */
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
|
|
|
/* the ghost curves are simply sampled F-Curves stored in sipo->ghostCurves */
|
|
|
|
for (fcu= sipo->ghostCurves.first; fcu; fcu= fcu->next) {
|
|
|
|
/* set whatever color the curve has set
|
|
|
|
* - this is set by the function which creates these
|
|
|
|
* - draw with a fixed opacity of 2
|
|
|
|
*/
|
|
|
|
glColor4f(fcu->color[0], fcu->color[1], fcu->color[2], 0.5f);
|
|
|
|
|
|
|
|
/* simply draw the stored samples */
|
|
|
|
draw_fcurve_curve_samples(fcu, &ar->v2d);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* restore settings */
|
|
|
|
setlinestyle(0);
|
|
|
|
glLineWidth(1.0f);
|
|
|
|
|
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is called twice from space_graph.c -> graph_main_area_draw()
|
|
|
|
* Unselected then selected F-Curves are drawn so that they do not occlude each other.
|
|
|
|
*/
|
|
|
|
void graph_draw_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid *grid, short sel)
|
2009-01-09 06:25:14 +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
|
|
|
ListBase anim_data = {NULL, NULL};
|
|
|
|
bAnimListElem *ale;
|
|
|
|
int filter;
|
2009-01-09 06:25:14 +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
|
|
|
/* build list of curves to draw */
|
2009-01-26 23:18:27 +00:00
|
|
|
filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CURVESONLY|ANIMFILTER_CURVEVISIBLE);
|
2009-04-12 13:19:21 +00:00
|
|
|
filter |= ((sel) ? (ANIMFILTER_SEL) : (ANIMFILTER_UNSEL));
|
2009-02-15 10:58:24 +00:00
|
|
|
ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
|
2009-01-09 06:25:14 +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
|
|
|
/* for each curve:
|
|
|
|
* draw curve, then handle-lines, and finally vertices in this order so that
|
|
|
|
* the data will be layered correctly
|
|
|
|
*/
|
2009-02-15 10:58:24 +00:00
|
|
|
for (ale=anim_data.first; ale; ale=ale->next) {
|
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
|
|
|
FCurve *fcu= (FCurve *)ale->key_data;
|
2009-07-02 05:25:14 +00:00
|
|
|
FModifier *fcm= find_active_fmodifier(&fcu->modifiers);
|
2009-06-23 13:25:31 +00:00
|
|
|
AnimData *adt= ANIM_nla_mapping_get(ac, ale);
|
2009-01-09 06:25:14 +00:00
|
|
|
|
2009-02-09 23:46:13 +00:00
|
|
|
/* map keyframes for drawing if scaled F-Curve */
|
2009-06-23 13:25:31 +00:00
|
|
|
if (adt)
|
|
|
|
ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 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
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
/* draw curve:
|
|
|
|
* - curve line may be result of one or more destructive modifiers or just the raw data,
|
|
|
|
* so we need to check which method should be used
|
|
|
|
* - controls from active modifier take precidence over keyframes
|
|
|
|
* (XXX! editing tools need to take this into account!)
|
2009-02-21 10:38:58 +00:00
|
|
|
*/
|
2009-03-15 10:39:02 +00:00
|
|
|
|
|
|
|
/* 1) draw curve line */
|
|
|
|
{
|
2009-02-12 01:47:45 +00:00
|
|
|
/* set color/drawing style for curve itself */
|
2009-02-12 10:41:57 +00:00
|
|
|
if ( ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED)) || (fcu->flag & FCURVE_PROTECTED) ) {
|
2009-02-12 01:47:45 +00:00
|
|
|
/* protected curves (non editable) are drawn with dotted lines */
|
|
|
|
setlinestyle(2);
|
|
|
|
}
|
|
|
|
if (fcu->flag & FCURVE_MUTED) {
|
|
|
|
/* muted curves are drawn in a greyish hue */
|
|
|
|
// XXX should we have some variations?
|
|
|
|
UI_ThemeColorShade(TH_HEADER, 50);
|
|
|
|
}
|
|
|
|
else {
|
2009-05-18 02:23:20 +00:00
|
|
|
/* set whatever color the curve has set
|
|
|
|
* - unselected curves draw less opaque to help distinguish the selected ones
|
|
|
|
*/
|
2009-09-25 10:52:29 +00:00
|
|
|
glColor4f(fcu->color[0], fcu->color[1], fcu->color[2], drawFCurveFade(fcu));
|
2009-02-12 01:47:45 +00:00
|
|
|
}
|
2009-02-09 11:05:34 +00:00
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
/* anti-aliased lines for less jagged appearance */
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
2009-02-12 01:47:45 +00:00
|
|
|
/* draw F-Curve */
|
2009-03-18 10:58:18 +00:00
|
|
|
if ((fcu->modifiers.first) || (fcu->flag & FCURVE_INT_VALUES)) {
|
|
|
|
/* draw a curve affected by modifiers or only allowed to have integer values
|
|
|
|
* by sampling it at various small-intervals over the visible region
|
|
|
|
*/
|
2009-03-15 10:39:02 +00:00
|
|
|
draw_fcurve_curve(fcu, sipo, &ar->v2d, grid);
|
|
|
|
}
|
|
|
|
else if ( ((fcu->bezt) || (fcu->fpt)) && (fcu->totvert) ) {
|
|
|
|
/* just draw curve based on defined data (i.e. no modifiers) */
|
|
|
|
if (fcu->bezt)
|
|
|
|
draw_fcurve_curve_bezts(fcu, &ar->v2d, grid);
|
|
|
|
else if (fcu->fpt)
|
|
|
|
draw_fcurve_curve_samples(fcu, &ar->v2d);
|
|
|
|
}
|
2009-02-09 11:05:34 +00:00
|
|
|
|
2009-02-12 01:47:45 +00:00
|
|
|
/* restore settings */
|
|
|
|
setlinestyle(0);
|
|
|
|
|
2009-03-15 10:39:02 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
2009-07-28 06:50:30 +00:00
|
|
|
/* 2) draw handles and vertices as appropriate based on active
|
|
|
|
* - if the option to only show controls if the F-Curve is selected is enabled, we must obey this
|
|
|
|
*/
|
|
|
|
if (!(sipo->flag & SIPO_SELCUVERTSONLY) || (fcu->flag & FCURVE_SELECTED)) {
|
|
|
|
if (fcurve_needs_draw_fmodifier_controls(fcu, fcm)) {
|
|
|
|
/* only draw controls if this is the active modifier */
|
|
|
|
if ((fcu->flag & FCURVE_ACTIVE) && (fcm)) {
|
|
|
|
switch (fcm->type) {
|
|
|
|
case FMODIFIER_TYPE_ENVELOPE: /* envelope */
|
|
|
|
draw_fcurve_modifier_controls_envelope(fcu, fcm, &ar->v2d);
|
|
|
|
break;
|
|
|
|
}
|
2009-03-21 03:49:22 +00:00
|
|
|
}
|
|
|
|
}
|
2009-07-28 06:50:30 +00:00
|
|
|
else if ( ((fcu->bezt) || (fcu->fpt)) && (fcu->totvert) ) {
|
|
|
|
if (fcu->bezt) {
|
|
|
|
/* only draw handles/vertices on keyframes */
|
2.5 - Assorted Animation UI/Editing Tweaks
Main Feature:
* It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.)
* Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying.
* Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region.
--> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen...
--> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors...
Other tweaks:
* Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon
* Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though.
* Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too.
* Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
|
|
|
glEnable(GL_BLEND);
|
|
|
|
draw_fcurve_handles(sipo, ar, fcu);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
2009-07-28 06:50:30 +00:00
|
|
|
draw_fcurve_vertices(sipo, ar, fcu);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* samples: should we only draw two indicators at either end as indicators? */
|
|
|
|
draw_fcurve_samples(sipo, ar, fcu);
|
|
|
|
}
|
2009-02-09 23:46:13 +00:00
|
|
|
}
|
2009-02-09 11:05:34 +00:00
|
|
|
}
|
2009-01-09 06:25:14 +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
|
|
|
/* undo mapping of keyframes for drawing if scaled F-Curve */
|
2009-06-23 13:25:31 +00:00
|
|
|
if (adt)
|
|
|
|
ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0);
|
2009-01-09 06:25:14 +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
|
|
|
|
|
|
|
/* free list of curves */
|
|
|
|
BLI_freelistN(&anim_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ************************************************************************* */
|
|
|
|
/* Channel List */
|
|
|
|
|
|
|
|
/* left hand part */
|
2009-08-16 02:21:43 +00:00
|
|
|
void graph_draw_channel_names(bContext *C, bAnimContext *ac, SpaceIpo *sipo, ARegion *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
|
|
|
{
|
|
|
|
ListBase anim_data = {NULL, NULL};
|
|
|
|
bAnimListElem *ale;
|
|
|
|
int filter;
|
|
|
|
|
|
|
|
View2D *v2d= &ar->v2d;
|
2009-08-11 11:52:23 +00:00
|
|
|
float y= 0.0f, height;
|
2009-02-15 10:58:24 +00:00
|
|
|
int items, i=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
|
|
|
|
|
|
|
/* build list of channels to draw */
|
|
|
|
filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS);
|
|
|
|
items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
|
|
|
|
|
|
|
|
/* Update max-extent of channels here (taking into account scrollers):
|
|
|
|
* - this is done to allow the channel list to be scrollable, but must be done here
|
|
|
|
* to avoid regenerating the list again and/or also because channels list is drawn first
|
|
|
|
* - offset of ACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
|
|
|
|
* start of list offset, and the second is as a correction for the scrollers.
|
|
|
|
*/
|
2009-01-29 10:19:43 +00:00
|
|
|
height= (float)((items*ACHANNEL_STEP) + (ACHANNEL_HEIGHT*2));
|
2009-02-19 17:13:04 +00:00
|
|
|
UI_view2d_totRect_set(v2d, ar->winx, height);
|
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
|
|
|
/* loop through channels, and set up drawing depending on their type */
|
2009-08-16 02:21:43 +00:00
|
|
|
{ /* first pass: just the standard GL-drawing for backdrop + text */
|
|
|
|
y= (float)ACHANNEL_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
|
|
|
|
2009-08-16 02:21:43 +00:00
|
|
|
for (ale= anim_data.first, i=0; ale; ale= ale->next, i++) {
|
|
|
|
const float yminc= (float)(y - ACHANNEL_HEIGHT_HALF);
|
|
|
|
const float ymaxc= (float)(y + ACHANNEL_HEIGHT_HALF);
|
|
|
|
|
|
|
|
/* check if visible */
|
|
|
|
if ( IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
|
|
|
|
IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax) )
|
|
|
|
{
|
|
|
|
/* draw all channels using standard channel-drawing API */
|
|
|
|
ANIM_channel_draw(ac, ale, yminc, ymaxc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* adjust y-position for next one */
|
|
|
|
y -= ACHANNEL_STEP;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
{ /* second pass: widgets */
|
|
|
|
uiBlock *block= uiBeginBlock(C, ar, "graph channel buttons", UI_EMBOSS);
|
|
|
|
|
|
|
|
y= (float)ACHANNEL_FIRST;
|
|
|
|
|
2009-08-18 11:48:34 +00:00
|
|
|
/* set blending again, as may not be set in previous step */
|
|
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
|
2009-08-16 02:21:43 +00:00
|
|
|
for (ale= anim_data.first, i=0; ale; ale= ale->next, i++) {
|
|
|
|
const float yminc= (float)(y - ACHANNEL_HEIGHT_HALF);
|
|
|
|
const float ymaxc= (float)(y + ACHANNEL_HEIGHT_HALF);
|
|
|
|
|
|
|
|
/* check if visible */
|
|
|
|
if ( IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
|
|
|
|
IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax) )
|
|
|
|
{
|
|
|
|
/* draw all channels using standard channel-drawing API */
|
|
|
|
ANIM_channel_draw_widgets(ac, ale, block, yminc, ymaxc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* adjust y-position for next one */
|
|
|
|
y -= ACHANNEL_STEP;
|
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
|
|
|
}
|
|
|
|
|
2009-08-16 02:21:43 +00:00
|
|
|
uiEndBlock(C, block);
|
|
|
|
uiDrawBlock(C, block);
|
2009-08-18 11:48:34 +00:00
|
|
|
|
|
|
|
glDisable(GL_BLEND);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/* free tempolary channels */
|
|
|
|
BLI_freelistN(&anim_data);
|
2009-01-09 06:25:14 +00:00
|
|
|
}
|