feat(platformer): momentum movement core with grappling hook

Replace the bunnyhop model with surface momentum. Slopes are frictionless
and accelerate you downhill from gravity projected along the ground normal,
flats run with friction, jumps preserve all horizontal speed, and air
control redirects momentum without adding to it. There is no hard speed
cap, so a clean ski line through ramps and kickers earns speed.

Add a grappling hook as a persistent tool on a cooldown: it fires along
the look ray from the eye, anchors to the first surface, reels you toward
it, and draws a rope while active. Keep wall running and wall jumping.

Strip the strafe assist, the coach hud, and the settings screen entirely.
Rework the first level into a ski flow course (drop in, carry speed across
a valley, launch a kicker, grapple a tower to the goal).

Author: matthewjberger

apps/platformer/.gitignore

@@ -1,2 +1,3 @@
 levels/
 maps/
+settings.json

apps/platformer/src/ecs.rs

@@ -20,7 +20,6 @@ freecs::ecs! {
         levels: LevelLibrary,
         prop_assets: PropAssets,
         editor: EditorState,
-        settings: Settings,
         ui_handles: UiHandles,
     }
 }

apps/platformer/src/ecs/resources.rs

@@ -17,23 +17,6 @@ pub enum Screen {
     Paused,
     LevelComplete,
     Editor,
-    Settings,
-}
-
-pub struct Settings {
-    pub assist_level: f32,
-}
-
-impl Default for Settings {
-    fn default() -> Self {
-        Self { assist_level: 6.0 }
-    }
-}
-
-impl Settings {
-    pub fn assist_factor(&self) -> f32 {
-        (self.assist_level / 10.0).clamp(0.0, 1.0)
-    }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
@@ -114,7 +97,6 @@ impl Default for EditorState {
 #[derive(Default)]
 pub struct ScreenState {
     pub current: Screen,
-    pub settings_return: Screen,
 }
 
 #[derive(Default)]
@@ -129,6 +111,7 @@ pub struct PlayerState {
     pub overview_camera: Option<Entity>,
     pub sun: Option<Entity>,
     pub floor: Option<Entity>,
+    pub grapple_rope: Option<Entity>,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
@@ -138,14 +121,6 @@ pub enum Locomotion {
     Airborne,
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
-pub enum TurnHint {
-    #[default]
-    None,
-    Left,
-    Right,
-}
-
 #[derive(Clone, Default)]
 pub struct ActiveLevel {
     pub name: String,
@@ -174,13 +149,16 @@ pub struct RunState {
     pub level_entities: Vec<Entity>,
     pub prop_entities: Vec<Entity>,
     pub play_level: Option<ActiveLevel>,
-    pub prev_yaw: f32,
-    pub has_prev_yaw: bool,
     pub testing_from_editor: bool,
-    pub autohop_armed: bool,
-    pub last_speed: f32,
-    pub speed_delta: f32,
-    pub turn_hint: TurnHint,
+    pub wall_run_active: bool,
+    pub wall_run_timer: f32,
+    pub wall_run_cooldown: f32,
+    pub wall_run_normal: Vec3,
+    pub wall_run_tilt: f32,
+    pub grappling: bool,
+    pub grapple_anchor: Vec3,
+    pub grapple_cooldown: f32,
+    pub grapple_time: f32,
 }
 
 #[derive(Default)]
@@ -190,24 +168,14 @@ pub struct TitleHandles {
     pub custom_buttons: Vec<Entity>,
     pub custom_names: Vec<String>,
     pub editor_button: Entity,
-    pub settings_button: Entity,
     pub quit_button: Entity,
 }
 
-#[derive(Default)]
-pub struct SettingsHandles {
-    pub root: Entity,
-    pub assist_slider: Entity,
-    pub assist_value: Entity,
-    pub back_button: Entity,
-}
-
 #[derive(Default)]
 pub struct PauseHandles {
     pub root: Entity,
     pub resume_button: Entity,
     pub restart_button: Entity,
-    pub settings_button: Entity,
     pub menu_button: Entity,
     pub quit_button: Entity,
 }
@@ -220,11 +188,6 @@ pub struct HudHandles {
     pub timer_label: Entity,
     pub level_label: Entity,
     pub crosshair: Entity,
-    pub turn_left: Entity,
-    pub turn_right: Entity,
-    pub coach_label: Entity,
-    pub key_a: Entity,
-    pub key_d: Entity,
 }
 
 #[derive(Default)]
@@ -253,5 +216,4 @@ pub struct UiHandles {
     pub hud: HudHandles,
     pub complete: CompleteHandles,
     pub editor: EditorHandles,
-    pub settings: SettingsHandles,
 }

apps/platformer/src/state.rs

@@ -1,5 +1,5 @@
 use crate::ecs::{PlatformerWorld, Screen};
-use crate::systems::screens::{complete, editor as editor_screen, hud, pause, settings, title};
+use crate::systems::screens::{complete, editor as editor_screen, hud, pause, title};
 use crate::systems::world::editor::EditorAction;
 use crate::systems::world::{cutscene, editor, movement};
 use crate::systems::{input, lifecycle};
@@ -22,13 +22,13 @@ impl State for Platformer {
         title::handle_input(&mut self.platformer_world, world);
         pause::handle_input(&mut self.platformer_world, world);
         complete::handle_input(&mut self.platformer_world, world);
-        settings::handle_input(&mut self.platformer_world, world);
 
         match self.platformer_world.resources.screen.current {
             Screen::Overview if cutscene::update(world) => {
                 lifecycle::begin_play(&mut self.platformer_world, world);
             }
             Screen::Playing => {
+                movement::pre_camera_roll(&self.platformer_world, world);
                 first_person_camera_look_system(world);
                 movement::update(&mut self.platformer_world, world);
                 if self.platformer_world.resources.run.timing {
@@ -60,6 +60,5 @@ impl State for Platformer {
 
         hud::update(&self.platformer_world, world);
         complete::update(&self.platformer_world, world);
-        settings::update(&mut self.platformer_world, world);
     }
 }

apps/platformer/src/systems/input.rs

@@ -36,6 +36,5 @@ pub fn handle_global(platformer_world: &mut PlatformerWorld, world: &mut World)
         }
         Screen::LevelComplete => {}
         Screen::Editor => {}
-        Screen::Settings => {}
     }
 }

apps/platformer/src/systems/lifecycle.rs

@@ -1,5 +1,5 @@
 use crate::ecs::{ActiveLevel, PlatformerWorld, PlayMode, Screen};
-use crate::systems::screens::{complete, editor as editor_screen, hud, pause, settings, title};
+use crate::systems::screens::{complete, editor as editor_screen, hud, pause, title};
 use crate::systems::world::{cutscene, editor, levels, player, props, textures};
 use nightshade::prelude::*;
 use std::collections::HashSet;
@@ -29,9 +29,6 @@ pub fn initialize(platformer_world: &mut PlatformerWorld, world: &mut World) {
     props::load(world, &mut platformer_world.resources.prop_assets);
 
     platformer_world.resources.levels.names = levels::list_level_names();
-    if let Some(assist) = settings::load_assist() {
-        platformer_world.resources.settings.assist_level = assist;
-    }
     build_ui(platformer_world, world);
 
     enter(platformer_world, world, Screen::Title);
@@ -58,20 +55,12 @@ fn build_ui(platformer_world: &mut PlatformerWorld, world: &mut World) {
     let hud_handles = hud::build(&mut tree);
     let complete_handles = complete::build(&mut tree);
     let editor_handles = editor_screen::build(&mut tree);
-    let settings_handles =
-        settings::build(&mut tree, platformer_world.resources.settings.assist_level);
     tree.finish();
     platformer_world.resources.ui_handles.title = title_handles;
     platformer_world.resources.ui_handles.pause = pause_handles;
     platformer_world.resources.ui_handles.hud = hud_handles;
     platformer_world.resources.ui_handles.complete = complete_handles;
     platformer_world.resources.ui_handles.editor = editor_handles;
-    platformer_world.resources.ui_handles.settings = settings_handles;
-}
-
-pub fn open_settings(platformer_world: &mut PlatformerWorld, world: &mut World, from: Screen) {
-    platformer_world.resources.screen.settings_return = from;
-    enter(platformer_world, world, Screen::Settings);
 }
 
 fn refresh_custom_map_list(platformer_world: &mut PlatformerWorld, world: &mut World) {
@@ -95,6 +84,7 @@ fn persistent_entities(platformer_world: &PlatformerWorld) -> HashSet<Entity> {
         player.overview_camera,
         player.sun,
         player.floor,
+        player.grapple_rope,
         platformer_world.resources.editor.camera,
     ]
     .into_iter()
@@ -115,13 +105,15 @@ pub fn start_level(platformer_world: &mut PlatformerWorld, world: &mut World, in
         return;
     };
 
-    let prop_entities = props::decorate(
+    let mut prop_entities = props::decorate(
         world,
         &platformer_world.resources.prop_assets,
         &platformer_world.resources.run.level_entities,
         index,
     );
+    prop_entities.extend(levels::spawn_level_pools(world, index));
     platformer_world.resources.run.prop_entities = prop_entities;
+    levels::apply_theme(world, index);
 
     platformer_world.resources.run.play_mode = PlayMode::Builtin(index);
     platformer_world.resources.run.play_level = Some(active);
@@ -185,11 +177,19 @@ pub fn begin_play(platformer_world: &mut PlatformerWorld, world: &mut World) {
     platformer_world.resources.run.run_time = 0.0;
     platformer_world.resources.run.timing = true;
     platformer_world.resources.run.top_speed = 0.0;
-    platformer_world.resources.run.has_prev_yaw = false;
-    platformer_world.resources.run.autohop_armed = false;
+    reset_movement_state(platformer_world);
     enter(platformer_world, world, Screen::Playing);
 }
 
+fn reset_movement_state(platformer_world: &mut PlatformerWorld) {
+    let run = &mut platformer_world.resources.run;
+    run.wall_run_active = false;
+    run.wall_run_timer = 0.0;
+    run.wall_run_tilt = 0.0;
+    run.grappling = false;
+    run.grapple_cooldown = 0.0;
+}
+
 pub fn restart(platformer_world: &mut PlatformerWorld, world: &mut World) {
     let spawn = platformer_world
         .resources
@@ -202,8 +202,7 @@ pub fn restart(platformer_world: &mut PlatformerWorld, world: &mut World) {
     platformer_world.resources.run.run_time = 0.0;
     platformer_world.resources.run.timing = true;
     platformer_world.resources.run.top_speed = 0.0;
-    platformer_world.resources.run.has_prev_yaw = false;
-    platformer_world.resources.run.autohop_armed = false;
+    reset_movement_state(platformer_world);
 }
 
 fn at_goal(platformer_world: &PlatformerWorld, world: &World) -> bool {
@@ -276,7 +275,7 @@ pub fn check_fall(platformer_world: &mut PlatformerWorld, world: &mut World) {
             .map(|level| level.spawn)
             .unwrap_or(DEFAULT_SPAWN);
         player::place_at_spawn(platformer_world, world, spawn);
-        platformer_world.resources.run.autohop_armed = false;
+        reset_movement_state(platformer_world);
     }
 }
 
@@ -328,13 +327,6 @@ pub fn enter(platformer_world: &mut PlatformerWorld, world: &mut World, screen:
             gamepad_nav: false,
             focus: None,
         },
-        Screen::Settings => ScreenConfig {
-            cursor_locked: false,
-            cursor_visible: true,
-            physics: false,
-            gamepad_nav: true,
-            focus: Some(handles.settings.assist_slider),
-        },
     };
 
     set_cursor_locked(world, config.cursor_locked);
@@ -379,11 +371,6 @@ pub fn apply_visibility(platformer_world: &PlatformerWorld, world: &mut World) {
         matches!(screen, Screen::Playing),
     );
     ui_set_visible(world, handles.editor.root, matches!(screen, Screen::Editor));
-    ui_set_visible(
-        world,
-        handles.settings.root,
-        matches!(screen, Screen::Settings),
-    );
 }
 
 pub fn next_level_index(platformer_world: &PlatformerWorld, current: usize) -> usize {
@@ -414,6 +401,7 @@ pub fn play_custom_map(platformer_world: &mut PlatformerWorld, world: &mut World
         goal_radius: levels::GOAL_RADIUS,
     });
     platformer_world.resources.run.testing_from_editor = false;
+    levels::apply_neutral_theme(world);
     world.resources.mesh_render_state.request_full_rebuild();
 
     cutscene::begin(platformer_world, world);
@@ -455,6 +443,7 @@ pub fn enter_editor(platformer_world: &mut PlatformerWorld, world: &mut World) {
     }
     platformer_world.resources.run.play_level = None;
     platformer_world.resources.run.timing = false;
+    levels::apply_neutral_theme(world);
     editor::enter(platformer_world, world);
     enter(platformer_world, world, Screen::Editor);
 }
@@ -473,6 +462,7 @@ pub fn test_play(platformer_world: &mut PlatformerWorld, world: &mut World) {
     });
     platformer_world.resources.run.play_mode = PlayMode::Custom(map.name.clone());
     platformer_world.resources.run.testing_from_editor = true;
+    levels::apply_neutral_theme(world);
     world.resources.mesh_render_state.request_full_rebuild();
     begin_play(platformer_world, world);
 }

apps/platformer/src/systems/screens.rs

@@ -3,5 +3,4 @@ pub mod editor;
 pub mod hud;
 pub mod menu_button;
 pub mod pause;
-pub mod settings;
 pub mod title;