blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T50148: Header: Wrong rounding when moving frames 

Deduplicate the code and use the same logic used to
calculate individual elements in `t->values_final[0]`.

Differential revision: https://developer.blender.org/D6135
This commit is contained in:
Germano Cavalcante 2019-10-28 09:51:53 -03:00
parent a83bbefec6
commit ce0db668ec
Notes: blender-bot 2023-02-14 19:45:25 +01:00 
Referenced by issue #50148, Wrong rounding when moving frames
3 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/include/ED_transform.h
View File

@ -206,6 +206,12 @@ bool snapNodesTransform(struct TransInfo *t,
float r_loc[2],
float *r_dist_px,
char *r_node_border);
void snapFrameTransform(struct TransInfo *t,
const short autosnap,
const bool is_frame_value,
const float delta,
/* return args */
float *r_val);
void ED_transform_calc_orientation_from_type(const struct bContext *C, float r_mat[3][3]);
void ED_transform_calc_orientation_from_type_ex(const struct bContext *C,

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

@ -72,7 +72,6 @@
#include "ED_keyframing.h"
#include "ED_screen.h"
#include "ED_space_api.h"
#include "ED_markers.h"
#include "ED_view3d.h"
#include "ED_mesh.h"
#include "ED_clip.h"
@ -8881,38 +8880,7 @@ static short getAnimEdit_SnapMode(TransInfo *t)
static void doAnimEdit_SnapFrame(
TransInfo *t, TransData *td, TransData2D *td2d, AnimData *adt, short autosnap)
{
/* snap key to nearest frame or second? */
if (ELEM(autosnap, SACTSNAP_FRAME, SACTSNAP_SECOND)) {
const Scene *scene = t->scene;
const double secf = FPS;
double val;
/* convert frame to nla-action time (if needed) */
if (adt) {
val = BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_MAP);
}
else {
val = *(td->val);
}
/* do the snapping to nearest frame/second */
if (autosnap == SACTSNAP_FRAME) {
val = floorf(val + 0.5);
}
else if (autosnap == SACTSNAP_SECOND) {
val = (float)(floor((val / secf) + 0.5) * secf);
}
/* convert frame out of nla-action time */
if (adt) {
*(td->val) = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
}
else {
*(td->val) = val;
}
}
/* snap key to nearest marker? */
else if (autosnap == SACTSNAP_MARKER) {
if (ELEM(autosnap, SACTSNAP_FRAME, SACTSNAP_SECOND, SACTSNAP_MARKER)) {
float val;
/* convert frame to nla-action time (if needed) */
@ -8923,9 +8891,7 @@ static void doAnimEdit_SnapFrame(
val = *(td->val);
}
/* snap to nearest marker */
// TODO: need some more careful checks for where data comes from
val = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, val);
snapFrameTransform(t, autosnap, true, val, &val);
/* convert frame out of nla-action time */
if (adt) {
@ -8998,31 +8964,20 @@ static void headerTimeTranslate(TransInfo *t, char str[UI_MAX_DRAW_STR])
const double secf = FPS;
float val = t->values_final[0];
/* apply snapping + frame->seconds conversions */
if (autosnap == SACTSNAP_STEP) {
/* frame step */
val = floorf(val + 0.5f);
}
else if (autosnap == SACTSNAP_TSTEP) {
/* second step */
val = floorf((double)val / secf + 0.5);
}
else if (autosnap == SACTSNAP_SECOND) {
/* nearest second */
val = (float)((double)val / secf);
}
float snap_val;
snapFrameTransform(t, autosnap, false, val, &snap_val);
if (autosnap == SACTSNAP_FRAME) {
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%d.00 (%.4f)", (int)val, val);
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.2f (%.4f)", snap_val, val);
}
else if (autosnap == SACTSNAP_SECOND) {
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%d.00 sec (%.4f)", (int)val, val);
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.2f sec (%.4f)", snap_val, val);
}
else if (autosnap == SACTSNAP_TSTEP) {
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f sec", val);
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f sec", snap_val);
}
else {
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", val);
BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", snap_val);
}
}

44
source/blender/editors/transform/transform_snap.c
View File

@ -57,6 +57,7 @@
#include "WM_types.h"
#include "ED_image.h"
#include "ED_markers.h"
#include "ED_node.h"
#include "ED_uvedit.h"
#include "ED_view3d.h"
@ -1468,7 +1469,7 @@ bool peelObjectsTransform(TransInfo *t,
/** \} */
/* -------------------------------------------------------------------- */
/** \name Nodes
/** \name snap Nodes
* \{ */
static bool snapNodeTest(View2D *v2d, bNode *node, eSnapSelect snap_select)
@ -1589,6 +1590,47 @@ bool snapNodesTransform(
r_node_border);
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name snap Frames
* \{ */
/* This function is used by Animation Editor specific transform functions to do
* the Snap Keyframe to Nearest Frame/Marker
*/
void snapFrameTransform(TransInfo *t,
const eAnimEdit_AutoSnap autosnap,
const bool is_frame_value,
const float delta,
float *r_val)
{
double val = delta;
switch (autosnap) {
case SACTSNAP_STEP:
case SACTSNAP_FRAME:
val = floor(val + 0.5);
break;
case SACTSNAP_MARKER:
/* snap to nearest marker */
// TODO: need some more careful checks for where data comes from
val = ED_markers_find_nearest_marker_time(&t->scene->markers, (float)val);
break;
case SACTSNAP_SECOND:
case SACTSNAP_TSTEP: {
/* second step */
const Scene *scene = t->scene;
const double secf = FPS;
val = floor((val / secf) + 0.5);
if (is_frame_value) {
val *= secf;
}
break;
}
}
*r_val = (float)val;
}
/*================================================================*/
static void applyGridIncrement(