feat!: Refactor everything to use behaviors, and simplify base classes (

#52)
kurtome · Aug 18, 2024 · b5eef12 · b5eef12
1 parent 8715700
commit b5eef12
Show file tree

Hide file tree

Showing 40 changed files with 534 additions and 449 deletions.
diff --git a/examples/standard_platformer/lib/basic_ladder.dart b/examples/standard_platformer/lib/basic_ladder.dart
@@ -2,10 +2,9 @@ import 'package:flame/components.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/image_composition.dart';
 import 'package:leap/leap.dart';
-import 'package:leap_standard_platformer/main.dart';
 import 'package:tiled/tiled.dart';
 
-class BasicLadder extends Ladder<ExamplePlatformerLeapGame> {
+class BasicLadder extends Ladder {
   BasicLadder(Image tileset, {required super.tiledObject})
       : super.fromTiledObject(topExtraHitbox: 4) {
     width = 16 * 2; // this is the width of our ladder sprite

diff --git a/examples/standard_platformer/lib/door.dart b/examples/standard_platformer/lib/door.dart
@@ -3,7 +3,7 @@ import 'package:leap/leap.dart';
 import 'package:leap_standard_platformer/main.dart';
 import 'package:tiled/tiled.dart';
 
-class Door extends PhysicalEntity<ExamplePlatformerLeapGame> {
+class Door extends PhysicalEntity with HasGameRef<ExamplePlatformerLeapGame> {
   Door(TiledObject object, ObjectGroup layer)
       : super(
           position: Vector2(object.x, object.y),

diff --git a/examples/standard_platformer/lib/info_text.dart b/examples/standard_platformer/lib/info_text.dart
@@ -1,10 +1,9 @@
 import 'package:flame/components.dart';
 import 'package:flutter/material.dart';
 import 'package:leap/leap.dart';
-import 'package:leap_standard_platformer/main.dart';
 import 'package:tiled/tiled.dart';
 
-class InfoText extends PhysicalEntity<ExamplePlatformerLeapGame> {
+class InfoText extends PhysicalEntity {
   InfoText(TiledObject object)
       : super(
           position: Vector2(object.x, object.y),

diff --git a/examples/standard_platformer/lib/main.dart b/examples/standard_platformer/lib/main.dart
@@ -25,7 +25,7 @@ void main() {
 }
 
 class ExamplePlatformerLeapGame extends LeapGame
-    with TapCallbacks, HasKeyboardHandlerComponents {
+    with SingleGameInstance, TapCallbacks, HasKeyboardHandlerComponents {
   ExamplePlatformerLeapGame({
     required super.tileSize,
   }) : super(world: LeapWorld());
@@ -53,7 +53,7 @@ class ExamplePlatformerLeapGame extends LeapGame
 
   @override
   Future<void> onLoad() async {
-    await super.onLoad();
+    super.onLoad();
 
     tiledObjectHandlers = {
       'Coin': await CoinFactory.createFactory(),
@@ -76,7 +76,11 @@ class ExamplePlatformerLeapGame extends LeapGame
 
     input = ThreeButtonInput();
     add(input);
+  }
 
+  @override
+  Future<void> onMount() async {
+    super.onMount();
     await _loadLevel();
 
     // Don't let the camera move outside the bounds of the map, inset