feat: Refactor game persistence and rendering management for CLI and Flutter hosts
Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
library;
|
||||
|
||||
export 'cli_game_loop_stub.dart' if (dart.library.io) 'cli_game_loop_io.dart';
|
||||
@@ -0,0 +1,240 @@
|
||||
/// Terminal game loop that ties engine ticks, raw input, and CLI rendering together.
|
||||
library;
|
||||
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:wolf_3d_dart/wolf_3d_engine.dart';
|
||||
import 'package:wolf_3d_dart/wolf_3d_input.dart';
|
||||
import 'package:wolf_3d_dart/wolf_3d_renderer.dart';
|
||||
|
||||
/// Runs the Wolf3D engine inside a terminal using CLI-specific renderers.
|
||||
///
|
||||
/// The loop owns raw-stdin handling, renderer switching, terminal size checks,
|
||||
/// and frame pacing. It expects [engine.input] to be a [CliInput] instance so
|
||||
/// raw key bytes can be queued directly into the engine input adapter.
|
||||
class CliGameLoop {
|
||||
CliGameLoop({
|
||||
required this.engine,
|
||||
required this.onExit,
|
||||
this.persistence,
|
||||
this.initialSettings,
|
||||
}) : input = engine.input is CliInput
|
||||
? engine.input as CliInput
|
||||
: throw ArgumentError.value(
|
||||
engine.input,
|
||||
'engine.input',
|
||||
'CliGameLoop requires a CliInput instance.',
|
||||
),
|
||||
primaryRenderer = SixelRenderer(),
|
||||
secondaryRenderer = AsciiRenderer(
|
||||
mode: AsciiRendererMode.terminalAnsi,
|
||||
) {
|
||||
_renderer = primaryRenderer;
|
||||
}
|
||||
|
||||
final WolfEngine engine;
|
||||
final CliRendererBackend primaryRenderer;
|
||||
final CliRendererBackend secondaryRenderer;
|
||||
final CliInput input;
|
||||
final void Function(int code) onExit;
|
||||
final RendererSettingsPersistence? persistence;
|
||||
final WolfRendererSettings? initialSettings;
|
||||
|
||||
final Stopwatch _stopwatch = Stopwatch();
|
||||
final Stream<List<int>> _stdinStream = stdin.asBroadcastStream();
|
||||
late CliRendererBackend _renderer;
|
||||
StreamSubscription<List<int>>? _stdinSubscription;
|
||||
Timer? _timer;
|
||||
bool _isRunning = false;
|
||||
bool _isSixelAvailable = false;
|
||||
Duration _lastTick = Duration.zero;
|
||||
|
||||
/// Starts terminal probing, enters raw input mode, and begins the frame timer.
|
||||
Future<void> start() async {
|
||||
if (_isRunning) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (primaryRenderer is SixelRenderer) {
|
||||
final sixel = primaryRenderer as SixelRenderer;
|
||||
sixel.isSixelSupported = await SixelRenderer.checkTerminalSixelSupport(
|
||||
inputStream: _stdinStream,
|
||||
);
|
||||
_isSixelAvailable = sixel.isSixelSupported;
|
||||
} else {
|
||||
_isSixelAvailable = false;
|
||||
}
|
||||
|
||||
final Set<WolfRendererMode> supportedModes = <WolfRendererMode>{
|
||||
WolfRendererMode.ascii,
|
||||
if (_isSixelAvailable) WolfRendererMode.sixel,
|
||||
};
|
||||
engine.setRendererCapabilities(
|
||||
WolfRendererCapabilities(
|
||||
supportedModes: supportedModes,
|
||||
supportsAsciiThemes: true,
|
||||
supportsFpsCounter: true,
|
||||
),
|
||||
);
|
||||
|
||||
if (initialSettings != null) {
|
||||
engine.updateRendererSettings(initialSettings!);
|
||||
} else if (_isSixelAvailable) {
|
||||
engine.updateRendererSettings(
|
||||
engine.rendererSettings.copyWith(mode: WolfRendererMode.sixel),
|
||||
);
|
||||
}
|
||||
|
||||
_syncRendererFromEngine();
|
||||
|
||||
if (stdin.hasTerminal) {
|
||||
try {
|
||||
stdin.echoMode = false;
|
||||
stdin.lineMode = false;
|
||||
} catch (_) {
|
||||
// Keep running without raw mode when stdin is not mutable.
|
||||
}
|
||||
}
|
||||
|
||||
// Disable Sixel scrolling mode so frames overwrite in-place.
|
||||
stdout.write('\x1b[?80l\x1b[?25l\x1b[2J');
|
||||
|
||||
_stdinSubscription = _stdinStream.listen(_handleInput);
|
||||
_stopwatch.start();
|
||||
_timer = Timer.periodic(const Duration(milliseconds: 33), _tick);
|
||||
_isRunning = true;
|
||||
}
|
||||
|
||||
/// Stops the timer, unsubscribes from stdin, and restores terminal settings.
|
||||
void stop() {
|
||||
if (!_isRunning) {
|
||||
return;
|
||||
}
|
||||
|
||||
_timer?.cancel();
|
||||
_timer = null;
|
||||
_stdinSubscription?.cancel();
|
||||
_stdinSubscription = null;
|
||||
|
||||
if (_stopwatch.isRunning) {
|
||||
_stopwatch.stop();
|
||||
}
|
||||
|
||||
if (stdin.hasTerminal) {
|
||||
try {
|
||||
stdin.echoMode = true;
|
||||
stdin.lineMode = true;
|
||||
} catch (_) {
|
||||
// Ignore cleanup failures if stdin is no longer a mutable TTY.
|
||||
}
|
||||
}
|
||||
|
||||
if (stdout.hasTerminal) {
|
||||
// Restore scrolling Sixel mode and cursor visibility.
|
||||
stdout.write('\x1b[0m\x1b[?80h\x1b[?25h');
|
||||
}
|
||||
|
||||
_isRunning = false;
|
||||
}
|
||||
|
||||
void _handleInput(List<int> bytes) {
|
||||
// Keep q and Ctrl+C as hard exits; ESC is now menu-back input.
|
||||
if (bytes.contains(113) || bytes.contains(3)) {
|
||||
stop();
|
||||
onExit(0);
|
||||
return;
|
||||
}
|
||||
|
||||
if (input.matchesRendererToggleShortcut(bytes)) {
|
||||
engine.cycleRendererMode();
|
||||
_syncRendererFromEngine();
|
||||
unawaited(persistence?.save(engine.rendererSettings));
|
||||
stdout.write('\x1b[2J\x1b[H');
|
||||
return;
|
||||
}
|
||||
|
||||
if (input.matchesAsciiThemeCycleShortcut(bytes)) {
|
||||
engine.cycleAsciiTheme();
|
||||
_syncRendererFromEngine();
|
||||
unawaited(persistence?.save(engine.rendererSettings));
|
||||
return;
|
||||
}
|
||||
|
||||
if (input.matchesFpsToggleShortcut(bytes)) {
|
||||
engine.toggleFpsCounter();
|
||||
_syncRendererFromEngine();
|
||||
unawaited(persistence?.save(engine.rendererSettings));
|
||||
return;
|
||||
}
|
||||
|
||||
input.handleKey(bytes);
|
||||
}
|
||||
|
||||
void _syncRendererFromEngine() {
|
||||
final CliRendererBackend previousRenderer = _renderer;
|
||||
final WolfRendererMode mode = engine.rendererSettings.mode;
|
||||
if (mode == WolfRendererMode.sixel && _isSixelAvailable) {
|
||||
_renderer = primaryRenderer;
|
||||
} else {
|
||||
_renderer = secondaryRenderer;
|
||||
}
|
||||
|
||||
final AsciiTheme theme =
|
||||
engine.rendererSettings.asciiThemeId ==
|
||||
WolfRendererSettings.asciiThemeQuadrant
|
||||
? AsciiThemes.quadrant
|
||||
: AsciiThemes.blocks;
|
||||
if (primaryRenderer is AsciiRenderer) {
|
||||
(primaryRenderer as AsciiRenderer).activeTheme = theme;
|
||||
}
|
||||
if (secondaryRenderer is AsciiRenderer) {
|
||||
(secondaryRenderer as AsciiRenderer).activeTheme = theme;
|
||||
}
|
||||
|
||||
engine.showFpsCounter = engine.rendererSettings.fpsCounterEnabled;
|
||||
|
||||
if (!identical(previousRenderer, _renderer) && stdout.hasTerminal) {
|
||||
// Clear stale frame content when switching backend output modes.
|
||||
stdout.write('\x1b[2J\x1b[H');
|
||||
}
|
||||
}
|
||||
|
||||
void _tick(Timer timer) {
|
||||
if (!_isRunning) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Apply renderer changes made via in-game menus or settings updates.
|
||||
_syncRendererFromEngine();
|
||||
|
||||
if (stdout.hasTerminal) {
|
||||
final int cols = stdout.terminalColumns;
|
||||
final int rows = stdout.terminalLines;
|
||||
if (!_renderer.prepareTerminalFrame(
|
||||
engine,
|
||||
columns: cols,
|
||||
rows: rows,
|
||||
)) {
|
||||
// Size warnings are rendered instead of running the simulation so the
|
||||
// game does not keep advancing while the user resizes the terminal.
|
||||
stdout.write('\x1b[2J\x1b[H');
|
||||
stdout.write(
|
||||
_renderer.buildTerminalSizeWarning(columns: cols, rows: rows),
|
||||
);
|
||||
|
||||
_lastTick = _stopwatch.elapsed;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
final Duration currentTick = _stopwatch.elapsed;
|
||||
final Duration elapsed = currentTick - _lastTick;
|
||||
_lastTick = currentTick;
|
||||
|
||||
stdout.write('\x1b[H');
|
||||
|
||||
engine.tick(elapsed);
|
||||
stdout.write(_renderer.render(engine));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
/// Web-safe stub for CLI game loop APIs.
|
||||
library;
|
||||
|
||||
import 'package:wolf_3d_dart/wolf_3d_engine.dart';
|
||||
import 'package:wolf_3d_dart/wolf_3d_input.dart';
|
||||
import 'package:wolf_3d_dart/wolf_3d_renderer.dart';
|
||||
|
||||
class CliGameLoop {
|
||||
CliGameLoop({
|
||||
required this.engine,
|
||||
required this.onExit,
|
||||
this.persistence,
|
||||
this.initialSettings,
|
||||
}) : input = engine.input is CliInput
|
||||
? engine.input as CliInput
|
||||
: throw ArgumentError.value(
|
||||
engine.input,
|
||||
'engine.input',
|
||||
'CliGameLoop requires a CliInput instance.',
|
||||
),
|
||||
primaryRenderer = SixelRenderer(),
|
||||
secondaryRenderer = AsciiRenderer(mode: AsciiRendererMode.terminalAnsi);
|
||||
|
||||
final WolfEngine engine;
|
||||
final CliRendererBackend primaryRenderer;
|
||||
final CliRendererBackend secondaryRenderer;
|
||||
final CliInput input;
|
||||
final void Function(int code) onExit;
|
||||
final RendererSettingsPersistence? persistence;
|
||||
final WolfRendererSettings? initialSettings;
|
||||
|
||||
Future<void> start() {
|
||||
throw UnsupportedError('CliGameLoop is only available on dart:io hosts.');
|
||||
}
|
||||
|
||||
void stop() {}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
library;
|
||||
|
||||
import 'package:wolf_3d_dart/wolf_3d_engine.dart';
|
||||
|
||||
/// Coordinates gameplay persistence concerns for host applications.
|
||||
class GamePersistenceManager {
|
||||
/// Creates persistence manager dependencies with overridable adapters.
|
||||
GamePersistenceManager({
|
||||
RendererSettingsPersistence? rendererSettingsPersistence,
|
||||
SaveGamePersistence? saveGamePersistence,
|
||||
}) : rendererSettingsPersistence =
|
||||
rendererSettingsPersistence ?? DefaultRendererSettingsPersistence(),
|
||||
saveGamePersistence =
|
||||
saveGamePersistence ?? DefaultSaveGamePersistence();
|
||||
|
||||
/// Persists and restores runtime renderer settings.
|
||||
final RendererSettingsPersistence rendererSettingsPersistence;
|
||||
|
||||
/// Persists slot-based save game snapshots.
|
||||
final SaveGamePersistence saveGamePersistence;
|
||||
|
||||
/// Loads previously persisted renderer settings.
|
||||
Future<WolfRendererSettings?> loadRendererSettings() {
|
||||
return rendererSettingsPersistence.load();
|
||||
}
|
||||
|
||||
/// Loads persisted renderer settings and applies them to [engine].
|
||||
Future<WolfRendererSettings?> restoreRendererSettings(
|
||||
WolfEngine engine,
|
||||
) async {
|
||||
final WolfRendererSettings? saved = await loadRendererSettings();
|
||||
if (saved != null) {
|
||||
engine.updateRendererSettings(saved);
|
||||
}
|
||||
return saved;
|
||||
}
|
||||
|
||||
/// Saves current renderer settings.
|
||||
Future<void> saveRendererSettings(WolfRendererSettings settings) {
|
||||
return rendererSettingsPersistence.save(settings);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
library;
|
||||
|
||||
import 'package:wolf_3d_dart/wolf_3d_engine.dart';
|
||||
|
||||
/// Renderer presentation mode used by host widgets.
|
||||
enum GameRendererMode {
|
||||
/// Software pixel renderer presented via decoded framebuffer images.
|
||||
software,
|
||||
|
||||
/// Text-mode renderer for debugging and retro terminal aesthetics.
|
||||
ascii,
|
||||
|
||||
/// GLSL renderer with optional CRT-style post processing.
|
||||
hardware,
|
||||
}
|
||||
|
||||
/// Maps engine renderer settings to host renderer presentation mode.
|
||||
GameRendererMode gameRendererModeFromSettings(WolfRendererSettings settings) {
|
||||
return switch (settings.mode) {
|
||||
WolfRendererMode.hardware => GameRendererMode.hardware,
|
||||
WolfRendererMode.software => GameRendererMode.software,
|
||||
WolfRendererMode.ascii || WolfRendererMode.sixel => GameRendererMode.ascii,
|
||||
};
|
||||
}
|
||||
|
||||
/// Falls back to software mode when GLSL rendering is unavailable at runtime.
|
||||
void handleGlslUnavailable({
|
||||
required bool isMounted,
|
||||
required GameRendererMode rendererMode,
|
||||
required WolfEngine? engine,
|
||||
}) {
|
||||
if (!isMounted || rendererMode != GameRendererMode.hardware) {
|
||||
return;
|
||||
}
|
||||
|
||||
final WolfEngine? activeEngine = engine;
|
||||
if (activeEngine == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
activeEngine.updateRendererSettings(
|
||||
activeEngine.rendererSettings.copyWith(mode: WolfRendererMode.software),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
library;
|
||||
|
||||
import 'dart:async';
|
||||
|
||||
import 'ascii_renderer.dart';
|
||||
|
||||
/// Web-safe stub used when dart:io is unavailable.
|
||||
class SixelRenderer extends AsciiRenderer {
|
||||
SixelRenderer() : super(mode: AsciiRendererMode.terminalAnsi);
|
||||
|
||||
bool isSixelSupported = false;
|
||||
|
||||
@override
|
||||
bool isTerminalSizeSupported(int columns, int rows) => false;
|
||||
|
||||
@override
|
||||
String get terminalSizeRequirement =>
|
||||
'Sixel renderer is unavailable on this platform.';
|
||||
|
||||
static Future<bool> checkTerminalSixelSupport({
|
||||
Stream<List<int>>? inputStream,
|
||||
}) async {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
/// Shared host-facing helpers for Wolf3D app shells.
|
||||
library;
|
||||
|
||||
export 'src/host/cli_game_loop.dart' show CliGameLoop;
|
||||
export 'src/host/managers/game_persistence_manager.dart'
|
||||
show GamePersistenceManager;
|
||||
export 'src/host/managers/game_renderer_mode_manager.dart'
|
||||
show GameRendererMode, gameRendererModeFromSettings, handleGlslUnavailable;
|
||||
@@ -6,5 +6,6 @@ export 'src/rendering/ascii_renderer.dart'
|
||||
show AsciiRenderer, AsciiRendererMode, AsciiTheme, AsciiThemes, ColoredChar;
|
||||
export 'src/rendering/cli_renderer_backend.dart';
|
||||
export 'src/rendering/renderer_backend.dart';
|
||||
export 'src/rendering/sixel_renderer.dart';
|
||||
export 'src/rendering/sixel_renderer_stub.dart'
|
||||
if (dart.library.io) 'src/rendering/sixel_renderer.dart';
|
||||
export 'src/rendering/software_renderer.dart';
|
||||
|
||||
Reference in New Issue
Block a user