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

converted timelineblock to output node instead

Browse Source
This commit is contained in:
itsmattkc
2019-07-28 10:57:37 -07:00
parent 8d944387a2
commit 6cb182bfc5
8 changed files with 74 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core.cpp
+3 -5
View File
@@ -219,8 +219,8 @@ void Core::CreateNewFolder()
// FIXME: Test code
#include "node/block/clip/clip.h"
#include "node/block/timeline/timeline.h"
#include "node/input/media/media.h"
#include "node/output/timeline/timeline.h"
#include "node/output/viewer/viewer.h"
#include "node/generator/solid/solid.h"
#include "panel/panelmanager.h"
@@ -285,7 +285,7 @@ void Core::CreateNewSequence()
cb2->set_length(1);
new_sequence->AddNode(cb2);
TimelineBlock* tb = new TimelineBlock();
TimelineOutput* tb = new TimelineOutput();
tb->AttachTimeline(olive::panel_focus_manager->MostRecentlyFocused<TimelinePanel>());
new_sequence->AddNode(tb);
@@ -297,13 +297,11 @@ void Core::CreateNewSequence()
NodeParam::ConnectEdge(ii->texture_output(), cb2->texture_input());
NodeParam::ConnectEdge(cb1->block_output(), cb2->previous_input());
NodeParam::ConnectEdge(cb2->block_output(), cb1->next_input());
NodeParam::ConnectEdge(cb2->block_output(), tb->previous_input());
NodeParam::ConnectEdge(tb->block_output(), cb2->next_input());
NodeParam::ConnectEdge(cb2->block_output(), tb->block_input());
NodeParam::ConnectEdge(tb->texture_output(), vo->texture_input());
cb1->Refresh();
cb2->Refresh();
tb->Refresh();
olive::panel_focus_manager->MostRecentlyFocused<NodePanel>()->SetGraph(new_sequence.get());
// End test code