diff --git a/src/debug.rs b/src/debug.rs index 10d5330..45a2f6b 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -4,15 +4,13 @@ use std::{fs, path::PathBuf}; use bevy::prelude::*; use bevy_inspector_egui::bevy_egui::EguiPlugin; use clap::Subcommand; -use console::exec_script; +use console::{ConsoleLog, exec_script}; use crate::AppState; mod console; mod debug_event; -pub use console::ConsoleLog; - pub use debug_event::DebugEvent; /// Debug system set. diff --git a/src/debug/debug_event.rs b/src/debug/debug_event.rs index 0c530cc..dbd2ad4 100644 --- a/src/debug/debug_event.rs +++ b/src/debug/debug_event.rs @@ -53,8 +53,4 @@ pub enum DebugEvent { /// - Nothing #[command(name = "enable-debug", aliases = ["debug-enable"])] EnableDebugMode, - - /// Load a gltf scene. - #[command(name = "load-scene", aliases = ["load-file", "load"])] - LoadGltf { asset_path: String }, } diff --git a/src/game.rs b/src/game.rs index 16c67c0..8f59fdb 100644 --- a/src/game.rs +++ b/src/game.rs @@ -7,8 +7,8 @@ use crate::{ }; mod camera; -mod debug; mod scene; +mod debug {} /// Gameplay system set. All functions in this control the gameplay (duh). #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)] @@ -25,6 +25,6 @@ pub fn plugin(app: &mut App) { OnExit(AppState::Ingame), despawn::.in_set(GameplaySet), ) - .add_plugins((camera::plugin, debug::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 20a7fce..0000000 --- a/src/game/debug.rs +++ /dev/null @@ -1,26 +0,0 @@ -use bevy::{asset::AssetPath, prelude::*}; - -use crate::debug::{ConsoleLog, DebugEvent, DebugMode}; - -pub fn plugin(app: &mut App) { - app.add_systems( - Update, - handle_load_gltf.run_if(in_state(DebugMode::Enabled)), - ); -} - -fn handle_load_gltf( - mut c: Commands, - mut dbg_reader: EventReader, - mut logger: ResMut, - asset_server: Res, -) { - for ev in dbg_reader.read() { - if let DebugEvent::LoadGltf { asset_path } = ev { - let scene_handle = asset_server - .load(GltfAssetLabel::Scene(0).from_asset(AssetPath::from(asset_path.clone()))); - - c.spawn(SceneRoot(scene_handle)); - } - } -} diff --git a/startup.tx b/startup.tx index 2ce0900..7671405 100644 --- a/startup.tx +++ b/startup.tx @@ -1,5 +1,2 @@ log "hello from startup script!!" - -enable-debug start-game -load-scene gltf/test.glb 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