asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6743 from mateka/issue-6296

Browse source 
Issue #6296: When searching for control, checking if matrix is inversible
This commit is contained in:
Rémi Verschelde 2016-10-09 14:53:32 +02:00 committed by GitHub
commit b9e010fb7f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/math/math_2d.cpp
View file

@ -424,7 +424,7 @@ Matrix32 Matrix32::inverse() const {
void Matrix32::affine_invert() {
float det = elements[0][0]*elements[1][1] - elements[1][0]*elements[0][1];
float det = basis_determinant();
ERR_FAIL_COND(det==0);
float idet = 1.0 / det;

3
scene/main/viewport.cpp
View file

@ -1715,6 +1715,9 @@ Control* Viewport::_gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_g
}
Matrix32 matrix = p_xform * p_node->get_transform();
// matrix.basis_determinant() == 0.0f implies that node does not exist on scene
if(matrix.basis_determinant() == 0.0f)
return NULL;
if (!c || !c->clips_input() || c->has_point(matrix.affine_inverse().xform(p_global))) {