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

Improved overlay grid

Browse Source
This commit is contained in:
brunoherbelin
2021-03-17 18:49:20 +01:00
parent 91d1ff1eb1
commit 63c954dedc
3 changed files with 148 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
GeometryView.cpp
View File

@@ -55,9 +55,8 @@ GeometryView::GeometryView() : View(GEOMETRY)
scene.fg()->attach(overlay_position_);
overlay_position_->visible_ = false;
// cross to show the axis for POSITION
overlay_position_cross_ = new Symbol(Symbol::CROSS);
overlay_position_cross_->rotation_ = glm::vec3(0.f, 0.f, M_PI_4);
overlay_position_cross_->scale_ = glm::vec3(0.3f, 0.3f, 1.f);
overlay_position_cross_ = new Symbol(Symbol::GRID);
overlay_position_cross_->scale_ = glm::vec3(0.5f, 0.5f, 1.f);
scene.fg()->attach(overlay_position_cross_);
overlay_position_cross_->visible_ = false;
// 'clock' : tic marks every 10 degrees for ROTATION
@@ -91,10 +90,11 @@ GeometryView::GeometryView() : View(GEOMETRY)
// with dark background
Group *g = new Group;
s = new Symbol(Symbol::GRID);
s->scale_ = glm::vec3(1.655f, 1.655f, 1.f);
g->attach(s);
s = new Symbol(Symbol::SQUARE_POINT);
s->color = glm::vec4(0.f, 0.f, 0.f, 0.1f);
s->scale_ = glm::vec3(18.f, 18.f, 1.f);
s->scale_ = glm::vec3(17.f, 17.f, 1.f);
s->translation_.z = -0.1;
g->attach(s);
overlay_scaling_grid_ = g;
@@ -953,24 +953,12 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
// discretized translation with ALT
if (UserInterface::manager().altModifier()) {
sourceNode->translation_.x = ROUND(sourceNode->translation_.x, 10.f);
sourceNode->translation_.y = ROUND(sourceNode->translation_.y, 10.f);
// // + SHIFT: single axis movement
// overlay_position_cross_->visible_ = false;
// if (UserInterface::manager().shiftModifier()) {
// overlay_position_cross_->visible_ = true;
// overlay_position_cross_->translation_.x = s->stored_status_->translation_.x;
// overlay_position_cross_->translation_.y = s->stored_status_->translation_.y;
// overlay_position_cross_->update(0);
// glm::vec3 dif = s->stored_status_->translation_ - sourceNode->translation_;
// if (ABS(dif.x) > ABS(dif.y) ) {
// sourceNode->translation_.y = s->stored_status_->translation_.y;
// ret.type = Cursor_ResizeEW;
// } else {
// sourceNode->translation_.x = s->stored_status_->translation_.x;
// ret.type = Cursor_ResizeNS;
// }
// }
sourceNode->translation_.y = ROUND(sourceNode->translation_.y, 10.f);
// Show grid overlay for POSITION
overlay_position_cross_->visible_ = true;
overlay_position_cross_->translation_.x = sourceNode->translation_.x;
overlay_position_cross_->translation_.y = sourceNode->translation_.y;
overlay_position_cross_->update(0);
}
// Show center overlay for POSITION
overlay_position_->visible_ = true;