DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1235 from abarth/handle_degenerate_transforms

Browse Source 
Handle degenerate transforms better
This commit is contained in:
Adam Barth 2016-01-13 11:21:06 -08:00
commit 15eeb7f57d
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter/lib/src/rendering/box.dart
View File

@ -636,6 +636,9 @@ abstract class RenderBox extends RenderObject {
/// Convert the given point from the global coodinate system to the local
/// coordinate system for this box.
///
/// If the transform from global coordinates to local coordinates is
/// degenerate, this function returns Point.origin.
Point globalToLocal(Point point) {
assert(attached);
Matrix4 transform = new Matrix4.identity();
@ -645,8 +648,9 @@ abstract class RenderBox extends RenderObject {
rendererParent.applyPaintTransform(renderer, transform);
renderer = rendererParent;
}
/* double det = */ transform.invert();
// TODO(abarth): Check the determinant for degeneracy.
double det = transform.invert();
if (det == 0.0)
return Point.origin;
return _transformPoint(transform, point);
}

11
packages/flutter/lib/src/rendering/proxy_box.dart
View File

@ -991,9 +991,14 @@ class RenderTransform extends RenderProxyBox {
bool hitTest(HitTestResult result, { Point position }) {
if (transformHitTests) {
Matrix4 inverse = new Matrix4.zero();
// TODO(abarth): Check the determinant for degeneracy.
inverse.copyInverse(_effectiveTransform);
Matrix4 inverse;
try {
inverse = new Matrix4.inverted(_effectiveTransform);
} catch (e) {
// We cannot invert the effective transform. That means the child
// doesn't appear on screen and cannot be hit.
return false;
}
Vector3 position3 = new Vector3(position.x, position.y, 0.0);
Vector3 transformed3 = inverse.transform3(position3);
position = new Point(transformed3.x, transformed3.y);

2
packages/flutter/pubspec.yaml
View File

@ -10,7 +10,7 @@ dependencies:
material_design_icons: '>=0.0.3 <0.1.0'
sky_engine: 0.0.81
sky_services: 0.0.81
vector_math: '>=1.4.3 <2.0.0'
vector_math: '>=1.4.5 <2.0.0'
quiver: '>=0.21.4 <0.22.0'
# See the comment in flutter_tools' pubspec.yaml. We have to pin it