From c444e752b09c6264a97e3ca7e17a1052c4775428 Mon Sep 17 00:00:00 2001 From: Lukas Klingsbo Date: Tue, 13 Oct 2020 20:53:43 +0200 Subject: [PATCH] Sprite.size -> srcSize --- lib/sprite.dart | 13 +++++++------ lib/widgets/sprite_widget.dart | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/sprite.dart b/lib/sprite.dart index fa86f6a6f..171686f1c 100644 --- a/lib/sprite.dart +++ b/lib/sprite.dart @@ -24,12 +24,12 @@ class Sprite { Vector2 get originalSize => Vector2(_imageWidth, _imageHeight); - Vector2 get size => Vector2(src.width, src.height); + Vector2 get srcSize => Vector2(src.width, src.height); Vector2 get srcPosition => src.topLeft.toVector2(); set srcPosition(Vector2 position) { - src = (position ?? Vector2.zero()).toPositionedRect(size); + src = (position ?? Vector2.zero()).toPositionedRect(srcSize); } /// Renders this Sprite on the position [p], scaled by the [scale] factor provided. @@ -43,7 +43,8 @@ class Sprite { double scale = 1.0, Paint overridePaint, }) { - renderPosition(canvas, p, size: size * scale, overridePaint: overridePaint); + renderPosition(canvas, p, + size: srcSize * scale, overridePaint: overridePaint); } void renderPosition( @@ -52,7 +53,7 @@ class Sprite { Vector2 size, Paint overridePaint, }) { - size ??= this.size; + size ??= this.srcSize; renderRect(canvas, p.toPositionedRect(size), overridePaint: overridePaint); } @@ -61,7 +62,7 @@ class Sprite { Vector2 size, Paint overridePaint, }) { - size ??= this.size; + size ??= this.srcSize; renderRect(canvas, size.toRect(), overridePaint: overridePaint); } @@ -75,7 +76,7 @@ class Sprite { Vector2 size, Paint overridePaint, }) { - size ??= this.size; + size ??= this.srcSize; renderRect( canvas, (p - size / 2).toPositionedRect(size), diff --git a/lib/widgets/sprite_widget.dart b/lib/widgets/sprite_widget.dart index 74f5d4931..3bcfca5c9 100644 --- a/lib/widgets/sprite_widget.dart +++ b/lib/widgets/sprite_widget.dart @@ -44,11 +44,11 @@ class _SpritePainter extends CustomPainter { @override void paint(Canvas canvas, Size size) { - final widthRate = size.width / _sprite.size.x; - final heightRate = size.height / _sprite.size.y; + final widthRate = size.width / _sprite.srcSize.x; + final heightRate = size.height / _sprite.srcSize.y; final rate = min(widthRate, heightRate); - final paintSize = _sprite.size * rate; + final paintSize = _sprite.srcSize * rate; final anchorPosition = _anchor.relativePosition; final anchoredPosition = size.toVector2()..multiply(anchorPosition); final delta = (anchoredPosition - paintSize)..multiply(anchorPosition);