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

First effective implementation of LayerView (both GUI, sorting and

Browse Source 
storing in session)
This commit is contained in:
brunoherbelin
2020-05-18 21:58:50 +02:00
parent 80478abde2
commit 530762d1d2
8 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
View.cpp
View File

@@ -42,6 +42,9 @@ void View::update(float dt)
{
// recursive update from root of scene
scene.update( dt );
// reorder depth
scene.fg()->sort();
}
void View::drag (glm::vec2 from, glm::vec2 to)
@@ -126,6 +129,8 @@ void MixingView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node *
// compute delta translation
sourceNode->translation_ = start_translation + gl_Position_to - gl_Position_from;
// request update
s->touch();
}
@@ -323,6 +328,8 @@ void GeometryView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node
sourceNode->translation_ = start_translation + gl_Position_to - gl_Position_from;
}
// request update
s->touch();
}
LayerView::LayerView() : View(LAYER), aspect_ratio(1.f)
@@ -379,7 +386,6 @@ void LayerView::zoom (float factor)
z = CLAMP( z + 0.1f * factor, 0.2f, 10.f);
scene.root()->scale_.x = z;
scene.root()->scale_.y = z;
Log::Info("scale layer %f", scene.root()->scale_.x );
}
@@ -409,6 +415,10 @@ void LayerView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node *,
sourceNode->translation_.x = CLAMP( sourceNode->translation_.x, -10.f, 0.f);
sourceNode->translation_.y = sourceNode->translation_.x / aspect_ratio;
// change depth
sourceNode->translation_.z = -sourceNode->translation_.x;
// request update
s->touch();
}