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

New GRID in views to perrorm MousePointer snap to GRID

Browse Source 
For this new MousePointer to snap to grid, a Grid specific for each view is necessary. Grid for moving is orthographic (with an aspect ratio), and grid for mixing or rotation is in polar coordinates. Rendering is done with new Primitives. The entire calculation of grab coordinates is changed to be able to snap to grid coordinates in all circumstances.
This commit is contained in:
Bruno Herbelin
2023-08-27 12:15:31 +02:00
parent d0e1101bfb
commit 7fcb53c7d0
29 changed files with 1517 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/MixingView.cpp
View File

@@ -154,12 +154,9 @@ MixingView::MixingView() : View(MIXING), limbo_scale_(MIXING_MIN_THRESHOLD)
tmp->shader()->color = glm::vec4( COLOR_CIRCLE_ARROW, 0.1f );
slider_arrows_->attach(tmp);
// stashCircle_ = new Disk();
// stashCircle_->scale_ = glm::vec3(0.5f, 0.5f, 1.f);
// stashCircle_->translation_ = glm::vec3(2.f, -1.0f, 0.f);
// stashCircle_->color = glm::vec4( COLOR_STASH_CIRCLE, 0.6f );
// scene.bg()->attach(stashCircle_);
// replace grid with appropriate one
if (grid) delete grid;
grid = new MixingGrid(scene.root());
}
@@ -169,6 +166,9 @@ void MixingView::draw()
if (mixingCircle_->texture() == 0)
mixingCircle_->setTexture(textureMixingQuadratic());
// Display grid
grid->root()->visible_ = (grid->active() && current_action_ongoing_);
// temporarily force shaders to use opacity blending for rendering icons
Shader::force_blending_opacity = true;
// draw scene of this view
@@ -378,6 +378,10 @@ void MixingView::update(float dt)
float s = CLAMP(scene.root()->scale_.x, MIXING_MIN_SCALE, MIXING_MAX_SCALE);
scene.root()->scale_.x = s;
scene.root()->scale_.y = s;
// change grid color
const ImVec4 c = ImGuiToolkit::HighlightColor();
grid->setColor( glm::vec4(c.x, c.y, c.z, 0.3) );
}
// the current view is the mixing view
@@ -396,7 +400,7 @@ void MixingView::update(float dt)
mixingCircle_->shader()->color = glm::vec4(f, f, f, 1.f);
// update the selection overlay
ImVec4 c = ImGuiToolkit::HighlightColor();
const ImVec4 c = ImGuiToolkit::HighlightColor();
updateSelectionOverlay(glm::vec4(c.x, c.y, c.z, c.w));
}
@@ -495,6 +499,10 @@ View::Cursor MixingView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pai
// No source is given
if (!s) {
// snap to grid (polar)
if (grid->active())
gl_Position_to = grid->snap(gl_Position_to);
// if interaction with slider
if (pick.first == slider_) {
@@ -544,8 +552,15 @@ View::Cursor MixingView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pai
//
// Interaction with source
//
// compute delta translation
s->group(mode_)->translation_ = s->stored_status_->translation_ + gl_Position_to - gl_Position_from;
// compute position after translation
glm::vec3 newpos = s->stored_status_->translation_ + gl_Position_to - gl_Position_from;
// snap to grid (polar)
if (grid->active())
newpos = grid->snap(newpos);
// apply translation
s->group(mode_)->translation_ = newpos;
// manage mixing group
if (s->mixinggroup_ != nullptr ) {
@@ -563,22 +578,19 @@ View::Cursor MixingView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pai
// request update
s->touch();
// // trying to enter stash
// if ( glm::distance( glm::vec2(s->group(mode_)->translation_), glm::vec2(stashCircle_->translation_)) < stashCircle_->scale_.x) {
// // refuse to put an active source in stash
// if (s->active())
// s->group(mode_)->translation_ = s->stored_status_->translation_;
// else {
// Mixer::manager().conceal(s);
// s->group(mode_)->scale_ = glm::vec3(MIXING_ICON_SCALE) - glm::vec3(0.1f, 0.1f, 0.f);
// }
// }
// else if ( Mixer::manager().concealed(s) ) {
// Mixer::manager().uncover(s);
// s->group(mode_)->scale_ = glm::vec3(MIXING_ICON_SCALE);
// }
//
// grab all others from selection
//
// compute effective translation of current source s
newpos = s->group(mode_)->translation_ - s->stored_status_->translation_;
// loop over selection
for (auto it = Mixer::selection().begin(); it != Mixer::selection().end(); ++it) {
if ( *it != s && !(*it)->locked() && ( s->mixinggroup_ == nullptr || !s->mixinggroup_->contains(*it)) ) {
// translate and request update
(*it)->group(mode_)->translation_ = (*it)->stored_status_->translation_ + newpos;
(*it)->touch();
}
}
std::ostringstream info;
if (s->active()) {
@@ -591,6 +603,7 @@ View::Cursor MixingView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pai
// store action in history
current_action_ = s->name() + ": " + info.str();
// update cursor
ret.info = info.str();
return ret;
@@ -834,3 +847,56 @@ uint textureMixingQuadratic()
}
return texid;
}
MixingGrid::MixingGrid(Group *parent) : Grid(parent, Grid::GRID_POLAR)
{
root_ = new Group;
root_->visible_ = false;
parent_->attach(root_);
polar_grids_ = new Switch;
polar_grids_->attach(new LineCircleGrid(Grid::polar_units_[UNIT_PRECISE], 50,
Grid::ortho_units_[UNIT_PRECISE], 0.5f));
polar_grids_->attach(new LineCircleGrid(Grid::polar_units_[UNIT_SMALL], 30,
Grid::ortho_units_[UNIT_SMALL], 0.5f));
polar_grids_->attach(new LineCircleGrid(Grid::polar_units_[UNIT_DEFAULT], 15,
Grid::ortho_units_[UNIT_DEFAULT], 0.5f));
polar_grids_->attach(new LineCircleGrid(Grid::polar_units_[UNIT_LARGE], 6,
Grid::ortho_units_[UNIT_LARGE], 0.5f));
polar_grids_->attach(new LineCircleGrid(Grid::polar_units_[UNIT_ONE], 3,
Grid::ortho_units_[UNIT_ONE], 0.5f));
root_->attach(polar_grids_);
// not visible at init
setColor( glm::vec4(0.f) );
}
Group *MixingGrid::root ()
{
//adjust the grid to the unit scale
polar_grids_->setActive(unit_);
// return the node to draw
return root_;
}
// // trying to enter stash
// if ( glm::distance( glm::vec2(s->group(mode_)->translation_), glm::vec2(stashCircle_->translation_)) < stashCircle_->scale_.x) {
// // refuse to put an active source in stash
// if (s->active())
// s->group(mode_)->translation_ = s->stored_status_->translation_;
// else {
// Mixer::manager().conceal(s);
// s->group(mode_)->scale_ = glm::vec3(MIXING_ICON_SCALE) - glm::vec3(0.1f, 0.1f, 0.f);
// }
// }
// else if ( Mixer::manager().concealed(s) ) {
// Mixer::manager().uncover(s);
// s->group(mode_)->scale_ = glm::vec3(MIXING_ICON_SCALE);
// }