diff options
Diffstat (limited to 'source/blender/sequencer/intern/strip_transform.c')
| -rw-r--r-- | source/blender/sequencer/intern/strip_transform.c | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c index 63ab4a30edc..ce5917b999f 100644 --- a/source/blender/sequencer/intern/strip_transform.c +++ b/source/blender/sequencer/intern/strip_transform.c @@ -86,8 +86,6 @@ void SEQ_transform_set_right_handle_frame(Sequence *seq, int val) } } -/* used so we can do a quick check for single image seq - * since they work a bit differently to normal image seq's (during transform) */ bool SEQ_transform_single_image_check(Sequence *seq) { return ((seq->len == 1) && @@ -95,7 +93,6 @@ bool SEQ_transform_single_image_check(Sequence *seq) ((seq->type & SEQ_TYPE_EFFECT) && SEQ_effect_get_num_inputs(seq->type) == 0))); } -/* check if the selected seq's reference unselected seq's */ bool SEQ_transform_seqbase_isolated_sel_check(ListBase *seqbase) { Sequence *seq; @@ -137,10 +134,6 @@ bool SEQ_transform_seqbase_isolated_sel_check(ListBase *seqbase) return true; } -/** - * Use to impose limits when dragging/extending - so impossible situations don't happen. - * Can't use the #SEQ_LEFTSEL and #SEQ_LEFTSEL directly because the strip may be in a meta-strip. - */ void SEQ_transform_handle_xlimits(Sequence *seq, int leftflag, int rightflag) { if (leftflag) { @@ -257,7 +250,6 @@ void SEQ_transform_translate_sequence(Scene *evil_scene, Sequence *seq, int delt SEQ_time_update_sequence(evil_scene, seqbase, seq); } -/* return 0 if there weren't enough space */ bool SEQ_transform_seqbase_shuffle_ex(ListBase *seqbasep, Sequence *test, Scene *evil_scene, @@ -393,14 +385,6 @@ bool SEQ_transform_seqbase_shuffle_time(SeqCollection *strips_to_shuffle, return offset ? false : true; } -/** - * Move strips and markers (if not locked) that start after timeline_frame by delta frames - * - * \param scene: Scene in which strips are located - * \param seqbase: ListBase in which strips are located - * \param delta: offset in frames to be applied - * \param timeline_frame: frame on timeline from where strips are moved - */ void SEQ_transform_offset_after_frame(Scene *scene, ListBase *seqbase, const int delta, @@ -436,14 +420,6 @@ void SEQ_image_transform_mirror_factor_get(const Sequence *seq, float r_mirror[2 } } -/** - * Get strip transform origin offset from image center - * Note: This function does not apply axis mirror. - * - * \param scene: Scene in which strips are located - * \param seq: Sequence to calculate image transform origin - * \param r_origin: return value - */ void SEQ_image_transform_origin_offset_pixelspace_get(const Scene *scene, const Sequence *seq, float r_origin[2]) @@ -463,9 +439,11 @@ void SEQ_image_transform_origin_offset_pixelspace_get(const Scene *scene, r_origin[0] = (image_size[0] * transform->origin[0]) - (image_size[0] * 0.5f) + transform->xofs; r_origin[1] = (image_size[1] * transform->origin[1]) - (image_size[1] * 0.5f) + transform->yofs; + const float viewport_pixel_aspect[2] = {scene->r.xasp / scene->r.yasp, 1.0f}; float mirror[2]; SEQ_image_transform_mirror_factor_get(seq, mirror); mul_v2_v2(r_origin, mirror); + mul_v2_v2(r_origin, viewport_pixel_aspect); } static void seq_image_transform_quad_get_ex(const Scene *scene, @@ -483,7 +461,6 @@ static void seq_image_transform_quad_get_ex(const Scene *scene, } float transform_matrix[4][4]; - float rotation_matrix[3][3]; axis_angle_to_mat3_single(rotation_matrix, 'Z', apply_rotation ? transform->rotation : 0.0f); loc_rot_size_to_mat4(transform_matrix, @@ -512,22 +489,16 @@ static void seq_image_transform_quad_get_ex(const Scene *scene, float mirror[2]; SEQ_image_transform_mirror_factor_get(seq, mirror); + const float viewport_pixel_aspect[2] = {scene->r.xasp / scene->r.yasp, 1.0f}; + for (int i = 0; i < 4; i++) { mul_m4_v3(transform_matrix, quad_temp[i]); mul_v2_v2(quad_temp[i], mirror); + mul_v2_v2(quad_temp[i], viewport_pixel_aspect); copy_v2_v2(r_quad[i], quad_temp[i]); } } -/** - * Get 4 corner points of strip image, optionally without rotation component applied. - * Corner vectors are in viewport space. - * - * \param scene: Scene in which strips are located - * \param seq: Sequence to calculate transformed image quad - * \param apply_rotation: Apply sequence rotation transform to the quad - * \param r_quad: array of 4 2D vectors - */ void SEQ_image_transform_quad_get(const Scene *scene, const Sequence *seq, bool apply_rotation, @@ -536,13 +507,6 @@ void SEQ_image_transform_quad_get(const Scene *scene, seq_image_transform_quad_get_ex(scene, seq, apply_rotation, r_quad); } -/** - * Get 4 corner points of strip image. Corner vectors are in viewport space. - * - * \param scene: Scene in which strips are located - * \param seq: Sequence to calculate transformed image quad - * \param r_quad: array of 4 2D vectors - */ void SEQ_image_transform_final_quad_get(const Scene *scene, const Sequence *seq, float r_quad[4][2]) |