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

began work on node view panel

Browse Source
This commit is contained in:
itsmattkc
2019-07-14 10:14:57 -04:00
parent f2d11662c9
commit f0bf51e4a6
15 changed files with 312 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/window/mainwindow/mainmenu.cpp
+1
View File
@@ -402,6 +402,7 @@ void MainMenu::Retranslate()
tools_pointer_item_->setText(tr("Pointer Tool"));
tools_edit_item_->setText(tr("Edit Tool"));
tools_ripple_item_->setText(tr("Ripple Tool"));
tools_rolling_item_->setText(tr("Rolling Tool"));
tools_razor_item_->setText(tr("Razor Tool"));
tools_slip_item_->setText(tr("Slip Tool"));
tools_slide_item_->setText(tr("Slide Tool"));
app/window/mainwindow/mainwindow.cpp
+8 -4
View File
@@ -24,7 +24,7 @@
// Panel objects
#include "panel/project/project.h"
#include "panel/taskmanager/taskmanager.h"
#include "panel/node/node.h"
#include "panel/timeline/timeline.h"
#include "panel/tool/tool.h"
#include "panel/viewer/viewer.h"
@@ -73,16 +73,20 @@ void olive::MainWindow::ProjectOpen(Project* p)
ToolPanel* tool_panel = new ToolPanel(this);
addDockWidget(Qt::BottomDockWidgetArea, tool_panel);
TaskManagerPanel* task_panel = new TaskManagerPanel(this);
NodePanel* task_panel = new NodePanel(this);
addDockWidget(Qt::BottomDockWidgetArea, task_panel);
TimelinePanel* timeline_panel = new TimelinePanel(this);
addDockWidget(Qt::BottomDockWidgetArea, timeline_panel);
// FIXME: Test code
ViewerOutput* vo = new ViewerOutput(this);
NodeGraph* graph = new NodeGraph();
graph->setParent(this);
graph->set_name("New Graph");
ViewerOutput* vo = new ViewerOutput(graph);
vo->AttachViewer(viewer_panel2);
SolidGenerator* sg = new SolidGenerator(this);
SolidGenerator* sg = new SolidGenerator(graph);
NodeInput::ConnectEdge(sg->texture_output(), vo->texture_input());
task_panel->SetGraph(graph);
// End test code
}