Cargo.lock

@@ -2226,7 +2226,6 @@ dependencies = [
  "bevy",
  "bevy_rapier3d",
  "chrono",
- "lipsum",
  "serde",
  "thiserror 2.0.12",
  "walkdir",
@@ -2781,16 +2780,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
-[[package]]
-name = "lipsum"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "636860251af8963cc40f6b4baadee105f02e21b28131d76eba8e40ce84ab8064"
-dependencies = [
- "rand",
- "rand_chacha",
-]
-
 [[package]]
 name = "litrs"
 version = "0.4.1"

Cargo.toml

@@ -17,9 +17,6 @@ version = "0.30.0"
 version = "0.16.1"
 features = ["wayland", "dynamic_linking"]
 
-[dev-dependencies]
-lipsum = "*"
-
 [build-dependencies]
 chrono = "*"
 walkdir = "*"

build.rs

@@ -50,16 +50,10 @@ fn write_monologues_file() {
     walkdir::WalkDir::new("assets/trees")
         .into_iter()
         .filter_map(|entry| entry.ok())
-        .filter(|entry| entry.path().extension() == Some(std::ffi::OsStr::new("mono")))
+        .filter(|entry| {
+            entry.path().extension() == Some(std::ffi::OsStr::new("mono"))
+        })
         .for_each(|entry| {
-            let _ = writeln!(
+            let _ = writeln!(file, "{}", entry.path().to_string_lossy().strip_prefix("assets/").unwrap());
-                file,
-                "{}",
-                entry
-                    .path()
-                    .to_string_lossy()
-                    .strip_prefix("assets/")
-                    .unwrap()
-            );
         });
 }

examples/ui.rs

@@ -1,74 +0,0 @@
-//! This example illustrates scrolling in Bevy UI.
-
-use games::*;
-
-fn main() {
-    let mut app = App::new();
-    app.add_plugins(BaseGamePlugin::default())
-        .add_systems(Startup, (setup_list, setup_nav_tree));
-    app.run();
-}
-
-fn setup_list(mut commands: Commands) {
-    // Scrolling list
-    commands
-        .spawn((
-            Node {
-                flex_direction: FlexDirection::Column,
-                // If height is not set, we need both align_self: Stetch and overflow: scroll()
-                height: Val::Percent(50.0),
-                // align_self: AlignSelf::Stretch,
-                overflow: Overflow::scroll(),
-                ..default()
-            },
-            BackgroundColor(RED.into()),
-        ))
-        .with_children(|parent| {
-            // List items
-            (0..250).for_each(|i| {
-                parent.spawn(Text(format!("Item {i}")));
-            });
-        })
-        .observe(scroll);
-}
-
-fn setup_nav_tree(mut commands: Commands) {
-    // Nav Tree
-    commands
-        .spawn((
-            Node {
-                position_type: PositionType::Absolute,
-                right: Val::Px(0.0),
-                top: Val::Percent(50.0),
-                min_width: Val::Px(25.0),
-                min_height: Val::Px(25.0),
-                ..default()
-            },
-            BackgroundColor(RED.into()),
-        ))
-        .with_children(|parent| {
-            parent
-                .spawn((
-                    Node {
-                        position_type: PositionType::Absolute,
-                        right: Val::Px(25.0),
-                        min_width: Val::Px(25.0),
-                        min_height: Val::Px(25.0),
-                        ..default()
-                    },
-                    BackgroundColor(ORANGE.into()),
-                ))
-                .with_children(|parent| {
-                    parent.spawn((
-                        Node {
-                            position_type: PositionType::Absolute,
-                            right: Val::Px(25.0),
-                            min_width: Val::Px(25.0),
-                            min_height: Val::Px(25.0),
-                            ..default()
-                        },
-                        BackgroundColor(YELLOW.into()),
-                    ));
-                });
-        });
-}

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752480373,
+        "lastModified": 1750506804,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
         "type": "github"
       },
       "original": {

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-07-16"
+channel = "nightly-2025-06-16"
 components = [ "rustfmt", "rustc-dev", "cargo", "clippy", "rust-analyzer", "rustc-codegen-cranelift" ]
 targets = [ "x86_64-unknown-linux-gnu", "wasm32-unknown-unknown" ]

src/base_game.rs

@@ -27,7 +27,6 @@ impl Plugin for BaseGamePlugin {
         .add_plugins(MeshPickingPlugin)
         .add_plugins(RapierPhysicsPlugin::<NoUserData>::default())
         .add_plugins(LoadingPlugin)
-        .add_plugins(BaseUiPlugin)
         .add_systems(Startup, setup_camera);
     }
 }

