From a5e9b11109f5c45566eddcf88cbb71852c08cbd1 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 27 Feb 2025 12:24:14 +0100 Subject: [PATCH] debug visuals and add mig jet --- assets/models/mig.glb | Bin 0 -> 16916 bytes src/main.rs | 51 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 assets/models/mig.glb diff --git a/assets/models/mig.glb b/assets/models/mig.glb new file mode 100644 index 0000000000000000000000000000000000000000..9cce6733661c4587bf6998f41c53a0b41a266eae GIT binary patch literal 16916 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 literal 0 HcmV?d00001 diff --git a/src/main.rs b/src/main.rs index 77f55ec..686c2ad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,9 +17,22 @@ pub struct MyBaseClass { pub my_value: u32, } +#[derive(Resource, Reflect, Debug)] +#[reflect(Resource)] +struct DebugVisuals { + pub unlit: bool, + pub tonemapping: Tonemapping, +} + fn main() { let mut app = App::new(); + app.register_type::(); + app.insert_resource(DebugVisuals { + unlit: true, + tonemapping: Tonemapping::None, + }); + app.add_plugins(DefaultPlugins.set(ImagePlugin { default_sampler: repeating_image_sampler(false), })); @@ -30,38 +43,62 @@ fn main() { app.insert_resource(MovementSettings { sensitivity: 0.00005, speed: 12., - }) - .add_plugins(bevy_inspector_egui::quick::WorldInspectorPlugin::default()); + }); + app.insert_resource(AmbientLight { + color: Color::WHITE, + brightness: 500., + }); + app.add_plugins(bevy_inspector_egui::quick::WorldInspectorPlugin::default()); app.add_plugins(TrenchBroomPlugin(TrenchBroomConfig::new("hedz"))); app.add_systems(Startup, write_trenchbroom_config); app.add_systems(PostStartup, setup_scene); - app.add_systems(Update, (set_materials_unlit, disable_tone_mapping)); + app.add_systems(Update, (set_materials_unlit, set_tonemapping)); app.run(); } fn setup_scene(mut commands: Commands, asset_server: Res) { commands.spawn(SceneRoot(asset_server.load("maps/map1.map#Scene"))); + + commands.spawn(( + DirectionalLight { + illuminance: light_consts::lux::OVERCAST_DAY, + shadows_enabled: true, + ..default() + }, + Transform { + translation: Vec3::new(0.0, 2.0, 0.0), + rotation: Quat::from_rotation_x(-1.7), + ..default() + }, + )); + + commands.spawn((SceneRoot( + asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/mig.glb")), + ),)); } fn write_trenchbroom_config(server: Res) { server.config.write_folder("trenchbroom/hedz").unwrap() } -fn disable_tone_mapping(mut cams: Query<&mut Tonemapping, With>) { +fn set_tonemapping(mut cams: Query<&mut Tonemapping, With>, visuals: Res) { for mut tm in cams.iter_mut() { - *tm = Tonemapping::None; + *tm = visuals.tonemapping; } } -fn set_materials_unlit(mut materials: ResMut>) { +fn set_materials_unlit( + mut materials: ResMut>, + visuals: Res, +) { if !materials.is_changed() { return; } for (_, material) in materials.iter_mut() { - material.unlit = true; + material.unlit = visuals.unlit; } }