2.5 - Action Editor / Dopesheet

Initial commit of drawing code for Action Editor / Dopesheet. By default, the Dopesheet is now enabled (like in AnimSys2). There are still a few unresolved problems (like bad alpha blending for icons, and keyframes still not being drawn). However, these will be resolved in due course.

3 files changed, 169 insertions, 13 deletions

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 61065cd970d..f6996bbb07e 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -33,12 +33,43 @@ struct ID;
 struct ListBase;
 struct bContext;
 struct View2D;
+struct gla2DDrawInfo;
+struct Object;
 struct bActionGroup;
 
 /* ************************************************ */
 /* ANIMATION CHANNEL FILTERING */
 
-/* --------------- Data Types -------------------- */
+/* --------------- Context --------------------- */
+
+/* This struct defines a structure used for animation-specific 
+ * 'context' information
+ */
+typedef struct bAnimContext {
+	void *data;				/* data to be filtered for use in animation editor */
+	short datatype;			/* type of data eAnimCont_Types */
+	
+	short mode;				/* editor->mode */
+	short spacetype;		/* sa->spacetype */
+	short regiontype;		/* active region -> type (channels or main) */
+	struct ScrArea *sa;		/* editor */ 
+	
+	struct Scene *scene;	/* active scene */
+	struct Object *obact;	/* active object */
+} bAnimContext;
+
+/* Main Data container types */
+// XXX was ACTCONT_*
+typedef enum eAnimCont_Types {
+	ANIMCONT_NONE = 0,		/* invalid or no data */
+	ANIMCONT_ACTION,		/* action (bAction) */
+	ANIMCONT_SHAPEKEY,		/* shapekey (Key) */
+	ANIMCONT_GPENCIL,		/* grease pencil (screen) */
+	ANIMCONT_DOPESHEET,		/* dopesheet (bDopesheet) */
+	ANIMCONT_IPO,			/* single IPO (Ipo) */
+} eAnimCont_Types;
+
+/* --------------- Channels -------------------- */
 
 /* This struct defines a structure used for quick and uniform access for 
  * channels of animation data
@@ -109,15 +140,7 @@ typedef enum eAnim_KeyType {
 	ALE_GROUP,			/* Action Group summary */
 } eAnim_KeyType;
 
-/* Main Data container types */
-// XXX was ACTCONT_*
-typedef enum eAnimCont_Types {
-	ANIMCONT_NONE = 0,		/* invalid or no data */
-	ANIMCONT_ACTION,		/* action (bAction) */
-	ANIMCONT_SHAPEKEY,		/* shapekey (Key) */
-	ANIMCONT_GPENCIL,		/* grease pencil (screen) */
-	ANIMCONT_DOPESHEET,		/* dopesheet (bDopesheet) */
-} eAnimCont_Types;
+/* ----------------- Filtering -------------------- */
 
 /* filtering flags  - under what circumstances should a channel be added */
 // XXX was ACTFILTER_*
