Commit: 66a028a5761c44fa37963443c78bd7baf04ff551
Author: Antony Riakiotakis
Date: Fri Mar 27 15:23:39 2015 +0100
Branches: master
https://developer.blender.org/rB66a028a5761c44fa37963443c78bd7baf04ff551
Proportional editing for IPO editor - version ready for feedback by artists.
This works by using the distance in the x axis only (usually artists want to
influence nearby
keyframes based on timing, not value). Tweaking handles is the same as tweaking
the central handle. It's a bit ambiguous if proportional editing is really
meaningful
for handles but will leave that for artists to decide.
===================================================================
M release/scripts/startup/bl_ui/space_graph.py
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_conversions.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_graph.py
b/release/scripts/startup/bl_ui/space_graph.py
index d3e1a86..4c3f4bb 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -29,6 +29,7 @@ class GRAPH_HT_header(Header):
from bl_ui.space_dopesheet import dopesheet_filter
layout = self.layout
+ toolsettings = context.tool_settings
st = context.space_data
@@ -46,6 +47,11 @@ class GRAPH_HT_header(Header):
row.active = st.use_normalization
row.prop(st, "use_auto_normalization", text="Auto")
+ row = layout.row(align=True)
+ row.prop(toolsettings, "proportional_edit", icon_only=True)
+ if toolsettings.proportional_edit != 'DISABLED':
+ row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
+
layout.prop(st, "auto_snap", text="")
layout.prop(st, "pivot_point", icon_only=True)
diff --git a/source/blender/editors/include/ED_anim_api.h
b/source/blender/editors/include/ED_anim_api.h
index 8cf42df..7fd0d35 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -114,8 +114,9 @@ typedef struct bAnimListElem {
int flag; /* copy of elem's flags for quick access */
int index; /* for un-named data, the index of the data in
its collection */
- short update; /* (eAnim_Update_Flags) tag the element for
updating */
-
+ char update; /* (eAnim_Update_Flags) tag the element for
updating */
+ char tag; /* tag the included data. Temporary always */
+
short datatype; /* (eAnim_KeyType) type of motion data to
expect */
void *key_data; /* motion data - mostly F-Curves, but can be
other types too */
diff --git a/source/blender/editors/space_graph/graph_ops.c
b/source/blender/editors/space_graph/graph_ops.c
index b529452..33e8b52 100644
--- a/source/blender/editors/space_graph/graph_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@ -562,7 +562,6 @@ static void graphedit_keymap_keyframes(wmKeyConfig
*keyconf, wmKeyMap *keymap)
WM_keymap_add_item(keymap, "GRAPH_OT_easing_type", EKEY, KM_PRESS,
KM_CTRL, 0);
/* destructive */
- WM_keymap_add_item(keymap, "GRAPH_OT_clean", OKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "GRAPH_OT_smooth", OKEY, KM_PRESS, KM_ALT,
0);
WM_keymap_add_item(keymap, "GRAPH_OT_sample", OKEY, KM_PRESS, KM_SHIFT,
0);
@@ -608,6 +607,11 @@ static void graphedit_keymap_keyframes(wmKeyConfig
*keyconf, wmKeyMap *keymap)
/* transform system */
transform_keymap_for_space(keyconf, keymap, SPACE_IPO);
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY,
KM_PRESS, 0, 0);
+ RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit");
+ RNA_string_set(kmi->ptr, "value_1", "DISABLED");
+ RNA_string_set(kmi->ptr, "value_2", "ENABLED");
+
/* pivot point settings */
kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY,
KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index 586c9d6..c8d8138 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2089,6 +2089,12 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator
*op, const wmEvent *eve
t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type,
drawTransformView, t, REGION_DRAW_POST_VIEW);
t->draw_handle_cursor =
WM_paint_cursor_activate(CTX_wm_manager(C), helpline_poll, drawHelpline, t);
}
+ else if (t->spacetype == SPACE_IPO) {
+ unit_m3(t->spacemtx);
+ t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type,
drawTransformView, t, REGION_DRAW_POST_VIEW);
+ //t->draw_handle_pixel =
ED_region_draw_cb_activate(t->ar->type, drawTransformPixel, t,
REGION_DRAW_POST_PIXEL);
+ t->draw_handle_cursor =
WM_paint_cursor_activate(CTX_wm_manager(C), helpline_poll, drawHelpline, t);
+ }
else
unit_m3(t->spacemtx);
diff --git a/source/blender/editors/transform/transform_constraints.c
b/source/blender/editors/transform/transform_constraints.c
index ccb81c7..bcd66f5 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -46,6 +46,7 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BLI_string.h"
+#include "BLI_rect.h"
#include "BKE_context.h"
@@ -757,12 +758,22 @@ void drawPropCircle(const struct bContext *C, TransInfo
*t)
ED_space_image_get_aspect(t->sa->spacedata.first, &aspx, &aspy);
}
else if (t->options & CTX_PAINT_CURVE) {
- aspx = aspy = 1.0;
+ aspx = aspy = 1.0f;
}
else {
ED_space_image_get_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
}
- glScalef(1.0f / aspx, 1.0f / aspy, 1.0);
+ glScalef(1.0f / aspx, 1.0f / aspy, 1.0f);
+ }
+ else if (t->spacetype == SPACE_IPO) {
+ /* only scale y */
+ rcti *mask = &t->ar->v2d.mask;
+ rctf *datamask = &t->ar->v2d.cur;
+ float xsize = BLI_rctf_size_x(datamask);
+ float ysize = BLI_rctf_size_y(datamask);
+ float xmask = BLI_rcti_size_x(mask);
+ float ymask = BLI_rcti_size_y(mask);
+ glScalef(1.0f, (ysize / xsize) * (xmask / ymask), 1.0f);
}
depth_test_enabled = glIsEnabled(GL_DEPTH_TEST);
diff --git a/source/blender/editors/transform/transform_conversions.c
b/source/blender/editors/transform/transform_conversions.c
index a74de31..e344399 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -3786,6 +3786,27 @@ static bool graph_edit_use_local_center(TransInfo *t)
return (t->around == V3D_LOCAL) && !graph_edit_is_translation_mode(t);
}
+
+static void graph_key_shortest_dist(FCurve *fcu, TransData *td_start,
TransData *td, bool use_handle)
+{
+ int j = 0;
+ TransData *td_iter = td_start;
+
+ td->dist = FLT_MAX;
+ for (; j < fcu->totvert; j++) {
+ BezTriple *bezt = fcu->bezt + j;
+ const bool sel2 = (bezt->f2 & SELECT) != 0;
+ const bool sel1 = use_handle ? (bezt->f1 & SELECT) != 0 : sel2;
+ const bool sel3 = use_handle ? (bezt->f3 & SELECT) != 0 : sel2;
+
+ if (sel1 || sel2 || sel3) {
+ td->dist = min_ff(td->dist, fabs(td_iter->center[0] -
td->center[0]));
+ }
+
+ td_iter += 3;
+ }
+}
+
static void createTransGraphEditData(bContext *C, TransInfo *t)
{
SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
@@ -3808,6 +3829,7 @@ static void createTransGraphEditData(bContext *C,
TransInfo *t)
const bool is_translation_mode = graph_edit_is_translation_mode(t);
const bool use_handle = !(sipo->flag & SIPO_NOHANDLES);
const bool use_local_center = graph_edit_use_local_center(t);
+ const bool propedit = (t->flag & T_PROP_EDIT) != 0;
short anim_map_flag = ANIM_UNITCONV_ONLYSEL | ANIM_UNITCONV_SELVERTS;
/* determine what type of data we are operating on */
@@ -3839,6 +3861,8 @@ static void createTransGraphEditData(bContext *C,
TransInfo *t)
AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
FCurve *fcu = (FCurve *)ale->key_data;
float cfra;
+ int curvecount = 0;
+ bool selected = false;
/* F-Curve may not have any keyframes */
if (fcu->bezt == NULL)
@@ -3859,20 +3883,34 @@ static void createTransGraphEditData(bContext *C,
TransInfo *t)
const bool sel1 = use_handle ? (bezt->f1 &
SELECT) != 0 : sel2;
const bool sel3 = use_handle ? (bezt->f3 &
SELECT) != 0 : sel2;
- if (!is_translation_mode || !(sel2)) {
- if (sel1) {
- count++;
+ if (propedit) {
+ curvecount += 3;
+ if (sel2 || sel1 || sel3)
+ selected = true;
+ }
+ else {
+ if (!is_translation_mode || !(sel2)) {
+ if (sel1) {
+ count++;
+ }
+
+ if (sel3) {
+ count++;
+ }
}
- if (sel3) {
+ /* only include main vert if selected */
+ if (sel2 && !use_local_center) {
count++;
}
}
+ }
+ }
- /* only include main vert if selected */
- if (sel2 && !use_local_center) {
- count++;
- }
+ if (propedit) {
+ if (selected) {
+ count += curvecount;
+ ale->tag = true;
}
}
}
@@ -3925,7 +3963,7 @@ static void createTransGraphEditData(bContext *C,
TransInfo *t)
float cfra;
/* F-Curve may not have any keyframes */
- if (fcu->bezt == NULL)
+ if (fcu->bezt == NULL || (propedit && ale->tag == 0))
continue;
/* convert current-frame to action-time (slightly less
accurate, especially under
@@ -3948,66 +3986,135 @@ static void createTransGraphEditData(bContext *C,
TransInfo *t)
TransDataCurveHandleFlags *hdata = NULL;
/* short h1=1, h2=1; */ /* UNUSED */
- /* only include handles if selected,
irrespective of the interpolation modes.
- * also, only treat handles specially if the
center point isn't selected.
- */
- if (!is_translation_mode || !(sel2)) {
- if (sel1) {
- hdata =
initTransDataCurveHandles(td, bezt);
- bezt_to_transdata(td++, td2d++,
tdg++, adt, bezt, 0, sel1, true, intvals, mtx, smtx, unit_scale);
+ if (propedit) {
+ bool is_sel = (sel2 || sel1 || sel3);
+ /* we always select all handles for
proportional editing if central handle is selected */
+ initTransDataCurveHandles(td, bezt);
+ bezt_to_transdata(td++, td2d++, tdg++,
adt, bezt, 0, is_sel, true, intvals, mtx, smtx, unit_scale);
+ initTransDataCurveHandles(td, bezt);
+ bezt_to_transdata(td++, td2d++, tdg++,
adt, bezt, 1, is_sel, false, intvals, mtx, smtx, unit_scale);
+ initTransDataCurveHandles(td, bezt);
+ bezt_to_transdata(td++, td2d++, tdg++,
adt, bezt, 2, is_sel, true, intvals, mtx, smtx, unit_scale);
+ }
+ else {
+ /* only include handles if selected,
irrespective of the interpolation modes.
+ * also, only treat handles specially
if the center point isn't selected.
+ */
+ if (!is_translation_mode || !(sel2)) {
+ if (sel1) {
+ hdata =
initTransDataCurveHandles(td, bezt);
+ bezt_to_transdata(td++,
td2d++, tdg++, adt, bezt, 0, sel1, true, intvals, mtx, smtx, unit_scale);
+ }
+ else {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
