From f2db10d29ac684f8680175a771ddf3a7edea50fa Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Sat, 9 Apr 2022 00:33:43 +0200 Subject: [PATCH] Added Double Frame on Session Source --- SessionSource.cpp | 78 +++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/SessionSource.cpp b/SessionSource.cpp index 909139c..8e178a9 100644 --- a/SessionSource.cpp +++ b/SessionSource.cpp @@ -38,6 +38,58 @@ SessionSource::SessionSource(uint64_t id) : Source(id), failed_(false), timer_(0), paused_(false) { 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() @@ -305,32 +357,6 @@ std::string SessionFileSource::info() const 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 symbol_ = new Symbol(Symbol::GROUP, glm::vec3(0.75f, 0.75f, 0.01f)); symbol_->scale_.y = 1.5f;