diff --git a/blender/10X5Hallway.blend b/blender/10X5Hallway.blend new file mode 100644 index 0000000..b6414b7 Binary files /dev/null and b/blender/10X5Hallway.blend differ diff --git a/src/debug.rs b/src/debug.rs new file mode 100644 index 0000000..e5c1173 --- /dev/null +++ b/src/debug.rs @@ -0,0 +1,118 @@ +//! Seperate out debugging uis/plugins in it's own module for cleanliness. +use std::{fs, path::PathBuf}; + +use bevy::prelude::*; +use bevy_inspector_egui::bevy_egui::EguiPlugin; +use clap::Subcommand; +use console::{ConsoleLog, exec_script}; + +use crate::AppState; + +mod console; + +/// Debug system set. +#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)] +pub struct DebugSet; + +pub fn plugin(app: &mut App) { + app.add_plugins(EguiPlugin { + enable_multipass_for_primary_context: true, + }) + .add_event::() + .add_systems( + Update, + (handle_debug_logs, start_game, run_file.pipe(exec_script)).in_set(DebugSet), + ) + .add_systems(Startup, startup_file.pipe(exec_script)) + .add_plugins(console::plugin); +} + +#[derive(Event, Debug, Subcommand, PartialEq, Eq)] +enum DebugEvent { + /// Close the debug console. + #[command(name = "close", aliases = ["close-console"])] + CloseDebugConsole, + + /// Output a string to the console. + /// + /// Needed for logging in startup scripts, since the console isn't initialized yet. + #[command(name = "echo", aliases = ["print", "print-to-console"])] + PrintToConsole { + /// Print as error. + #[arg(short, long)] + error: bool, + /// The text to be printed in the console. + text: String, + }, + + /// Log as INFO or ERROR to stdout. + Log { + /// Log as error. + #[arg(short, long)] + error: bool, + /// The text to be logged. + text: String, + }, + + /// Start the game + StartGame, + + /// Run a tx file (the games debug scripting lang :3) + #[command(name = "run")] + RunFile { file: PathBuf }, +} + +fn start_game( + mut dbg_reader: EventReader, + mut log: ResMut, + cur_state: Res>, + mut next_state: ResMut>, +) { + for ev in dbg_reader.read() { + if *ev == DebugEvent::StartGame { + if *cur_state == AppState::Ingame { + log.err("Can't start game since it's already started."); + } else { + log.write("Starting game..."); + next_state.set(AppState::Ingame); + } + } + } +} + +fn handle_debug_logs(mut dbg_reader: EventReader) { + for ev in dbg_reader.read() { + if let DebugEvent::Log { error, text } = ev { + if *error { + error!("{text}") + } else { + info!("{text}") + }; + } + } +} + +fn run_file(mut dbg_reader: EventReader) -> Option<(String, String)> { + for ev in dbg_reader.read() { + if let DebugEvent::RunFile { file } = ev { + let f = std::fs::read_to_string(file); + + if let Ok(f) = f { + return Some((f, String::from(file.file_name().unwrap().to_string_lossy()))); + } + } + } + + None +} + +fn startup_file() -> Option<(String, String)> { + let path: PathBuf = "./startup.tx".into(); + + fs::exists(&path).unwrap_or(false).then(|| { + Some(( + fs::read_to_string(&path).unwrap(), + path.file_name().unwrap().to_string_lossy().to_string(), + )) + })? +} diff --git a/src/game/debug/console.rs b/src/debug/console.rs similarity index 58% rename from src/game/debug/console.rs rename to src/debug/console.rs index d00d656..4b2709a 100644 --- a/src/game/debug/console.rs +++ b/src/debug/console.rs @@ -1,12 +1,15 @@ +use std::panic::Location; + use bevy::prelude::*; +use cli::respond; use ui::{ DebugConsole, autofocus, autoscroll, handle_open_console, process_prompt, update_content, update_scroll_position, }; -use crate::{AppState, cleanup::despawn, game::GameplaySet}; +use crate::{AppState, cleanup::despawn}; -use super::DebugEvent; +use super::{DebugEvent, DebugSet}; mod cli; mod ui; @@ -15,14 +18,12 @@ pub(super) fn plugin(app: &mut App) { app.init_state::() .add_systems( OnEnter(ConsoleState::Open), - (open_console, (autofocus, autoscroll).after(open_console)), + (open_console, (autofocus, autoscroll).after(open_console)).in_set(DebugSet), ) .add_systems( Update, ( - handle_open_console - .in_set(GameplaySet) - .run_if(in_state(ConsoleState::Closed).and(in_state(AppState::Ingame))), + handle_open_console.run_if(in_state(ConsoleState::Closed)), update_content.run_if(resource_changed::), ( update_scroll_position, @@ -30,21 +31,27 @@ pub(super) fn plugin(app: &mut App) { execute_console_events, ) .run_if(in_state(ConsoleState::Open)), - ), + ) + .in_set(DebugSet), + ) + .add_systems( + OnExit(ConsoleState::Open), + despawn::.in_set(DebugSet), ) - .add_systems(OnExit(ConsoleState::Open), despawn::) .insert_resource::(ConsoleLog::new()); } /// the usize is a read index #[derive(Resource, Clone)] -struct ConsoleLog(Vec, usize); +pub struct ConsoleLog(Vec, usize); impl ConsoleLog { fn new() -> Self { Self( - vec![ConsoleEvent::Output(String::from( - "Welcome to the dev console :3\n (i should probably put some proper info into this some time)", + vec![ConsoleEvent::Output(format!( + "Running {} ({})\nMeow!! :3", + env!("CARGO_PKG_NAME"), + env!("CARGO_PKG_VERSION") ))], 1, ) @@ -56,15 +63,15 @@ impl ConsoleLog { res } - pub fn input(&mut self, content: &str) { + fn input(&mut self, content: &str) { self.0.push(ConsoleEvent::Input(content.to_string())) } - pub fn output(&mut self, content: &str) { + pub fn write(&mut self, content: &str) { self.0.push(ConsoleEvent::Output(content.to_string())) } - pub fn error(&mut self, content: &str) { + pub fn err(&mut self, content: &str) { self.0.push(ConsoleEvent::Error(content.to_string())) } } @@ -98,8 +105,30 @@ fn execute_console_events( for ev in ev_reader.read() { match ev { DebugEvent::CloseDebugConsole => next_state.set(ConsoleState::Closed), - DebugEvent::PrintToConsole(s) => log.output(s), - _ => todo!(), + DebugEvent::PrintToConsole { text, error: false } => log.write(text), + DebugEvent::PrintToConsole { text, error: true } => log.err(text), + _ => {} }; } } + +pub fn exec_script( + file: In>, + mut dbg_writer: EventWriter, + mut logger: ResMut, +) { + let Some((file, file_name)) = &*file else { + return; + }; + + for (line_nr, line) in file.lines().enumerate() { + if !line.trim().is_empty() && !line.trim().starts_with("//") { + match respond(line) { + Ok(ev) => { + dbg_writer.write(ev); + } + Err(err) => logger.err(&format!("{err}\n\n({file_name}:{line_nr})")), + } + } + } +} diff --git a/src/debug/console/cli.rs b/src/debug/console/cli.rs new file mode 100644 index 0000000..f819ca9 --- /dev/null +++ b/src/debug/console/cli.rs @@ -0,0 +1,31 @@ +use bevy::prelude::*; +use clap::{Parser, Subcommand}; + +use crate::debug::DebugEvent; + +use super::ConsoleLog; + +pub(super) fn respond(line: &str) -> Result { + let args = shlex::split(line).ok_or("Invalid Quoting")?; + let cli = Cli::try_parse_from(args).map_err(|e| e.to_string()); + + // help detection + let command_contains_help = line.contains("help") || line.contains("-h"); + let some_line_starts_with_usage = cli + .as_ref() + .is_err_and(|item| item.lines().any(|line| line.starts_with("Usage: "))); + + if command_contains_help && some_line_starts_with_usage { + let Err(text) = cli else { unreachable!() }; + return Ok(DebugEvent::PrintToConsole { text, error: false }); + } + + Ok(cli?.cmd) +} + +#[derive(Debug, Parser)] +#[command(multicall = true)] +struct Cli { + #[command(subcommand)] + cmd: DebugEvent, +} diff --git a/src/game/debug/console/ui.rs b/src/debug/console/ui.rs similarity index 96% rename from src/game/debug/console/ui.rs rename to src/debug/console/ui.rs index de265e3..9a5472f 100644 --- a/src/game/debug/console/ui.rs +++ b/src/debug/console/ui.rs @@ -16,7 +16,7 @@ use bevy_ui_text_input::TextSubmitEvent; pub(super) use components::console; use components::{Content, Prompt}; -use crate::game::debug::DebugEvent; +use crate::debug::DebugEvent; use super::{ConsoleEvent, ConsoleLog, ConsoleState, OPEN_CONSOLE_DEFAULT, cli::respond}; @@ -75,7 +75,7 @@ pub fn process_prompt( Ok(debug_ev) => { debug_event_writer.write(debug_ev); } - Err(e) => log.error(&e), + Err(e) => log.err(&e), } } } @@ -90,7 +90,7 @@ pub fn update_content( ) { c.entity(*content).with_children(|parent| { for item in log.unread() { - match dbg!(item) { + match item { ConsoleEvent::Input(s) => { parent.spawn(components::input(s.to_string(), &asset_server)); } diff --git a/src/game/debug/console/ui/components.rs b/src/debug/console/ui/components.rs similarity index 98% rename from src/game/debug/console/ui/components.rs rename to src/debug/console/ui/components.rs index c9e6d0e..4a7773e 100644 --- a/src/game/debug/console/ui/components.rs +++ b/src/debug/console/ui/components.rs @@ -1,7 +1,7 @@ use bevy::{ecs::spawn::SpawnWith, prelude::*}; use bevy_ui_text_input::{TextInputMode, TextInputNode, TextInputPrompt}; -use crate::game::debug::console::{ConsoleEvent, ConsoleLog}; +use crate::debug::console::{ConsoleEvent, ConsoleLog}; use super::DebugConsole; @@ -26,6 +26,7 @@ pub fn console(data: ConsoleLog, asset_server: AssetServer) -> impl Bundle { }, ..default() }, + BorderRadius::bottom(Val::Px(10.)), BorderColor(Color::BLACK), ZIndex(i32::MAX), BackgroundColor(Color::Srgba(Srgba::BLACK.with_alpha(0.2))), diff --git a/src/debugging.rs b/src/debugging.rs deleted file mode 100644 index 02560fa..0000000 --- a/src/debugging.rs +++ /dev/null @@ -1,14 +0,0 @@ -//! Seperate out debugging uis/plugins in it's own module for cleanliness. -use bevy::prelude::*; -use bevy_inspector_egui::bevy_egui::EguiPlugin; - -pub fn plugin(app: &mut App) { - app.add_plugins(EguiPlugin { - enable_multipass_for_primary_context: true, - }) - .add_plugins(( - // WorldInspectorPlugin::new(), - // StateInspectorPlugin::::new(), - // StateInspectorPlugin::::new(), - )); -} diff --git a/src/game.rs b/src/game.rs index 731d28e..6b69f1b 100644 --- a/src/game.rs +++ b/src/game.rs @@ -6,18 +6,7 @@ use crate::{ }; mod camera; -mod debug; mod scene; -mod tram { - use bevy::prelude::*; - - fn spawn_tram( - mut c: Commands, - mut meshes: ResMut>, - mut materials: ResMut>, - ) { - } -} /// Gameplay system set. All functions in this control the gameplay (duh). #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)] @@ -29,6 +18,6 @@ pub fn plugin(app: &mut App) { OnExit(AppState::Ingame), despawn::.in_set(GameplaySet), ) - .add_plugins((debug::plugin, camera::plugin)); + .add_plugins(camera::plugin); app.configure_sets(Update, GameplaySet.run_if(in_state(AppState::Ingame))); } diff --git a/src/game/debug.rs b/src/game/debug.rs deleted file mode 100644 index 6eeee43..0000000 --- a/src/game/debug.rs +++ /dev/null @@ -1,13 +0,0 @@ -use bevy::prelude::*; - -mod console; - -#[derive(Event)] -enum DebugEvent { - CloseDebugConsole, - PrintToConsole(String), -} - -pub(super) fn plugin(app: &mut App) { - app.add_plugins(console::plugin).add_event::(); -} diff --git a/src/game/debug/console/cli.rs b/src/game/debug/console/cli.rs deleted file mode 100644 index 4fe321d..0000000 --- a/src/game/debug/console/cli.rs +++ /dev/null @@ -1,32 +0,0 @@ -use clap::{Parser, Subcommand}; - -use crate::game::debug::DebugEvent; - -pub(super) fn respond(line: &str) -> Result { - let might_be_help_call = line.contains("help") || line.contains("-h"); - let args = shlex::split(line).ok_or("Invalid Quoting")?; - let cli = Cli::try_parse_from(args).map_err(|e| e.to_string()); - - if might_be_help_call && cli.as_ref().is_err_and(|item| item.starts_with("Usage: ")) { - let Err(s) = cli else { unreachable!() }; - return Ok(DebugEvent::PrintToConsole(s)); - } - - Ok(match cli?.cmd { - Commands::Close => DebugEvent::CloseDebugConsole, - Commands::Echo { text } => DebugEvent::PrintToConsole(text), - }) -} - -#[derive(Debug, Parser)] -#[command(multicall = true)] -struct Cli { - #[command(subcommand)] - cmd: Commands, -} - -#[derive(Debug, Subcommand)] -enum Commands { - Close, - Echo { text: String }, -} diff --git a/src/main.rs b/src/main.rs index 6868b28..be9794e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,14 +2,15 @@ use bevy::prelude::*; use bevy_skein::SkeinPlugin; use bevy_ui_text_input::TextInputPlugin; +use clap::ValueEnum; mod camera; mod cleanup; -mod debugging; +mod debug; mod game; mod menus; -#[derive(States, Default, Debug, Clone, PartialEq, Eq, Hash, Reflect)] +#[derive(States, Default, Debug, Clone, PartialEq, Eq, Hash, Reflect, ValueEnum)] #[allow(unused)] enum AppState { #[default] @@ -23,7 +24,7 @@ fn main() { .register_type::() .add_systems(Startup, camera::setup) .add_plugins((DefaultPlugins, TextInputPlugin)) - .add_plugins((game::plugin, menus::plugin, debugging::plugin)) + .add_plugins((game::plugin, menus::plugin, debug::plugin)) .add_plugins(SkeinPlugin::default()) .init_state::() .register_type::() diff --git a/src/menus/lib/plugin.rs b/src/menus/lib/plugin.rs index 022919e..5210373 100644 --- a/src/menus/lib/plugin.rs +++ b/src/menus/lib/plugin.rs @@ -5,6 +5,8 @@ use bevy::{ state::state::FreelyMutableState, }; +use crate::cleanup::despawn; + use super::{ ItemPosition, MenuItemInternal, MenuItemType, OnPressAction, menus::{Menu, Menus}, @@ -30,7 +32,8 @@ where update_ui_trigger::, handle_press_actions::.run_if(in_state(self.trigger.clone())), ), - ); + ) + .add_systems(OnExit(self.trigger.clone()), close_menu::); } } @@ -53,6 +56,15 @@ impl Menus { } } +fn close_menu( + mut c: Commands, + mut nav_state: ResMut>, + closed_when: Res>, +) { + c.run_system_cached(despawn::>); + nav_state.set(closed_when.0.clone()); +} + #[derive(Resource)] struct MenusStore(HashMap>); #[derive(Resource)] diff --git a/startup.tx b/startup.tx new file mode 100644 index 0000000..7671405 --- /dev/null +++ b/startup.tx @@ -0,0 +1,2 @@ +log "hello from startup script!!" +start-game diff --git a/test.tx b/test.tx new file mode 100644 index 0000000..0cd9b21 --- /dev/null +++ b/test.tx @@ -0,0 +1,6 @@ +// test comment +echo hii +echo "meow" + +echo 42 +start-game