Starting to move data loader to its own package

Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
This commit is contained in:
2026-03-14 19:34:39 +01:00
parent 052b5afd2e
commit f225ca728e
21 changed files with 146 additions and 39 deletions

View File

@@ -1,6 +1,6 @@
import 'dart:math' as math;
import 'package:wolf_dart/classes/sprite.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/features/map/door.dart';
class DoorManager {

View File

@@ -1,12 +1,12 @@
import 'dart:math' as math;
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/features/entities/map_objects.dart';
class Pushwall {
int x;
int y;
int mapId; // The wall texture ID
int mapId;
int dirX = 0;
int dirY = 0;
double offset = 0.0;
@@ -19,7 +19,7 @@ class PushwallManager {
final Map<String, Pushwall> pushwalls = {};
Pushwall? activePushwall;
void initPushwalls(Matrix<int> wallGrid, Matrix<int> objectGrid) {
void initPushwalls(Sprite wallGrid, Sprite objectGrid) {
pushwalls.clear();
activePushwall = null;
@@ -32,7 +32,7 @@ class PushwallManager {
}
}
void update(Duration elapsed, Matrix<int> wallGrid) {
void update(Duration elapsed, Sprite wallGrid) {
if (activePushwall == null) return;
final pw = activePushwall!;
@@ -85,7 +85,7 @@ class PushwallManager {
double playerX,
double playerY,
double playerAngle,
Matrix<int> wallGrid,
Sprite wallGrid,
) {
// Only one pushwall can move at a time in the original engine!
if (activePushwall != null) return;

View File

@@ -1,11 +1,11 @@
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
class WolfLevel {
final String name;
final int width; // Always 64 in standard Wolf3D
final int height; // Always 64
final Matrix<int> wallGrid;
final Matrix<int> objectGrid;
final Sprite wallGrid;
final Sprite objectGrid;
WolfLevel({
required this.name,

View File

@@ -1,14 +1,13 @@
import 'package:flutter/services.dart';
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/features/map/wolf_level.dart';
import 'package:wolf_dart/features/map/wolf_map_parser.dart';
import 'package:wolf_dart/vswap_parser.dart';
class WolfMap {
/// The fully parsed and decompressed levels from the game files.
final List<WolfLevel> levels;
final List<Matrix<int>> textures;
final List<Matrix<int>> sprites;
final List<Sprite> textures;
final List<Sprite> sprites;
// A private constructor so we can only instantiate this from the async loader
WolfMap._(

View File

@@ -1,7 +1,7 @@
import 'dart:convert';
import 'dart:typed_data';
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/features/entities/map_objects.dart';
import 'package:wolf_dart/features/map/wolf_level.dart';
@@ -86,8 +86,8 @@ abstract class WolfMapParser {
}
}
Matrix<int> wallGrid = [];
Matrix<int> objectGrid = []; // NEW
Sprite wallGrid = [];
Sprite objectGrid = []; // NEW
for (int y = 0; y < height; y++) {
List<int> wallRow = [];

View File

@@ -1,21 +1,21 @@
import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/classes/coordinate_2d.dart';
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_dart/features/entities/entity.dart';
import 'package:wolf_dart/features/entities/pushwall_manager.dart'; // NEW IMPORT
import 'package:wolf_dart/features/entities/pushwall_manager.dart';
import 'package:wolf_dart/features/player/player.dart';
import 'package:wolf_dart/features/renderer/color_palette.dart';
class RaycasterPainter extends CustomPainter {
final Matrix<int> map;
final List<Matrix<int>> textures;
final Level map;
final List<Sprite> textures;
final Player player;
final double fov;
final Map<String, double> doorOffsets;
final Pushwall? activePushwall; // NEW
final List<Matrix<int>> sprites;
final Pushwall? activePushwall;
final List<Sprite> sprites;
final List<Entity> entities;
RaycasterPainter({
@@ -24,7 +24,7 @@ class RaycasterPainter extends CustomPainter {
required this.player,
required this.fov,
required this.doorOffsets,
this.activePushwall, // NEW
this.activePushwall,
required this.sprites,
required this.entities,
});
@@ -289,7 +289,7 @@ class RaycasterPainter extends CustomPainter {
double drawX = stripe * columnWidth;
int safeIndex = entity.spriteIndex.clamp(0, sprites.length - 1);
Matrix<int> spritePixels = sprites[safeIndex];
Sprite spritePixels = sprites[safeIndex];
for (int ty = 0; ty < 64; ty++) {
int colorByte = spritePixels[texX][ty];
@@ -322,7 +322,7 @@ class RaycasterPainter extends CustomPainter {
int side,
Size size,
int hitWallId,
List<Matrix<int>> textures,
List<Sprite> textures,
double textureOffset,
Paint paint,
) {

View File

@@ -2,8 +2,8 @@ import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/classes/coordinate_2d.dart';
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_dart/features/difficulty/difficulty.dart';
import 'package:wolf_dart/features/entities/collectible.dart';
import 'package:wolf_dart/features/entities/door_manager.dart';
@@ -45,7 +45,7 @@ class _WolfRendererState extends State<WolfRenderer>
late Ticker _gameLoop;
final FocusNode _focusNode = FocusNode();
late WolfMap gameMap;
late Matrix<int> currentLevel;
late Level currentLevel;
final double fov = math.pi / 3;
@@ -71,7 +71,7 @@ class _WolfRendererState extends State<WolfRenderer>
doorManager.initDoors(currentLevel);
final Matrix<int> objectLevel = gameMap.levels[0].objectGrid;
final Level objectLevel = gameMap.levels[0].objectGrid;
pushwallManager.initPushwalls(currentLevel, objectLevel);

View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:wolf_dart/classes/sprite.dart';
import 'package:wolf_3d_data/wolf_3d_data.dart';
import 'package:wolf_dart/features/renderer/color_palette.dart';
class WeaponPainter extends CustomPainter {