From 0dc75ded6227aaea6c7bae14c4fdfe400d4344e6 Mon Sep 17 00:00:00 2001 From: Hans Kokx Date: Tue, 17 Mar 2026 10:55:10 +0100 Subject: [PATCH] Migrate all Dart packages to a single wolf_3d_dart package Signed-off-by: Hans Kokx --- apps/wolf_3d_cli/bin/main.dart | 8 +- apps/wolf_3d_cli/pubspec.yaml | 6 +- .../lib/screens/difficulty_screen.dart | 2 +- .../lib/screens/episode_screen.dart | 2 +- apps/wolf_3d_gui/lib/screens/game_screen.dart | 6 +- .../lib/screens/game_select_screen.dart | 2 +- .../lib/screens/sprite_gallery.dart | 4 +- apps/wolf_3d_gui/lib/screens/vga_gallery.dart | 2 +- apps/wolf_3d_gui/pubspec.yaml | 7 +- package.sh | 140 ++++++++++++++++++ .../lib/src/data}/data_version.dart | 0 .../lib/src/data}/io/discovery_io.dart | 6 +- .../lib/src/data}/io/discovery_stub.dart | 2 +- .../lib/src/data}/wl_parser.dart | 4 +- .../lib/src/data}/wolfenstein_loader.dart | 4 +- .../src/data_types}/cardinal_direction.dart | 0 .../lib/src/data_types}/color_palette.dart | 0 .../lib/src/data_types}/coordinate_2d.dart | 0 .../lib/src/data_types}/difficulty.dart | 0 .../lib/src/data_types}/enemy_map_data.dart | 2 +- .../lib/src/data_types}/episode.dart | 2 +- .../lib/src/data_types}/frame_buffer.dart | 0 .../lib/src/data_types}/game_file.dart | 0 .../lib/src/data_types}/game_version.dart | 0 .../lib/src/data_types}/image.dart | 0 .../lib/src/data_types}/map_objects.dart | 4 +- .../lib/src/data_types}/sound.dart | 0 .../lib/src/data_types}/sprite.dart | 0 .../src/data_types}/sprite_frame_range.dart | 0 .../lib/src/data_types}/wolf_level.dart | 2 +- .../lib/src/data_types}/wolfenstein_data.dart | 2 +- .../lib/src/engine}/audio/engine_audio.dart | 2 +- .../src/engine}/audio/silent_renderer.dart | 4 +- .../lib/src/engine}/input/engine_input.dart | 2 +- .../src/engine}/managers/door_manager.dart | 4 +- .../engine}/managers/pushwall_manager.dart | 2 +- .../lib/src/engine}/player/player.dart | 4 +- .../engine}/rasterizer/ascii_rasterizer.dart | 4 +- .../src/engine}/rasterizer/rasterizer.dart | 6 +- .../rasterizer/software_rasterizer.dart | 4 +- .../lib/src/engine}/wolf_3d_engine_base.dart | 8 +- .../src/entities}/entities/collectible.dart | 4 +- .../entities/decorations/dead_aardwolf.dart | 4 +- .../entities/decorations/dead_guard.dart | 4 +- .../src/entities}/entities/decorative.dart | 4 +- .../lib/src/entities}/entities/door.dart | 0 .../entities/enemies/bosses/hans_grosse.dart | 6 +- .../src/entities}/entities/enemies/dog.dart | 10 +- .../src/entities}/entities/enemies/enemy.dart | 16 +- .../entities/enemies/enemy_animation.dart | 0 .../entities/enemies/enemy_type.dart | 4 +- .../src/entities}/entities/enemies/guard.dart | 10 +- .../entities}/entities/enemies/mutant.dart | 10 +- .../entities}/entities/enemies/officer.dart | 10 +- .../src/entities}/entities/enemies/ss.dart | 10 +- .../src/entities}/entities/weapon/weapon.dart | 6 +- .../entities/weapon/weapons/chain_gun.dart | 2 +- .../entities/weapon/weapons/knife.dart | 2 +- .../entities/weapon/weapons/machine_gun.dart | 2 +- .../entities/weapon/weapons/pistol.dart | 2 +- .../lib/src/entities}/entity.dart | 2 +- .../lib/src/entities}/entity_registry.dart | 16 +- .../lib/src/input}/cli_input.dart | 4 +- .../lib/src/input}/wolf_3d_input.dart | 4 +- .../lib/src/synth}/imf_renderer.dart | 2 +- .../lib/src/synth}/opl2_emulator.dart | 0 .../lib/src/synth}/wolf_3d_audio.dart | 6 +- packages/wolf_3d_dart/lib/wolf_3d_data.dart | 7 + .../wolf_3d_dart/lib/wolf_3d_data_types.dart | 22 +++ packages/wolf_3d_dart/lib/wolf_3d_engine.dart | 15 ++ .../wolf_3d_dart/lib/wolf_3d_entities.dart | 24 +++ packages/wolf_3d_dart/lib/wolf_3d_input.dart | 4 + .../lib/wolf_3d_synth.dart | 2 +- packages/wolf_3d_dart/pubspec.yaml | 16 ++ packages/wolf_3d_data/.gitignore | 7 - packages/wolf_3d_data/CHANGELOG.md | 3 - packages/wolf_3d_data/README.md | 39 ----- packages/wolf_3d_data/analysis_options.yaml | 4 - packages/wolf_3d_data/lib/wolf_3d_data.dart | 7 - packages/wolf_3d_data/pubspec.yaml | 20 --- packages/wolf_3d_data_types/.gitignore | 7 - packages/wolf_3d_data_types/CHANGELOG.md | 3 - packages/wolf_3d_data_types/README.md | 39 ----- .../wolf_3d_data_types/analysis_options.yaml | 30 ---- .../lib/wolf_3d_data_types.dart | 22 --- packages/wolf_3d_data_types/pubspec.yaml | 16 -- packages/wolf_3d_engine/.gitignore | 7 - packages/wolf_3d_engine/CHANGELOG.md | 3 - packages/wolf_3d_engine/README.md | 39 ----- packages/wolf_3d_engine/analysis_options.yaml | 30 ---- .../wolf_3d_engine/lib/wolf_3d_engine.dart | 15 -- packages/wolf_3d_engine/pubspec.yaml | 20 --- packages/wolf_3d_entities/.gitignore | 7 - packages/wolf_3d_entities/CHANGELOG.md | 3 - packages/wolf_3d_entities/README.md | 39 ----- .../wolf_3d_entities/analysis_options.yaml | 4 - .../lib/wolf_3d_entities.dart | 24 --- packages/wolf_3d_entities/pubspec.yaml | 16 -- .../lib/audio/audio_adaptor.dart | 4 +- packages/wolf_3d_flutter/lib/wolf_3d.dart | 8 +- .../lib/wolf_3d_input_flutter.dart | 4 +- packages/wolf_3d_flutter/pubspec.yaml | 7 +- packages/wolf_3d_input/.gitignore | 31 ---- packages/wolf_3d_input/.metadata | 10 -- packages/wolf_3d_input/CHANGELOG.md | 3 - packages/wolf_3d_input/LICENSE | 1 - packages/wolf_3d_input/README.md | 39 ----- packages/wolf_3d_input/analysis_options.yaml | 4 - packages/wolf_3d_input/lib/wolf_3d_input.dart | 4 - packages/wolf_3d_input/pubspec.yaml | 13 -- .../wolf_3d_renderer/lib/base_renderer.dart | 2 +- .../lib/wolf_3d_ascii_renderer.dart | 4 +- .../lib/wolf_3d_flutter_renderer.dart | 4 +- packages/wolf_3d_renderer/pubspec.yaml | 4 +- packages/wolf_3d_synth/.gitignore | 7 - packages/wolf_3d_synth/CHANGELOG.md | 3 - packages/wolf_3d_synth/README.md | 39 ----- packages/wolf_3d_synth/analysis_options.yaml | 30 ---- packages/wolf_3d_synth/pubspec.yaml | 18 --- pubspec.yaml | 7 +- 120 files changed, 364 insertions(+), 763 deletions(-) create mode 100755 package.sh rename packages/{wolf_3d_data/lib/src => wolf_3d_dart/lib/src/data}/data_version.dart (100%) rename packages/{wolf_3d_data/lib/src => wolf_3d_dart/lib/src/data}/io/discovery_io.dart (95%) rename packages/{wolf_3d_data/lib/src => wolf_3d_dart/lib/src/data}/io/discovery_stub.dart (84%) rename packages/{wolf_3d_data/lib/src => wolf_3d_dart/lib/src/data}/wl_parser.dart (99%) rename packages/{wolf_3d_data/lib/src => wolf_3d_dart/lib/src/data}/wolfenstein_loader.dart (94%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/cardinal_direction.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/color_palette.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/coordinate_2d.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/difficulty.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/enemy_map_data.dart (91%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/episode.dart (68%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/frame_buffer.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/game_file.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/game_version.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/image.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/map_objects.dart (97%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/sound.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/sprite.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/sprite_frame_range.dart (100%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/wolf_level.dart (81%) rename packages/{wolf_3d_data_types/lib/src => wolf_3d_dart/lib/src/data_types}/wolfenstein_data.dart (89%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/audio/engine_audio.dart (80%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/audio/silent_renderer.dart (86%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/input/engine_input.dart (90%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/managers/door_manager.dart (94%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/managers/pushwall_manager.dart (98%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/player/player.dart (98%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/rasterizer/ascii_rasterizer.dart (99%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/rasterizer/rasterizer.dart (98%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/rasterizer/software_rasterizer.dart (98%) rename packages/{wolf_3d_engine/lib/src => wolf_3d_dart/lib/src/engine}/wolf_3d_engine_base.dart (97%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/collectible.dart (92%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/decorations/dead_aardwolf.dart (81%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/decorations/dead_guard.dart (85%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/decorative.dart (93%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/door.dart (100%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/bosses/hans_grosse.dart (95%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/dog.dart (89%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/enemy.dart (92%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/enemy_animation.dart (100%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/enemy_type.dart (97%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/guard.dart (90%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/mutant.dart (91%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/officer.dart (90%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/enemies/ss.dart (91%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/weapon/weapon.dart (95%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/weapon/weapons/chain_gun.dart (74%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/weapon/weapons/knife.dart (87%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/weapon/weapons/machine_gun.dart (81%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entities/weapon/weapons/pistol.dart (74%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entity.dart (96%) rename packages/{wolf_3d_entities/lib/src => wolf_3d_dart/lib/src/entities}/entity_registry.dart (62%) rename packages/{wolf_3d_input/lib/src => wolf_3d_dart/lib/src/input}/cli_input.dart (92%) rename packages/{wolf_3d_input/lib/src => wolf_3d_dart/lib/src/input}/wolf_3d_input.dart (86%) rename packages/{wolf_3d_synth/lib/src => wolf_3d_dart/lib/src/synth}/imf_renderer.dart (98%) rename packages/{wolf_3d_synth/lib/src => wolf_3d_dart/lib/src/synth}/opl2_emulator.dart (100%) rename packages/{wolf_3d_synth/lib/src => wolf_3d_dart/lib/src/synth}/wolf_3d_audio.dart (96%) create mode 100644 packages/wolf_3d_dart/lib/wolf_3d_data.dart create mode 100644 packages/wolf_3d_dart/lib/wolf_3d_data_types.dart create mode 100644 packages/wolf_3d_dart/lib/wolf_3d_engine.dart create mode 100644 packages/wolf_3d_dart/lib/wolf_3d_entities.dart create mode 100644 packages/wolf_3d_dart/lib/wolf_3d_input.dart rename packages/{wolf_3d_synth => wolf_3d_dart}/lib/wolf_3d_synth.dart (60%) create mode 100644 packages/wolf_3d_dart/pubspec.yaml delete mode 100644 packages/wolf_3d_data/.gitignore delete mode 100644 packages/wolf_3d_data/CHANGELOG.md delete mode 100644 packages/wolf_3d_data/README.md delete mode 100644 packages/wolf_3d_data/analysis_options.yaml delete mode 100644 packages/wolf_3d_data/lib/wolf_3d_data.dart delete mode 100644 packages/wolf_3d_data/pubspec.yaml delete mode 100644 packages/wolf_3d_data_types/.gitignore delete mode 100644 packages/wolf_3d_data_types/CHANGELOG.md delete mode 100644 packages/wolf_3d_data_types/README.md delete mode 100644 packages/wolf_3d_data_types/analysis_options.yaml delete mode 100644 packages/wolf_3d_data_types/lib/wolf_3d_data_types.dart delete mode 100644 packages/wolf_3d_data_types/pubspec.yaml delete mode 100644 packages/wolf_3d_engine/.gitignore delete mode 100644 packages/wolf_3d_engine/CHANGELOG.md delete mode 100644 packages/wolf_3d_engine/README.md delete mode 100644 packages/wolf_3d_engine/analysis_options.yaml delete mode 100644 packages/wolf_3d_engine/lib/wolf_3d_engine.dart delete mode 100644 packages/wolf_3d_engine/pubspec.yaml delete mode 100644 packages/wolf_3d_entities/.gitignore delete mode 100644 packages/wolf_3d_entities/CHANGELOG.md delete mode 100644 packages/wolf_3d_entities/README.md delete mode 100644 packages/wolf_3d_entities/analysis_options.yaml delete mode 100644 packages/wolf_3d_entities/lib/wolf_3d_entities.dart delete mode 100644 packages/wolf_3d_entities/pubspec.yaml delete mode 100644 packages/wolf_3d_input/.gitignore delete mode 100644 packages/wolf_3d_input/.metadata delete mode 100644 packages/wolf_3d_input/CHANGELOG.md delete mode 100644 packages/wolf_3d_input/LICENSE delete mode 100644 packages/wolf_3d_input/README.md delete mode 100644 packages/wolf_3d_input/analysis_options.yaml delete mode 100644 packages/wolf_3d_input/lib/wolf_3d_input.dart delete mode 100644 packages/wolf_3d_input/pubspec.yaml delete mode 100644 packages/wolf_3d_synth/.gitignore delete mode 100644 packages/wolf_3d_synth/CHANGELOG.md delete mode 100644 packages/wolf_3d_synth/README.md delete mode 100644 packages/wolf_3d_synth/analysis_options.yaml delete mode 100644 packages/wolf_3d_synth/pubspec.yaml diff --git a/apps/wolf_3d_cli/bin/main.dart b/apps/wolf_3d_cli/bin/main.dart index 4d8be46..02eb5e8 100644 --- a/apps/wolf_3d_cli/bin/main.dart +++ b/apps/wolf_3d_cli/bin/main.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:io'; -import 'package:wolf_3d_data/wolf_3d_data.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_input/wolf_3d_input.dart'; +import 'package:wolf_3d_dart/wolf_3d_data.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_input.dart'; // Helper to gracefully exit and restore the terminal void exitCleanly(int code) { diff --git a/apps/wolf_3d_cli/pubspec.yaml b/apps/wolf_3d_cli/pubspec.yaml index 76e45d3..5da593b 100644 --- a/apps/wolf_3d_cli/pubspec.yaml +++ b/apps/wolf_3d_cli/pubspec.yaml @@ -8,9 +8,5 @@ environment: resolution: workspace dependencies: - wolf_3d_data: - wolf_3d_data_types: - wolf_3d_engine: - wolf_3d_input: - wolf_3d_synth: + wolf_3d_dart: wolf_3d_assets: diff --git a/apps/wolf_3d_gui/lib/screens/difficulty_screen.dart b/apps/wolf_3d_gui/lib/screens/difficulty_screen.dart index d31e9d4..57c116e 100644 --- a/apps/wolf_3d_gui/lib/screens/difficulty_screen.dart +++ b/apps/wolf_3d_gui/lib/screens/difficulty_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; import 'package:wolf_3d_flutter/wolf_3d.dart'; import 'package:wolf_3d_gui/screens/game_screen.dart'; diff --git a/apps/wolf_3d_gui/lib/screens/episode_screen.dart b/apps/wolf_3d_gui/lib/screens/episode_screen.dart index 447244c..e9c375d 100644 --- a/apps/wolf_3d_gui/lib/screens/episode_screen.dart +++ b/apps/wolf_3d_gui/lib/screens/episode_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; import 'package:wolf_3d_flutter/wolf_3d.dart'; import 'package:wolf_3d_gui/screens/difficulty_screen.dart'; import 'package:wolf_3d_gui/screens/sprite_gallery.dart'; diff --git a/apps/wolf_3d_gui/lib/screens/game_screen.dart b/apps/wolf_3d_gui/lib/screens/game_screen.dart index 2fdf1e8..2b5da6f 100644 --- a/apps/wolf_3d_gui/lib/screens/game_screen.dart +++ b/apps/wolf_3d_gui/lib/screens/game_screen.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.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_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/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_dart/wolf_3d_input.dart'; import 'package:wolf_3d_renderer/wolf_3d_ascii_renderer.dart'; import 'package:wolf_3d_renderer/wolf_3d_flutter_renderer.dart'; diff --git a/apps/wolf_3d_gui/lib/screens/game_select_screen.dart b/apps/wolf_3d_gui/lib/screens/game_select_screen.dart index ec33d6b..f95515a 100644 --- a/apps/wolf_3d_gui/lib/screens/game_select_screen.dart +++ b/apps/wolf_3d_gui/lib/screens/game_select_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; import 'package:wolf_3d_flutter/wolf_3d.dart'; import 'package:wolf_3d_gui/screens/episode_screen.dart'; diff --git a/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart b/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart index 5498f29..3286b17 100644 --- a/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart +++ b/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; import 'package:wolf_3d_flutter/wolf_3d.dart'; class SpriteGallery extends StatelessWidget { diff --git a/apps/wolf_3d_gui/lib/screens/vga_gallery.dart b/apps/wolf_3d_gui/lib/screens/vga_gallery.dart index a7fcbaf..f2a1a24 100644 --- a/apps/wolf_3d_gui/lib/screens/vga_gallery.dart +++ b/apps/wolf_3d_gui/lib/screens/vga_gallery.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; class VgaGallery extends StatelessWidget { final List images; diff --git a/apps/wolf_3d_gui/pubspec.yaml b/apps/wolf_3d_gui/pubspec.yaml index 77df33b..017a964 100644 --- a/apps/wolf_3d_gui/pubspec.yaml +++ b/apps/wolf_3d_gui/pubspec.yaml @@ -9,13 +9,8 @@ environment: resolution: workspace dependencies: - wolf_3d_data: any - wolf_3d_data_types: any - wolf_3d_synth: any - wolf_3d_engine: any - wolf_3d_entities: any + wolf_3d_dart: wolf_3d_renderer: any - wolf_3d_input: any wolf_3d_flutter: any flutter: diff --git a/package.sh b/package.sh new file mode 100755 index 0000000..6f5cfb0 --- /dev/null +++ b/package.sh @@ -0,0 +1,140 @@ +#!/bin/bash + +# Exit immediately if a command exits with a non-zero status +set -e + +# ========================================== +# 1. Identify Candidate Packages & Dependents +# ========================================== +PACKAGES=("wolf_3d_data" "wolf_3d_data_types" "wolf_3d_engine" "wolf_3d_entities" "wolf_3d_input" "wolf_3d_synth") +DEPENDENTS=("apps/wolf_3d_cli" "apps/wolf_3d_gui" "packages/wolf_3d_flutter" "packages/wolf_3d_renderer") +NEW_PKG="wolf_3d_dart" + +echo "Starting migration to $NEW_PKG..." + +# ========================================== +# 2. Create the New Package wolf_3d_dart +# ========================================== +echo "Creating new package structure..." +mkdir -p "packages/$NEW_PKG/lib/src" + +# Initialize a base pubspec.yaml +cat < "packages/$NEW_PKG/pubspec.yaml" +name: $NEW_PKG +description: A combined package for all non-Flutter components of wolf 3D +version: 0.0.1 +resolution: workspace + +environment: + sdk: ^3.11.1 + +dependencies: +EOF + +# Carefully extract dependencies from source packages (ignoring the wolf_3d packages themselves) +touch temp_deps.txt +for pkg in "${PACKAGES[@]}"; do + if [ -f "packages/$pkg/pubspec.yaml" ]; then + # Use awk to extract lines under 'dependencies:' until a new unindented section starts + awk '/^dependencies:/{flag=1; next} /^[a-zA-Z]/{flag=0} flag && /^[ \t]+[a-zA-Z0-9_]+:/ {print}' "packages/$pkg/pubspec.yaml" >> temp_deps.txt + fi +done + +# Deduplicate dependencies, filter out the old packages, and append to pubspec.yaml +sort -u temp_deps.txt | grep -v "wolf_3d_" >> "packages/$NEW_PKG/pubspec.yaml" || true +rm temp_deps.txt + +cat <> "packages/$NEW_PKG/pubspec.yaml" + +dev_dependencies: + lints: ^3.0.0 + test: ^1.24.0 +EOF + +# ========================================== +# 3 & 4. Migrate Code, Entry Points & Refactor Internal Imports +# ========================================== +echo "Migrating code and updating imports..." + +for pkg in "${PACKAGES[@]}"; do + SUFFIX="${pkg#wolf_3d_}" # Removes the 'wolf_3d_' prefix + + # 3.1 & 3.2 Move Internal Code and Entry Point + mkdir -p "packages/$NEW_PKG/lib/src/$SUFFIX" + + # Copy instead of move for safety during script execution (we delete originals at the end) + if [ -d "packages/$pkg/lib/src" ] && [ "$(ls -A "packages/$pkg/lib/src")" ]; then + cp -R "packages/$pkg/lib/src/"* "packages/$NEW_PKG/lib/src/$SUFFIX/" + fi + + if [ -f "packages/$pkg/lib/$pkg.dart" ]; then + cp "packages/$pkg/lib/$pkg.dart" "packages/$NEW_PKG/lib/$pkg.dart" + + # 3.3 Update Entry Point Paths (export 'src/... -> export 'src/suffix/...) + sed -i "s|export 'src/|export 'src/$SUFFIX/|g" "packages/$NEW_PKG/lib/$pkg.dart" + sed -i "s|export \"src/|export \"src/$SUFFIX/|g" "packages/$NEW_PKG/lib/$pkg.dart" + fi +done + +# 4.1 & 4.2 Refactor Internal Imports (Run this globally on the new package) +for pkg in "${PACKAGES[@]}"; do + SUFFIX="${pkg#wolf_3d_}" + + # Find all Dart files in the new package + find "packages/$NEW_PKG/lib" -name "*.dart" -type f | while read -r file; do + # 1st Pass: Fix deep paths (package:wolf_3d_data/src/... -> package:wolf_3d_dart/src/data/...) + sed -i "s|package:$pkg/src/|package:$NEW_PKG/src/$SUFFIX/|g" "$file" + + # 2nd Pass: Fix root imports (package:wolf_3d_data/... -> package:wolf_3d_dart/...) + sed -i "s|package:$pkg/|package:$NEW_PKG/|g" "$file" + done +done + +# ========================================== +# 5. Update Dependents (Apps and Other Packages) +# ========================================== +echo "Updating dependent apps and packages..." + +for target in "${DEPENDENTS[@]}"; do + if [ -d "$target" ]; then + # 5.1 Update pubspec.yaml Files + if [ -f "$target/pubspec.yaml" ]; then + # Remove old dependencies + for pkg in "${PACKAGES[@]}"; do + sed -i "/^[[:space:]]*$pkg:/d" "$target/pubspec.yaml" + done + + # Add new dependency under dependencies block if not present + if ! grep -q "$NEW_PKG:" "$target/pubspec.yaml"; then + sed -i "/^dependencies:/a\\ $NEW_PKG:" "$target/pubspec.yaml" + fi + fi + + # 5.2 Update Imports in dependent dart files + for pkg in "${PACKAGES[@]}"; do + SUFFIX="${pkg#wolf_3d_}" + find "$target" -name "*.dart" -type f | while read -r file; do + # Match user requirement: package:wolf_3d_/wolf_3d_.dart -> package:wolf_3d_dart/wolf_3d_.dart + sed -i "s|package:$pkg/$pkg.dart|package:$NEW_PKG/$pkg.dart|g" "$file" + + # Catch any stray deep imports just in case + sed -i "s|package:$pkg/src/|package:$NEW_PKG/src/$SUFFIX/|g" "$file" + sed -i "s|package:$pkg/|package:$NEW_PKG/|g" "$file" + done + done + fi +done + +# ========================================== +# 6. Cleanup and Validation +# ========================================== +echo "Cleaning up old packages..." +for pkg in "${PACKAGES[@]}"; do + rm -rf "packages/$pkg" +done + +echo "Running workspace refresh and tests..." +dart pub get || echo "⚠️ 'dart pub get' failed. Check your new pubspec.yaml." +dart test || echo "⚠️ Tests failed. Please review the output." + +echo "Migration complete!" diff --git a/packages/wolf_3d_data/lib/src/data_version.dart b/packages/wolf_3d_dart/lib/src/data/data_version.dart similarity index 100% rename from packages/wolf_3d_data/lib/src/data_version.dart rename to packages/wolf_3d_dart/lib/src/data/data_version.dart diff --git a/packages/wolf_3d_data/lib/src/io/discovery_io.dart b/packages/wolf_3d_dart/lib/src/data/io/discovery_io.dart similarity index 95% rename from packages/wolf_3d_data/lib/src/io/discovery_io.dart rename to packages/wolf_3d_dart/lib/src/data/io/discovery_io.dart index c8cd9f4..b582912 100644 --- a/packages/wolf_3d_data/lib/src/io/discovery_io.dart +++ b/packages/wolf_3d_dart/lib/src/data/io/discovery_io.dart @@ -2,9 +2,9 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:crypto/crypto.dart'; -import 'package:wolf_3d_data/src/data_version.dart'; -import 'package:wolf_3d_data/src/wl_parser.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/data/data_version.dart'; +import 'package:wolf_3d_dart/src/data/wl_parser.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; /// dart:io implementation for directory discovery with version integrity checks. Future> discoverInDirectory({ diff --git a/packages/wolf_3d_data/lib/src/io/discovery_stub.dart b/packages/wolf_3d_dart/lib/src/data/io/discovery_stub.dart similarity index 84% rename from packages/wolf_3d_data/lib/src/io/discovery_stub.dart rename to packages/wolf_3d_dart/lib/src/data/io/discovery_stub.dart index 454a41e..276b054 100644 --- a/packages/wolf_3d_data/lib/src/io/discovery_stub.dart +++ b/packages/wolf_3d_dart/lib/src/data/io/discovery_stub.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; /// Web-safe stub for directory discovery. Future> discoverInDirectory({ diff --git a/packages/wolf_3d_data/lib/src/wl_parser.dart b/packages/wolf_3d_dart/lib/src/data/wl_parser.dart similarity index 99% rename from packages/wolf_3d_data/lib/src/wl_parser.dart rename to packages/wolf_3d_dart/lib/src/data/wl_parser.dart index 5a1fccb..ca20daf 100644 --- a/packages/wolf_3d_data/lib/src/wl_parser.dart +++ b/packages/wolf_3d_dart/lib/src/data/wl_parser.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:crypto/crypto.dart' show md5; -import 'package:wolf_3d_data/src/data_version.dart'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/data/data_version.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; abstract class WLParser { // --- Original Song Lookup Tables --- diff --git a/packages/wolf_3d_data/lib/src/wolfenstein_loader.dart b/packages/wolf_3d_dart/lib/src/data/wolfenstein_loader.dart similarity index 94% rename from packages/wolf_3d_data/lib/src/wolfenstein_loader.dart rename to packages/wolf_3d_dart/lib/src/data/wolfenstein_loader.dart index b6e4c92..eeae4db 100644 --- a/packages/wolf_3d_data/lib/src/wolfenstein_loader.dart +++ b/packages/wolf_3d_dart/lib/src/data/wolfenstein_loader.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; import 'package:crypto/crypto.dart'; // Import for MD5 -import 'package:wolf_3d_data/src/data_version.dart'; // Import your enum -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/data/data_version.dart'; // Import your enum +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; import 'io/discovery_stub.dart' if (dart.library.io) 'io/discovery_io.dart' diff --git a/packages/wolf_3d_data_types/lib/src/cardinal_direction.dart b/packages/wolf_3d_dart/lib/src/data_types/cardinal_direction.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/cardinal_direction.dart rename to packages/wolf_3d_dart/lib/src/data_types/cardinal_direction.dart diff --git a/packages/wolf_3d_data_types/lib/src/color_palette.dart b/packages/wolf_3d_dart/lib/src/data_types/color_palette.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/color_palette.dart rename to packages/wolf_3d_dart/lib/src/data_types/color_palette.dart diff --git a/packages/wolf_3d_data_types/lib/src/coordinate_2d.dart b/packages/wolf_3d_dart/lib/src/data_types/coordinate_2d.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/coordinate_2d.dart rename to packages/wolf_3d_dart/lib/src/data_types/coordinate_2d.dart diff --git a/packages/wolf_3d_data_types/lib/src/difficulty.dart b/packages/wolf_3d_dart/lib/src/data_types/difficulty.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/difficulty.dart rename to packages/wolf_3d_dart/lib/src/data_types/difficulty.dart diff --git a/packages/wolf_3d_data_types/lib/src/enemy_map_data.dart b/packages/wolf_3d_dart/lib/src/data_types/enemy_map_data.dart similarity index 91% rename from packages/wolf_3d_data_types/lib/src/enemy_map_data.dart rename to packages/wolf_3d_dart/lib/src/data_types/enemy_map_data.dart index 17864ea..c35839d 100644 --- a/packages/wolf_3d_data_types/lib/src/enemy_map_data.dart +++ b/packages/wolf_3d_dart/lib/src/data_types/enemy_map_data.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; class EnemyMapData { final int baseId; diff --git a/packages/wolf_3d_data_types/lib/src/episode.dart b/packages/wolf_3d_dart/lib/src/data_types/episode.dart similarity index 68% rename from packages/wolf_3d_data_types/lib/src/episode.dart rename to packages/wolf_3d_dart/lib/src/data_types/episode.dart index 035a54b..94866f5 100644 --- a/packages/wolf_3d_data_types/lib/src/episode.dart +++ b/packages/wolf_3d_dart/lib/src/data_types/episode.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; class Episode { final String name; diff --git a/packages/wolf_3d_data_types/lib/src/frame_buffer.dart b/packages/wolf_3d_dart/lib/src/data_types/frame_buffer.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/frame_buffer.dart rename to packages/wolf_3d_dart/lib/src/data_types/frame_buffer.dart diff --git a/packages/wolf_3d_data_types/lib/src/game_file.dart b/packages/wolf_3d_dart/lib/src/data_types/game_file.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/game_file.dart rename to packages/wolf_3d_dart/lib/src/data_types/game_file.dart diff --git a/packages/wolf_3d_data_types/lib/src/game_version.dart b/packages/wolf_3d_dart/lib/src/data_types/game_version.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/game_version.dart rename to packages/wolf_3d_dart/lib/src/data_types/game_version.dart diff --git a/packages/wolf_3d_data_types/lib/src/image.dart b/packages/wolf_3d_dart/lib/src/data_types/image.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/image.dart rename to packages/wolf_3d_dart/lib/src/data_types/image.dart diff --git a/packages/wolf_3d_data_types/lib/src/map_objects.dart b/packages/wolf_3d_dart/lib/src/data_types/map_objects.dart similarity index 97% rename from packages/wolf_3d_data_types/lib/src/map_objects.dart rename to packages/wolf_3d_dart/lib/src/data_types/map_objects.dart index 6737793..0f66386 100644 --- a/packages/wolf_3d_data_types/lib/src/map_objects.dart +++ b/packages/wolf_3d_dart/lib/src/data_types/map_objects.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; abstract class MapObject { // --- Player Spawns --- diff --git a/packages/wolf_3d_data_types/lib/src/sound.dart b/packages/wolf_3d_dart/lib/src/data_types/sound.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/sound.dart rename to packages/wolf_3d_dart/lib/src/data_types/sound.dart diff --git a/packages/wolf_3d_data_types/lib/src/sprite.dart b/packages/wolf_3d_dart/lib/src/data_types/sprite.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/sprite.dart rename to packages/wolf_3d_dart/lib/src/data_types/sprite.dart diff --git a/packages/wolf_3d_data_types/lib/src/sprite_frame_range.dart b/packages/wolf_3d_dart/lib/src/data_types/sprite_frame_range.dart similarity index 100% rename from packages/wolf_3d_data_types/lib/src/sprite_frame_range.dart rename to packages/wolf_3d_dart/lib/src/data_types/sprite_frame_range.dart diff --git a/packages/wolf_3d_data_types/lib/src/wolf_level.dart b/packages/wolf_3d_dart/lib/src/data_types/wolf_level.dart similarity index 81% rename from packages/wolf_3d_data_types/lib/src/wolf_level.dart rename to packages/wolf_3d_dart/lib/src/data_types/wolf_level.dart index 06b9bd7..7c515b6 100644 --- a/packages/wolf_3d_data_types/lib/src/wolf_level.dart +++ b/packages/wolf_3d_dart/lib/src/data_types/wolf_level.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; class WolfLevel { final String name; diff --git a/packages/wolf_3d_data_types/lib/src/wolfenstein_data.dart b/packages/wolf_3d_dart/lib/src/data_types/wolfenstein_data.dart similarity index 89% rename from packages/wolf_3d_data_types/lib/src/wolfenstein_data.dart rename to packages/wolf_3d_dart/lib/src/data_types/wolfenstein_data.dart index 5ea80a9..f7ce4df 100644 --- a/packages/wolf_3d_data_types/lib/src/wolfenstein_data.dart +++ b/packages/wolf_3d_dart/lib/src/data_types/wolfenstein_data.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; class WolfensteinData { final GameVersion version; diff --git a/packages/wolf_3d_engine/lib/src/audio/engine_audio.dart b/packages/wolf_3d_dart/lib/src/engine/audio/engine_audio.dart similarity index 80% rename from packages/wolf_3d_engine/lib/src/audio/engine_audio.dart rename to packages/wolf_3d_dart/lib/src/engine/audio/engine_audio.dart index a79d221..b515c25 100644 --- a/packages/wolf_3d_engine/lib/src/audio/engine_audio.dart +++ b/packages/wolf_3d_dart/lib/src/engine/audio/engine_audio.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; abstract class EngineAudio { WolfensteinData? activeGame; diff --git a/packages/wolf_3d_engine/lib/src/audio/silent_renderer.dart b/packages/wolf_3d_dart/lib/src/engine/audio/silent_renderer.dart similarity index 86% rename from packages/wolf_3d_engine/lib/src/audio/silent_renderer.dart rename to packages/wolf_3d_dart/lib/src/engine/audio/silent_renderer.dart index 93ba47f..36b3899 100644 --- a/packages/wolf_3d_engine/lib/src/audio/silent_renderer.dart +++ b/packages/wolf_3d_dart/lib/src/engine/audio/silent_renderer.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; class CliSilentAudio implements EngineAudio { @override diff --git a/packages/wolf_3d_engine/lib/src/input/engine_input.dart b/packages/wolf_3d_dart/lib/src/engine/input/engine_input.dart similarity index 90% rename from packages/wolf_3d_engine/lib/src/input/engine_input.dart rename to packages/wolf_3d_dart/lib/src/engine/input/engine_input.dart index 1d803a0..64bbe85 100644 --- a/packages/wolf_3d_engine/lib/src/input/engine_input.dart +++ b/packages/wolf_3d_dart/lib/src/engine/input/engine_input.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; /// A pure, framework-agnostic snapshot of the player's intended actions for a single frame. class EngineInput { diff --git a/packages/wolf_3d_engine/lib/src/managers/door_manager.dart b/packages/wolf_3d_dart/lib/src/engine/managers/door_manager.dart similarity index 94% rename from packages/wolf_3d_engine/lib/src/managers/door_manager.dart rename to packages/wolf_3d_dart/lib/src/engine/managers/door_manager.dart index 193b96f..f51104c 100644 --- a/packages/wolf_3d_engine/lib/src/managers/door_manager.dart +++ b/packages/wolf_3d_dart/lib/src/engine/managers/door_manager.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; class DoorManager { // Key is '$x,$y' diff --git a/packages/wolf_3d_engine/lib/src/managers/pushwall_manager.dart b/packages/wolf_3d_dart/lib/src/engine/managers/pushwall_manager.dart similarity index 98% rename from packages/wolf_3d_engine/lib/src/managers/pushwall_manager.dart rename to packages/wolf_3d_dart/lib/src/engine/managers/pushwall_manager.dart index f22756a..e8c6679 100644 --- a/packages/wolf_3d_engine/lib/src/managers/pushwall_manager.dart +++ b/packages/wolf_3d_dart/lib/src/engine/managers/pushwall_manager.dart @@ -1,6 +1,6 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; class Pushwall { int x; diff --git a/packages/wolf_3d_engine/lib/src/player/player.dart b/packages/wolf_3d_dart/lib/src/engine/player/player.dart similarity index 98% rename from packages/wolf_3d_engine/lib/src/player/player.dart rename to packages/wolf_3d_dart/lib/src/engine/player/player.dart index 1b09b63..9d76156 100644 --- a/packages/wolf_3d_engine/lib/src/player/player.dart +++ b/packages/wolf_3d_dart/lib/src/engine/player/player.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; enum WeaponSwitchState { idle, lowering, raising } diff --git a/packages/wolf_3d_engine/lib/src/rasterizer/ascii_rasterizer.dart b/packages/wolf_3d_dart/lib/src/engine/rasterizer/ascii_rasterizer.dart similarity index 99% rename from packages/wolf_3d_engine/lib/src/rasterizer/ascii_rasterizer.dart rename to packages/wolf_3d_dart/lib/src/engine/rasterizer/ascii_rasterizer.dart index d28cf67..10d1367 100644 --- a/packages/wolf_3d_engine/lib/src/rasterizer/ascii_rasterizer.dart +++ b/packages/wolf_3d_dart/lib/src/engine/rasterizer/ascii_rasterizer.dart @@ -1,8 +1,8 @@ import 'dart:math' as math; import 'package:arcane_helper_utils/arcane_helper_utils.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_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; class AsciiTheme { /// The character ramp, ordered from most dense (index 0) to least dense (last index). diff --git a/packages/wolf_3d_engine/lib/src/rasterizer/rasterizer.dart b/packages/wolf_3d_dart/lib/src/engine/rasterizer/rasterizer.dart similarity index 98% rename from packages/wolf_3d_engine/lib/src/rasterizer/rasterizer.dart rename to packages/wolf_3d_dart/lib/src/engine/rasterizer/rasterizer.dart index 1a6c55f..f46587c 100644 --- a/packages/wolf_3d_engine/lib/src/rasterizer/rasterizer.dart +++ b/packages/wolf_3d_dart/lib/src/engine/rasterizer/rasterizer.dart @@ -1,8 +1,8 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; abstract class Rasterizer { late List zBuffer; diff --git a/packages/wolf_3d_engine/lib/src/rasterizer/software_rasterizer.dart b/packages/wolf_3d_dart/lib/src/engine/rasterizer/software_rasterizer.dart similarity index 98% rename from packages/wolf_3d_engine/lib/src/rasterizer/software_rasterizer.dart rename to packages/wolf_3d_dart/lib/src/engine/rasterizer/software_rasterizer.dart index 2739a8f..539ed01 100644 --- a/packages/wolf_3d_engine/lib/src/rasterizer/software_rasterizer.dart +++ b/packages/wolf_3d_dart/lib/src/engine/rasterizer/software_rasterizer.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; class SoftwareRasterizer extends Rasterizer { late FrameBuffer _buffer; diff --git a/packages/wolf_3d_engine/lib/src/wolf_3d_engine_base.dart b/packages/wolf_3d_dart/lib/src/engine/wolf_3d_engine_base.dart similarity index 97% rename from packages/wolf_3d_engine/lib/src/wolf_3d_engine_base.dart rename to packages/wolf_3d_dart/lib/src/engine/wolf_3d_engine_base.dart index 0510414..e7b5e64 100644 --- a/packages/wolf_3d_engine/lib/src/wolf_3d_engine_base.dart +++ b/packages/wolf_3d_dart/lib/src/engine/wolf_3d_engine_base.dart @@ -1,9 +1,9 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; -import 'package:wolf_3d_input/wolf_3d_input.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_input.dart'; class WolfEngine { WolfEngine({ diff --git a/packages/wolf_3d_entities/lib/src/entities/collectible.dart b/packages/wolf_3d_dart/lib/src/entities/entities/collectible.dart similarity index 92% rename from packages/wolf_3d_entities/lib/src/entities/collectible.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/collectible.dart index b241059..5503ec5 100644 --- a/packages/wolf_3d_entities/lib/src/entities/collectible.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/collectible.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; enum CollectibleType { ammo, health, treasure, weapon, key } diff --git a/packages/wolf_3d_entities/lib/src/entities/decorations/dead_aardwolf.dart b/packages/wolf_3d_dart/lib/src/entities/entities/decorations/dead_aardwolf.dart similarity index 81% rename from packages/wolf_3d_entities/lib/src/entities/decorations/dead_aardwolf.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/decorations/dead_aardwolf.dart index 0b12c90..74f87ac 100644 --- a/packages/wolf_3d_entities/lib/src/entities/decorations/dead_aardwolf.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/decorations/dead_aardwolf.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; class DeadAardwolf extends Decorative { static const int sprite = 96; diff --git a/packages/wolf_3d_entities/lib/src/entities/decorations/dead_guard.dart b/packages/wolf_3d_dart/lib/src/entities/entities/decorations/dead_guard.dart similarity index 85% rename from packages/wolf_3d_entities/lib/src/entities/decorations/dead_guard.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/decorations/dead_guard.dart index 3a0f6d2..db5f8cc 100644 --- a/packages/wolf_3d_entities/lib/src/entities/decorations/dead_guard.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/decorations/dead_guard.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; class DeadGuard extends Decorative { /// The sprite index in VSWAP for the final "dead" frame of a Guard. diff --git a/packages/wolf_3d_entities/lib/src/entities/decorative.dart b/packages/wolf_3d_dart/lib/src/entities/entities/decorative.dart similarity index 93% rename from packages/wolf_3d_entities/lib/src/entities/decorative.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/decorative.dart index d338739..032ab3f 100644 --- a/packages/wolf_3d_entities/lib/src/entities/decorative.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/decorative.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class Decorative extends Entity { Decorative({ diff --git a/packages/wolf_3d_entities/lib/src/entities/door.dart b/packages/wolf_3d_dart/lib/src/entities/entities/door.dart similarity index 100% rename from packages/wolf_3d_entities/lib/src/entities/door.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/door.dart diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/bosses/hans_grosse.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/bosses/hans_grosse.dart similarity index 95% rename from packages/wolf_3d_entities/lib/src/entities/enemies/bosses/hans_grosse.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/bosses/hans_grosse.dart index 0c14c33..5bd3cea 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/bosses/hans_grosse.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/bosses/hans_grosse.dart @@ -1,8 +1,8 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class HansGrosse extends Enemy { static const double speed = 0.04; diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/dog.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/dog.dart similarity index 89% rename from packages/wolf_3d_entities/lib/src/entities/enemies/dog.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/dog.dart index 9711c5b..a7f41dd 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/dog.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/dog.dart @@ -1,10 +1,10 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_animation.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_type.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_animation.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_type.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class Dog extends Enemy { static const double speed = 0.05; diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/enemy.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy.dart similarity index 92% rename from packages/wolf_3d_entities/lib/src/entities/enemies/enemy.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy.dart index c8f00cc..3614d0e 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/enemy.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy.dart @@ -1,13 +1,13 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/dog.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_type.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/guard.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/mutant.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/officer.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/ss.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/dog.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_type.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/guard.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/mutant.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/officer.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/ss.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; abstract class Enemy extends Entity { Enemy({ diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/enemy_animation.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_animation.dart similarity index 100% rename from packages/wolf_3d_entities/lib/src/entities/enemies/enemy_animation.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_animation.dart diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/enemy_type.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart similarity index 97% rename from packages/wolf_3d_entities/lib/src/entities/enemies/enemy_type.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart index 8da24a2..c37dafa 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/enemy_type.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_animation.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_animation.dart'; class EnemyAnimationMap { final SpriteFrameRange idle; diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/guard.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/guard.dart similarity index 90% rename from packages/wolf_3d_entities/lib/src/entities/enemies/guard.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/guard.dart index 794f49a..0de4378 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/guard.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/guard.dart @@ -1,10 +1,10 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_animation.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_type.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_animation.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_type.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class Guard extends Enemy { static const double speed = 0.03; diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/mutant.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/mutant.dart similarity index 91% rename from packages/wolf_3d_entities/lib/src/entities/enemies/mutant.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/mutant.dart index b8eb318..3755db5 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/mutant.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/mutant.dart @@ -1,10 +1,10 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_animation.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_type.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_animation.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_type.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class Mutant extends Enemy { static const double speed = 0.04; diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/officer.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/officer.dart similarity index 90% rename from packages/wolf_3d_entities/lib/src/entities/enemies/officer.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/officer.dart index 0637d2c..3a1d805 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/officer.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/officer.dart @@ -1,10 +1,10 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_animation.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_type.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_animation.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_type.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class Officer extends Enemy { static const double speed = 0.055; diff --git a/packages/wolf_3d_entities/lib/src/entities/enemies/ss.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/ss.dart similarity index 91% rename from packages/wolf_3d_entities/lib/src/entities/enemies/ss.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/enemies/ss.dart index 13ba3ca..c87ef03 100644 --- a/packages/wolf_3d_entities/lib/src/entities/enemies/ss.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/ss.dart @@ -1,10 +1,10 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_animation.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy_type.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_animation.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy_type.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; class SS extends Enemy { static const double speed = 0.04; diff --git a/packages/wolf_3d_entities/lib/src/entities/weapon/weapon.dart b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapon.dart similarity index 95% rename from packages/wolf_3d_entities/lib/src/entities/weapon/weapon.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapon.dart index 8e6abab..9a191c3 100644 --- a/packages/wolf_3d_entities/lib/src/entities/weapon/weapon.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapon.dart @@ -1,8 +1,8 @@ import 'dart:math' as math; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; enum WeaponState { idle, firing } diff --git a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/chain_gun.dart b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/chain_gun.dart similarity index 74% rename from packages/wolf_3d_entities/lib/src/entities/weapon/weapons/chain_gun.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/chain_gun.dart index add5c0e..5dd07e3 100644 --- a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/chain_gun.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/chain_gun.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_entities/src/entities/weapon/weapon.dart'; +import 'package:wolf_3d_dart/src/entities/entities/weapon/weapon.dart'; class ChainGun extends Weapon { ChainGun() diff --git a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/knife.dart b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/knife.dart similarity index 87% rename from packages/wolf_3d_entities/lib/src/entities/weapon/weapons/knife.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/knife.dart index 6ff4a41..3ca3b25 100644 --- a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/knife.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/knife.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_entities/src/entities/weapon/weapon.dart'; +import 'package:wolf_3d_dart/src/entities/entities/weapon/weapon.dart'; class Knife extends Weapon { Knife() diff --git a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/machine_gun.dart b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/machine_gun.dart similarity index 81% rename from packages/wolf_3d_entities/lib/src/entities/weapon/weapons/machine_gun.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/machine_gun.dart index da880bb..b264e52 100644 --- a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/machine_gun.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/machine_gun.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_entities/src/entities/weapon/weapon.dart'; +import 'package:wolf_3d_dart/src/entities/entities/weapon/weapon.dart'; class MachineGun extends Weapon { MachineGun() diff --git a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/pistol.dart b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/pistol.dart similarity index 74% rename from packages/wolf_3d_entities/lib/src/entities/weapon/weapons/pistol.dart rename to packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/pistol.dart index 49d076c..ab7747f 100644 --- a/packages/wolf_3d_entities/lib/src/entities/weapon/weapons/pistol.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/weapon/weapons/pistol.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_entities/src/entities/weapon/weapon.dart'; +import 'package:wolf_3d_dart/src/entities/entities/weapon/weapon.dart'; class Pistol extends Weapon { Pistol() diff --git a/packages/wolf_3d_entities/lib/src/entity.dart b/packages/wolf_3d_dart/lib/src/entities/entity.dart similarity index 96% rename from packages/wolf_3d_entities/lib/src/entity.dart rename to packages/wolf_3d_dart/lib/src/entities/entity.dart index b0c1571..515dd9d 100644 --- a/packages/wolf_3d_entities/lib/src/entity.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entity.dart @@ -1,4 +1,4 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; enum EntityState { staticObj, ambush, idle, patrolling, attacking, pain, dead } diff --git a/packages/wolf_3d_entities/lib/src/entity_registry.dart b/packages/wolf_3d_dart/lib/src/entities/entity_registry.dart similarity index 62% rename from packages/wolf_3d_entities/lib/src/entity_registry.dart rename to packages/wolf_3d_dart/lib/src/entities/entity_registry.dart index 5c4aadf..3646e95 100644 --- a/packages/wolf_3d_entities/lib/src/entity_registry.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entity_registry.dart @@ -1,11 +1,11 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_entities/src/entities/collectible.dart'; -import 'package:wolf_3d_entities/src/entities/decorations/dead_aardwolf.dart'; -import 'package:wolf_3d_entities/src/entities/decorations/dead_guard.dart'; -import 'package:wolf_3d_entities/src/entities/decorative.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/bosses/hans_grosse.dart'; -import 'package:wolf_3d_entities/src/entities/enemies/enemy.dart'; -import 'package:wolf_3d_entities/src/entity.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/src/entities/entities/collectible.dart'; +import 'package:wolf_3d_dart/src/entities/entities/decorations/dead_aardwolf.dart'; +import 'package:wolf_3d_dart/src/entities/entities/decorations/dead_guard.dart'; +import 'package:wolf_3d_dart/src/entities/entities/decorative.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/bosses/hans_grosse.dart'; +import 'package:wolf_3d_dart/src/entities/entities/enemies/enemy.dart'; +import 'package:wolf_3d_dart/src/entities/entity.dart'; typedef EntitySpawner = Entity? Function( diff --git a/packages/wolf_3d_input/lib/src/cli_input.dart b/packages/wolf_3d_dart/lib/src/input/cli_input.dart similarity index 92% rename from packages/wolf_3d_input/lib/src/cli_input.dart rename to packages/wolf_3d_dart/lib/src/input/cli_input.dart index 3864562..513c089 100644 --- a/packages/wolf_3d_input/lib/src/cli_input.dart +++ b/packages/wolf_3d_dart/lib/src/input/cli_input.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; -import 'package:wolf_3d_input/src/wolf_3d_input.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/src/input/wolf_3d_input.dart'; class CliInput extends Wolf3dInput { // Pending buffer for asynchronous stdin events diff --git a/packages/wolf_3d_input/lib/src/wolf_3d_input.dart b/packages/wolf_3d_dart/lib/src/input/wolf_3d_input.dart similarity index 86% rename from packages/wolf_3d_input/lib/src/wolf_3d_input.dart rename to packages/wolf_3d_dart/lib/src/input/wolf_3d_input.dart index d555e73..923e803 100644 --- a/packages/wolf_3d_input/lib/src/wolf_3d_input.dart +++ b/packages/wolf_3d_dart/lib/src/input/wolf_3d_input.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; abstract class Wolf3dInput { bool isMovingForward = false; diff --git a/packages/wolf_3d_synth/lib/src/imf_renderer.dart b/packages/wolf_3d_dart/lib/src/synth/imf_renderer.dart similarity index 98% rename from packages/wolf_3d_synth/lib/src/imf_renderer.dart rename to packages/wolf_3d_dart/lib/src/synth/imf_renderer.dart index d42e4a0..cd4aafb 100644 --- a/packages/wolf_3d_synth/lib/src/imf_renderer.dart +++ b/packages/wolf_3d_dart/lib/src/synth/imf_renderer.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; import 'opl2_emulator.dart'; diff --git a/packages/wolf_3d_synth/lib/src/opl2_emulator.dart b/packages/wolf_3d_dart/lib/src/synth/opl2_emulator.dart similarity index 100% rename from packages/wolf_3d_synth/lib/src/opl2_emulator.dart rename to packages/wolf_3d_dart/lib/src/synth/opl2_emulator.dart diff --git a/packages/wolf_3d_synth/lib/src/wolf_3d_audio.dart b/packages/wolf_3d_dart/lib/src/synth/wolf_3d_audio.dart similarity index 96% rename from packages/wolf_3d_synth/lib/src/wolf_3d_audio.dart rename to packages/wolf_3d_dart/lib/src/synth/wolf_3d_audio.dart index c5b588c..6f41e37 100644 --- a/packages/wolf_3d_synth/lib/src/wolf_3d_audio.dart +++ b/packages/wolf_3d_dart/lib/src/synth/wolf_3d_audio.dart @@ -1,9 +1,9 @@ import 'dart:typed_data'; import 'package:audioplayers/audioplayers.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_synth/src/imf_renderer.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/src/synth/imf_renderer.dart'; class WolfAudio implements EngineAudio { @override diff --git a/packages/wolf_3d_dart/lib/wolf_3d_data.dart b/packages/wolf_3d_dart/lib/wolf_3d_data.dart new file mode 100644 index 0000000..50bf7de --- /dev/null +++ b/packages/wolf_3d_dart/lib/wolf_3d_data.dart @@ -0,0 +1,7 @@ +/// Support for doing something awesome. +/// +/// More dartdocs go here. +library; + +export 'src/data/wl_parser.dart' show WLParser; +export 'src/data/wolfenstein_loader.dart' show WolfensteinLoader; diff --git a/packages/wolf_3d_dart/lib/wolf_3d_data_types.dart b/packages/wolf_3d_dart/lib/wolf_3d_data_types.dart new file mode 100644 index 0000000..3076a39 --- /dev/null +++ b/packages/wolf_3d_dart/lib/wolf_3d_data_types.dart @@ -0,0 +1,22 @@ +/// Support for doing something awesome. +/// +/// More dartdocs go here. +library; + +export 'src/data_types/cardinal_direction.dart' show CardinalDirection; +export 'src/data_types/color_palette.dart' show ColorPalette; +export 'src/data_types/coordinate_2d.dart' show Coordinate2D; +export 'src/data_types/difficulty.dart' show Difficulty; +export 'src/data_types/enemy_map_data.dart' show EnemyMapData; +export 'src/data_types/episode.dart' show Episode; +export 'src/data_types/frame_buffer.dart' show FrameBuffer; +export 'src/data_types/game_file.dart' show GameFile; +export 'src/data_types/game_version.dart' show GameVersion; +export 'src/data_types/image.dart' show VgaImage; +export 'src/data_types/map_objects.dart' show MapObject; +export 'src/data_types/sound.dart' + show PcmSound, ImfMusic, ImfInstruction, WolfMusicMap, WolfSound; +export 'src/data_types/sprite.dart' hide Matrix; +export 'src/data_types/sprite_frame_range.dart' show SpriteFrameRange; +export 'src/data_types/wolf_level.dart' show WolfLevel; +export 'src/data_types/wolfenstein_data.dart' show WolfensteinData; diff --git a/packages/wolf_3d_dart/lib/wolf_3d_engine.dart b/packages/wolf_3d_dart/lib/wolf_3d_engine.dart new file mode 100644 index 0000000..95a4e4e --- /dev/null +++ b/packages/wolf_3d_dart/lib/wolf_3d_engine.dart @@ -0,0 +1,15 @@ +/// Support for doing something awesome. +/// +/// More dartdocs go here. +library; + +export 'src/engine/audio/engine_audio.dart'; +export 'src/engine/audio/silent_renderer.dart'; +export 'src/engine/input/engine_input.dart'; +export 'src/engine/managers/door_manager.dart'; +export 'src/engine/managers/pushwall_manager.dart'; +export 'src/engine/player/player.dart'; +export 'src/engine/rasterizer/ascii_rasterizer.dart'; +export 'src/engine/rasterizer/rasterizer.dart'; +export 'src/engine/rasterizer/software_rasterizer.dart'; +export 'src/engine/wolf_3d_engine_base.dart'; diff --git a/packages/wolf_3d_dart/lib/wolf_3d_entities.dart b/packages/wolf_3d_dart/lib/wolf_3d_entities.dart new file mode 100644 index 0000000..685ed0f --- /dev/null +++ b/packages/wolf_3d_dart/lib/wolf_3d_entities.dart @@ -0,0 +1,24 @@ +/// Support for doing something awesome. +/// +/// More dartdocs go here. +library; + +export 'src/entities/entities/collectible.dart'; +export 'src/entities/entities/decorative.dart'; +export 'src/entities/entities/door.dart'; +export 'src/entities/entities/enemies/bosses/hans_grosse.dart'; +export 'src/entities/entities/enemies/dog.dart'; +export 'src/entities/entities/enemies/enemy.dart'; +export 'src/entities/entities/enemies/enemy_animation.dart'; +export 'src/entities/entities/enemies/enemy_type.dart'; +export 'src/entities/entities/enemies/guard.dart'; +export 'src/entities/entities/enemies/mutant.dart'; +export 'src/entities/entities/enemies/officer.dart'; +export 'src/entities/entities/enemies/ss.dart'; +export 'src/entities/entities/weapon/weapon.dart'; +export 'src/entities/entities/weapon/weapons/chain_gun.dart'; +export 'src/entities/entities/weapon/weapons/knife.dart'; +export 'src/entities/entities/weapon/weapons/machine_gun.dart'; +export 'src/entities/entities/weapon/weapons/pistol.dart'; +export 'src/entities/entity.dart'; +export 'src/entities/entity_registry.dart'; diff --git a/packages/wolf_3d_dart/lib/wolf_3d_input.dart b/packages/wolf_3d_dart/lib/wolf_3d_input.dart new file mode 100644 index 0000000..2742dac --- /dev/null +++ b/packages/wolf_3d_dart/lib/wolf_3d_input.dart @@ -0,0 +1,4 @@ +library; + +export 'src/input/cli_input.dart'; +export 'src/input/wolf_3d_input.dart'; diff --git a/packages/wolf_3d_synth/lib/wolf_3d_synth.dart b/packages/wolf_3d_dart/lib/wolf_3d_synth.dart similarity index 60% rename from packages/wolf_3d_synth/lib/wolf_3d_synth.dart rename to packages/wolf_3d_dart/lib/wolf_3d_synth.dart index 10d38a6..9e96b77 100644 --- a/packages/wolf_3d_synth/lib/wolf_3d_synth.dart +++ b/packages/wolf_3d_dart/lib/wolf_3d_synth.dart @@ -3,4 +3,4 @@ /// More dartdocs go here. library; -export 'src/wolf_3d_audio.dart' show WolfAudio; +export 'src/synth/wolf_3d_audio.dart' show WolfAudio; diff --git a/packages/wolf_3d_dart/pubspec.yaml b/packages/wolf_3d_dart/pubspec.yaml new file mode 100644 index 0000000..9dae108 --- /dev/null +++ b/packages/wolf_3d_dart/pubspec.yaml @@ -0,0 +1,16 @@ +name: wolf_3d_dart +description: A combined package for all non-Flutter components of wolf 3D +version: 0.0.1 +resolution: workspace + +environment: + sdk: ^3.11.1 + +dependencies: + arcane_helper_utils: ^1.4.7 + audioplayers: ^6.6.0 + crypto: ^3.0.7 + +dev_dependencies: + lints: ^6.0.0 + test: ^1.24.0 diff --git a/packages/wolf_3d_data/.gitignore b/packages/wolf_3d_data/.gitignore deleted file mode 100644 index 3cceda5..0000000 --- a/packages/wolf_3d_data/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# https://dart.dev/guides/libraries/private-files -# Created by `dart pub` -.dart_tool/ - -# Avoid committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/wolf_3d_data/CHANGELOG.md b/packages/wolf_3d_data/CHANGELOG.md deleted file mode 100644 index effe43c..0000000 --- a/packages/wolf_3d_data/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 1.0.0 - -- Initial version. diff --git a/packages/wolf_3d_data/README.md b/packages/wolf_3d_data/README.md deleted file mode 100644 index 8831761..0000000 --- a/packages/wolf_3d_data/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/wolf_3d_data/analysis_options.yaml b/packages/wolf_3d_data/analysis_options.yaml deleted file mode 100644 index 85ac016..0000000 --- a/packages/wolf_3d_data/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: package:flutter_lints/flutter.yaml - -formatter: - trailing_commas: preserve diff --git a/packages/wolf_3d_data/lib/wolf_3d_data.dart b/packages/wolf_3d_data/lib/wolf_3d_data.dart deleted file mode 100644 index 0ada12c..0000000 --- a/packages/wolf_3d_data/lib/wolf_3d_data.dart +++ /dev/null @@ -1,7 +0,0 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library; - -export 'src/wl_parser.dart' show WLParser; -export 'src/wolfenstein_loader.dart' show WolfensteinLoader; diff --git a/packages/wolf_3d_data/pubspec.yaml b/packages/wolf_3d_data/pubspec.yaml deleted file mode 100644 index ab12fad..0000000 --- a/packages/wolf_3d_data/pubspec.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: wolf_3d_data -description: A starting point for Dart libraries or applications. -version: 1.0.0 -# repository: https://github.com/my_org/my_repo - -environment: - sdk: ^3.11.1 - -resolution: workspace - -publish_to: none - -dependencies: - crypto: ^3.0.7 - wolf_3d_data_types: - wolf_3d_entities: - -dev_dependencies: - lints: ^6.0.0 - test: ^1.25.6 diff --git a/packages/wolf_3d_data_types/.gitignore b/packages/wolf_3d_data_types/.gitignore deleted file mode 100644 index 3cceda5..0000000 --- a/packages/wolf_3d_data_types/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# https://dart.dev/guides/libraries/private-files -# Created by `dart pub` -.dart_tool/ - -# Avoid committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/wolf_3d_data_types/CHANGELOG.md b/packages/wolf_3d_data_types/CHANGELOG.md deleted file mode 100644 index effe43c..0000000 --- a/packages/wolf_3d_data_types/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 1.0.0 - -- Initial version. diff --git a/packages/wolf_3d_data_types/README.md b/packages/wolf_3d_data_types/README.md deleted file mode 100644 index 8831761..0000000 --- a/packages/wolf_3d_data_types/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/wolf_3d_data_types/analysis_options.yaml b/packages/wolf_3d_data_types/analysis_options.yaml deleted file mode 100644 index dee8927..0000000 --- a/packages/wolf_3d_data_types/analysis_options.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# This file configures the static analysis results for your project (errors, -# warnings, and lints). -# -# This enables the 'recommended' set of lints from `package:lints`. -# This set helps identify many issues that may lead to problems when running -# or consuming Dart code, and enforces writing Dart using a single, idiomatic -# style and format. -# -# If you want a smaller set of lints you can change this to specify -# 'package:lints/core.yaml'. These are just the most critical lints -# (the recommended set includes the core lints). -# The core lints are also what is used by pub.dev for scoring packages. - -include: package:lints/recommended.yaml - -# Uncomment the following section to specify additional rules. - -# linter: -# rules: -# - camel_case_types - -# analyzer: -# exclude: -# - path/to/excluded/files/** - -# For more information about the core and recommended set of lints, see -# https://dart.dev/go/core-lints - -# For additional information about configuring this file, see -# https://dart.dev/guides/language/analysis-options diff --git a/packages/wolf_3d_data_types/lib/wolf_3d_data_types.dart b/packages/wolf_3d_data_types/lib/wolf_3d_data_types.dart deleted file mode 100644 index d54618d..0000000 --- a/packages/wolf_3d_data_types/lib/wolf_3d_data_types.dart +++ /dev/null @@ -1,22 +0,0 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library; - -export 'src/cardinal_direction.dart' show CardinalDirection; -export 'src/color_palette.dart' show ColorPalette; -export 'src/coordinate_2d.dart' show Coordinate2D; -export 'src/difficulty.dart' show Difficulty; -export 'src/enemy_map_data.dart' show EnemyMapData; -export 'src/episode.dart' show Episode; -export 'src/frame_buffer.dart' show FrameBuffer; -export 'src/game_file.dart' show GameFile; -export 'src/game_version.dart' show GameVersion; -export 'src/image.dart' show VgaImage; -export 'src/map_objects.dart' show MapObject; -export 'src/sound.dart' - show PcmSound, ImfMusic, ImfInstruction, WolfMusicMap, WolfSound; -export 'src/sprite.dart' hide Matrix; -export 'src/sprite_frame_range.dart' show SpriteFrameRange; -export 'src/wolf_level.dart' show WolfLevel; -export 'src/wolfenstein_data.dart' show WolfensteinData; diff --git a/packages/wolf_3d_data_types/pubspec.yaml b/packages/wolf_3d_data_types/pubspec.yaml deleted file mode 100644 index 534bcfb..0000000 --- a/packages/wolf_3d_data_types/pubspec.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: wolf_3d_data_types -description: A starting point for Dart libraries or applications. -version: 1.0.0 -# repository: https://github.com/my_org/my_repo - -environment: - sdk: ^3.11.1 - -resolution: workspace - -dependencies: - wolf_3d_entities: any - -dev_dependencies: - lints: ^6.0.0 - test: ^1.25.6 diff --git a/packages/wolf_3d_engine/.gitignore b/packages/wolf_3d_engine/.gitignore deleted file mode 100644 index 3cceda5..0000000 --- a/packages/wolf_3d_engine/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# https://dart.dev/guides/libraries/private-files -# Created by `dart pub` -.dart_tool/ - -# Avoid committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/wolf_3d_engine/CHANGELOG.md b/packages/wolf_3d_engine/CHANGELOG.md deleted file mode 100644 index effe43c..0000000 --- a/packages/wolf_3d_engine/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 1.0.0 - -- Initial version. diff --git a/packages/wolf_3d_engine/README.md b/packages/wolf_3d_engine/README.md deleted file mode 100644 index 8831761..0000000 --- a/packages/wolf_3d_engine/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/wolf_3d_engine/analysis_options.yaml b/packages/wolf_3d_engine/analysis_options.yaml deleted file mode 100644 index dee8927..0000000 --- a/packages/wolf_3d_engine/analysis_options.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# This file configures the static analysis results for your project (errors, -# warnings, and lints). -# -# This enables the 'recommended' set of lints from `package:lints`. -# This set helps identify many issues that may lead to problems when running -# or consuming Dart code, and enforces writing Dart using a single, idiomatic -# style and format. -# -# If you want a smaller set of lints you can change this to specify -# 'package:lints/core.yaml'. These are just the most critical lints -# (the recommended set includes the core lints). -# The core lints are also what is used by pub.dev for scoring packages. - -include: package:lints/recommended.yaml - -# Uncomment the following section to specify additional rules. - -# linter: -# rules: -# - camel_case_types - -# analyzer: -# exclude: -# - path/to/excluded/files/** - -# For more information about the core and recommended set of lints, see -# https://dart.dev/go/core-lints - -# For additional information about configuring this file, see -# https://dart.dev/guides/language/analysis-options diff --git a/packages/wolf_3d_engine/lib/wolf_3d_engine.dart b/packages/wolf_3d_engine/lib/wolf_3d_engine.dart deleted file mode 100644 index e302156..0000000 --- a/packages/wolf_3d_engine/lib/wolf_3d_engine.dart +++ /dev/null @@ -1,15 +0,0 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library; - -export 'src/audio/engine_audio.dart'; -export 'src/audio/silent_renderer.dart'; -export 'src/input/engine_input.dart'; -export 'src/managers/door_manager.dart'; -export 'src/managers/pushwall_manager.dart'; -export 'src/player/player.dart'; -export 'src/rasterizer/ascii_rasterizer.dart'; -export 'src/rasterizer/rasterizer.dart'; -export 'src/rasterizer/software_rasterizer.dart'; -export 'src/wolf_3d_engine_base.dart'; diff --git a/packages/wolf_3d_engine/pubspec.yaml b/packages/wolf_3d_engine/pubspec.yaml deleted file mode 100644 index 55889ba..0000000 --- a/packages/wolf_3d_engine/pubspec.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: wolf_3d_engine -description: A starting point for Dart libraries or applications. -version: 1.0.0 -# repository: https://github.com/my_org/my_repo - -environment: - sdk: ^3.11.1 - -resolution: workspace - -dependencies: - wolf_3d_data_types: any - wolf_3d_entities: any - wolf_3d_data: any - wolf_3d_input: any - arcane_helper_utils: ^1.4.7 - -dev_dependencies: - lints: ^6.0.0 - test: ^1.25.6 diff --git a/packages/wolf_3d_entities/.gitignore b/packages/wolf_3d_entities/.gitignore deleted file mode 100644 index 3cceda5..0000000 --- a/packages/wolf_3d_entities/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# https://dart.dev/guides/libraries/private-files -# Created by `dart pub` -.dart_tool/ - -# Avoid committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/wolf_3d_entities/CHANGELOG.md b/packages/wolf_3d_entities/CHANGELOG.md deleted file mode 100644 index effe43c..0000000 --- a/packages/wolf_3d_entities/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 1.0.0 - -- Initial version. diff --git a/packages/wolf_3d_entities/README.md b/packages/wolf_3d_entities/README.md deleted file mode 100644 index 8831761..0000000 --- a/packages/wolf_3d_entities/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/wolf_3d_entities/analysis_options.yaml b/packages/wolf_3d_entities/analysis_options.yaml deleted file mode 100644 index 85ac016..0000000 --- a/packages/wolf_3d_entities/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: package:flutter_lints/flutter.yaml - -formatter: - trailing_commas: preserve diff --git a/packages/wolf_3d_entities/lib/wolf_3d_entities.dart b/packages/wolf_3d_entities/lib/wolf_3d_entities.dart deleted file mode 100644 index 174294b..0000000 --- a/packages/wolf_3d_entities/lib/wolf_3d_entities.dart +++ /dev/null @@ -1,24 +0,0 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library; - -export 'src/entities/collectible.dart'; -export 'src/entities/decorative.dart'; -export 'src/entities/door.dart'; -export 'src/entities/enemies/bosses/hans_grosse.dart'; -export 'src/entities/enemies/dog.dart'; -export 'src/entities/enemies/enemy.dart'; -export 'src/entities/enemies/enemy_animation.dart'; -export 'src/entities/enemies/enemy_type.dart'; -export 'src/entities/enemies/guard.dart'; -export 'src/entities/enemies/mutant.dart'; -export 'src/entities/enemies/officer.dart'; -export 'src/entities/enemies/ss.dart'; -export 'src/entities/weapon/weapon.dart'; -export 'src/entities/weapon/weapons/chain_gun.dart'; -export 'src/entities/weapon/weapons/knife.dart'; -export 'src/entities/weapon/weapons/machine_gun.dart'; -export 'src/entities/weapon/weapons/pistol.dart'; -export 'src/entity.dart'; -export 'src/entity_registry.dart'; diff --git a/packages/wolf_3d_entities/pubspec.yaml b/packages/wolf_3d_entities/pubspec.yaml deleted file mode 100644 index 436301a..0000000 --- a/packages/wolf_3d_entities/pubspec.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: wolf_3d_entities -description: A starting point for Dart libraries or applications. -version: 1.0.0 -# repository: https://github.com/my_org/my_repo - -environment: - sdk: ^3.11.1 - -resolution: workspace - -dependencies: - wolf_3d_data_types: any - -dev_dependencies: - lints: ^6.0.0 - test: ^1.25.6 diff --git a/packages/wolf_3d_flutter/lib/audio/audio_adaptor.dart b/packages/wolf_3d_flutter/lib/audio/audio_adaptor.dart index 8106874..e38b590 100644 --- a/packages/wolf_3d_flutter/lib/audio/audio_adaptor.dart +++ b/packages/wolf_3d_flutter/lib/audio/audio_adaptor.dart @@ -1,5 +1,5 @@ -import 'package:wolf_3d_data_types/wolf_3d_data_types.dart'; -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; import 'package:wolf_3d_flutter/wolf_3d.dart'; class FlutterAudioAdapter implements EngineAudio { diff --git a/packages/wolf_3d_flutter/lib/wolf_3d.dart b/packages/wolf_3d_flutter/lib/wolf_3d.dart index 2d77cd5..6ea714f 100644 --- a/packages/wolf_3d_flutter/lib/wolf_3d.dart +++ b/packages/wolf_3d_flutter/lib/wolf_3d.dart @@ -1,9 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:wolf_3d_data/wolf_3d_data.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_synth/wolf_3d_synth.dart'; +import 'package:wolf_3d_dart/wolf_3d_data.dart'; +import 'package:wolf_3d_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_synth.dart'; class Wolf3d { Wolf3d._(); diff --git a/packages/wolf_3d_flutter/lib/wolf_3d_input_flutter.dart b/packages/wolf_3d_flutter/lib/wolf_3d_input_flutter.dart index fedfaa6..64f7734 100644 --- a/packages/wolf_3d_flutter/lib/wolf_3d_input_flutter.dart +++ b/packages/wolf_3d_flutter/lib/wolf_3d_input_flutter.dart @@ -1,6 +1,6 @@ import 'package:flutter/services.dart'; -import 'package:wolf_3d_entities/wolf_3d_entities.dart'; -import 'package:wolf_3d_input/wolf_3d_input.dart'; +import 'package:wolf_3d_dart/wolf_3d_entities.dart'; +import 'package:wolf_3d_dart/wolf_3d_input.dart'; class Wolf3dFlutterInput extends Wolf3dInput { Set _previousKeys = {}; diff --git a/packages/wolf_3d_flutter/pubspec.yaml b/packages/wolf_3d_flutter/pubspec.yaml index 0bf0269..495ca47 100644 --- a/packages/wolf_3d_flutter/pubspec.yaml +++ b/packages/wolf_3d_flutter/pubspec.yaml @@ -10,14 +10,9 @@ environment: resolution: workspace dependencies: + wolf_3d_dart: flutter: sdk: flutter - wolf_3d_data: any - wolf_3d_data_types: any - wolf_3d_synth: any - wolf_3d_engine: any - wolf_3d_entities: any - wolf_3d_input: any wolf_3d_assets: any dev_dependencies: diff --git a/packages/wolf_3d_input/.gitignore b/packages/wolf_3d_input/.gitignore deleted file mode 100644 index dd5eb98..0000000 --- a/packages/wolf_3d_input/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -.dart_tool/ -.flutter-plugins-dependencies -/build/ -/coverage/ diff --git a/packages/wolf_3d_input/.metadata b/packages/wolf_3d_input/.metadata deleted file mode 100644 index 37c1556..0000000 --- a/packages/wolf_3d_input/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: "ff37bef603469fb030f2b72995ab929ccfc227f0" - channel: "stable" - -project_type: package diff --git a/packages/wolf_3d_input/CHANGELOG.md b/packages/wolf_3d_input/CHANGELOG.md deleted file mode 100644 index 41cc7d8..0000000 --- a/packages/wolf_3d_input/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 0.0.1 - -* TODO: Describe initial release. diff --git a/packages/wolf_3d_input/LICENSE b/packages/wolf_3d_input/LICENSE deleted file mode 100644 index ba75c69..0000000 --- a/packages/wolf_3d_input/LICENSE +++ /dev/null @@ -1 +0,0 @@ -TODO: Add your license here. diff --git a/packages/wolf_3d_input/README.md b/packages/wolf_3d_input/README.md deleted file mode 100644 index 4a260d8..0000000 --- a/packages/wolf_3d_input/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/wolf_3d_input/analysis_options.yaml b/packages/wolf_3d_input/analysis_options.yaml deleted file mode 100644 index a5744c1..0000000 --- a/packages/wolf_3d_input/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: package:flutter_lints/flutter.yaml - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/packages/wolf_3d_input/lib/wolf_3d_input.dart b/packages/wolf_3d_input/lib/wolf_3d_input.dart deleted file mode 100644 index 251e399..0000000 --- a/packages/wolf_3d_input/lib/wolf_3d_input.dart +++ /dev/null @@ -1,4 +0,0 @@ -library; - -export 'src/cli_input.dart'; -export 'src/wolf_3d_input.dart'; diff --git a/packages/wolf_3d_input/pubspec.yaml b/packages/wolf_3d_input/pubspec.yaml deleted file mode 100644 index 3df1026..0000000 --- a/packages/wolf_3d_input/pubspec.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: wolf_3d_input -description: "A new Flutter package project." -version: 0.0.1 -homepage: - -environment: - sdk: ^3.11.1 - -resolution: workspace - -dependencies: - wolf_3d_entities: any - wolf_3d_engine: any diff --git a/packages/wolf_3d_renderer/lib/base_renderer.dart b/packages/wolf_3d_renderer/lib/base_renderer.dart index 7b17d2b..43d7ed9 100644 --- a/packages/wolf_3d_renderer/lib/base_renderer.dart +++ b/packages/wolf_3d_renderer/lib/base_renderer.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; -import 'package:wolf_3d_engine/wolf_3d_engine.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; // 1. The widget now only requires the engine! abstract class BaseWolfRenderer extends StatefulWidget { diff --git a/packages/wolf_3d_renderer/lib/wolf_3d_ascii_renderer.dart b/packages/wolf_3d_renderer/lib/wolf_3d_ascii_renderer.dart index 5293c8d..b9ef415 100644 --- a/packages/wolf_3d_renderer/lib/wolf_3d_ascii_renderer.dart +++ b/packages/wolf_3d_renderer/lib/wolf_3d_ascii_renderer.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.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_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; import 'package:wolf_3d_renderer/base_renderer.dart'; class WolfAsciiRenderer extends BaseWolfRenderer { diff --git a/packages/wolf_3d_renderer/lib/wolf_3d_flutter_renderer.dart b/packages/wolf_3d_renderer/lib/wolf_3d_flutter_renderer.dart index 9f38382..50aef2c 100644 --- a/packages/wolf_3d_renderer/lib/wolf_3d_flutter_renderer.dart +++ b/packages/wolf_3d_renderer/lib/wolf_3d_flutter_renderer.dart @@ -1,8 +1,8 @@ import 'dart:ui' as ui; import 'package:flutter/material.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_dart/wolf_3d_data_types.dart'; +import 'package:wolf_3d_dart/wolf_3d_engine.dart'; import 'package:wolf_3d_renderer/base_renderer.dart'; class WolfFlutterRenderer extends BaseWolfRenderer { diff --git a/packages/wolf_3d_renderer/pubspec.yaml b/packages/wolf_3d_renderer/pubspec.yaml index 70b229a..0fd2e9e 100644 --- a/packages/wolf_3d_renderer/pubspec.yaml +++ b/packages/wolf_3d_renderer/pubspec.yaml @@ -10,11 +10,9 @@ environment: resolution: workspace dependencies: + wolf_3d_dart: flutter: sdk: flutter - wolf_3d_data_types: any - wolf_3d_engine: any - wolf_3d_entities: any wolf_3d_flutter: any dev_dependencies: diff --git a/packages/wolf_3d_synth/.gitignore b/packages/wolf_3d_synth/.gitignore deleted file mode 100644 index 3cceda5..0000000 --- a/packages/wolf_3d_synth/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# https://dart.dev/guides/libraries/private-files -# Created by `dart pub` -.dart_tool/ - -# Avoid committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/wolf_3d_synth/CHANGELOG.md b/packages/wolf_3d_synth/CHANGELOG.md deleted file mode 100644 index effe43c..0000000 --- a/packages/wolf_3d_synth/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 1.0.0 - -- Initial version. diff --git a/packages/wolf_3d_synth/README.md b/packages/wolf_3d_synth/README.md deleted file mode 100644 index 8831761..0000000 --- a/packages/wolf_3d_synth/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -TODO: Put a short description of the package here that helps potential users -know whether this package might be useful for them. - -## Features - -TODO: List what your package can do. Maybe include images, gifs, or videos. - -## Getting started - -TODO: List prerequisites and provide or point to information on how to -start using the package. - -## Usage - -TODO: Include short and useful examples for package users. Add longer examples -to `/example` folder. - -```dart -const like = 'sample'; -``` - -## Additional information - -TODO: Tell users more about the package: where to find more information, how to -contribute to the package, how to file issues, what response they can expect -from the package authors, and more. diff --git a/packages/wolf_3d_synth/analysis_options.yaml b/packages/wolf_3d_synth/analysis_options.yaml deleted file mode 100644 index dee8927..0000000 --- a/packages/wolf_3d_synth/analysis_options.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# This file configures the static analysis results for your project (errors, -# warnings, and lints). -# -# This enables the 'recommended' set of lints from `package:lints`. -# This set helps identify many issues that may lead to problems when running -# or consuming Dart code, and enforces writing Dart using a single, idiomatic -# style and format. -# -# If you want a smaller set of lints you can change this to specify -# 'package:lints/core.yaml'. These are just the most critical lints -# (the recommended set includes the core lints). -# The core lints are also what is used by pub.dev for scoring packages. - -include: package:lints/recommended.yaml - -# Uncomment the following section to specify additional rules. - -# linter: -# rules: -# - camel_case_types - -# analyzer: -# exclude: -# - path/to/excluded/files/** - -# For more information about the core and recommended set of lints, see -# https://dart.dev/go/core-lints - -# For additional information about configuring this file, see -# https://dart.dev/guides/language/analysis-options diff --git a/packages/wolf_3d_synth/pubspec.yaml b/packages/wolf_3d_synth/pubspec.yaml deleted file mode 100644 index 8667a69..0000000 --- a/packages/wolf_3d_synth/pubspec.yaml +++ /dev/null @@ -1,18 +0,0 @@ -name: wolf_3d_synth -description: A starting point for Dart libraries or applications. -version: 1.0.0 -# repository: https://github.com/my_org/my_repo - -environment: - sdk: ^3.11.1 - -resolution: workspace - -dependencies: - audioplayers: ^6.6.0 - wolf_3d_data_types: - wolf_3d_engine: - -dev_dependencies: - lints: ^6.0.0 - test: ^1.25.6 diff --git a/pubspec.yaml b/pubspec.yaml index 73313fb..0a68be9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,12 +6,7 @@ environment: workspace: - apps/wolf_3d_gui/ - apps/wolf_3d_cli/ - - packages/wolf_3d_data/ - - packages/wolf_3d_data_types/ - - packages/wolf_3d_synth/ - - packages/wolf_3d_engine/ - - packages/wolf_3d_entities/ + - packages/wolf_3d_dart/ - packages/wolf_3d_renderer/ - - packages/wolf_3d_input/ - packages/wolf_3d_flutter/ - packages/wolf_3d_assets/