eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 18:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added Double Frame on Session Source

Browse Source
This commit is contained in:
Bruno Herbelin
2022-04-09 00:33:43 +02:00
parent 33756c775c
commit f2db10d29a
1 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
SessionSource.cpp
View File

@@ -38,6 +38,58 @@
SessionSource::SessionSource(uint64_t id) : Source(id), failed_(false), timer_(0), paused_(false) SessionSource::SessionSource(uint64_t id) : Source(id), failed_(false), timer_(0), paused_(false)
{ {
session_ = new Session; session_ = new Session;
// redo frame for MIXING view
frames_[View::MIXING]->clear();
// set Frame in MIXING with an additional border
Group *group = new Group;
Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP);
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
group->attach(frame);
frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP);
frame->scale_.x = 1.05;
frame->scale_.y = 1.1;
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
group->attach(frame);
frames_[View::MIXING]->attach(group);
group = new Group;
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::DROP);
frame->translation_.z = 0.01;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
group->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::DROP);
frame->scale_.x = 1.05;
frame->scale_.y = 1.1;
frame->translation_.z = 0.01;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
group->attach(frame);
frames_[View::MIXING]->attach(group);
// redo frame for LAYER view
frames_[View::LAYER]->clear();
// set Frame in LAYER with an additional border (Group in perspective)
group = new Group;
frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE);
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
group->attach(frame);
Frame *persp = new Frame(Frame::GROUP, Frame::THIN, Frame::NONE);
persp->translation_.z = 0.1;
persp->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
group->attach(persp);
frames_[View::LAYER]->attach(group);
group = new Group;
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::PERSPECTIVE);
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
group->attach(frame);
persp = new Frame(Frame::GROUP, Frame::LARGE, Frame::NONE);
persp->translation_.z = 0.1;
persp->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
group->attach(persp);
frames_[View::LAYER]->attach(group);
} }
SessionSource::~SessionSource() SessionSource::~SessionSource()
@@ -305,32 +357,6 @@ std::string SessionFileSource::info() const
SessionGroupSource::SessionGroupSource(uint64_t id) : SessionSource(id), resolution_(glm::vec3(0.f)) SessionGroupSource::SessionGroupSource(uint64_t id) : SessionSource(id), resolution_(glm::vec3(0.f))
{ {
// // redo frame for layers view
// frames_[View::LAYER]->clear();
// // Groups in LAYER have an additional border
// Group *group = new Group;
// Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE);
// frame->translation_.z = 0.1;
// frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
// group->attach(frame);
// Frame *persp = new Frame(Frame::GROUP, Frame::THIN, Frame::NONE);
// persp->translation_.z = 0.1;
// persp->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
// group->attach(persp);
// frames_[View::LAYER]->attach(group);
// group = new Group;
// frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::PERSPECTIVE);
// frame->translation_.z = 0.1;
// frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
// group->attach(frame);
// persp = new Frame(Frame::GROUP, Frame::LARGE, Frame::NONE);
// persp->translation_.z = 0.1;
// persp->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
// group->attach(persp);
// frames_[View::LAYER]->attach(group);
// set symbol // set symbol
symbol_ = new Symbol(Symbol::GROUP, glm::vec3(0.75f, 0.75f, 0.01f)); symbol_ = new Symbol(Symbol::GROUP, glm::vec3(0.75f, 0.75f, 0.01f));
symbol_->scale_.y = 1.5f; symbol_->scale_.y = 1.5f;