diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-12-09 11:46:23 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-12-09 11:46:23 +0300 |
commit | d033c248d31c0471f218ebafc9a6034401a5246f (patch) | |
tree | a5b7252e7f69e7f8a75f28820e05215221d24eda /source/blender/makesdna | |
parent | 259c807f70607386b63ff2c89d48cbefe97ffbe6 (diff) |
== Armature Visualisation - A few additions ==
* Added an option to make frame numbers of keyframes draw on bone-paths even when frame numbers for other points are not shown.
* Added a new ghosting method, which only shows the keyframes within a range.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_armature_types.h | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index f5eacede809..b5c6134fe3f 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -68,7 +68,7 @@ typedef struct Bone { float size[3]; /* patch for upward compat, UNUSED! */ short layer; short segments; /* for B-bones */ -}Bone; +} Bone; typedef struct bArmature { ID id; @@ -84,76 +84,76 @@ typedef struct bArmature { int ghostsf, ghostef; /* start and end frames of ghost-drawing range */ int pathsf, pathef; /* start and end frames of path-calculation range for all bones */ int pathbc, pathac; /* number of frames before/after current frame of path-calculation for all bones */ -}bArmature; +} bArmature; /* armature->flag */ /* dont use bit 7, was saved in files to disable stuff */ - -/* armature->flag */ -#define ARM_RESTPOS 0x001 - /* XRAY is here only for backwards converting */ -#define ARM_DRAWXRAY 0x002 -#define ARM_DRAWAXES 0x004 -#define ARM_DRAWNAMES 0x008 -#define ARM_POSEMODE 0x010 -#define ARM_EDITMODE 0x020 -#define ARM_DELAYDEFORM 0x040 -#define ARM_DONT_USE 0x080 -#define ARM_MIRROR_EDIT 0x100 -#define ARM_AUTO_IK 0x200 - /* made option negative, for backwards compat */ -#define ARM_NO_CUSTOM 0x400 -#define ARM_COL_CUSTOM 0x800 +typedef enum eArmature_Flag { + ARM_RESTPOS = (1<<0), + ARM_DRAWXRAY = (1<<1), /* XRAY is here only for backwards converting */ + ARM_DRAWAXES = (1<<2), + ARM_DRAWNAMES = (1<<3), + ARM_POSEMODE = (1<<4), + ARM_EDITMODE = (1<<5), + ARM_DELAYDEFORM = (1<<6), + ARM_DONT_USE = (1<<7), + ARM_MIRROR_EDIT = (1<<8), + ARM_AUTO_IK = (1<<9), + ARM_NO_CUSTOM = (1<<10), /* made option negative, for backwards compat */ + ARM_COL_CUSTOM = (1<<11) +} eArmature_Flag; /* armature->drawtype */ -#define ARM_OCTA 0 -#define ARM_LINE 1 -#define ARM_B_BONE 2 -#define ARM_ENVELOPE 3 +typedef enum eArmature_Drawtype { + ARM_OCTA = 0, + ARM_LINE, + ARM_B_BONE, + ARM_ENVELOPE +} eArmature_Drawtype; /* armature->deformflag */ -#define ARM_DEF_VGROUP 1 -#define ARM_DEF_ENVELOPE 2 -#define ARM_DEF_QUATERNION 4 -#define ARM_DEF_B_BONE_REST 8 -#define ARM_DEF_INVERT_VGROUP 16 +typedef enum eArmature_DeformFlag { + ARM_DEF_VGROUP = (1<<0), + ARM_DEF_ENVELOPE = (1<<1), + ARM_DEF_QUATERNION = (1<<2), + ARM_DEF_B_BONE_REST = (1<<3), + ARM_DEF_INVERT_VGROUP = (1<<4) +} eArmature_DeformFlag; /* armature->pathflag */ -#define ARM_PATH_FNUMS (1<<0) -#define ARM_PATH_KFRAS (1<<1) -#define ARM_PATH_HEADS (1<<2) -#define ARM_PATH_ACFRA (1<<3) +typedef enum eArmature_PathFlag { + ARM_PATH_FNUMS = (1<<0), + ARM_PATH_KFRAS = (1<<1), + ARM_PATH_HEADS = (1<<2), + ARM_PATH_ACFRA = (1<<3), + ARM_PATH_KFNOS = (1<<4) +} eArmature_PathFlag; /* armature->ghosttype */ -#define ARM_GHOST_CUR 0 -#define ARM_GHOST_RANGE 1 +typedef enum eArmature_GhostType { + ARM_GHOST_CUR = 0, + ARM_GHOST_RANGE, + ARM_GHOST_KEYS +} eArmature_GhostType; /* bone->flag */ -#define BONE_SELECTED 1 -#define BONE_ROOTSEL 2 -#define BONE_TIPSEL 4 - /* Used instead of BONE_SELECTED during transform */ -#define BONE_TRANSFORM 8 -#define BONE_CONNECTED 16 - /* 32 used to be quatrot, was always set in files, do not reuse unless you clear it always */ - /* hidden Bones when drawing Posechannels */ -#define BONE_HIDDEN_P 64 - /* For detecting cyclic dependancies */ -#define BONE_DONE 128 - /* active is on mouse clicks only */ -#define BONE_ACTIVE 256 - /* No parent rotation or scale */ -#define BONE_HINGE 512 - /* hidden Bones when drawing Armature Editmode */ -#define BONE_HIDDEN_A 1024 - /* multiplies vgroup with envelope */ -#define BONE_MULT_VG_ENV 2048 -#define BONE_NO_DEFORM 4096 - /* set to prevent destruction of its unkeyframed pose (after transform) */ -#define BONE_UNKEYED 8192 - /* set to prevent hinge child bones from influencing the transform center */ -#define BONE_HINGE_CHILD_TRANSFORM 16384 - /* No parent scale */ -#define BONE_NO_SCALE (1<<15) +typedef enum eBone_Flag { + BONE_SELECTED = (1<<0), + BONE_ROOTSEL = (1<<1), + BONE_TIPSEL = (1<<2), + BONE_TRANSFORM = (1<<3), /* Used instead of BONE_SELECTED during transform */ + BONE_CONNECTED = (1<<4), + /* 32 used to be quatrot, was always set in files, do not reuse unless you clear it always */ + BONE_HIDDEN_P = (1<<6), /* hidden Bones when drawing Posechannels */ + BONE_DONE = (1<<7), /* For detecting cyclic dependancies */ + BONE_ACTIVE = (1<<8), /* active is on mouse clicks only */ + BONE_HINGE = (1<<9), /* No parent rotation or scale */ + BONE_HIDDEN_A = (1<<10), /* hidden Bones when drawing Armature Editmode */ + BONE_MULT_VG_ENV = (1<<11), /* multiplies vgroup with envelope */ + BONE_NO_DEFORM = (1<<12), + BONE_UNKEYED = (1<<13), /* set to prevent destruction of its unkeyframed pose (after transform) */ + BONE_HINGE_CHILD_TRANSFORM = (1<<14), /* set to prevent hinge child bones from influencing the transform center */ + BONE_NO_SCALE = (1<<15) /* No parent scale */ +} eBone_Flag; #endif |