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

Merge branch 'master' into gizmos

Browse Source
This commit is contained in:
itsmattkc
2020-05-02 17:06:49 +10:00
parent 1cca9de7c5 90597bd08a
commit cfc5ce24a3
130 changed files with 2310 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/param/param.cpp
+7
View File
@@ -60,6 +60,11 @@ void ParamPanel::SetTimestamp(const int64_t &timestamp)
}
}
void ParamPanel::DeleteSelected()
{
static_cast<NodeParamView*>(GetTimeBasedWidget())->DeleteSelected();
}
void ParamPanel::Retranslate()
{
SetTitle(tr("Parameter Editor"));
@@ -95,9 +100,11 @@ void ParamPanel::CreateCurvePanel(NodeInput *input)
panel->SetInput(input);
panel->SetTimebase(view->timebase());
panel->SetTimestamp(view->GetTimestamp());
panel->SetTimeTarget(view->GetTimeTarget());
connect(view, &NodeParamView::TimebaseChanged, panel, &CurvePanel::SetTimebase);
connect(view, &NodeParamView::TimeChanged, panel, &CurvePanel::SetTimestamp);
connect(view, &NodeParamView::TimeTargetChanged, panel, &CurvePanel::SetTimeTarget);
connect(panel, &CurvePanel::TimeChanged, view, &NodeParamView::SetTimestamp);
connect(panel, &CurvePanel::TimeChanged, view, &NodeParamView::TimeChanged);
connect(panel, &CurvePanel::CloseRequested, this, &ParamPanel::ClosingCurvePanel);
app/panel/param/param.h
+2
View File
@@ -38,6 +38,8 @@ public slots:
virtual void SetTimestamp(const int64_t& timestamp) override;
virtual void DeleteSelected() override;
signals:
void TimeTargetChanged(Node* node);