diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index a0bd3f7a..83fd1b34 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -48,7 +48,6 @@ class PinballGame extends Forge2DGame await add( PinballCanvasComponent( - camera: camera, children: [ BoardBackgroundSpriteComponent(), Multipliers(), diff --git a/packages/pinball_flame/lib/src/rendering/pinball_canvas.dart b/packages/pinball_flame/lib/src/rendering/pinball_canvas.dart index 6a2b72bb..76783722 100644 --- a/packages/pinball_flame/lib/src/rendering/pinball_canvas.dart +++ b/packages/pinball_flame/lib/src/rendering/pinball_canvas.dart @@ -5,19 +5,12 @@ import 'dart:ui'; import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; -import 'package:flame/game.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_flame/src/rendering/rendering.dart'; class PinballCanvas implements Canvas { - PinballCanvas({ - required this.camera, - }); - late Canvas canvas; - Camera camera; - final List _zBuffer = []; void buffer(Rendering rendering) => _zBuffer.add(rendering); diff --git a/packages/pinball_flame/lib/src/rendering/pinball_canvas_component.dart b/packages/pinball_flame/lib/src/rendering/pinball_canvas_component.dart index 5413dd28..a88d50be 100644 --- a/packages/pinball_flame/lib/src/rendering/pinball_canvas_component.dart +++ b/packages/pinball_flame/lib/src/rendering/pinball_canvas_component.dart @@ -8,9 +8,8 @@ import 'package:pinball_flame/src/rendering/rendering.dart'; class PinballCanvasComponent extends Component { PinballCanvasComponent({ - required Camera camera, Iterable? children, - }) : _pinballCanvas = PinballCanvas(camera: camera), + }) : _pinballCanvas = PinballCanvas(), super(children: children); final PinballCanvas _pinballCanvas; diff --git a/packages/pinball_flame/lib/src/rendering/rendering_mixin.dart b/packages/pinball_flame/lib/src/rendering/rendering_mixin.dart index 7eaef1e0..78f1764d 100644 --- a/packages/pinball_flame/lib/src/rendering/rendering_mixin.dart +++ b/packages/pinball_flame/lib/src/rendering/rendering_mixin.dart @@ -8,11 +8,8 @@ mixin Rendering on Component { int zIndex = 0; @override - void renderTree(Canvas canvas) { - if (canvas is PinballCanvas) { + void renderTree( + covariant PinballCanvas canvas, + ) => canvas.buffer(this); - } else { - super.renderTree(canvas); - } - } }