higher dezoom + m hotkey to load another map

TUTORIAL.md

@@ -11,6 +11,7 @@ rotate the camera around its focus point on the terrain.
 # Hotkeys
 
 * Press `Esc` — cancel current action.
+* Key `M` — Cycle through default maps
 
 # Building Construction
 

assets/shaders/terrain.wgsl

@@ -51,7 +51,7 @@ fn draw_circle(
     radius: f32,
 ) -> vec4<f32> {
     let distance: f32 = distance(uv, center);
-    if distance <= (radius + SHAPE_THICKNESS) && radius <= distance  {
+    if distance <= (radius + SHAPE_THICKNESS) && radius <= distance {
         return mix_colors(base, SHAPE_COLOR);
     }
     return base;
@@ -103,7 +103,7 @@ fn nearest(uv: vec2<f32>) -> u32 {
 
         let axis = next.depth % 2u;
         let diff = uv[axis] - node.location[axis];
-        
+
         var close = 2u * next.index + 2u;
         var away = 2u * next.index + 1u;
 

crates/camera/src/camera.rs

@@ -23,13 +23,18 @@ const CAMERA_HORIZONTAL_SPEED: InverseSecond = Quantity::new_unchecked(2.0);
 /// Minimum camera distance from terrain achievable with zooming along.
 const MIN_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(20.);
 /// Maximum camera distance from terrain achievable with zooming alone.
-const MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(100.);
+const MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(300.);
+/// Maximum camera distance from terrain achievable with zooming alone.
+const DEFAULT_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(
+    (MIN_CAMERA_DISTANCE.inner() + (MAX_CAMERA_DISTANCE.inner() - MIN_CAMERA_DISTANCE.inner()))
+        * 0.4,
+);
 /// Minimum temporary distance from terrain. Forward/backward camera motion is
 /// smooth within this range. Step adjustment is applied outside of this range.
 const HARD_MIN_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(16.);
 /// Maximum temporary distance from terrain. Forward/backward camera motion is
 /// smooth within this range. Step adjustment is applied outside of this range.
-const HARD_MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(110.);
+const HARD_MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(310.);
 /// Camera moves along forward axis (zooming) at speed `distance *
 /// CAMERA_VERTICAL_SPEED`.
 const CAMERA_VERTICAL_SPEED: InverseSecond = Quantity::new_unchecked(2.0);
@@ -209,19 +214,23 @@ impl DesiredPoW {
     }
 }
 
-fn setup(mut commands: Commands) {
+fn setup(mut commands: Commands, camera_query: Query<Entity, With<Camera3d>>) {
     commands.insert_resource(HorizontalMovement::default());
     commands.insert_resource(DesiredPoW {
-        distance: MAX_CAMERA_DISTANCE,
+        distance: DEFAULT_CAMERA_DISTANCE,
         off_nadir: Radian::ZERO,
         azimuth: Radian::ZERO,
     });
     commands.insert_resource(CameraFocus {
         point: Vec3::ZERO,
-        distance: MAX_CAMERA_DISTANCE,
+        distance: DEFAULT_CAMERA_DISTANCE,
     });
+    if let Ok(cam_entity) = camera_query.get_single() {
+        commands.entity(cam_entity).despawn();
+    }
+
     commands.spawn_bundle(Camera3dBundle {
-        transform: Transform::from_xyz(0.0, MAX_CAMERA_DISTANCE.into(), 0.0)
+        transform: Transform::from_xyz(0.0, DEFAULT_CAMERA_DISTANCE.into(), 0.0)
             .looking_at(Vec3::ZERO, -Vec3::Z),
         ..Default::default()
     });

crates/loader/src/lib.rs

@@ -2,11 +2,13 @@ use bevy::{app::PluginGroupBuilder, prelude::PluginGroup};
 use map::MapLoaderPlugin;
 
 mod map;
+mod map_select;
 
 pub struct LoaderPluginGroup;
 
 impl PluginGroup for LoaderPluginGroup {
     fn build(&mut self, group: &mut PluginGroupBuilder) {
         group.add(MapLoaderPlugin);
+        group.add(map_select::MapSelectPlugin);
     }
 }

crates/loader/src/map.rs

@@ -31,6 +31,9 @@ impl Plugin for MapLoaderPlugin {
 
 struct MapLoadingTask(Task<Result<Map, MapLoadingError>>);
 
+#[derive(Component, Reflect)]
+pub struct RemoveBeforeLoad;
+
 fn load_map_system(mut commands: Commands, game_config: Res<GameConfig>) {
     let map_path = if game_config.map_path().is_relative() {
         asset_path(game_config.map_path())
@@ -48,6 +51,7 @@ fn spawn_map(
     task: Option<ResMut<MapLoadingTask>>,
     mut move_focus_events: EventWriter<MoveFocusEvent>,
     game_config: Res<GameConfig>,
+    entities_to_remove: Query<Entity, Or<(With<Handle<Scene>>, With<RemoveBeforeLoad>)>>,
 ) -> Progress {
     let mut task = match task {
         Some(task) => task,
@@ -59,6 +63,10 @@ fn spawn_map(
         None => return false.into(),
     };
 
+    info!("Map loaded, removing old one");
+    for to_remove in entities_to_remove.iter() {
+        commands.entity(to_remove).despawn_recursive();
+    }
     info!("Map loaded, spawning");
     commands.remove_resource::<MapLoadingTask>();
 
@@ -91,7 +99,9 @@ fn spawn_map(
     }
 
     setup_light(&mut commands);
-    commands.spawn_bundle(TerrainBundle::flat(map.bounds()));
+    commands
+        .spawn_bundle(TerrainBundle::flat(map.bounds()))
+        .insert(RemoveBeforeLoad);
 
     for object in map.objects() {
         let mut entity_commands = commands.spawn();
@@ -120,13 +130,15 @@ fn setup_light(commands: &mut Commands) {
 
     let mut transform = Transform::identity();
     transform.look_at(Vec3::new(1., -1., 0.), Vec3::new(1., 1., 0.));
-    commands.spawn_bundle(DirectionalLightBundle {
-        directional_light: DirectionalLight {
-            color: Color::WHITE,
-            illuminance: 30000.,
+    commands
+        .spawn_bundle(DirectionalLightBundle {
+            directional_light: DirectionalLight {
+                color: Color::WHITE,
+                illuminance: 30000.,
+                ..Default::default()
+            },
+            transform,
             ..Default::default()
-        },
-        transform,
-        ..Default::default()
-    });
+        })
+        .insert(RemoveBeforeLoad);
 }

crates/loader/src/map_select.rs

@@ -0,0 +1,39 @@
+use bevy::prelude::*;
+use de_core::{gconfig::GameConfig, player::Player, state::GameState};
+use iyes_loopless::{prelude::IntoConditionalSystem, state::NextState};
+
+pub struct MapSelectPlugin;
+
+impl Plugin for MapSelectPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<MapList>();
+        app.add_system(cycle_map.run_in_state(GameState::Playing));
+    }
+}
+
+pub struct MapList {
+    pub maps: Vec<String>,
+    pub current_id: usize,
+}
+
+impl Default for MapList {
+    fn default() -> Self {
+        Self {
+            maps: vec!["map.tar".into(), "de_map_test.tar".into()],
+            current_id: 0,
+        }
+    }
+}
+
+fn cycle_map(
+    mut commands: Commands,
+    mut config: ResMut<GameConfig>,
+    mut map_list: ResMut<MapList>,
+    kbd: Res<Input<KeyCode>>,
+) {
+    if kbd.just_pressed(KeyCode::M) {
+        map_list.current_id = (map_list.current_id + 1) % map_list.maps.len();
+        *config = GameConfig::new(&map_list.maps[map_list.current_id], Player::Player1);
+        commands.insert_resource(NextState(GameState::Loading));
+    }
+}

crates/uom/src/quantity.rs

@@ -49,6 +49,10 @@ impl<const U: Unit> Quantity<U> {
         panic_on_invalid(self.0);
         Self::new(self.0.abs())
     }
+
+    pub const fn inner(&self) -> f32 {
+        self.0
+    }
 }
 
 impl<const U: Unit> Clone for Quantity<U> {