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

Initial implementation of Layer view (not effective, but integrated in

Browse Source 
mixer).
This commit is contained in:
brunoherbelin
2020-05-17 13:29:27 +02:00
parent 54d4bc2aba
commit 569a097c4a
11 changed files with 111 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Mesh.cpp
View File

@@ -466,10 +466,9 @@ Handles::Handles(Type type) : Node(), type_(type)
if ( type_ == ROTATE ) {
handle_ = new Mesh("mesh/border_handles_rotation.ply");
// handle_->scale_ = glm::vec3( 0.01f, 0.01f, 1.f);
}
else {
handle_ = new LineSquare(color, 3);
handle_ = new LineSquare(color, 2);
handle_->scale_ = glm::vec3( 0.05f, 0.05f, 1.f);
}
// handle_ = new Mesh("mesh/border_handles_overlay.ply");
@@ -499,7 +498,6 @@ void Handles::draw(glm::mat4 modelview, glm::mat4 projection)
// set color
handle_->shader()->color = color;
// handle_->scale_ = glm::vec3( 0.01f, 0.01f, 1.f);
glm::mat4 ctm;
@@ -535,7 +533,6 @@ void Handles::draw(glm::mat4 modelview, glm::mat4 projection)
}
else if ( type_ == ROTATE ){
// only once in upper top right corner
// ctm = modelview * glm::translate(glm::identity<glm::mat4>(), glm::vec3(1.08f, +1.08f, 0.f));
glm::vec4 pos = modelview * glm::vec4(1.08f, 1.08f, 0.f, 1.f);
ctm = GlmToolkit::transform(glm::vec3(pos), glm::vec3(0.f), glm::vec3(1.f));
handle_->draw( ctm, projection );