sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T39819: Decouple autosnap behaviour from time display

Browse Source 
This commit cleans up and fixes some problems related to how the auto-snapping
behaviour in the animation editors works, resolving the issues mentioned in T39819.

1) "Nearest Frame" no longer snaps to the nearest second when time is displayed in seconds.
    Instead, there is now also a "Nearest Second" option, so that either can be used
    as needed instead of only when a certain time display is used.
2) A similar change has been made for "Time Step" - This is now "Frame Step" and "Second Step"
    respectively.

Notes:
* Removed the unneeded getAnimEdit_DrawTime()
* Time Step/Frame Step don't work for Graph Editor yet (and seem to not have worked at all)
* NLA Editor also seems to be showing some weirdness now. Will be checked on.
* Cancelling nearest-second snapping doesn't work nicely, due to another bug with GraphEdit transforms.
This commit is contained in:
Joshua Leung 2014-04-25 00:40:51 +12:00
parent 1ae3a3fc16
commit 9c28a24153
4 changed files with 50 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
source/blender/editors/transform/transform.c
View File

@ -7201,55 +7201,15 @@ static short getAnimEdit_SnapMode(TransInfo *t)
return autosnap; return autosnap;
} }
/* This function is used for testing if an Animation Editor is displaying
* its data in frames or seconds (and the data needing to be edited as such).
* Returns 1 if in seconds, 0 if in frames
*/
static bool getAnimEdit_DrawTime(TransInfo *t)
{
bool drawtime;
if (t->spacetype == SPACE_ACTION) {
SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
drawtime = (saction->flag & SACTION_DRAWTIME) != 0;
}
else if (t->spacetype == SPACE_NLA) {
SpaceNla *snla = (SpaceNla *)t->sa->spacedata.first;
drawtime = (snla->flag & SNLA_DRAWTIME) != 0;
}
else if (t->spacetype == SPACE_IPO) {
SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
drawtime = (sipo->flag & SIPO_DRAWTIME) != 0;
}
else {
drawtime = false;
}
return drawtime;
}
/* This function is used by Animation Editor specific transform functions to do /* This function is used by Animation Editor specific transform functions to do
* the Snap Keyframe to Nearest Frame/Marker * the Snap Keyframe to Nearest Frame/Marker
*/ */
static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d, AnimData *adt, short autosnap) static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d, AnimData *adt, short autosnap)
{ {
/* snap key to nearest frame? */ /* snap key to nearest frame or second? */
if (autosnap == SACTSNAP_FRAME) { if (ELEM(autosnap, SACTSNAP_FRAME, SACTSNAP_SECOND)) {
#if 0 /* 'do_time' disabled for now */
const Scene *scene = t->scene; const Scene *scene = t->scene;
#if 0 /* NOTE: this works, but may be confusing behavior given the option's label, hence disabled */
const bool do_time = getAnimEdit_DrawTime(t);
#else
const bool do_time = false;
#endif
const double secf = FPS; const double secf = FPS;
#endif
double val; double val;
/* convert frame to nla-action time (if needed) */ /* convert frame to nla-action time (if needed) */
@ -7258,16 +7218,12 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d,
else else
val = *(td->val); val = *(td->val);
#if 0 /* 'do_time' disabled for now */
/* do the snapping to nearest frame/second */ /* do the snapping to nearest frame/second */
if (do_time) { if (autosnap == SACTSNAP_FRAME) {
val = (float)(floor((val / secf) + 0.5f) * secf); val = floorf(val + 0.5);
} }
else else if (autosnap == SACTSNAP_SECOND) {
#endif val = (float)(floor((val / secf) + 0.5f) * secf);
{
val = floor(val + 0.5);
} }
/* convert frame out of nla-action time */ /* convert frame out of nla-action time */
@ -7355,20 +7311,21 @@ static void headerTimeTranslate(TransInfo *t, char str[MAX_INFO_LEN])
else { else {
const Scene *scene = t->scene; const Scene *scene = t->scene;
const short autosnap = getAnimEdit_SnapMode(t); const short autosnap = getAnimEdit_SnapMode(t);
const bool do_time = getAnimEdit_DrawTime(t);
const double secf = FPS; const double secf = FPS;
float val = t->values[0]; float val = t->values[0];
/* apply snapping + frame->seconds conversions */ /* apply snapping + frame->seconds conversions */
if (autosnap == SACTSNAP_STEP) { if (autosnap == SACTSNAP_STEP) {
if (do_time) /* frame step */
val = floorf((double)val / secf + 0.5); val = floorf(val + 0.5f);
else }
val = floorf(val + 0.5f); else if (autosnap == SACTSNAP_TSTEP) {
/* second step */
val = floorf((double)val / secf + 0.5);
} }
else { else {
if (do_time) /* nearest frame/second/marker */
val = (float)((double)val / secf); val = (float)((double)val / secf);
} }
if (autosnap == SACTSNAP_FRAME) if (autosnap == SACTSNAP_FRAME)
@ -7387,10 +7344,8 @@ static void applyTimeTranslateValue(TransInfo *t, float UNUSED(sval))
Scene *scene = t->scene; Scene *scene = t->scene;
int i; int i;
const bool do_time = getAnimEdit_DrawTime(t);
const double secf = FPS;
const short autosnap = getAnimEdit_SnapMode(t); const short autosnap = getAnimEdit_SnapMode(t);
const double secf = FPS;
float deltax, val /* , valprev */; float deltax, val /* , valprev */;
@ -7405,14 +7360,14 @@ static void applyTimeTranslateValue(TransInfo *t, float UNUSED(sval))
/* valprev = *td->val; */ /* UNUSED */ /* valprev = *td->val; */ /* UNUSED */
/* check if any need to apply nla-mapping */ /* check if any need to apply nla-mapping */
if (adt && t->spacetype != SPACE_SEQ) { if (adt && (t->spacetype != SPACE_SEQ)) {
deltax = t->values[0]; deltax = t->values[0];
if (autosnap == SACTSNAP_STEP) { if (autosnap == SACTSNAP_TSTEP) {
if (do_time) deltax = (float)(floor(((double)deltax / secf) + 0.5) * secf);
deltax = (float)(floor(((double)deltax / secf) + 0.5) * secf); }
else else if (autosnap == SACTSNAP_STEP) {
deltax = (float)(floor(deltax + 0.5f)); deltax = (float)(floor(deltax + 0.5f));
} }
val = BKE_nla_tweakedit_remap(adt, td->ival, NLATIME_CONVERT_MAP); val = BKE_nla_tweakedit_remap(adt, td->ival, NLATIME_CONVERT_MAP);
@ -7422,11 +7377,11 @@ static void applyTimeTranslateValue(TransInfo *t, float UNUSED(sval))
else { else {
deltax = val = t->values[0]; deltax = val = t->values[0];
if (autosnap == SACTSNAP_STEP) { if (autosnap == SACTSNAP_TSTEP) {
if (do_time) val = (float)(floor(((double)deltax / secf) + 0.5) * secf);
val = (float)(floor(((double)deltax / secf) + 0.5) * secf); }
else else if (autosnap == SACTSNAP_STEP) {
val = (float)(floor(val + 0.5f)); val = (float)(floor(val + 0.5f));
} }
*(td->val) = td->ival + val; *(td->val) = td->ival + val;
@ -7674,7 +7629,6 @@ static void applyTimeScaleValue(TransInfo *t)
int i; int i;
const short autosnap = getAnimEdit_SnapMode(t); const short autosnap = getAnimEdit_SnapMode(t);
const bool do_time = getAnimEdit_DrawTime(t);
const double secf = FPS; const double secf = FPS;
@ -7687,11 +7641,11 @@ static void applyTimeScaleValue(TransInfo *t)
float startx = CFRA; float startx = CFRA;
float fac = t->values[0]; float fac = t->values[0];
if (autosnap == SACTSNAP_STEP) { if (autosnap == SACTSNAP_TSTEP) {
if (do_time) fac = (float)(floor((double)fac / secf + 0.5) * secf);
fac = (float)(floor((double)fac / secf + 0.5) * secf); }
else else if (autosnap == SACTSNAP_STEP) {
fac = (float)(floor(fac + 0.5f)); fac = (float)(floor(fac + 0.5f));
} }
/* check if any need to apply nla-mapping */ /* check if any need to apply nla-mapping */

11
source/blender/editors/transform/transform_conversions.c
View File

@ -4110,11 +4110,12 @@ void flushTransGraphData(TransInfo *t)
*/ */
if ((td->flag & TD_NOTIMESNAP) == 0) { if ((td->flag & TD_NOTIMESNAP) == 0) {
switch (sipo->autosnap) { switch (sipo->autosnap) {
case SACTSNAP_FRAME: /* snap to nearest frame (or second if drawing seconds) */ case SACTSNAP_FRAME: /* snap to nearest frame */
if (sipo->flag & SIPO_DRAWTIME) td2d->loc[0] = floor((double)td2d->loc[0] + 0.5);
td2d->loc[0] = floor(((double)td2d->loc[0] / secf) + 0.5) * secf; break;
else
td2d->loc[0] = floor((double)td2d->loc[0] + 0.5); case SACTSNAP_SECOND: /* snap to nearest second */
td2d->loc[0] = floor(((double)td2d->loc[0] / secf) + 0.5) * secf;
break; break;
case SACTSNAP_MARKER: /* snap to nearest marker */ case SACTSNAP_MARKER: /* snap to nearest marker */

6
source/blender/makesdna/DNA_action_types.h
View File

@ -655,7 +655,11 @@ typedef enum eAnimEdit_AutoSnap {
/* snap to actual frames/seconds (nla-action time) */ /* snap to actual frames/seconds (nla-action time) */
SACTSNAP_FRAME = 2, SACTSNAP_FRAME = 2,
/* snap to nearest marker */ /* snap to nearest marker */
SACTSNAP_MARKER = 3 SACTSNAP_MARKER = 3,
/* snap to actual seconds (nla-action time) */
SACTSNAP_SECOND = 4,
/* snap to 1.0 second increments */
SACTSNAP_TSTEP = 5
} eAnimEdit_AutoSnap; } eAnimEdit_AutoSnap;

9
source/blender/makesrna/intern/rna_space.c
View File

@ -112,8 +112,13 @@ static EnumPropertyItem transform_orientation_items[] = {
#ifndef RNA_RUNTIME #ifndef RNA_RUNTIME
static EnumPropertyItem autosnap_items[] = { static EnumPropertyItem autosnap_items[] = {
{SACTSNAP_OFF, "NONE", 0, "No Auto-Snap", ""}, {SACTSNAP_OFF, "NONE", 0, "No Auto-Snap", ""},
{SACTSNAP_STEP, "STEP", 0, "Time Step", "Snap to 1.0 frame/second intervals"}, /* {-1, "", 0, "", ""}, */
{SACTSNAP_FRAME, "FRAME", 0, "Nearest Frame", "Snap to actual frames/seconds (nla-action time)"}, {SACTSNAP_STEP, "STEP", 0, "Frame Step", "Snap to 1.0 frame intervals"},
{SACTSNAP_TSTEP, "TIME_STEP", 0, "Second Step", "Snap to 1.0 second intervals"},
/* {-1, "", 0, "", ""}, */
{SACTSNAP_FRAME, "FRAME", 0, "Nearest Frame", "Snap to actual frames (nla-action time)"},
{SACTSNAP_SECOND, "SECOND", 0, "Nearest Second", "Snap to actual seconds (nla-action time)"},
/* {-1, "", 0, "", ""}, */
{SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker"}, {SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker"},
{0, NULL, 0, NULL, NULL} {0, NULL, 0, NULL, NULL}
}; };