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

Add intermediate display mode of source selected but not current

Browse Source 
Frames of sources are now different between default, selected and current modes (thus emphasizing the outline for the unique current source).
This commit is contained in:
Bruno Herbelin
2023-06-25 18:20:28 +02:00
parent 64b2a18ff3
commit 97704deea0
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SessionSource.cpp
View File

@@ -240,11 +240,15 @@ SessionFileSource::SessionFileSource(uint64_t id) : SessionSource(id), path_("")
groups_[View::TRANSITION]->translation_ = glm::vec3(-1.f, 0.f, 0.f); groups_[View::TRANSITION]->translation_ = glm::vec3(-1.f, 0.f, 0.f);
frames_[View::TRANSITION] = new Switch; frames_[View::TRANSITION] = new Switch;
Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP); Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP); // visible
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f); frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.85f);
frames_[View::TRANSITION]->attach(frame); frames_[View::TRANSITION]->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::DROP); frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP); // selected
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f);
frames_[View::TRANSITION]->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::DROP); // current
frame->translation_.z = 0.01; frame->translation_.z = 0.01;
frame->color = glm::vec4( COLOR_TRANSITION_SOURCE, 1.f); frame->color = glm::vec4( COLOR_TRANSITION_SOURCE, 1.f);
frames_[View::TRANSITION]->attach(frame); frames_[View::TRANSITION]->attach(frame);

48
src/Source.cpp
View File

@@ -133,11 +133,15 @@ Source::Source(uint64_t id) : SourceCore(), id_(id), ready_(false), symbol_(null
groups_[View::MIXING]->translation_ = glm::vec3(DEFAULT_MIXING_TRANSLATION, 0.f); groups_[View::MIXING]->translation_ = glm::vec3(DEFAULT_MIXING_TRANSLATION, 0.f);
frames_[View::MIXING] = new Switch; frames_[View::MIXING] = new Switch;
Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP); Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP); // visible
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f); frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.85f);
frames_[View::MIXING]->attach(frame); frames_[View::MIXING]->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::DROP); frame = new Frame(Frame::ROUND, Frame::THIN, Frame::DROP); // selected
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 0.95f);
frames_[View::MIXING]->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::DROP); // current
frame->translation_.z = 0.01; frame->translation_.z = 0.01;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
frames_[View::MIXING]->attach(frame); frames_[View::MIXING]->attach(frame);
@@ -174,11 +178,15 @@ Source::Source(uint64_t id) : SourceCore(), id_(id), ready_(false), symbol_(null
// default geometry nodes // default geometry nodes
frames_[View::GEOMETRY] = new Switch; frames_[View::GEOMETRY] = new Switch;
frame = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); frame = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); // visible
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.8f); frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.85f);
frames_[View::GEOMETRY]->attach(frame); frames_[View::GEOMETRY]->attach(frame);
frame = new Frame(Frame::SHARP, Frame::LARGE, Frame::GLOW); frame = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); // selected
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 0.95f);
frames_[View::GEOMETRY]->attach(frame);
frame = new Frame(Frame::SHARP, Frame::LARGE, Frame::GLOW); // current
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
frames_[View::GEOMETRY]->attach(frame); frames_[View::GEOMETRY]->attach(frame);
@@ -226,11 +234,15 @@ Source::Source(uint64_t id) : SourceCore(), id_(id), ready_(false), symbol_(null
groups_[View::LAYER]->translation_.z = -1.f; groups_[View::LAYER]->translation_.z = -1.f;
frames_[View::LAYER] = new Switch; frames_[View::LAYER] = new Switch;
frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE); frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE); // visible
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f); frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.85f);
frames_[View::LAYER]->attach(frame); frames_[View::LAYER]->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::PERSPECTIVE); frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE); // selected
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 0.95f);
frames_[View::LAYER]->attach(frame);
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::PERSPECTIVE); // current
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
frames_[View::LAYER]->attach(frame); frames_[View::LAYER]->attach(frame);
@@ -246,11 +258,15 @@ Source::Source(uint64_t id) : SourceCore(), id_(id), ready_(false), symbol_(null
// default appearance node // default appearance node
frames_[View::TEXTURE] = new Switch; frames_[View::TEXTURE] = new Switch;
frame = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); frame = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); // visible
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_APPEARANCE_SOURCE, 0.2f);
frames_[View::TEXTURE]->attach(frame);
frame = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); // selected
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_APPEARANCE_SOURCE, 0.7f); frame->color = glm::vec4( COLOR_APPEARANCE_SOURCE, 0.7f);
frames_[View::TEXTURE]->attach(frame); frames_[View::TEXTURE]->attach(frame);
frame = new Frame(Frame::SHARP, Frame::LARGE, Frame::NONE); frame = new Frame(Frame::SHARP, Frame::LARGE, Frame::NONE); // current
frame->translation_.z = 0.1; frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_APPEARANCE_SOURCE, 1.f); frame->color = glm::vec4( COLOR_APPEARANCE_SOURCE, 1.f);
frames_[View::TEXTURE]->attach(frame); frames_[View::TEXTURE]->attach(frame);
@@ -390,13 +406,13 @@ void Source::setMode(Source::Mode m)
(*g).second->visible_ = true; (*g).second->visible_ = true;
} }
// choose frame 0 if visible, 1 if selected // Switch frame between visible, selected and current modes
uint index_frame = m == Source::VISIBLE ? 0 : 1; const uint index_frame = MAX(m, 1) - 1;
for (auto f = frames_.begin(); f != frames_.end(); ++f) for (auto f = frames_.begin(); f != frames_.end(); ++f)
(*f).second->setActive(index_frame); (*f).second->setActive(index_frame);
// show overlay if current // Switch overlay if current
bool current = m >= Source::CURRENT; const bool current = m >= Source::CURRENT;
for (auto o = overlays_.begin(); o != overlays_.end(); ++o) for (auto o = overlays_.begin(); o != overlays_.end(); ++o)
(*o).second->visible_ = (current && !locked_); (*o).second->visible_ = (current && !locked_);
@@ -412,7 +428,7 @@ void Source::setMode(Source::Mode m)
overlay_mixinggroup_->visible_ = mixinggroup_!= nullptr && !locked_; overlay_mixinggroup_->visible_ = mixinggroup_!= nullptr && !locked_;
overlay_mixinggroup_->setActive(current); overlay_mixinggroup_->setActive(current);
// show in appearance view if current // show in texturing view if selected or current
groups_[View::TEXTURE]->visible_ = m > Source::VISIBLE; groups_[View::TEXTURE]->visible_ = m > Source::VISIBLE;
mode_ = m; mode_ = m;