[Bf-blender-cvs] [d9b062a86de] temp-vse-preview-transform: VSE: Use transform operator in preview
Richard Antalik
noreply at git.blender.org
Mon Aug 30 00:01:28 CEST 2021
Commit: d9b062a86deba82bb2f88b2fd6ba454058eb51fa
Author: Richard Antalik
Date: Fri Jul 30 12:21:02 2021 +0200
Branches: temp-vse-preview-transform
https://developer.blender.org/rBd9b062a86deba82bb2f88b2fd6ba454058eb51fa
VSE: Use transform operator in preview
Initial implementation, not extensively tested, there may be bugs
Differential Revision: https://developer.blender.org/D12105
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M source/blender/editors/transform/CMakeLists.txt
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_convert.c
M source/blender/editors/transform/transform_convert.h
A source/blender/editors/transform/transform_convert_sequencer_image.c
M source/blender/editors/transform/transform_draw_cursors.c
M source/blender/editors/transform/transform_ops.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 6a9306c2eab..ca847e6dec7 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2686,6 +2686,12 @@ def km_sequencerpreview(params):
("sequencer.view_zoom_ratio", {"type": 'NUMPAD_8', "value": 'PRESS'},
{"properties": [("ratio", 0.125)]}),
("sequencer.sample", {"type": params.action_mouse, "value": 'PRESS'}, None),
+ ("transform.translate", {"type": 'G', "value": 'PRESS'},
+ {"properties": [("sequencer_image", True)]}),
+ ("transform.resize", {"type": 'S', "value": 'PRESS'},
+ {"properties": [("sequencer_image", True)]}),
+ ("transform.rotate", {"type": 'R', "value": 'PRESS'},
+ {"properties": [("sequencer_image", True)]}),
])
return keymap
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index e9efed3cd61..64a720322c1 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -60,6 +60,7 @@ set(SRC
transform_convert_particle.c
transform_convert_sculpt.c
transform_convert_sequencer.c
+ transform_convert_sequencer_image.c
transform_convert_tracking.c
transform_draw_cursors.c
transform_generics.c
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 58491f8c2d3..b89b9c04450 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1674,6 +1674,13 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
}
}
+ if ((prop = RNA_struct_find_property(op->ptr, "sequencer_image")) &&
+ RNA_property_is_set(op->ptr, prop)) {
+ if (RNA_property_boolean_get(op->ptr, prop)) {
+ options |= CTX_SEQUENCER_IMAGE;
+ }
+ }
+
t->options = options;
t->mode = mode;
@@ -1703,11 +1710,13 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
t->draw_handle_cursor = WM_paint_cursor_activate(
SPACE_TYPE_ANY, RGN_TYPE_ANY, transform_draw_cursor_poll, transform_draw_cursor_draw, t);
}
- else if (t->spacetype == SPACE_SEQ) {
- t->draw_handle_view = ED_region_draw_cb_activate(
- t->region->type, drawTransformView, t, REGION_DRAW_POST_VIEW);
- }
- else if (ELEM(t->spacetype, SPACE_IMAGE, SPACE_CLIP, SPACE_NODE, SPACE_GRAPH, SPACE_ACTION)) {
+ else if (ELEM(t->spacetype,
+ SPACE_IMAGE,
+ SPACE_CLIP,
+ SPACE_NODE,
+ SPACE_GRAPH,
+ SPACE_ACTION,
+ SPACE_SEQ)) {
t->draw_handle_view = ED_region_draw_cb_activate(
t->region->type, drawTransformView, t, REGION_DRAW_POST_VIEW);
t->draw_handle_cursor = WM_paint_cursor_activate(
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 013c5faa54a..f36bb124ac1 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -87,15 +87,20 @@ typedef enum {
CTX_PAINT_CURVE = (1 << 7),
CTX_POSE_BONE = (1 << 8),
CTX_TEXTURE_SPACE = (1 << 9),
+ CTX_SEQUENCER_IMAGE = (1 << 10),
- CTX_NO_PET = (1 << 10),
- CTX_AUTOCONFIRM = (1 << 11),
+ CTX_NO_PET = (1 << 11),
+ CTX_AUTOCONFIRM = (1 << 12),
/** When transforming object's, adjust the object data so it stays in the same place. */
- CTX_OBMODE_XFORM_OBDATA = (1 << 12),
+ CTX_OBMODE_XFORM_OBDATA = (1 << 13),
/** Transform object parents without moving their children. */
+<<<<<<< HEAD
CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 13),
/** Enable edge scrolling in 2D views */
CTX_VIEW2D_EDGE_PAN = (1 << 14),
+=======
+ CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 14),
+>>>>>>> VSE: Use transform operator in preview
} eTContext;
/** #TransInfo.flag */
@@ -240,6 +245,7 @@ typedef enum {
TC_PARTICLE_VERTS,
TC_SCULPT,
TC_SEQ_DATA,
+ TC_SEQ_IMAGE_DATA,
TC_TRACKING_DATA,
} eTConvertType;
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index d756e2c90a6..557fa79e7ac 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -955,6 +955,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
case TC_OBJECT_TEXSPACE:
case TC_PAINT_CURVE_VERTS:
case TC_PARTICLE_VERTS:
+ case TC_SEQ_IMAGE_DATA:
case TC_NONE:
default:
break;
@@ -1042,6 +1043,7 @@ static void init_proportional_edit(TransInfo *t)
case TC_PAINT_CURVE_VERTS:
case TC_SCULPT:
case TC_SEQ_DATA:
+ case TC_SEQ_IMAGE_DATA:
case TC_TRACKING_DATA:
case TC_NONE:
default:
@@ -1120,6 +1122,7 @@ static void init_TransDataContainers(TransInfo *t,
case TC_PARTICLE_VERTS:
case TC_SCULPT:
case TC_SEQ_DATA:
+ case TC_SEQ_IMAGE_DATA:
case TC_TRACKING_DATA:
case TC_NONE:
default:
@@ -1204,6 +1207,7 @@ static eTFlag flags_from_data_type(eTConvertType data_type)
case TC_NODE_DATA:
case TC_PAINT_CURVE_VERTS:
case TC_SEQ_DATA:
+ case TC_SEQ_IMAGE_DATA:
case TC_TRACKING_DATA:
return T_POINTS | T_2D_EDIT;
case TC_ARMATURE_VERTS:
@@ -1282,7 +1286,12 @@ static eTConvertType convert_type_get(const TransInfo *t, Object **r_obj_armatur
convert_type = TC_NLA_DATA;
}
else if (t->spacetype == SPACE_SEQ) {
- convert_type = TC_SEQ_DATA;
+ if (t->options & CTX_SEQUENCER_IMAGE) {
+ convert_type = TC_SEQ_IMAGE_DATA;
+ }
+ else {
+ convert_type = TC_SEQ_DATA;
+ }
}
else if (t->spacetype == SPACE_GRAPH) {
convert_type = TC_GRAPH_EDIT_DATA;
@@ -1470,6 +1479,10 @@ void createTransData(bContext *C, TransInfo *t)
t->num.flag |= NUM_NO_FRACTION; /* sequencer has no use for floating point transform. */
createTransSeqData(t);
break;
+ case TC_SEQ_IMAGE_DATA:
+ t->obedit_type = -1;
+ createTransSeqImageData(t);
+ break;
case TC_TRACKING_DATA:
createTransTrackingData(C, t);
break;
@@ -1746,6 +1759,9 @@ void recalcData(TransInfo *t)
case TC_SEQ_DATA:
recalcData_sequencer(t);
break;
+ case TC_SEQ_IMAGE_DATA:
+ recalcData_sequencer_image(t);
+ break;
case TC_TRACKING_DATA:
recalcData_tracking(t);
break;
diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h
index 9cb0400cad9..66d84bca2d2 100644
--- a/source/blender/editors/transform/transform_convert.h
+++ b/source/blender/editors/transform/transform_convert.h
@@ -218,6 +218,10 @@ void createTransSeqData(TransInfo *t);
void recalcData_sequencer(TransInfo *t);
void special_aftertrans_update__sequencer(bContext *C, TransInfo *t);
+/* transform_convert_sequencer_image.c */
+void createTransSeqImageData(TransInfo *t);
+void recalcData_sequencer_image(TransInfo *t);
+
/* transform_convert_tracking.c */
void createTransTrackingData(bContext *C, TransInfo *t);
void recalcData_tracking(TransInfo *t);
diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.c b/source/blender/editors/transform/transform_convert_sequencer_image.c
new file mode 100644
index 00000000000..55d69da1a2d
--- /dev/null
+++ b/source/blender/editors/transform/transform_convert_sequencer_image.c
@@ -0,0 +1,160 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2021 Blender Foundation.
+ * All rights reserved.
+ */
+
+/** \file
+ * \ingroup edtransform
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_space_types.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_report.h"
+
+#include "SEQ_iterator.h"
+#include "SEQ_relations.h"
+#include "SEQ_sequencer.h"
+#include "SEQ_time.h"
+#include "SEQ_transform.h"
+#include "SEQ_utils.h"
+
+#include "UI_view2d.h"
+
+#include "transform.h"
+#include "transform_convert.h"
+
+/** Used for sequencer transform. */
+typedef struct TransDataSeq {
+ struct Sequence *seq;
+ float orig_scale_x;
+ float orig_scale_y;
+ float orig_rotation;
+} TransDataSeq;
+
+static TransData *SeqToTransData(
+ Sequence *seq, TransData *td, TransData2D *td2d, TransDataSeq *tdseq, int vert_index)
+{
+ const StripTransform *transform = seq->strip->transform;
+ float vertex[2] = {transform->xofs, transform->yofs};
+
+ /* Add control vertex, so rotation and scale can be calculated. */
+ if (vert_index == 1) {
+ vertex[0] += 1.0f;
+ }
+ else if (vert_index == 2) {
+ vertex[1] += 1.0f;
+ }
+
+ td2d->loc[0] = vertex[0];
+ td2d->loc[1] = vertex[1];
+ td2d->loc2d = NULL;
+ td->loc = td2d->loc;
+ copy_v3_v3(td->iloc, td->loc);
+
+ td->center[0] = transform->xofs;
+ td->center[1] = transform->yofs;
+
+ memset(td->axismtx, 0, sizeof(td->axismtx));
+ td->axismtx[2][2] = 1.0f;
+ unit_m3(td->mtx);
+ unit_m3(td->smtx);
+
+ tdseq->seq = seq;
+ tdseq->orig_scale_x = transform->scale_x;
+ tdseq->orig_scale_y = transform->scale_y;
+ tdseq->orig_rotation = transform->rotation;
+
+ td->extra = (void *)tdseq;
+ td->ext = NULL;
+ td->flag |= TD_SELECTED;
+ td->dist = 0.0;
+
+ return td;
+}
+
+void createTransSeqImageData(Tran
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list