@@ -179,13 +202,28 @@ typedef enum eAnimFilter_Flags {
 #define EDITABLE_GPL(gpl) ((gpl->flag & GP_LAYER_LOCKED)==0)
 #define SEL_GPL(gpl) ((gpl->flag & GP_LAYER_ACTIVE) || (gpl->flag & GP_LAYER_SELECT))
 
+/* -------------- Channel Defines -------------- */
+
+/* channel heights */
+#define	ACHANNEL_HEIGHT			16
+#define ACHANNEL_HEIGHT_HALF	8
+#define	ACHANNEL_SKIP			2
+#define ACHANNEL_STEP			(ACHANNEL_HEIGHT + ACHANNEL_SKIP)
+	// FIXME: needs to be renamed...
+#define NAMEWIDTH				190
+
 /* ---------------- API  -------------------- */
 
 /* Obtain list of filtered Animation channels to operate on */
 void ANIM_animdata_filter(struct ListBase *anim_data, int filter_mode, void *data, short datatype);
 
 /* Obtain current anim-data context from Blender Context info */
-void *ANIM_animdata_get_context(const struct bContext *C, short *datatype);
+/** Example usage (example to be removed...):
+	// get editor data
+	if ((ANIM_animdata_get_context(C, &ac) == 0) || (ac.data == NULL))
+		return;
+ */
+short ANIM_animdata_get_context(const struct bContext *C, bAnimContext *ac);
 
 /* ************************************************ */
 /* DRAWING API */
@@ -210,12 +248,24 @@ void ANIM_draw_cfra(const bContext *C, struct View2D *v2d, short flag);
 
 /* ------------- Preview Range Drawing -------------- */
 
-// XXX should preview range get its own file?
-
 /* main call to draw preview range curtains */
 void ANIM_draw_previewrange(const bContext *C, struct View2D *v2d);
 
 /* ************************************************* */
+/* ASSORTED TOOLS */
+
+/* ------------- NLA-Mapping ----------------------- */
+
+/* Obtain the Object providing NLA-scaling for the given channel if applicable */
+struct Object *ANIM_nla_mapping_get(bAnimContext *ac, bAnimListElem *ale);
+
+/* set/clear temporary mapping of coordinates from 'local-action' time to 'global-nla-scaled' time */
+void ANIM_nla_mapping_draw(struct gla2DDrawInfo *di, struct Object *ob, short restore);
+
+/* ------------- xxx macros ----------------------- */
+#define BEZSELECTED(bezt) ((bezt->f2 & SELECT) || (bezt->f1 & SELECT) || (bezt->f3 & SELECT))
+
+/* ************************************************* */
 /* OPERATORS */
 
 void ED_operatortypes_anim(void);
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
new file mode 100644
index 00000000000..a1ddd6b6bed
--- /dev/null
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -0,0 +1,99 @@
+/**
+ * $Id: BDR_drawaction.h 17579 2008-11-26 11:01:56Z aligorith $
+ *
+ * ***** 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) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BDR_DRAWACTION_H
+#define BDR_DRAWACTION_H
+
+struct BezTriple;
+struct Ipo;
+struct IpoCurve;
+struct gla2DDrawInfo;
+struct bAction;
+struct bActionGroup;
+struct bActListElem;
+struct Object;
+struct ListBase;
+struct bGPDlayer;
+
+/* ****************************** Base Structs ****************************** */
+
+/* Keyframe Column Struct */
+typedef struct ActKeyColumn {
+	struct ActKeyColumn *next, *prev;
+	short sel, handle_type;
+	float cfra;
+	
+	/* only while drawing - used to determine if long-keyframe needs to be drawn */
+	short modified;
+	short totcurve;
+} ActKeyColumn;
+
+/* 'Long Keyframe' Struct */
+typedef struct ActKeyBlock {
+	struct ActKeyBlock *next, *prev;
+	short sel, handle_type;
+	float val;
+	float start, end;
+	
+	/* only while drawing - used to determine if block needs to be drawn */
+	short modified;
+	short totcurve; 
+} ActKeyBlock;
+
+
+/* Inclusion-Range Limiting Struct (optional) */
+typedef struct ActKeysInc {
+	struct bDopeSheet *ads;			/* dopesheet data (for dopesheet mode) */
+	struct Object *ob;				/* owner object for NLA-scaling info (if Object channels, is just Object) */
+	short actmode;					/* mode of the Action Editor (-1 is for NLA) */
+	
+	float start, end;				/* frames (global-time) to only consider keys between */  // XXX not used anymore!
+} ActKeysInc;
+
+/* ******************************* Methods ****************************** */
+
+/* Channel Drawing */
+void draw_icu_channel(struct gla2DDrawInfo *di, ActKeysInc *aki, struct IpoCurve *icu, float ypos);
+void draw_ipo_channel(struct gla2DDrawInfo *di, ActKeysInc *aki, struct Ipo *ipo, float ypos);
+void draw_agroup_channel(struct gla2DDrawInfo *di, ActKeysInc *aki, struct bActionGroup *agrp, float ypos);
+void draw_action_channel(struct gla2DDrawInfo *di, ActKeysInc *aki, struct bAction *act, float ypos);
+void draw_object_channel(struct gla2DDrawInfo *di, ActKeysInc *aki, struct Object *ob, float ypos);
+void draw_gpl_channel(struct gla2DDrawInfo *di, ActKeysInc *aki, struct bGPDlayer *gpl, float ypos);
+
+/* Keydata Generation */
+void icu_to_keylist(struct IpoCurve *icu, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void ipo_to_keylist(struct Ipo *ipo, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void agroup_to_keylist(struct bActionGroup *agrp, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void action_to_keylist(struct bAction *act, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void action_nlascaled_to_keylist(struct Object *ob, struct bAction *act, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void ob_to_keylist(struct Object *ob, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void gpl_to_keylist(struct bGPDlayer *gpl, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+
+#endif  /*  BDR_DRAWACTION_H */
+
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 461150ef045..a7a4c2814c3 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -527,6 +527,13 @@ enum {
 	
 	TH_EDGE_SHARP,
 	TH_EDITMESH_ACTIVE,
+	
+	TH_HANDLE_VERTEX,
+	TH_HANDLE_VERTEX_SELECT,
+	TH_HANDLE_VERTEX_SIZE,
+	
+	TH_DOPESHEET_CHANNELOB,
+	TH_DOPESHEET_CHANNELSUBOB,
 };
 /* XXX WARNING: previous is saved in file, so do not change order! */