Refactor: combine x and y for insert_vert_fcurve into float2
No functional changes. To reduce the argument count of `insert_vert_fcurve`, the x and y argumentsto define the position of a keyframe can be merged into a single `float2` Pull Request: https://projects.blender.org/blender/blender/pulls/115886
This commit is contained in:
parent
4dcda1ec12
commit
e0806e6d51
|
@ -61,7 +61,9 @@ int insert_bezt_fcurve(FCurve *fcu, const BezTriple *bezt, eInsertKeyFlags flag)
|
|||
* \param flag: Optional flags (#eInsertKeyFlags) for controlling how keys get added
|
||||
* and/or whether updates get done.
|
||||
*/
|
||||
int insert_vert_fcurve(
|
||||
FCurve *fcu, float x, float y, eBezTriple_KeyframeType keyframe_type, eInsertKeyFlags flag);
|
||||
int insert_vert_fcurve(FCurve *fcu,
|
||||
const float2 position,
|
||||
eBezTriple_KeyframeType keyframe_type,
|
||||
eInsertKeyFlags flag);
|
||||
|
||||
} // namespace blender::animrig
|
||||
|
|
|
@ -260,11 +260,13 @@ void initialize_bezt(BezTriple *beztr,
|
|||
beztr->period = 4.1f;
|
||||
}
|
||||
|
||||
int insert_vert_fcurve(
|
||||
FCurve *fcu, float x, float y, eBezTriple_KeyframeType keyframe_type, eInsertKeyFlags flag)
|
||||
int insert_vert_fcurve(FCurve *fcu,
|
||||
const float2 position,
|
||||
eBezTriple_KeyframeType keyframe_type,
|
||||
eInsertKeyFlags flag)
|
||||
{
|
||||
BezTriple beztr = {{{0}}};
|
||||
initialize_bezt(&beztr, {x, y}, keyframe_type, flag, eFCurve_Flags(fcu->flag));
|
||||
initialize_bezt(&beztr, position, keyframe_type, flag, eFCurve_Flags(fcu->flag));
|
||||
|
||||
uint oldTot = fcu->totvert;
|
||||
int a;
|
||||
|
|
|
@ -315,14 +315,14 @@ static bool insert_keyframe_value(
|
|||
return false;
|
||||
}
|
||||
|
||||
if (insert_vert_fcurve(fcu, cfra, curval, keytype, flag) < 0) {
|
||||
if (insert_vert_fcurve(fcu, {cfra, curval}, keytype, flag) < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return insert_vert_fcurve(fcu, cfra, curval, keytype, flag) >= 0;
|
||||
return insert_vert_fcurve(fcu, {cfra, curval}, keytype, flag) >= 0;
|
||||
}
|
||||
|
||||
bool insert_keyframe_direct(ReportList *reports,
|
||||
|
|
|
@ -32,9 +32,9 @@ TEST(evaluate_fcurve, OnKeys)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 3.0f, 19.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {3.0f, 19.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
|
||||
EXPECT_NEAR(evaluate_fcurve(fcu, 1.0f), 7.0f, EPSILON); /* hits 'on or before first' function */
|
||||
EXPECT_NEAR(evaluate_fcurve(fcu, 2.0f), 13.0f, EPSILON); /* hits 'between' function */
|
||||
|
@ -55,8 +55,10 @@ TEST(evaluate_fcurve, InterpolationConstant)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
|
||||
fcu->bezt[0].ipo = BEZT_IPO_CONST;
|
||||
fcu->bezt[1].ipo = BEZT_IPO_CONST;
|
||||
|
@ -71,8 +73,10 @@ TEST(evaluate_fcurve, InterpolationLinear)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
|
||||
fcu->bezt[0].ipo = BEZT_IPO_LIN;
|
||||
fcu->bezt[1].ipo = BEZT_IPO_LIN;
|
||||
|
@ -88,8 +92,10 @@ TEST(evaluate_fcurve, InterpolationBezier)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
|
||||
EXPECT_EQ(fcu->bezt[0].ipo, BEZT_IPO_BEZ);
|
||||
EXPECT_EQ(fcu->bezt[1].ipo, BEZT_IPO_BEZ);
|
||||
|
@ -121,8 +127,10 @@ TEST(evaluate_fcurve, InterpolationBounce)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
|
||||
fcu->bezt[0].ipo = BEZT_IPO_BOUNCE;
|
||||
fcu->bezt[1].ipo = BEZT_IPO_BOUNCE;
|
||||
|
@ -141,8 +149,10 @@ TEST(evaluate_fcurve, ExtrapolationLinearKeys)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
fcu->bezt[0].ipo = BEZT_IPO_LIN;
|
||||
fcu->bezt[1].ipo = BEZT_IPO_LIN;
|
||||
|
||||
|
@ -170,8 +180,10 @@ TEST(evaluate_fcurve, ExtrapolationBezierKeys)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 2.0f, 13.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {2.0f, 13.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
|
||||
fcu->bezt[0].vec[0][0] = 0.71855f; /* left handle X */
|
||||
fcu->bezt[0].vec[0][1] = 6.22482f; /* left handle Y */
|
||||
|
@ -207,8 +219,10 @@ TEST(fcurve_subdivide, BKE_fcurve_bezt_subdivide_handles)
|
|||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
/* Insert two keyframes and set handles to something non-default. */
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 0.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 13.0f, 2.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 0.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {13.0f, 2.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
|
||||
fcu->bezt[0].h1 = fcu->bezt[0].h2 = HD_FREE;
|
||||
fcu->bezt[0].vec[0][0] = -5.0f;
|
||||
|
@ -273,11 +287,14 @@ TEST(fcurve_active_keyframe, ActiveKeyframe)
|
|||
EXPECT_EQ(BKE_fcurve_active_keyframe_index(fcu), FCURVE_ACTIVE_KEYFRAME_NONE);
|
||||
|
||||
/* Check that adding new points sets the active index. */
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 1.0f, 7.5f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {1.0f, 7.5f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
0);
|
||||
EXPECT_EQ(BKE_fcurve_active_keyframe_index(fcu), 0);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 8.0f, 15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {8.0f, 15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
1);
|
||||
EXPECT_EQ(BKE_fcurve_active_keyframe_index(fcu), 1);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, 14.0f, 8.2f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF), 2);
|
||||
EXPECT_EQ(insert_vert_fcurve(fcu, {14.0f, 8.2f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF),
|
||||
2);
|
||||
EXPECT_EQ(BKE_fcurve_active_keyframe_index(fcu), 2);
|
||||
|
||||
/* Check clearing the index. */
|
||||
|
@ -325,9 +342,9 @@ TEST(BKE_fcurve, BKE_fcurve_keyframe_move_value_with_handles)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
insert_vert_fcurve(fcu, 1.0f, 7.5f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 8.0f, 15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 14.0f, 8.2f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {1.0f, 7.5f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {8.0f, 15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {14.0f, 8.2f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
|
||||
EXPECT_FLOAT_EQ(fcu->bezt[1].vec[0][0], 5.2671194f);
|
||||
EXPECT_FLOAT_EQ(fcu->bezt[1].vec[0][1], 15.0f);
|
||||
|
@ -356,9 +373,9 @@ TEST(BKE_fcurve, BKE_fcurve_keyframe_move_time_with_handles)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
insert_vert_fcurve(fcu, 1.0f, 7.5f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 8.0f, 15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 14.0f, 8.2f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {1.0f, 7.5f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {8.0f, 15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {14.0f, 8.2f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
|
||||
EXPECT_FLOAT_EQ(fcu->bezt[1].vec[0][0], 5.2671194f);
|
||||
EXPECT_FLOAT_EQ(fcu->bezt[1].vec[0][1], 15.0f);
|
||||
|
@ -387,11 +404,11 @@ TEST(BKE_fcurve, BKE_fcurve_calc_range)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
insert_vert_fcurve(fcu, 1.0f, 7.5f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 4.0f, -15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 8.0f, 15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 14.0f, 8.2f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 18.2f, -20.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {1.0f, 7.5f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {4.0f, -15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {8.0f, 15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {14.0f, 8.2f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {18.2f, -20.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
|
||||
for (int i = 0; i < fcu->totvert; i++) {
|
||||
fcu->bezt[i].f1 &= ~SELECT;
|
||||
|
@ -439,11 +456,11 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
|
|||
{
|
||||
FCurve *fcu = BKE_fcurve_create();
|
||||
|
||||
insert_vert_fcurve(fcu, 1.0f, 7.5f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 4.0f, -15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 8.0f, 15.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 14.0f, 8.2f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, 18.2f, -20.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {1.0f, 7.5f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {4.0f, -15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {8.0f, 15.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {14.0f, 8.2f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
insert_vert_fcurve(fcu, {18.2f, -20.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NO_USERPREF);
|
||||
|
||||
for (int i = 0; i < fcu->totvert; i++) {
|
||||
fcu->bezt[i].f1 &= ~SELECT;
|
||||
|
|
|
@ -125,9 +125,9 @@ FCurve *alloc_driver_fcurve(const char rna_path[],
|
|||
* which can be easily tweaked from there.
|
||||
*/
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, 0.0f, 0.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST | INSERTKEY_NO_USERPREF);
|
||||
fcu, {0.0f, 0.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST | INSERTKEY_NO_USERPREF);
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, 1.0f, 1.0f, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST | INSERTKEY_NO_USERPREF);
|
||||
fcu, {1.0f, 1.0f}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_FAST | INSERTKEY_NO_USERPREF);
|
||||
fcu->extend = FCURVE_EXTRAPOLATE_LINEAR;
|
||||
BKE_fcurve_handles_recalc(fcu);
|
||||
}
|
||||
|
|
|
@ -1272,7 +1272,7 @@ void bake_fcurve_segments(FCurve *fcu)
|
|||
/* add keyframes with these, tagging as 'breakdowns' */
|
||||
for (n = 1, fp = value_cache; n < range && fp; n++, fp++) {
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, fp->frame, fp->val, BEZT_KEYTYPE_BREAKDOWN, eInsertKeyFlags(1));
|
||||
fcu, {fp->frame, fp->val}, BEZT_KEYTYPE_BREAKDOWN, eInsertKeyFlags(1));
|
||||
}
|
||||
|
||||
/* free temp cache */
|
||||
|
|
|
@ -1739,8 +1739,10 @@ static void propagate_curve_values(ListBase /*tPChanFCurveLink*/ *pflinks,
|
|||
FCurve *fcu = (FCurve *)ld->data;
|
||||
const float current_fcu_value = evaluate_fcurve(fcu, source_frame);
|
||||
LISTBASE_FOREACH (FrameLink *, target_frame, target_frames) {
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, target_frame->frame, current_fcu_value, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NEEDED);
|
||||
blender::animrig::insert_vert_fcurve(fcu,
|
||||
{target_frame->frame, current_fcu_value},
|
||||
BEZT_KEYTYPE_KEYFRAME,
|
||||
INSERTKEY_NEEDED);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -862,7 +862,7 @@ static void insert_fcurve_key(bAnimContext *ac,
|
|||
|
||||
const float curval = evaluate_fcurve(fcu, cfra);
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, cfra, curval, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
fcu, {cfra, curval}, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
}
|
||||
|
||||
ale->update |= ANIM_UPDATE_DEFAULT;
|
||||
|
|
|
@ -182,7 +182,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
|
|||
|
||||
/* Insert keyframe directly into the F-Curve. */
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, x, y, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
fcu, {x, y}, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
|
||||
ale->update |= ANIM_UPDATE_DEFAULT;
|
||||
}
|
||||
|
@ -231,7 +231,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
|
|||
|
||||
const float curval = evaluate_fcurve_only_curve(fcu, cfra);
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, cfra, curval, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
fcu, {cfra, curval}, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
}
|
||||
|
||||
ale->update |= ANIM_UPDATE_DEFAULT;
|
||||
|
@ -348,7 +348,7 @@ static int graphkeys_click_insert_exec(bContext *C, wmOperator *op)
|
|||
|
||||
/* Insert keyframe on the specified frame + value. */
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, frame, val, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
fcu, {frame, val}, eBezTriple_KeyframeType(ts->keyframe_type), eInsertKeyFlags(0));
|
||||
|
||||
ale->update |= ANIM_UPDATE_DEPS;
|
||||
|
||||
|
|
|
@ -316,7 +316,7 @@ void BCAnimationCurve::clean_handles()
|
|||
float x = bezt->vec[1][0];
|
||||
float y = bezt->vec[1][1];
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcurve, x, y, (eBezTriple_KeyframeType)BEZKEYTYPE(bezt), INSERTKEY_NOFLAGS);
|
||||
fcurve, {x, y}, (eBezTriple_KeyframeType)BEZKEYTYPE(bezt), INSERTKEY_NOFLAGS);
|
||||
BezTriple *lastb = fcurve->bezt + (fcurve->totvert - 1);
|
||||
lastb->f1 = lastb->f2 = lastb->f3 = 0;
|
||||
}
|
||||
|
@ -382,7 +382,7 @@ void BCAnimationCurve::add_value(const float val, const int frame_index)
|
|||
FCurve *fcu = get_edit_fcurve();
|
||||
fcu->auto_smoothing = U.auto_smoothing_new;
|
||||
blender::animrig::insert_vert_fcurve(
|
||||
fcu, frame_index, val, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NOFLAGS);
|
||||
fcu, {(float)frame_index, val}, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NOFLAGS);
|
||||
|
||||
if (fcu->totvert == 1) {
|
||||
init_range(val);
|
||||
|
|
|
@ -1056,8 +1056,7 @@ static BezTriple *rna_FKeyframe_points_insert(
|
|||
ID *id, FCurve *fcu, Main *bmain, float frame, float value, int keyframe_type, int flag)
|
||||
{
|
||||
int index = blender::animrig::insert_vert_fcurve(fcu,
|
||||
frame,
|
||||
value,
|
||||
{frame, value},
|
||||
eBezTriple_KeyframeType(keyframe_type),
|
||||
eInsertKeyFlags(flag) | INSERTKEY_NO_USERPREF);
|
||||
|
||||
|
|
Loading…
Reference in New Issue