From 01b3863353dd8c8600733f26ef3f53ef67b1cdae Mon Sep 17 00:00:00 2001 From: Luan Nico Date: Tue, 18 Aug 2020 23:39:40 -0400 Subject: [PATCH] address comments --- doc/examples/effects/combined_effects/lib/square.dart | 2 +- doc/examples/effects/infinite_effects/lib/square.dart | 2 +- doc/examples/effects/sequence_effect/lib/square.dart | 2 +- doc/examples/effects/simple/lib/square.dart | 2 +- doc/examples/gestures/lib/main_tapables.dart | 2 +- doc/examples/sound/lib/main.dart | 2 +- example/lib/main.dart | 2 +- lib/components/nine_tile_box_component.dart | 2 +- lib/components/position_component.dart | 8 ++++---- lib/components/text_box_component.dart | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/examples/effects/combined_effects/lib/square.dart b/doc/examples/effects/combined_effects/lib/square.dart index 37d327cdf..9692f706b 100644 --- a/doc/examples/effects/combined_effects/lib/square.dart +++ b/doc/examples/effects/combined_effects/lib/square.dart @@ -18,6 +18,6 @@ class Square extends PositionComponent { @override void render(Canvas canvas) { super.render(canvas); - canvas.drawRect(toZeroRect(), _paint); + canvas.drawRect(toOriginRect(), _paint); } } diff --git a/doc/examples/effects/infinite_effects/lib/square.dart b/doc/examples/effects/infinite_effects/lib/square.dart index 37d327cdf..9692f706b 100644 --- a/doc/examples/effects/infinite_effects/lib/square.dart +++ b/doc/examples/effects/infinite_effects/lib/square.dart @@ -18,6 +18,6 @@ class Square extends PositionComponent { @override void render(Canvas canvas) { super.render(canvas); - canvas.drawRect(toZeroRect(), _paint); + canvas.drawRect(toOriginRect(), _paint); } } diff --git a/doc/examples/effects/sequence_effect/lib/square.dart b/doc/examples/effects/sequence_effect/lib/square.dart index 37d327cdf..9692f706b 100644 --- a/doc/examples/effects/sequence_effect/lib/square.dart +++ b/doc/examples/effects/sequence_effect/lib/square.dart @@ -18,6 +18,6 @@ class Square extends PositionComponent { @override void render(Canvas canvas) { super.render(canvas); - canvas.drawRect(toZeroRect(), _paint); + canvas.drawRect(toOriginRect(), _paint); } } diff --git a/doc/examples/effects/simple/lib/square.dart b/doc/examples/effects/simple/lib/square.dart index fd24948c7..cbdb6c489 100644 --- a/doc/examples/effects/simple/lib/square.dart +++ b/doc/examples/effects/simple/lib/square.dart @@ -13,6 +13,6 @@ class Square extends PositionComponent { @override void render(Canvas canvas) { super.render(canvas); - canvas.drawRect(toZeroRect(), _paint); + canvas.drawRect(toOriginRect(), _paint); } } diff --git a/doc/examples/gestures/lib/main_tapables.dart b/doc/examples/gestures/lib/main_tapables.dart index a747caf1b..dbafba2a1 100644 --- a/doc/examples/gestures/lib/main_tapables.dart +++ b/doc/examples/gestures/lib/main_tapables.dart @@ -30,7 +30,7 @@ class TapableSquare extends PositionComponent with Tapable { @override void render(Canvas canvas) { super.render(canvas); - canvas.drawRect(toZeroRect(), _beenPressed ? _grey : _white); + canvas.drawRect(toOriginRect(), _beenPressed ? _grey : _white); } @override diff --git a/doc/examples/sound/lib/main.dart b/doc/examples/sound/lib/main.dart index 40a74bcfc..e79ccf593 100644 --- a/doc/examples/sound/lib/main.dart +++ b/doc/examples/sound/lib/main.dart @@ -20,7 +20,7 @@ class Ball extends PositionComponent { @override void render(Canvas c) { super.render(c); - c.drawOval(toZeroRect(), paint); + c.drawOval(toOriginRect(), paint); } @override diff --git a/example/lib/main.dart b/example/lib/main.dart index 6a06095f5..e9eea1bff 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -31,7 +31,7 @@ class Square extends PositionComponent with HasGameRef { void render(Canvas c) { super.render(c); - c.drawRect(toZeroRect(), white); + c.drawRect(toOriginRect(), white); c.drawRect(const Rect.fromLTWH(0, 0, 3, 3), red); c.drawRect(Rect.fromLTWH(width / 2, height / 2, 3, 3), blue); } diff --git a/lib/components/nine_tile_box_component.dart b/lib/components/nine_tile_box_component.dart index 9251da18a..caf0d306c 100644 --- a/lib/components/nine_tile_box_component.dart +++ b/lib/components/nine_tile_box_component.dart @@ -18,6 +18,6 @@ class NineTileBoxComponent extends PositionComponent { @override void render(Canvas c) { super.render(c); - nineTileBox.drawRect(c, toZeroRect()); + nineTileBox.drawRect(c, toOriginRect()); } } diff --git a/lib/components/position_component.dart b/lib/components/position_component.dart index ae3af210d..a5b2a33cc 100644 --- a/lib/components/position_component.dart +++ b/lib/components/position_component.dart @@ -87,7 +87,7 @@ abstract class PositionComponent extends Component { /// Returns the size of this component starting at (0, 0). /// Effectively this is it's position with respect to itself. /// Use this if the canvas is already translated by (x, y). - Rect toZeroRect() => Rect.fromLTWH(0, 0, width, height); + Rect toOriginRect() => Rect.fromLTWH(0, 0, width, height); /// Returns the relative position/size of this component. /// Relative because it might be translated by their parents (which is not considered here). @@ -116,7 +116,7 @@ abstract class PositionComponent extends Component { } void renderDebugMode(Canvas canvas) { - canvas.drawRect(toZeroRect(), _debugPaint); + canvas.drawRect(toOriginRect(), _debugPaint); debugTextConfig.render( canvas, 'x: ${x.toStringAsFixed(2)} y:${y.toStringAsFixed(2)}', @@ -131,7 +131,7 @@ abstract class PositionComponent extends Component { Position(width - 50, height)); } - void prepareCanvas(Canvas canvas) { + void _prepareCanvas(Canvas canvas) { canvas.translate(x, y); canvas.rotate(angle); @@ -201,7 +201,7 @@ abstract class PositionComponent extends Component { @mustCallSuper @override void render(Canvas canvas) { - prepareCanvas(canvas); + _prepareCanvas(canvas); if (debugMode) { renderDebugMode(canvas); diff --git a/lib/components/text_box_component.dart b/lib/components/text_box_component.dart index 546ac5a92..6c266f972 100644 --- a/lib/components/text_box_component.dart +++ b/lib/components/text_box_component.dart @@ -148,7 +148,7 @@ class TextBoxComponent extends PositionComponent with Resizable { Future _redrawCache() { final PictureRecorder recorder = PictureRecorder(); - final Canvas c = Canvas(recorder, toZeroRect()); + final Canvas c = Canvas(recorder, toOriginRect()); _fullRender(c); return recorder.endRecording().toImage(width.toInt(), height.toInt()); }