[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11557] trunk/blender/source/blender/src/ header_action.c: Action Editor - Code Cleanups:
Joshua Leung
aligorith at gmail.com
Sun Aug 12 09:30:11 CEST 2007
Revision: 11557
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11557
Author: aligorith
Date: 2007-08-12 09:30:11 +0200 (Sun, 12 Aug 2007)
Log Message:
-----------
Action Editor - Code Cleanups:
* I've replaced the long lists of #defines in header_action.c with enums, which should make that easier to maintain/add new items as needed.
* Added a few comments also
Modified Paths:
--------------
trunk/blender/source/blender/src/header_action.c
Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c 2007-08-12 06:14:33 UTC (rev 11556)
+++ trunk/blender/source/blender/src/header_action.c 2007-08-12 07:30:11 UTC (rev 11557)
@@ -30,7 +30,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): 2007, Joshua Leung (Action Editor recode)
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
@@ -79,84 +79,110 @@
#include "blendef.h"
#include "mydevice.h"
-#define ACTMENU_VIEW_CENTERVIEW 0
-#define ACTMENU_VIEW_AUTOUPDATE 1
-#define ACTMENU_VIEW_PLAY3D 2
-#define ACTMENU_VIEW_PLAYALL 3
-#define ACTMENU_VIEW_ALL 4
-#define ACTMENU_VIEW_MAXIMIZE 5
-#define ACTMENU_VIEW_LOCK 6
-#define ACTMENU_VIEW_SLIDERS 7
-#define ACTMENU_VIEW_NEXTMARKER 8
-#define ACTMENU_VIEW_PREVMARKER 9
-#define ACTMENU_VIEW_TIME 10
+/* enums declaring constants that are used as menu event codes */
-#define ACTMENU_SEL_BORDER 0
-#define ACTMENU_SEL_BORDERM 1
-#define ACTMENU_SEL_ALL_KEYS 2
-#define ACTMENU_SEL_ALL_CHAN 3
-#define ACTMENU_SEL_ALL_MARKERS 4
-#define ACTMENU_SEL_INVERSE_KEYS 5
-#define ACTMENU_SEL_INVERSE_MARKERS 6
+enum {
+ ACTMENU_VIEW_CENTERVIEW= 0,
+ ACTMENU_VIEW_AUTOUPDATE,
+ ACTMENU_VIEW_PLAY3D,
+ ACTMENU_VIEW_PLAYALL,
+ ACTMENU_VIEW_ALL,
+ ACTMENU_VIEW_MAXIMIZE,
+ ACTMENU_VIEW_LOCK,
+ ACTMENU_VIEW_SLIDERS,
+ ACTMENU_VIEW_NEXTMARKER,
+ ACTMENU_VIEW_PREVMARKER,
+ ACTMENU_VIEW_TIME,
+};
-#define ACTMENU_SEL_COLUMN_KEYS 1
-#define ACTMENU_SEL_COLUMN_MARKERSCOLUMN 2
-#define ACTMENU_SEL_COLUMN_MARKERSBETWEEN 3
+enum {
+ ACTMENU_SEL_BORDER = 0,
+ ACTMENU_SEL_BORDERM,
+ ACTMENU_SEL_ALL_KEYS,
+ ACTMENU_SEL_ALL_CHAN,
+ ACTMENU_SEL_ALL_MARKERS,
+ ACTMENU_SEL_INVERSE_KEYS,
+ ACTMENU_SEL_INVERSE_MARKERS
+};
-#define ACTMENU_KEY_DUPLICATE 0
-#define ACTMENU_KEY_DELETE 1
-#define ACTMENU_KEY_BAKE 2
-#define ACTMENU_KEY_CLEAN 3
+enum {
+ ACTMENU_SEL_COLUMN_KEYS = 1,
+ ACTMENU_SEL_COLUMN_MARKERSCOLUMN,
+ ACTMENU_SEL_COLUMN_MARKERSBETWEEN
+};
-#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_UP 0
-#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_DOWN 1
-#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_TOP 2
-#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_BOTTOM 3
+enum {
+ ACTMENU_KEY_DUPLICATE = 0,
+ ACTMENU_KEY_DELETE,
+ ACTMENU_KEY_BAKE,
+ ACTMENU_KEY_CLEAN
+};
-#define ACTMENU_KEY_TRANSFORM_MOVE 0
-#define ACTMENU_KEY_TRANSFORM_SCALE 1
-#define ACTMENU_KEY_TRANSFORM_SLIDE 2
+enum {
+ ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_UP = 0,
+ ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_DOWN,
+ ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_TOP,
+ ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_BOTTOM
+};
-#define ACTMENU_KEY_HANDLE_AUTO 0
-#define ACTMENU_KEY_HANDLE_ALIGN 1
-#define ACTMENU_KEY_HANDLE_FREE 2
-#define ACTMENU_KEY_HANDLE_VECTOR 3
+enum {
+ ACTMENU_KEY_TRANSFORM_MOVE = 0,
+ ACTMENU_KEY_TRANSFORM_SCALE,
+ ACTMENU_KEY_TRANSFORM_SLIDE
+};
-#define ACTMENU_KEY_INTERP_CONST 0
-#define ACTMENU_KEY_INTERP_LINEAR 1
-#define ACTMENU_KEY_INTERP_BEZIER 2
+enum {
+ ACTMENU_KEY_HANDLE_AUTO = 0,
+ ACTMENU_KEY_HANDLE_ALIGN,
+ ACTMENU_KEY_HANDLE_FREE,
+ ACTMENU_KEY_HANDLE_VECTOR
+};
-#define ACTMENU_KEY_EXTEND_CONST 0
-#define ACTMENU_KEY_EXTEND_EXTRAPOLATION 1
-#define ACTMENU_KEY_EXTEND_CYCLIC 2
-#define ACTMENU_KEY_EXTEND_CYCLICEXTRAPOLATION 3
+enum {
+ ACTMENU_KEY_INTERP_CONST = 0,
+ ACTMENU_KEY_INTERP_LINEAR,
+ ACTMENU_KEY_INTERP_BEZIER
+};
-#define ACTMENU_KEY_SNAP_NEARFRAME 1
-#define ACTMENU_KEY_SNAP_CURFRAME 2
-#define ACTMENU_KEY_SNAP_NEARMARK 3
-#define ACTMENU_KEY_SNAP_NEARTIME 4
+enum {
+ ACTMENU_KEY_EXTEND_CONST = 0,
+ ACTMENU_KEY_EXTEND_EXTRAPOLATION,
+ ACTMENU_KEY_EXTEND_CYCLIC,
+ ACTMENU_KEY_EXTEND_CYCLICEXTRAPOLATION
+};
-#define ACTMENU_KEY_MIRROR_CURFRAME 1
-#define ACTMENU_KEY_MIRROR_YAXIS 2
-#define ACTMENU_KEY_MIRROR_XAXIS 3
-#define ACTMENU_KEY_MIRROR_MARKER 4
+enum {
+ ACTMENU_KEY_SNAP_NEARFRAME = 1,
+ ACTMENU_KEY_SNAP_CURFRAME,
+ ACTMENU_KEY_SNAP_NEARMARK,
+ ACTMENU_KEY_SNAP_NEARTIME,
+};
-#define ACTMENU_MARKERS_ADD 0
-#define ACTMENU_MARKERS_DUPLICATE 1
-#define ACTMENU_MARKERS_DELETE 2
-#define ACTMENU_MARKERS_NAME 3
-#define ACTMENU_MARKERS_MOVE 4
+enum {
+ ACTMENU_KEY_MIRROR_CURFRAME = 1,
+ ACTMENU_KEY_MIRROR_YAXIS,
+ ACTMENU_KEY_MIRROR_XAXIS,
+ ACTMENU_KEY_MIRROR_MARKER
+};
+enum {
+ ACTMENU_MARKERS_ADD = 0,
+ ACTMENU_MARKERS_DUPLICATE,
+ ACTMENU_MARKERS_DELETE,
+ ACTMENU_MARKERS_NAME,
+ ACTMENU_MARKERS_MOVE
+};
+
void do_action_buttons(unsigned short event)
{
Object *ob= OBACT;
switch(event) {
- case B_ACTHOME:
+ case B_ACTHOME: /* HOMEKEY in Action Editor */
/* Find X extents */
G.v2d->cur.xmin = 0;
G.v2d->cur.ymin=-SCROLLB;
-
+
if (G.saction->action) {
float extra;
@@ -185,10 +211,12 @@
G.v2d->tot= G.v2d->cur;
test_view2d(G.v2d, curarea->winx, curarea->winy);
view2d_do_locks(curarea, V2D_LOCK_COPY);
-
+
addqueue (curarea->win, REDRAW, 1);
-
+
break;
+
+ /* copy/paste/paste-flip buttons in 3d-view header in PoseMode */
case B_ACTCOPY:
copy_posebuf();
allqueue(REDRAWVIEW3D, 1);
More information about the Bf-blender-cvs
mailing list