Transforming PaletteEntry#paint into a full method and adding more colors to BasicPalette (#725)

* Transforming PaletteEntry#paint into a full method

* Fixing some errors that went unoticed

* Update packages/flame/CHANGELOG.md

Co-authored-by: Jochum van der Ploeg <jochum@vdploeg.net>

* Update packages/flame/CHANGELOG.md

Co-authored-by: Jochum van der Ploeg <jochum@vdploeg.net>

* followup

* format

Co-authored-by: Jochum van der Ploeg <jochum@vdploeg.net>
This commit is contained in:
Erick
2021-03-27 14:53:29 -03:00
committed by GitHub
parent 4640ce0934
commit 444375dd14
16 changed files with 29 additions and 27 deletions

View File

@ -4,7 +4,7 @@ import 'package:flame/components.dart';
import 'package:flame/palette.dart';
class SquareComponent extends PositionComponent {
Paint paint = BasicPalette.white.paint;
Paint paint = BasicPalette.white.paint();
SquareComponent() {
size = Vector2.all(100.0);

View File

@ -7,9 +7,9 @@ import 'package:flame/extensions.dart';
import 'package:flame/palette.dart';
import 'package:flutter/material.dart';
final _whitePaint = BasicPalette.white.paint;
final _bluePaint = Paint()..color = const Color(0xFF0000FF);
final _greenPaint = Paint()..color = const Color(0xFF00FF00);
final _whitePaint = BasicPalette.white.paint();
final _bluePaint = BasicPalette.blue.paint();
final _greenPaint = BasicPalette.green.paint();
class JoystickPlayer extends Component implements JoystickListener {
static const speed = 32.0;

View File

@ -6,7 +6,7 @@ import 'package:flame/palette.dart';
import 'package:flutter/services.dart' show RawKeyDownEvent, RawKeyEvent;
class KeyboardGame extends Game with KeyboardEvents {
static final Paint white = BasicPalette.white.paint;
static final Paint white = BasicPalette.white.paint();
static const int speed = 200;
Rect rect = const Rect.fromLTWH(0, 100, 100, 100);

View File

@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
class MouseMovementGame extends BaseGame with MouseMovementDetector {
static const speed = 200;
static final Paint blue = Paint()..color = const Color(0xFF0000FF);
static final Paint white = BasicPalette.white.paint;
static final Paint _blue = BasicPalette.blue.paint();
static final Paint _white = BasicPalette.white.paint();
static final Vector2 objSize = Vector2.all(50);
Vector2 position = Vector2(0, 0);
@ -28,7 +28,7 @@ class MouseMovementGame extends BaseGame with MouseMovementDetector {
super.render(canvas);
canvas.drawRect(
_toRect(),
onTarget ? blue : white,
onTarget ? _blue : _white,
);
}

View File

@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
/// Includes an example including advanced detectors
class MultitapGame extends BaseGame with MultiTouchTapDetector {
static final whitePaint = BasicPalette.white.paint;
static final whitePaint = BasicPalette.white.paint();
static final tapSize = Vector2.all(50);
final Map<int, Rect> taps = {};

View File

@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
/// Showcases how to mix two advanced detectors
class MultitapAdvancedGame extends BaseGame
with MultiTouchTapDetector, MultiTouchDragDetector {
static final whitePaint = BasicPalette.white.paint;
static final whitePaint = BasicPalette.white.paint();
static final tapSize = Vector2.all(50);
final Map<int, Rect> taps = {};

View File

@ -14,7 +14,7 @@ class TapableSquare extends PositionComponent with Tapable {
rng.nextInt(256),
0.9,
);
return PaletteEntry(color).paint;
return PaletteEntry(color).paint();
}
Paint currentPaint;

View File

@ -9,7 +9,7 @@ import 'package:flame/extensions.dart';
class ScrollGame extends BaseGame with ScrollDetector {
static const speed = 2000.0;
final _size = Vector2.all(50);
final _paint = BasicPalette.white.paint;
final _paint = BasicPalette.white.paint();
Vector2 position = Vector2.all(100);
Vector2? target;