eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-16 04:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

First acceptable implementation of geometry distortion and crop

Browse Source 
Fixed shape node and crop, added rounding corner.
This commit is contained in:
Bruno Herbelin
2023-12-17 23:30:41 +01:00
parent 53bd7d6ae2
commit 5465a45dc6
11 changed files with 536 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Decorations.cpp
View File

@@ -220,6 +220,7 @@ Handles::Handles(Type type) : Node(), type_(type)
static Mesh *handle_shadow = new Mesh("mesh/border_handles_shadow.ply", "images/soft_shadow.dds");
static Mesh *handle_node = new Mesh("mesh/border_handles_sharp.ply");
static Mesh *handle_crop_h = new Mesh("mesh/border_handles_arrows.ply");
static Mesh *handle_rounding = new Mesh("mesh/border_handles_roundcorner.ply");
color = glm::vec4( 1.f, 1.f, 1.f, 1.f);
corner_ = glm::vec2(0.f, 0.f);
@@ -252,11 +253,11 @@ Handles::Handles(Type type) : Node(), type_(type)
else if ( type_ >= Handles::NODE_LOWER_LEFT && type_ <= Handles::NODE_UPPER_RIGHT ) {
handle_ = handle_node;
}
else if ( type_ == Handles::CROP_H ) {
else if ( type_ == Handles::CROP_H || type_ == Handles::CROP_V ) {
handle_ = handle_crop_h;
}
else if ( type_ == Handles::CROP_V ) {
handle_ = handle_crop_h;
else if ( type_ == Handles::ROUNDING ) {
handle_ = handle_rounding;
}
else {
handle_ = handle_corner;
@@ -480,6 +481,18 @@ void Handles::draw(glm::mat4 modelview, glm::mat4 projection)
ctm = glm::rotate(ctm, M_PI_2f, glm::vec3(0.f, 0.f, 1.f));
handle_->draw( ctm, projection );
}
else if ( type_ == Handles::ROUNDING ){
// one icon in top right corner
// 1. Fixed displacement by (0.0,0.12) along the rotation..
ctm = GlmToolkit::transform(glm::vec4(0.f), rot, mirror);
glm::vec4 pos = ctm * glm::vec4( 0.0f, 0.13f, 0.f, 1.f);
// 2. ..from the top right corner (1,1)
vec = ( modelview * glm::vec4(translation_.x +1.f, 1.f, 0.f, 1.f) ) + pos;
ctm = GlmToolkit::transform(vec, rot, glm::vec3(1.f));
// 3. draw
shadow_->draw( ctm, projection );
handle_->draw( ctm, projection );
}
}
}