mirror of
https://github.com/flutter/flutter.git
synced 2026-02-11 05:17:36 +08:00
bf017b79b3
* Manually fix every use of Point.x and Point.y
Some of these were moved to dx/dy, but not all.
* Manually convert uses of the old gradient API
* Remove old reference to Point.
* Mechanical changes
I applied the following at the root of the Flutter repository:
git ls-files -z | xargs -0 sed -i 's/\bPoint[.]origin\b/Offset.zero/g'
git ls-files -z | xargs -0 sed -i 's/\bPoint[.]lerp\b/Offset.lerp/g'
git ls-files -z | xargs -0 sed -i 's/\bnew Point\b/new Offset/g'
git ls-files -z | xargs -0 sed -i 's/\bconst Point\b/const Offset/g'
git ls-files -z | xargs -0 sed -i 's/\bstatic Point /static Offset /g'
git ls-files -z | xargs -0 sed -i 's/\bfinal Point /final Offset /g'
git ls-files -z | xargs -0 sed -i 's/^\( *\)Point /\1Offset /g'
git ls-files -z | xargs -0 sed -i 's/ui[.]Point\b/ui.Offset/g'
git ls-files -z | xargs -0 sed -i 's/(Point\b/(Offset/g'
git ls-files -z | xargs -0 sed -i 's/\([[{,]\) Point\b/\1 Offset/g'
git ls-files -z | xargs -0 sed -i 's/@required Point\b/@required Offset/g'
git ls-files -z | xargs -0 sed -i 's/<Point>/<Offset>/g'
git ls-files -z | xargs -0 sed -i 's/[.]toOffset()//g'
git ls-files -z | xargs -0 sed -i 's/[.]toPoint()//g'
git ls-files -z | xargs -0 sed -i 's/\bshow Point, /show /g'
git ls-files -z | xargs -0 sed -i 's/\bshow Point;/show Offset;/g'
* Mechanical changes - dartdocs
I applied the following at the root of the Flutter repository:
git ls-files -z | xargs -0 sed -i 's/\ba \[Point\]/an [Offset]/g'
git ls-files -z | xargs -0 sed -i 's/\[Point\]/[Offset]/g'
* Further improvements and a test
* Fix minor errors from rebasing...
* Roll engine
195 lines
10 KiB
Dart
195 lines
10 KiB
Dart
// Copyright 2015 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'dart:math' as math;
|
|
|
|
import 'package:flutter/rendering.dart';
|
|
import 'package:test/test.dart';
|
|
|
|
import 'rendering_tester.dart';
|
|
|
|
Offset round(Offset value) {
|
|
return new Offset(value.dx.roundToDouble(), value.dy.roundToDouble());
|
|
}
|
|
|
|
void main() {
|
|
test('RenderTransform - identity', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: new Matrix4.identity(),
|
|
alignment: FractionalOffset.center,
|
|
child: inner = new RenderSizedBox(const Size(100.0, 100.0)),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
expect(inner.globalToLocal(const Offset(0.0, 0.0)), equals(const Offset(0.0, 0.0)));
|
|
expect(inner.globalToLocal(const Offset(100.0, 100.0)), equals(const Offset(100.0, 100.0)));
|
|
expect(inner.globalToLocal(const Offset(25.0, 75.0)), equals(const Offset(25.0, 75.0)));
|
|
expect(inner.globalToLocal(const Offset(50.0, 50.0)), equals(const Offset(50.0, 50.0)));
|
|
expect(inner.localToGlobal(const Offset(0.0, 0.0)), equals(const Offset(0.0, 0.0)));
|
|
expect(inner.localToGlobal(const Offset(100.0, 100.0)), equals(const Offset(100.0, 100.0)));
|
|
expect(inner.localToGlobal(const Offset(25.0, 75.0)), equals(const Offset(25.0, 75.0)));
|
|
expect(inner.localToGlobal(const Offset(50.0, 50.0)), equals(const Offset(50.0, 50.0)));
|
|
});
|
|
|
|
test('RenderTransform - identity with internal offset', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: new Matrix4.identity(),
|
|
alignment: FractionalOffset.center,
|
|
child: new RenderPadding(
|
|
padding: const EdgeInsets.only(left: 20.0),
|
|
child: inner = new RenderSizedBox(const Size(80.0, 100.0)),
|
|
),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
expect(inner.globalToLocal(const Offset(0.0, 0.0)), equals(const Offset(-20.0, 0.0)));
|
|
expect(inner.globalToLocal(const Offset(100.0, 100.0)), equals(const Offset(80.0, 100.0)));
|
|
expect(inner.globalToLocal(const Offset(25.0, 75.0)), equals(const Offset(5.0, 75.0)));
|
|
expect(inner.globalToLocal(const Offset(50.0, 50.0)), equals(const Offset(30.0, 50.0)));
|
|
expect(inner.localToGlobal(const Offset(0.0, 0.0)), equals(const Offset(20.0, 0.0)));
|
|
expect(inner.localToGlobal(const Offset(100.0, 100.0)), equals(const Offset(120.0, 100.0)));
|
|
expect(inner.localToGlobal(const Offset(25.0, 75.0)), equals(const Offset(45.0, 75.0)));
|
|
expect(inner.localToGlobal(const Offset(50.0, 50.0)), equals(const Offset(70.0, 50.0)));
|
|
});
|
|
|
|
test('RenderTransform - translation', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: new Matrix4.translationValues(50.0, 200.0, 0.0),
|
|
alignment: FractionalOffset.center,
|
|
child: inner = new RenderSizedBox(const Size(100.0, 100.0)),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
expect(inner.globalToLocal(const Offset(0.0, 0.0)), equals(const Offset(-50.0, -200.0)));
|
|
expect(inner.globalToLocal(const Offset(100.0, 100.0)), equals(const Offset(50.0, -100.0)));
|
|
expect(inner.globalToLocal(const Offset(25.0, 75.0)), equals(const Offset(-25.0, -125.0)));
|
|
expect(inner.globalToLocal(const Offset(50.0, 50.0)), equals(const Offset(0.0, -150.0)));
|
|
expect(inner.localToGlobal(const Offset(0.0, 0.0)), equals(const Offset(50.0, 200.0)));
|
|
expect(inner.localToGlobal(const Offset(100.0, 100.0)), equals(const Offset(150.0, 300.0)));
|
|
expect(inner.localToGlobal(const Offset(25.0, 75.0)), equals(const Offset(75.0, 275.0)));
|
|
expect(inner.localToGlobal(const Offset(50.0, 50.0)), equals(const Offset(100.0, 250.0)));
|
|
});
|
|
|
|
test('RenderTransform - translation with internal offset', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: new Matrix4.translationValues(50.0, 200.0, 0.0),
|
|
alignment: FractionalOffset.center,
|
|
child: new RenderPadding(
|
|
padding: const EdgeInsets.only(left: 20.0),
|
|
child: inner = new RenderSizedBox(const Size(80.0, 100.0)),
|
|
),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
expect(inner.globalToLocal(const Offset(0.0, 0.0)), equals(const Offset(-70.0, -200.0)));
|
|
expect(inner.globalToLocal(const Offset(100.0, 100.0)), equals(const Offset(30.0, -100.0)));
|
|
expect(inner.globalToLocal(const Offset(25.0, 75.0)), equals(const Offset(-45.0, -125.0)));
|
|
expect(inner.globalToLocal(const Offset(50.0, 50.0)), equals(const Offset(-20.0, -150.0)));
|
|
expect(inner.localToGlobal(const Offset(0.0, 0.0)), equals(const Offset(70.0, 200.0)));
|
|
expect(inner.localToGlobal(const Offset(100.0, 100.0)), equals(const Offset(170.0, 300.0)));
|
|
expect(inner.localToGlobal(const Offset(25.0, 75.0)), equals(const Offset(95.0, 275.0)));
|
|
expect(inner.localToGlobal(const Offset(50.0, 50.0)), equals(const Offset(120.0, 250.0)));
|
|
});
|
|
|
|
test('RenderTransform - rotation', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: new Matrix4.rotationZ(math.PI),
|
|
alignment: FractionalOffset.center,
|
|
child: inner = new RenderSizedBox(const Size(100.0, 100.0)),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
expect(round(inner.globalToLocal(const Offset(0.0, 0.0))), equals(const Offset(100.0, 100.0)));
|
|
expect(round(inner.globalToLocal(const Offset(100.0, 100.0))), equals(const Offset(0.0, 0.0)));
|
|
expect(round(inner.globalToLocal(const Offset(25.0, 75.0))), equals(const Offset(75.0, 25.0)));
|
|
expect(round(inner.globalToLocal(const Offset(50.0, 50.0))), equals(const Offset(50.0, 50.0)));
|
|
expect(round(inner.localToGlobal(const Offset(0.0, 0.0))), equals(const Offset(100.0, 100.0)));
|
|
expect(round(inner.localToGlobal(const Offset(100.0, 100.0))), equals(const Offset(0.0, 0.0)));
|
|
expect(round(inner.localToGlobal(const Offset(25.0, 75.0))), equals(const Offset(75.0, 25.0)));
|
|
expect(round(inner.localToGlobal(const Offset(50.0, 50.0))), equals(const Offset(50.0, 50.0)));
|
|
});
|
|
|
|
test('RenderTransform - rotation with internal offset', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: new Matrix4.rotationZ(math.PI),
|
|
alignment: FractionalOffset.center,
|
|
child: new RenderPadding(
|
|
padding: const EdgeInsets.only(left: 20.0),
|
|
child: inner = new RenderSizedBox(const Size(80.0, 100.0)),
|
|
),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
expect(round(inner.globalToLocal(const Offset(0.0, 0.0))), equals(const Offset(80.0, 100.0)));
|
|
expect(round(inner.globalToLocal(const Offset(100.0, 100.0))), equals(const Offset(-20.0, 0.0)));
|
|
expect(round(inner.globalToLocal(const Offset(25.0, 75.0))), equals(const Offset(55.0, 25.0)));
|
|
expect(round(inner.globalToLocal(const Offset(50.0, 50.0))), equals(const Offset(30.0, 50.0)));
|
|
expect(round(inner.localToGlobal(const Offset(0.0, 0.0))), equals(const Offset(80.0, 100.0)));
|
|
expect(round(inner.localToGlobal(const Offset(100.0, 100.0))), equals(const Offset(-20.0, 0.0)));
|
|
expect(round(inner.localToGlobal(const Offset(25.0, 75.0))), equals(const Offset(55.0, 25.0)));
|
|
expect(round(inner.localToGlobal(const Offset(50.0, 50.0))), equals(const Offset(30.0, 50.0)));
|
|
});
|
|
|
|
test('RenderTransform - perspective - globalToLocal', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: rotateAroundXAxis(math.PI * 0.25), // at pi/4, we are about 70 pixels high
|
|
alignment: FractionalOffset.center,
|
|
child: inner = new RenderSizedBox(const Size(100.0, 100.0)),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
|
|
expect(round(inner.globalToLocal(const Offset(25.0, 50.0))), equals(const Offset(25.0, 50.0)));
|
|
expect(inner.globalToLocal(const Offset(25.0, 17.0)).dy, greaterThan(0.0));
|
|
expect(inner.globalToLocal(const Offset(25.0, 17.0)).dy, lessThan(10.0));
|
|
expect(inner.globalToLocal(const Offset(25.0, 73.0)).dy, greaterThan(90.0));
|
|
expect(inner.globalToLocal(const Offset(25.0, 73.0)).dy, lessThan(100.0));
|
|
expect(inner.globalToLocal(const Offset(25.0, 17.0)).dy, equals(-inner.globalToLocal(const Offset(25.0, 73.0)).dy));
|
|
}, skip: true); // https://github.com/flutter/flutter/issues/6080
|
|
|
|
test('RenderTransform - perspective - localToGlobal', () {
|
|
RenderBox inner;
|
|
final RenderBox sizer = new RenderTransform(
|
|
transform: rotateAroundXAxis(math.PI * 0.4999), // at pi/2, we're seeing the box on its edge,
|
|
alignment: FractionalOffset.center,
|
|
child: inner = new RenderSizedBox(const Size(100.0, 100.0)),
|
|
);
|
|
layout(sizer, constraints: new BoxConstraints.tight(const Size(100.0, 100.0)), alignment: FractionalOffset.topLeft);
|
|
|
|
// the inner widget has a height of about half a pixel at this rotation, so
|
|
// everything should end up around the middle of the outer box.
|
|
expect(inner.localToGlobal(const Offset(25.0, 50.0)), equals(const Offset(25.0, 50.0)));
|
|
expect(round(inner.localToGlobal(const Offset(25.0, 75.0))), equals(const Offset(25.0, 50.0)));
|
|
expect(round(inner.localToGlobal(const Offset(25.0, 100.0))), equals(const Offset(25.0, 50.0)));
|
|
});
|
|
}
|
|
|
|
Matrix4 rotateAroundXAxis(double a) {
|
|
// 3D rotation transform with alpha=a
|
|
final double x = 1.0;
|
|
final double y = 0.0;
|
|
final double z = 0.0;
|
|
final double sc = math.sin(a / 2.0) * math.cos(a / 2.0);
|
|
final double sq = math.sin(a / 2.0) * math.sin(a / 2.0);
|
|
return new Matrix4.fromList(<double>[
|
|
// col 1
|
|
1.0 - 2.0 * (y * y + z * z) * sq,
|
|
2.0 * (x * y * sq + z * sc),
|
|
2.0 * (x * z * sq - y * sc),
|
|
0.0,
|
|
// col 2
|
|
2.0 * (x * y * sq - z * sc),
|
|
1.0 - 2.0 * (x * x + z * z) * sq,
|
|
2.0 * (y * z * sq + x * sc),
|
|
0.0,
|
|
// col 3
|
|
2.0 * (x * z * sq + y * sc),
|
|
2.0 * (y * z * sq - x * sc),
|
|
1.0 - 2.0 * (x * x + z * z) * sq,
|
|
0.0,
|
|
// col 4
|
|
0.0, 0.0, 0.0, 1.0,
|
|
]);
|
|
}
|