[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17980] branches/blender2.5/blender/source /blender/editors: 2.5 - Time operations to Animation Module
Joshua Leung
aligorith at gmail.com
Sun Dec 21 09:02:25 CET 2008
Revision: 17980
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17980
Author: aligorith
Date: 2008-12-21 09:02:24 +0100 (Sun, 21 Dec 2008)
Log Message:
-----------
2.5 - Time operations to Animation Module
Moved time_ops.c contents to anim_ops.c, as the operators there are applicable to all other Animation Editors too. anim_ops.c will therefore contain all operators which will apply to all Animation Editors (i.e. change frame, frames/seconds display toggle, and soon Preview Range tools).
As such, added new global 'Animation' keymap like for View2D and Markers, which will ensure that these tools can be accessed in an uniform way across editors.
Note that the order that these things are added is important, as the Animation ones will often 'steal' events from the View2D and Markers ones if placed before the others. To prevent that, we'd need to be able to set boundboxes here...
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h
branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
branches/blender2.5/blender/source/blender/editors/space_time/time_ops.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
Added: branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c 2008-12-21 08:02:24 UTC (rev 17980)
@@ -0,0 +1,299 @@
+/**
+ * $Id:
+ *
+ * ***** 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) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation, Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <math.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_action_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_context.h"
+#include "BKE_utildefines.h"
+
+#include "UI_interface.h"
+#include "UI_view2d.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_anim_api.h"
+#include "ED_markers.h"
+#include "ED_screen.h"
+
+/* ********************** frame change operator ***************************/
+
+/* Set any flags that are necessary to indicate modal time-changing operation */
+static int change_frame_init(bContext *C, wmOperator *op)
+{
+ ScrArea *curarea= CTX_wm_area(C);
+
+ if (curarea == NULL)
+ return 0;
+
+ if (curarea->spacetype == SPACE_TIME) {
+ SpaceTime *stime= (SpaceTime*)CTX_wm_space_data(C);
+
+ /* timeline displays frame number only when dragging indicator */
+ // XXX make this more in line with other anim editors?
+ stime->flag |= TIME_CFRA_NUM;
+ }
+
+ return 1;
+}
+
+/* Set the new frame number */
+static void change_frame_apply(bContext *C, wmOperator *op)
+{
+ Scene *scene= CTX_data_scene(C);
+ int cfra;
+
+ /* get frame, and clamp to MINFRAME */
+ cfra= RNA_int_get(op->ptr, "frame");
+ if (cfra < MINFRAME)
+ cfra= MINFRAME;
+
+#if 0
+ if( cfra!=CFRA || first )
+ {
+ first= 0;
+ CFRA= cfra;
+ update_for_newframe_nodraw(0); // 1= nosound
+ timeline_force_draw(stime->redraws);
+ }
+#endif
+
+ /* XXX why don't we directly set this? */
+ if (cfra != scene->r.cfra)
+ scene->r.cfra= cfra;
+
+ WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
+ /* XXX: add WM_NOTE_TIME_CHANGED? */
+}
+
+/* Clear any temp flags */
+static void change_frame_exit(bContext *C, wmOperator *op)
+{
+ ScrArea *curarea= CTX_wm_area(C);
+
+ if (curarea == NULL)
+ return;
+
+ if (curarea->spacetype == SPACE_TIME) {
+ SpaceTime *stime= (SpaceTime*)CTX_wm_space_data(C);
+
+ /* timeline displays frame number only when dragging indicator */
+ // XXX make this more in line with other anim editors?
+ stime->flag &= ~TIME_CFRA_NUM;
+ }
+}
+
+/* ---- */
+
+/* Non-modal callback for running operator without user input */
+static int change_frame_exec(bContext *C, wmOperator *op)
+{
+ if (!change_frame_init(C, op))
+ return OPERATOR_CANCELLED;
+
+ change_frame_apply(C, op);
+ change_frame_exit(C, op);
+ return OPERATOR_FINISHED;
+}
+
+/* ---- */
+
+/* Get frame from mouse coordinates */
+static int frame_from_event(bContext *C, wmEvent *event)
+{
+ ARegion *region= CTX_wm_region(C);
+ float viewx;
+ int x, y;
+
+ /* convert screen coordinates to region coordinates */
+ x= event->x - region->winrct.xmin;
+ y= event->y - region->winrct.ymin;
+
+ /* convert from region coordinates to View2D 'tot' space */
+ UI_view2d_region_to_view(®ion->v2d, x, y, &viewx, NULL);
+
+ /* round result to nearest int (frames are ints!) */
+ return (int)floor(viewx+0.5f);
+}
+
+/* Modal Operator init */
+static int change_frame_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+ /* Change to frame that mouse is over before adding modal handler,
+ * as user could click on a single frame (jump to frame) as well as
+ * click-dragging over a range (modal scrubbing).
+ */
+ RNA_int_set(op->ptr, "frame", frame_from_event(C, event));
+
+ change_frame_init(C, op);
+ change_frame_apply(C, op);
+
+ /* add temp handler */
+ WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+
+ return OPERATOR_RUNNING_MODAL;
+}
+
+/* In case modal operator is cancelled */
+static int change_frame_cancel(bContext *C, wmOperator *op)
+{
+ change_frame_exit(C, op);
+ return OPERATOR_CANCELLED;
+}
+
+/* Modal event handling of frame changing */
+static int change_frame_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+ /* execute the events */
+ switch (event->type) {
+ case MOUSEMOVE:
+ RNA_int_set(op->ptr, "frame", frame_from_event(C, event));
+ change_frame_apply(C, op);
+ break;
+
+ case LEFTMOUSE:
+ if (event->val==0) {
+ change_frame_exit(C, op);
+ return OPERATOR_FINISHED;
+ }
+ break;
+ }
+
+ return OPERATOR_RUNNING_MODAL;
+}
+
+void ED_ANIM_OT_change_frame(wmOperatorType *ot)
+{
+ PropertyRNA *prop;
+
+ /* identifiers */
+ ot->name= "Change frame";
+ ot->idname= "ED_ANIM_OT_change_frame";
+
+ /* api callbacks */
+ ot->exec= change_frame_exec;
+ ot->invoke= change_frame_invoke;
+ ot->cancel= change_frame_cancel;
+ ot->modal= change_frame_modal;
+
+ /* rna */
+ prop= RNA_def_property(ot->srna, "frame", PROP_INT, PROP_NONE);
+}
+
+/* ****************** time display toggle operator ****************************/
+
+static int toggle_time_exec(bContext *C, wmOperator *op)
+{
+ ScrArea *curarea= CTX_wm_area(C);
+
+ if (curarea == NULL)
+ return OPERATOR_CANCELLED;
+
+ /* simply toggle draw frames flag in applicable spaces */
+ // XXX or should relevant spaces define their own version of this?
+ switch (curarea->spacetype) {
+ case SPACE_TIME: /* TimeLine */
+ {
+ SpaceTime *stime= (SpaceTime *)CTX_wm_space_data(C);
+ stime->flag ^= TIME_DRAWFRAMES;
+ }
+ break;
+ case SPACE_ACTION: /* Action Editor */
+ {
+ SpaceAction *saction= (SpaceAction *)CTX_wm_space_data(C);
+ saction->flag ^= SACTION_DRAWTIME;
+ }
+ break;
+ case SPACE_IPO: /* IPO Editor */
+ {
+ SpaceIpo *sipo= (SpaceIpo *)CTX_wm_space_data(C);
+ sipo->flag ^= SIPO_DRAWTIME;
+ }
+ break;
+ case SPACE_NLA: /* NLA Editor */
+ {
+ SpaceNla *snla= (SpaceNla *)CTX_wm_space_data(C);
+ snla->flag ^= SNLA_DRAWTIME;
+ }
+ break;
+ case SPACE_SEQ: /* Sequencer */
+ {
+ SpaceSeq *sseq= (SpaceSeq *)CTX_wm_space_data(C);
+ sseq->flag ^= SEQ_DRAWFRAMES;
+ }
+ break;
+
+ default: /* editor doesn't show frames */
+ return OPERATOR_CANCELLED; // XXX or should we pass through instead?
+ }
+
+ ED_area_tag_redraw(curarea);
+
+ return OPERATOR_FINISHED;
+}
+
+void ED_ANIM_OT_toggle_time(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name= "Toggle Frames/Seconds";
+ ot->idname= "ED_ANIM_OT_toggle_time";
+
+ /* api callbacks */
+ ot->exec= toggle_time_exec;
+}
+
+/* ************************** registration **********************************/
+
+void ED_operatortypes_anim(void)
+{
+ WM_operatortype_append(ED_ANIM_OT_change_frame);
+ WM_operatortype_append(ED_ANIM_OT_toggle_time);
+}
+
+void ED_keymap_anim(wmWindowManager *wm)
+{
+ ListBase *keymap= WM_keymap_listbase(wm, "Animation", 0, 0);
+
+ WM_keymap_verify_item(keymap, "ED_ANIM_OT_change_frame", LEFTMOUSE, KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "ED_ANIM_OT_toggle_time", TKEY, KM_PRESS, 0, 0);
+}
+
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h 2008-12-21 04:11:19 UTC (rev 17979)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h 2008-12-21 08:02:24 UTC (rev 17980)
@@ -137,46 +137,46 @@
/* Dopesheet only */
/* 'Object' channels */
-#define SEL_OBJC(base) ((base->flag & SELECT))
-#define EXPANDED_OBJC(ob) ((ob->nlaflag & OB_ADS_COLLAPSED)==0)
- /* 'Sub-object' channels (flags stored in Object block) */
-#define FILTER_IPO_OBJC(ob) ((ob->nlaflag & OB_ADS_SHOWIPO))
-#define FILTER_CON_OBJC(ob) ((ob->nlaflag & OB_ADS_SHOWCONS))
-#define FILTER_MAT_OBJC(ob) ((ob->nlaflag & OB_ADS_SHOWMATS))
- /* 'Sub-object' channels (flags stored in Data block) */
-#define FILTER_SKE_OBJD(key) ((key->flag & KEYBLOCK_DS_EXPAND))
-#define FILTER_MAT_OBJD(ma) ((ma->flag & MA_DS_EXPAND))
-#define FILTER_LAM_OBJD(la) ((la->flag & LA_DS_EXPAND))
-#define FILTER_CAM_OBJD(ca) ((ca->flag & CAM_DS_EXPAND))
-#define FILTER_CUR_OBJD(cu) ((cu->flag & CU_DS_EXPAND))
- /* 'Sub-object/Action' channels (flags stored in Action) */
-#define SEL_ACTC(actc) ((actc->flag & ACTC_SELECTED))
-#define EXPANDED_ACTC(actc) ((actc->flag & ACTC_EXPANDED))
-
-/* Actions (also used for Dopesheet) */
- /* Action Channel Group */
-#define EDITABLE_AGRP(agrp) ((agrp->flag & AGRP_PROTECTED)==0)
-#define EXPANDED_AGRP(agrp) (agrp->flag & AGRP_EXPANDED)
-#define SEL_AGRP(agrp) ((agrp->flag & AGRP_SELECTED) || (agrp->flag & AGRP_ACTIVE))
- /* Action Channel Settings */
-#define VISIBLE_ACHAN(achan) ((achan->flag & ACHAN_HIDDEN)==0)
-#define EDITABLE_ACHAN(achan) ((VISIBLE_ACHAN(achan)) && ((achan->flag & ACHAN_PROTECTED)==0))
-#define EXPANDED_ACHAN(achan) ((VISIBLE_ACHAN(achan)) && (achan->flag & ACHAN_EXPANDED))
-#define SEL_ACHAN(achan) ((achan->flag & ACHAN_SELECTED) || (achan->flag & ACHAN_HILIGHTED))
-#define FILTER_IPO_ACHAN(achan) ((achan->flag & ACHAN_SHOWIPO))
-#define FILTER_CON_ACHAN(achan) ((achan->flag & ACHAN_SHOWCONS))
- /* Constraint Channel Settings */
-#define EDITABLE_CONCHAN(conchan) ((conchan->flag & CONSTRAINT_CHANNEL_PROTECTED)==0)
-#define SEL_CONCHAN(conchan) (conchan->flag & CONSTRAINT_CHANNEL_SELECT)
- /* IPO Curve Channels */
-#define EDITABLE_ICU(icu) ((icu->flag & IPO_PROTECT)==0)
-#define SEL_ICU(icu) (icu->flag & IPO_SELECT)
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list