oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented creating dual and single transitions

Browse Source 
The user can now create transitions on each side as well as transitions between
blocks.
This commit is contained in:
itsmattkc
2019-12-12 15:50:08 +11:00
parent 76c0399b75
commit 1ba254ae87
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/timelinewidget.h
+2
View File
@@ -313,6 +313,8 @@ private:
virtual void MouseMove(TimelineViewMouseEvent *event) override;
virtual void MouseRelease(TimelineViewMouseEvent *event) override;
protected:
private:
bool dual_transition_;
};
void SetBlockLinksSelected(Block *block, bool selected);
app/widget/timelinewidget/tool/transition.cpp
+4 -1
View File
@@ -27,12 +27,15 @@ void TimelineWidget::TransitionTool::MousePress(TimelineViewMouseEvent *event)
rational transition_start_point;
olive::timeline::MovementMode trim_mode;
rational halfway_point = block_at_time->in() + block_at_time->length() / 2;
rational tenth_point = block_at_time->in() + block_at_time->length() / 10;
if (cursor_frame < halfway_point) {
transition_start_point = block_at_time->in();
trim_mode = olive::timeline::kTrimIn;
dual_transition_ = (cursor_frame < tenth_point);
} else {
transition_start_point = block_at_time->out();
trim_mode = olive::timeline::kTrimOut;
dual_transition_ = (cursor_frame > block_at_time->length() - tenth_point);
}
// Create ghost
@@ -57,7 +60,7 @@ void TimelineWidget::TransitionTool::MouseMove(TimelineViewMouseEvent *event)
return;
}
MouseMoveInternal(event->GetCoordinates().GetFrame(), false);
MouseMoveInternal(event->GetCoordinates().GetFrame(), dual_transition_);
}
void TimelineWidget::TransitionTool::MouseRelease(TimelineViewMouseEvent *event)