Otterhide

Saturday, 2025-12-27

Commits: 3

Update Nix dependencies

index a07a714..d87be3c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,29 +5,11 @@
=        "systems": "systems"
=      },
=      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
=        "owner": "numtide",
=        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
=        "type": "github"
=      },
=      "original": {
@@ -38,11 +20,11 @@
=    },
=    "nixpkgs": {
=      "locked": {
-        "lastModified": 1713297878,
-        "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
=        "owner": "NixOS",
=        "repo": "nixpkgs",
-        "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
=        "type": "github"
=      },
=      "original": {
@@ -54,11 +36,11 @@
=    },
=    "nixpkgs_2": {
=      "locked": {
-        "lastModified": 1706487304,
-        "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
=        "owner": "NixOS",
=        "repo": "nixpkgs",
-        "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
=        "type": "github"
=      },
=      "original": {
@@ -77,15 +59,14 @@
=    },
=    "rust-overlay": {
=      "inputs": {
-        "flake-utils": "flake-utils_2",
=        "nixpkgs": "nixpkgs_2"
=      },
=      "locked": {
-        "lastModified": 1713492869,
-        "narHash": "sha256-Zv+ZQq3X+EH6oogkXaJ8dGN8t1v26kPZgC5bki04GnM=",
+        "lastModified": 1765766816,
+        "narHash": "sha256-m2au5a2x9L3ikyBi0g3/NRJSjmHVDvT42mn+O6FlyPs=",
=        "owner": "oxalica",
=        "repo": "rust-overlay",
-        "rev": "1e9264d1214d3db00c795b41f75d55b5e153758e",
+        "rev": "4f53a635709d82652567f51ef7af4365fbc0c88b",
=        "type": "github"
=      },
=      "original": {
@@ -108,21 +89,6 @@
=        "repo": "default",
=        "type": "github"
=      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
=    }
=  },
=  "root": "root",

Update Bevy to 0.17

Just the crate, so everything is broken. I'll update the code in subsequent commits.

index f0881dd..7527164 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
=
=[dependencies]
=anyhow = "1.0.81"
-bevy = { version = "0.13", features = ["wayland", "serialize"] }
=bevy-inspector-egui = { git = "https://github.com/jakobhellermann/bevy-inspector-egui", rev = "1563fe9", version = "0.23.4" }
+bevy = { version = "0.17", features = ["wayland", "serialize"] }
=bevy_args = "=1.3.0"
=bevy_egui = "0.25.0"
=bevy_mod_picking = { version = "0.18.2", features = ["backend_egui"] }

Update the full-screen window logic to new API

index 4a57ca0..82d9bce 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,13 +22,16 @@ use otterhide::selecting::SelectingPlugin;
=use otterhide::simulation::SimulationLoadingPlugin;
=use otterhide::sun::SunPlugin;
=
-fn main() {
+// TODO: Use https://bevy.org/news/bevy-0-16/#ecs-relationships
+// TODO: Apply https://bevy.org/news/bevy-0-17/#event-observer-overhaul
+
+fn main() -> AppExit {
=    App::new()
=        .add_plugins(DefaultPlugins.set(WindowPlugin {
=            primary_window: Some(Window {
=                title: "Otterhide".into(),
=                canvas: Some("#game-canvas".into()),
-                mode: bevy::window::WindowMode::Fullscreen,
+                mode: bevy::window::WindowMode::BorderlessFullscreen(MonitorSelection::Current),
=                ..default()
=            }),
=            ..default()