From 2c705ebcee224b6c6ecf02465ef5b6c32022b68a Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Wed, 1 Apr 2020 21:36:29 -0300 Subject: [PATCH 1/3] Adding Animation#paint --- CHANGELOG.md | 1 + lib/components/animation_component.dart | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8584ecce..8a93aca72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Adding Component#onDestroy - Adding Keyboard events API - Adding Box2DGame, an extension of BaseGame to simplify lifecycle of Box2D components +- Adding AnimationComponent#paint ## 0.18.2 - Add loop for AnimationComponent.sequenced() (thanks @wenxiangjiang) diff --git a/lib/components/animation_component.dart b/lib/components/animation_component.dart index b57c120e1..112f4162c 100644 --- a/lib/components/animation_component.dart +++ b/lib/components/animation_component.dart @@ -5,6 +5,7 @@ import 'package:flame/animation.dart'; class AnimationComponent extends PositionComponent { Animation animation; + Paint paint; bool destroyOnFinish = false; AnimationComponent(double width, double height, this.animation, @@ -53,7 +54,7 @@ class AnimationComponent extends PositionComponent { @override void render(Canvas canvas) { prepareCanvas(canvas); - animation.getSprite().render(canvas, width: width, height: height); + animation.getSprite().render(canvas, width: width, height: height, overridePaint: paint); } @override From ac36472b36872e35cb84ecb14e8cc075ae08ecb8 Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Wed, 1 Apr 2020 23:07:47 -0300 Subject: [PATCH 2/3] Linting --- lib/components/animation_component.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/components/animation_component.dart b/lib/components/animation_component.dart index 112f4162c..62dff16e9 100644 --- a/lib/components/animation_component.dart +++ b/lib/components/animation_component.dart @@ -54,7 +54,9 @@ class AnimationComponent extends PositionComponent { @override void render(Canvas canvas) { prepareCanvas(canvas); - animation.getSprite().render(canvas, width: width, height: height, overridePaint: paint); + animation + .getSprite() + .render(canvas, width: width, height: height, overridePaint: paint); } @override From 7af07f4700989a2fa1473fa3e91b275b2825fb11 Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Thu, 2 Apr 2020 20:17:19 -0300 Subject: [PATCH 3/3] overridePaint and adding to SpriteComponent as well --- CHANGELOG.md | 5 +++-- lib/components/animation_component.dart | 7 +++---- lib/components/component.dart | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a93aca72..3723676e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ -## [next] +## [next] - Adding Component#onDestroy - Adding Keyboard events API - Adding Box2DGame, an extension of BaseGame to simplify lifecycle of Box2D components -- Adding AnimationComponent#paint +- Adding AnimationComponent#overridePaint +- Adding SpriteComponent#overridePaint ## 0.18.2 - Add loop for AnimationComponent.sequenced() (thanks @wenxiangjiang) diff --git a/lib/components/animation_component.dart b/lib/components/animation_component.dart index 62dff16e9..5030e22d7 100644 --- a/lib/components/animation_component.dart +++ b/lib/components/animation_component.dart @@ -5,7 +5,7 @@ import 'package:flame/animation.dart'; class AnimationComponent extends PositionComponent { Animation animation; - Paint paint; + Paint overridePaint; bool destroyOnFinish = false; AnimationComponent(double width, double height, this.animation, @@ -54,9 +54,8 @@ class AnimationComponent extends PositionComponent { @override void render(Canvas canvas) { prepareCanvas(canvas); - animation - .getSprite() - .render(canvas, width: width, height: height, overridePaint: paint); + animation.getSprite().render(canvas, + width: width, height: height, overridePaint: overridePaint); } @override diff --git a/lib/components/component.dart b/lib/components/component.dart index 9f26e7d95..2e983bfd4 100644 --- a/lib/components/component.dart +++ b/lib/components/component.dart @@ -157,6 +157,7 @@ abstract class PositionComponent extends Component { /// This is the most commonly used child of [Component]. class SpriteComponent extends PositionComponent { Sprite sprite; + Paint overridePaint; SpriteComponent(); @@ -174,7 +175,8 @@ class SpriteComponent extends PositionComponent { @override void render(Canvas canvas) { prepareCanvas(canvas); - sprite.render(canvas, width: width, height: height); + sprite.render(canvas, + width: width, height: height, overridePaint: overridePaint); } @override