src/bin/trees/main.rs

@@ -56,8 +56,6 @@ fn main() {
         .add_observer(remove_tree_monologue)
         .add_observer(hide_monologue_preview)
         .add_observer(populate_tree)
-        .add_observer(show_monologue_list)
-        .add_observer(hide_monologue_list)
         .run();
 }
 
@@ -121,14 +119,13 @@ fn init_debug_ui(mut commands: Commands) {
     commands
         .spawn((
             Node {
-                max_height: Val::Percent(90.0),
+                height: Val::Percent(90.0),
                 align_self: AlignSelf::Center,
                 justify_self: JustifySelf::Start,
                 ..default()
             },
             MonologuesContainer,
             GlobalZIndex(i32::MAX - 1),
-            BackgroundColor(PINK.into()),
             DebuggingState::On,
         ))
         .with_children(|parent| {
@@ -137,7 +134,6 @@ fn init_debug_ui(mut commands: Commands) {
                     height: Val::Percent(100.0),
                     flex_direction: FlexDirection::Column,
                     padding: UiRect::all(Val::Px(10.0)),
-                    overflow: Overflow::scroll_y(),
                     ..default()
                 },
                 BackgroundColor(PINK.with_alpha(0.9).into()),
@@ -148,7 +144,6 @@ fn init_debug_ui(mut commands: Commands) {
                     height: Val::Percent(100.0),
                     flex_direction: FlexDirection::Column,
                     padding: UiRect::all(Val::Px(10.0)),
-                    overflow: Overflow::scroll_y(),
                     ..default()
                 },
                 BackgroundColor(ORANGE.with_alpha(0.9).into()),
@@ -533,11 +528,13 @@ fn delete_tree(trigger: Trigger<Pointer<Click>>, mut commands: Commands) {
 }
 
 /// Load all monologues so they are in the asset store and trigger on-load events
-fn load_monologues(server: ResMut<AssetServer>, mut loaded_assets: Local<Vec<Handle<Monologue>>>) {
+fn load_monologues(
-    *loaded_assets = include_str!("../../../assets/trees/MONOLOGUES")
+    server: ResMut<AssetServer>,
-        .split("\n")
+    mut loaded_assets: Local<Vec<Handle<Monologue>>>,
-        .map(|path| server.load(path))
+) {
-        .collect();
+    *loaded_assets = include_str!("../../../assets/trees/MONOLOGUES").split("\n").map(|path| {
+        server.load(path)
+    }).collect();
 }
 
 fn spawn_debug_buttons(
@@ -628,32 +625,6 @@ fn preview_monologue(
     }
 }
 
-fn show_monologue_list(
-    trigger: Trigger<Pointer<Over>>,
-    container: Query<Entity, With<MonologuesContainer>>,
-    children: Query<&Children>,
-    mut visibility: Query<&mut Visibility>,
-) {
-    if let Ok(root) = container.get(trigger.target()) {
-        children.iter_descendants(root).for_each(|e| {
-            *visibility.get_mut(e).unwrap() = Visibility::Inherited;
-        });
-    }
-}
-
-fn hide_monologue_list(
-    trigger: Trigger<Pointer<Out>>,
-    container: Query<Entity, With<MonologuesContainer>>,
-    children: Query<&Children>,
-    mut visibility: Query<&mut Visibility>,
-) {
-    if let Ok(root) = container.get(trigger.target()) {
-        children.iter_descendants(root).for_each(|e| {
-            *visibility.get_mut(e).unwrap() = Visibility::Hidden;
-        });
-    }
-}
-
 fn spawn_monologue_tree(
     trigger: Trigger<Pointer<Click>>,
     tree_monologues: Query<&TreeMonologue, With<Button>>,
@@ -729,7 +700,6 @@ fn hide_monologue_preview(
     mut commands: Commands,
 ) {
     if !query.contains(trigger.target()) {
-        info!("Processing over: {:?}", trigger.target());
         commands.entity(*preview).despawn_related::<Children>();
     }
 }
@@ -739,18 +709,17 @@ fn drag_tree(
     state: Res<State<DebuggingState>>,
     mut query: Query<&mut Transform, With<Tree>>,
     camera: Single<(&Camera, &GlobalTransform), With<Camera>>,
-    window: Single<&Window>,
+    window: Single<&Window>
 ) {
     if *state.get() == DebuggingState::On {
         if let Ok(mut t) = query.get_mut(trigger.target()) {
             let world_position = window
                 .cursor_position()
-                .and_then(|cursor| camera.0.viewport_to_world(camera.1, cursor).ok())
+                .and_then(|cursor| {
-                .map(|ray| {
+                    camera.0.viewport_to_world(camera.1, cursor).ok()
+                }).map(|ray| {
                     // Compute ray's distance to entity
-                    let distance = ray
+                    let distance = ray.intersect_plane(t.translation, InfinitePlane3d::new(t.up())).unwrap();
-                        .intersect_plane(t.translation, InfinitePlane3d::new(t.up()))
-                        .unwrap();
                     ray.get_point(distance)
                 });
             t.translation = world_position.unwrap();

src/bin/trees/mono.rs

@@ -42,7 +42,9 @@ impl Display for MonologueLine {
 
 impl From<String> for MonologueLine {
     fn from(value: String) -> Self {
-        MonologueLine { value }
+        MonologueLine {
+            value
+        }
     }
 }
 
@@ -55,7 +57,7 @@ impl Into<String> for MonologueLine {
 impl From<&str> for MonologueLine {
     fn from(value: &str) -> Self {
         MonologueLine {
-            value: value.into(),
+            value: value.into()
         }
     }
 }

src/debug.rs

@@ -1,5 +1,3 @@
-use std::collections::VecDeque;
-
 use super::*;
 
 /// Debugging systems, resources, events, etc.
@@ -9,8 +7,6 @@ impl Plugin for DebuggingPlugin {
     fn build(&self, app: &mut App) {
         app.init_state::<DebuggingState>()
             .init_resource::<ToolTip>()
-            .init_resource::<Fps>()
-            .init_resource::<EntityCount>()
             .add_plugins(RapierDebugRenderPlugin::default().disabled())
             // Added by Rapier
             // .add_plugins(AabbGizmoPlugin)
@@ -28,10 +24,6 @@ impl Plugin for DebuggingPlugin {
                             .run_if(on_event::<Pointer<Over>>.or(on_event::<Pointer<Out>>)),
                         tooltip_follow.run_if(any_component_changed::<Window>),
                         sync_resource_to_ui::<ToolTip>.run_if(resource_changed::<ToolTip>),
-                        track_fps,
-                        sync_resource_to_ui::<Fps>.run_if(resource_changed::<Fps>),
-                        track_entity_count,
-                        sync_resource_to_ui::<EntityCount>.run_if(resource_changed::<EntityCount>),
                     )
                         .run_if(in_state(DebuggingState::On)),
                 ),
@@ -97,37 +89,6 @@ fn init_debug_ui(mut commands: Commands) {
         },
     ));
 
-    // Version string for troubleshooting
-    commands.spawn((
-        DebuggingState::On,
-        Name::new("FPS"),
-        Text::new("FPS: ##.#"),
-        TextColor(WHITE.into()),
-        BackgroundColor(BLACK.into()),
-        SyncResource::<Fps>::default(),
-        Node {
-            width: Val::Auto,
-            align_self: AlignSelf::Start,
-            justify_self: JustifySelf::End,
-            ..default()
-        },
-    ));
-
-    commands.spawn((
-        DebuggingState::On,
-        Name::new("Entity Count"),
-        Text::new("Entities: ###"),
-        TextColor(WHITE.into()),
-        BackgroundColor(BLACK.into()),
-        SyncResource::<EntityCount>::default(),
-        Node {
-            width: Val::Auto,
-            align_self: AlignSelf::Start,
-            justify_self: JustifySelf::Center,
-            ..default()
-        },
-    ));
-
     // Tooltip
     commands.spawn((
         DebuggingState::On,
@@ -299,48 +260,3 @@ fn toggle_aabb_gizmo(
     let (_, aabb_group) = config_store.config_mut::<AabbGizmoConfigGroup>();
     aabb_group.draw_all = *state.get() == DebuggingState::On;
 }
-
-#[derive(Resource, Default, Debug)]
-struct Fps(f32);
-
-impl Display for Fps {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        writeln!(f, "FPS: {:0.1}", self.0)
-    }
-}
-
-fn track_fps(
-    time: Res<Time>,
-    mut fps: ResMut<Fps>,
-    mut history: Local<VecDeque<f32>>,
-) {
-    // Get the time to render the last frame
-    let d = time.delta_secs();
-
-    // Add the latest delta to the list
-    history.push_back(d);
-
-    // Ensure the vecdeque doesn't get too long
-    if history.len() > 64 {
-        history.pop_front();
-    }
-
-    // Set FPS to 1/averageDeltaTime
-    fps.0 = 1.0 / (history.iter().fold(0.0, |acc, e| acc + e) / history.len() as f32);
-}
-
-#[derive(Resource, Default, Debug)]
-struct EntityCount(usize);
-
-impl Display for EntityCount {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        writeln!(f, "Entities: {}", self.0)
-    }
-}
-
-fn track_entity_count(
-    query: Query<Entity>,
-    mut count: ResMut<EntityCount>,
-) {
-    count.0 = query.iter().len();
-}

src/ui.rs

@@ -1,13 +1,5 @@
 use super::*;
 
-pub(crate) struct BaseUiPlugin;
-
-impl Plugin for BaseUiPlugin {
-    fn build(&self, app: &mut App) {
-        // TODO
-    }
-}
-
 /// Marker component for handling Resource -> Ui Sync
 #[derive(Component, Default, Debug)]
 pub struct SyncResource<R: Resource + Default + Display>(R);
@@ -23,30 +15,3 @@ pub fn sync_resource_to_ui<R: Resource + Default + Display>(
         t.0 = format!("{}", *r);
     });
 }
-
-/// Updates the scroll position of scrollable nodes in response to mouse input
-pub fn scroll(trigger: Trigger<Pointer<Scroll>>, mut scrollers: Query<&mut ScrollPosition>) {
-    let Pointer {
-        event: Scroll { unit, x, y, .. },
-        ..
-    } = trigger.event();
-
-    let (dx, dy) = match unit {
-        MouseScrollUnit::Line => (x * 16.0, y * 16.0),
-        MouseScrollUnit::Pixel => (x * 1., y * 1.),
-    };
-
-    if let Ok(mut pos) = scrollers.get_mut(trigger.target()) {
-        pos.offset_x -= dx;
-        pos.offset_y -= dy;
-    }
-}
-
-#[derive(Component, Debug)]
-#[relationship(relationship_target = NavParent)]
-pub(crate) struct NavChild(Entity);
-
-#[derive(Component, Debug)]
-#[relationship_target(relationship = NavChild)]
-pub(crate) struct NavParent(Vec<Entity>);
-