Unified game screen and abstracted input

Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>

packages/wolf_3d_renderer/lib/base_renderer.dart

@@ -1,16 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:wolf_3d_engine/wolf_3d_engine.dart';
-import 'package:wolf_3d_input/wolf_3d_input.dart';
 
 // 1. The widget now only requires the engine!
 abstract class BaseWolfRenderer extends StatefulWidget {
   final WolfEngine engine;
-  final Wolf3dInput inputManager;
 
   const BaseWolfRenderer({
     required this.engine,
-    required this.inputManager,
     super.key,
   });
 }
@@ -37,9 +34,8 @@ abstract class BaseWolfRendererState<T extends BaseWolfRenderer>
     Duration delta = elapsed - _lastTick;
     _lastTick = elapsed;
 
-    widget.inputManager.update();
     // Tick the shared engine
-    widget.engine.tick(delta, widget.inputManager.currentInput);
+    widget.engine.tick(delta);
 
     performRender();
   }

packages/wolf_3d_renderer/lib/wolf_3d_ascii_renderer.dart

@@ -2,14 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:wolf_3d_data_types/wolf_3d_data_types.dart';
 import 'package:wolf_3d_engine/wolf_3d_engine.dart';
-import 'package:wolf_3d_flutter/wolf_3d_input_flutter.dart';
-import 'package:wolf_3d_input/wolf_3d_input.dart';
 import 'package:wolf_3d_renderer/base_renderer.dart';
 
 class WolfAsciiRenderer extends BaseWolfRenderer {
   const WolfAsciiRenderer({
     required super.engine,
-    required super.inputManager,
     super.key,
   });
 
@@ -19,7 +16,6 @@ class WolfAsciiRenderer extends BaseWolfRenderer {
 
 class _WolfAsciiRendererState extends State<WolfAsciiRenderer>
     with SingleTickerProviderStateMixin {
-  final Wolf3dInput inputManager = Wolf3dFlutterInput();
   late final WolfEngine engine;
   late Ticker _gameLoop;
   final FocusNode _focusNode = FocusNode();
@@ -39,6 +35,7 @@ class _WolfAsciiRendererState extends State<WolfAsciiRenderer>
       difficulty: widget.engine.difficulty,
       startingEpisode: widget.engine.startingEpisode,
       audio: widget.engine.audio,
+      input: widget.engine.input,
       onGameWon: () {
         Navigator.of(context).pop();
       },
@@ -56,8 +53,7 @@ class _WolfAsciiRendererState extends State<WolfAsciiRenderer>
     Duration delta = elapsed - _lastTick;
     _lastTick = elapsed;
 
-    inputManager.update();
-    engine.tick(delta, inputManager.currentInput);
+    engine.tick(delta);
 
     // Calculate frame synchronously and trigger UI rebuild
     setState(() {

packages/wolf_3d_renderer/lib/wolf_3d_flutter_renderer.dart

@@ -4,14 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:wolf_3d_data_types/wolf_3d_data_types.dart';
 import 'package:wolf_3d_engine/wolf_3d_engine.dart';
-import 'package:wolf_3d_flutter/wolf_3d_input_flutter.dart';
-import 'package:wolf_3d_input/wolf_3d_input.dart';
 import 'package:wolf_3d_renderer/base_renderer.dart';
 
 class WolfFlutterRenderer extends BaseWolfRenderer {
   const WolfFlutterRenderer({
     required super.engine,
-    required super.inputManager,
     super.key,
   });
 
@@ -21,7 +18,6 @@ class WolfFlutterRenderer extends BaseWolfRenderer {
 
 class _WolfFlutterRendererState extends State<WolfFlutterRenderer>
     with SingleTickerProviderStateMixin {
-  final Wolf3dInput inputManager = Wolf3dFlutterInput();
   late final WolfEngine engine;
   late Ticker _gameLoop;
   final FocusNode _focusNode = FocusNode();
@@ -45,6 +41,7 @@ class _WolfFlutterRendererState extends State<WolfFlutterRenderer>
       difficulty: widget.engine.difficulty,
       startingEpisode: widget.engine.startingEpisode,
       audio: widget.engine.audio,
+      input: widget.engine.input,
       onGameWon: () {
         Navigator.of(context).pop();
       },
@@ -62,8 +59,7 @@ class _WolfFlutterRendererState extends State<WolfFlutterRenderer>
     Duration delta = elapsed - _lastTick;
     _lastTick = elapsed;
 
-    inputManager.update();
-    engine.tick(delta, inputManager.currentInput);
+    engine.tick(delta);
 
     // Only start rendering a new frame if the previous one is finished.
     // This prevents memory leaks and stuttering on lower-end hardware!

packages/wolf_3d_renderer/pubspec.yaml

@@ -15,7 +15,6 @@ dependencies:
   wolf_3d_data_types: any
   wolf_3d_engine: any
   wolf_3d_entities: any
-  wolf_3d_input: any
   wolf_3d_flutter: any
 
 dev_dependencies: