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

Acceptable implementation of Geometry view, but graphics to be improved.

Browse Source
This commit is contained in:
brunoherbelin
2020-05-16 22:18:19 +02:00
parent 610e68c697
commit 61896fdf53
3 changed files with 207 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Mesh.cpp
View File

@@ -421,12 +421,13 @@ void Frame::draw(glm::mat4 modelview, glm::mat4 projection)
if ( visible_ ) {
// enable antialiasing
glEnable(GL_MULTISAMPLE_ARB);
// shadow
if(shadow_)
shadow_->draw( modelview * transform_, projection);
// enable antialiasing
glEnable(GL_MULTISAMPLE_ARB);
// right side
float ar = scale_.x / scale_.y;
@@ -443,7 +444,7 @@ void Frame::draw(glm::mat4 modelview, glm::mat4 projection)
t.x = -t.x;
s.x = -s.x;
ctm = modelview * GlmToolkit::transform(t, rotation_, s);
// border_->draw( ctm, projection );
border_->draw( ctm, projection );
}
// enable antialiasing
@@ -487,12 +488,28 @@ void Handles::draw(glm::mat4 modelview, glm::mat4 projection)
// set color
handle_->shader()->color = color;
float ar = scale_.x / scale_.y;
float ar = 1.f;//scale_.x / scale_.y;
glm::mat4 ctm;
glm::vec4 center = modelview * glm::vec4(0.f, 0.f, 0.f, 1.f);
glm::vec4 h = modelview * glm::vec4(1.f, 0.f, 0.f, 1.f);
// glm::vec3 scale = glm::normalize( diagonal - center );
glm::mat4 S = glm::scale(glm::identity<glm::mat4>(), glm::vec3( 1.f / h.x, 1.f / h.y, 1.f) );
// glm::vec4 t(1.f, 0.f, 0.f, 1.f);
// t = modelview * t;
// glm::mat4 S = glm::scale(glm::identity<glm::mat4>(), glm::vec3(1.f, 1.f, 1.f) );
if ( type_ == RESIZE ) {
// 4 corners
ctm = modelview * glm::translate(glm::identity<glm::mat4>(), glm::vec3(ar, -1.f, 0.f) );
ctm = modelview * glm::translate(glm::identity<glm::mat4>(), glm::vec3(1.f, -1.f, 0.f) ) ;
// ctm *= S;
// glm::vec4 P = glm::inverse(modelview) * glm::vec4(1.f, 1.f, 0.f, 1.f );
// ctm = glm::translate(glm::identity<glm::mat4>(), glm::vec3(t) );
handle_->draw( ctm, projection );