From 0798aa5d5724115b198d5ec2a2df57e051b49f60 Mon Sep 17 00:00:00 2001
From: Rbanh <Rbanh15@gmail.com>
Date: Sun, 12 Jul 2026 00:24:06 -0400
Subject: [PATCH] Build renderer and material component foundations

Add dedicated skinned rendering, pose restoration, shared Material and Material Instance slots, registry-driven components, Surface/Solari integration, transactional schema upgrades, navigation authoring, documentation, and evaluation evidence.
---
 .cargo/config.toml                            |    2 +
 .../navigation_authoring_2026-07-11.plan.md   |   68 +
 ...al_component_foundation_2026-07-11.plan.md |   43 +
 .gitignore                                    |    1 +
 Cargo.lock                                    |  707 +++-
 Cargo.toml                                    |    7 +
 README.md                                     |   40 +-
 assets/.index/registry.ron                    |  230 ++
 ...-e39c-41d4-9b5b-e48efe541f7f.animation.ron |  236 ++
 ...-45eb-4cb2-8970-71921cbd7bd0.animation.ron |  236 ++
 ...-3500-49e7-9935-f685fa9b2594.animation.ron |   20 +
 .../levels/audio_authoring_showcase.scn.ron   |   46 +-
 assets/levels/editor_scene 2.scn.ron          |  696 ++--
 assets/levels/editor_scene 3.scn.ron          |  760 ++--
 assets/levels/editor_scene.scn.ron            | 3481 ++++++++--------
 .../navigation_authoring_showcase.scn.ron     |   70 +
 assets/levels/rendering_showcase.scn.ron      |   58 +-
 assets/materials/concrete.ron                 |   32 +-
 assets/materials/emissive_panel.ron           |   31 +-
 assets/materials/surface_tint.ron             |   71 +
 assets/materials/surface_tint_instance.ron    |   12 +
 ...39c-41d4-9b5b-e48efe541f7f.static_mesh.ron |  360 ++
 ...5eb-4cb2-8970-71921cbd7bd0.static_mesh.ron |  360 ++
 ...500-49e7-9935-f685fa9b2594.static_mesh.ron |    5 +-
 assets/models/RobotExpressive.glb             |    3 +
 .../navigation_showcase_humanoid.nav.ron      |  963 +++++
 assets/prefabs/example_base.scn.ron           |   28 +-
 assets/prefabs/example_nested.scn.ron         |   28 +-
 assets/prefabs/example_variant.scn.ron        |   28 +-
 assets/shaders/blacksite_surface.wgsl         |   42 +
 assets/shaders/standard_lit.shader.ron        |   75 +-
 assets/shaders/surface_tint.shader.ron        |   80 +
 assets/shaders/surface_tint.wgsl              |   14 +
 assets/shaders/unlit.shader.ron               |   34 +-
 crates/blacksite_surface/Cargo.toml           |   13 +
 crates/blacksite_surface/src/lib.rs           |  777 ++++
 .../blacksite_surface/src/surface_footer.wgsl |   41 +
 .../blacksite_surface/src/surface_header.wgsl |  103 +
 crates/editor/Cargo.toml                      |    1 +
 crates/editor/src/assets/animation.rs         |   67 +-
 crates/editor/src/assets/asset_db.rs          |   10 +
 crates/editor/src/assets/catalog.rs           |  370 +-
 crates/editor/src/assets/materials.rs         |  110 +-
 crates/editor/src/assets/operators.rs         |   52 +-
 crates/editor/src/assets/static_mesh.rs       |  208 +-
 crates/editor/src/assets/thumbnails/studio.rs |   68 +-
 crates/editor/src/history/commands.rs         |   57 +-
 crates/editor/src/history/mod.rs              |  519 ++-
 crates/editor/src/play/session.rs             |   17 +-
 crates/editor/src/project/settings_ui.rs      |    6 +-
 crates/editor/src/scene/scene_io.rs           |  160 +-
 crates/editor/src/ui/actor_inspector/mod.rs   |   17 +-
 crates/editor/src/ui/animation_inspector.rs   |    7 +-
 crates/editor/src/ui/asset_browser/panel.rs   | 1172 +++++-
 crates/editor/src/ui/asset_browser/state.rs   |   11 +-
 crates/editor/src/ui/component_registry.rs    |  575 ++-
 crates/editor/src/ui/helpers.rs               |   33 +
 crates/editor/src/ui/hierarchy_ops.rs         |   13 +-
 crates/editor/src/ui/inspector.rs             |  800 +++-
 crates/editor/src/ui/menu.rs                  |   38 +
 crates/editor/src/ui/mod.rs                   |   19 +-
 crates/editor/src/ui/navigation_inspector.rs  |  765 ++++
 crates/editor/src/ui/toolbar.rs               |   19 +
 crates/editor/src/ui/viewport_chrome.rs       |    4 +-
 crates/editor/src/viewport/actor_icons.rs     |   22 +-
 crates/editor/src/viewport/brush_tool.rs      |   11 +
 .../src/viewport/rendering_diagnostics.rs     |   32 +-
 crates/editor/src/viewport/visualizers.rs     |  137 +-
 crates/game/Cargo.toml                        |    2 +
 crates/game/src/animation.rs                  |  432 +-
 crates/game/src/audio.rs                      |   18 +-
 crates/game/src/lib.rs                        |    1 +
 crates/game/src/navigation.rs                 |  257 ++
 crates/game_hot/Cargo.toml                    |    1 +
 crates/game_hot/src/rendering/solari.rs       |  143 +-
 crates/game_hot/src/rendering/volumes.rs      |   11 +-
 crates/game_hot/src/world/lighting.rs         |   44 +-
 crates/scene/Cargo.toml                       |    3 +
 crates/scene/src/document.rs                  |    2 +-
 crates/scene/src/lib.rs                       |   21 +-
 crates/scene/src/migrate.rs                   |   88 +
 crates/scene/src/navigation.rs                |  899 ++++
 crates/scene/src/project_validation.rs        |  703 +++-
 crates/scene/src/upgrade.rs                   |  450 ++
 crates/shared/src/actor.rs                    |  287 +-
 crates/shared/src/animation.rs                |   81 +-
 crates/shared/src/components.rs               |  288 +-
 crates/shared/src/hydration/brushes.rs        |   21 +-
 crates/shared/src/hydration/lights.rs         |   43 +-
 crates/shared/src/hydration/materials.rs      |   16 +-
 crates/shared/src/hydration/mod.rs            |  141 +-
 crates/shared/src/hydration/physics.rs        |   40 +-
 crates/shared/src/hydration/primitives.rs     |   16 +-
 crates/shared/src/hydration/skinned_meshes.rs |  473 +++
 crates/shared/src/hydration/static_meshes.rs  |  271 +-
 crates/shared/src/lib.rs                      |  111 +-
 crates/shared/src/material_asset.rs           |  215 +-
 crates/shared/src/navigation.rs               |  181 +
 crates/shared/src/renderer_material.rs        |  155 +
 docs/README.md                                |   11 +
 docs/adr/0009-authoring-vs-hydrated.md        |    4 +-
 docs/adr/0010-actor-kind-and-inspector.md     |    6 +-
 .../adr/0017-normalized-static-mesh-assets.md |   12 +-
 ...onentized-actor-inspector-and-materials.md |    9 +-
 docs/adr/0021-brush-authoring-schema.md       |    4 +-
 ...31-animation-authoring-runtime-contract.md |   30 +-
 ...ioned-navigation-bake-and-runtime-query.md |   36 +
 .../0033-dedicated-skinned-mesh-renderer.md   |   60 +
 ...34-registry-driven-authoring-components.md |   45 +
 ...ared-material-assets-and-renderer-slots.md |   60 +
 .../adr/0036-surface-abi-and-solari-parity.md |   72 +
 .../Bevy_Editor_Component_System_Spec.md      |   32 +
 docs/editor/README.md                         |   22 +-
 docs/editor/animation-authoring.md            |   42 +-
 docs/editor/architecture.md                   |   41 +-
 docs/editor/brp.md                            |    7 +-
 .../material-renderer-foundation/README.md    |   96 +
 .../component-registry-add-menu.png           |    3 +
 .../custom-surface-on-skinned-renderer.png    |    3 +
 .../larger-material-thumbnail-previews.png    |    3 +
 .../material-editor-create-instance.png       |    3 +
 .../material-instance-sparse-overrides.png    |    3 +
 .../mesh-light-component-composition.png      |    3 +
 .../skinned-mesh-renderer-material-slots.png  |    3 +
 docs/editor/extensibility.md                  |   49 +
 docs/editor/material-system.md                |  149 +
 docs/editor/navigation-authoring.md           |   66 +
 docs/editor/roadmap.md                        |    2 +-
 docs/mission.md                               |    4 +-
 third_party/bevy_solari/.cargo-ok             |    1 +
 third_party/bevy_solari/.cargo_vcs_info.json  |    6 +
 third_party/bevy_solari/BLACKSITE_PATCH.md    |   24 +
 third_party/bevy_solari/Cargo.lock            | 3602 +++++++++++++++++
 third_party/bevy_solari/Cargo.toml            |  159 +
 third_party/bevy_solari/Cargo.toml.orig       |   55 +
 third_party/bevy_solari/LICENSE-APACHE        |  176 +
 third_party/bevy_solari/LICENSE-MIT           |   19 +
 third_party/bevy_solari/README.md             |   20 +
 third_party/bevy_solari/src/lib.rs            |   59 +
 .../bevy_solari/src/pathtracer/extract.rs     |   36 +
 third_party/bevy_solari/src/pathtracer/mod.rs |   68 +
 .../bevy_solari/src/pathtracer/node.rs        |  118 +
 .../src/pathtracer/pathtracer.wgsl            |  118 +
 .../bevy_solari/src/pathtracer/prepare.rs     |   47 +
 .../bevy_solari/src/realtime/extract.rs       |   27 +
 .../src/realtime/gbuffer_utils.wgsl           |   55 +
 third_party/bevy_solari/src/realtime/mod.rs   |  112 +
 third_party/bevy_solari/src/realtime/node.rs  |  597 +++
 .../bevy_solari/src/realtime/prepare.rs       |  324 ++
 .../src/realtime/presample_light_tiles.wgsl   |   43 +
 .../src/realtime/realtime_bindings.wgsl       |   74 +
 .../realtime/resolve_dlss_rr_textures.wgsl    |   59 +
 .../bevy_solari/src/realtime/restir_di.wgsl   |  339 ++
 .../bevy_solari/src/realtime/restir_gi.wgsl   |  318 ++
 .../bevy_solari/src/realtime/specular_gi.wgsl |  242 ++
 .../src/realtime/world_cache_compact.wgsl     |   86 +
 .../src/realtime/world_cache_query.wgsl       |  148 +
 .../src/realtime/world_cache_update.wgsl      |  129 +
 third_party/bevy_solari/src/scene/binder.rs   |  589 +++
 third_party/bevy_solari/src/scene/blas.rs     |  186 +
 third_party/bevy_solari/src/scene/brdf.wgsl   |  121 +
 third_party/bevy_solari/src/scene/extract.rs  |   88 +
 third_party/bevy_solari/src/scene/mod.rs      |  249 ++
 .../src/scene/raytracing_scene_bindings.wgsl  |  396 ++
 .../bevy_solari/src/scene/sampling.wgsl       |  251 ++
 third_party/bevy_solari/src/scene/types.rs    |   24 +
 xtask/Cargo.toml                              |   10 +
 xtask/src/bake_navigation.rs                  |  125 +
 xtask/src/upgrade_project.rs                  |   52 +
 169 files changed, 27098 insertions(+), 3469 deletions(-)
 create mode 100644 .cursor/plans/navigation_authoring_2026-07-11.plan.md
 create mode 100644 .cursor/plans/renderer_material_component_foundation_2026-07-11.plan.md
 create mode 100644 assets/animations/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.animation.ron
 create mode 100644 assets/animations/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation.ron
 create mode 100644 assets/animations/generated/b98ef565-3500-49e7-9935-f685fa9b2594.animation.ron
 create mode 100644 assets/levels/navigation_authoring_showcase.scn.ron
 create mode 100644 assets/materials/surface_tint.ron
 create mode 100644 assets/materials/surface_tint_instance.ron
 create mode 100644 assets/meshes/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.static_mesh.ron
 create mode 100644 assets/meshes/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.static_mesh.ron
 create mode 100644 assets/models/RobotExpressive.glb
 create mode 100644 assets/navigation/generated/navigation_showcase_humanoid.nav.ron
 create mode 100644 assets/shaders/blacksite_surface.wgsl
 create mode 100644 assets/shaders/surface_tint.shader.ron
 create mode 100644 assets/shaders/surface_tint.wgsl
 create mode 100644 crates/blacksite_surface/Cargo.toml
 create mode 100644 crates/blacksite_surface/src/lib.rs
 create mode 100644 crates/blacksite_surface/src/surface_footer.wgsl
 create mode 100644 crates/blacksite_surface/src/surface_header.wgsl
 create mode 100644 crates/editor/src/ui/navigation_inspector.rs
 create mode 100644 crates/game/src/navigation.rs
 create mode 100644 crates/scene/src/navigation.rs
 create mode 100644 crates/scene/src/upgrade.rs
 create mode 100644 crates/shared/src/hydration/skinned_meshes.rs
 create mode 100644 crates/shared/src/navigation.rs
 create mode 100644 crates/shared/src/renderer_material.rs
 create mode 100644 docs/adr/0032-versioned-navigation-bake-and-runtime-query.md
 create mode 100644 docs/adr/0033-dedicated-skinned-mesh-renderer.md
 create mode 100644 docs/adr/0034-registry-driven-authoring-components.md
 create mode 100644 docs/adr/0035-shared-material-assets-and-renderer-slots.md
 create mode 100644 docs/adr/0036-surface-abi-and-solari-parity.md
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/README.md
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/component-registry-add-menu.png
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/custom-surface-on-skinned-renderer.png
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/larger-material-thumbnail-previews.png
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/material-editor-create-instance.png
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/material-instance-sparse-overrides.png
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/mesh-light-component-composition.png
 create mode 100644 docs/editor/evaluations/material-renderer-foundation/skinned-mesh-renderer-material-slots.png
 create mode 100644 docs/editor/extensibility.md
 create mode 100644 docs/editor/material-system.md
 create mode 100644 docs/editor/navigation-authoring.md
 create mode 100644 third_party/bevy_solari/.cargo-ok
 create mode 100644 third_party/bevy_solari/.cargo_vcs_info.json
 create mode 100644 third_party/bevy_solari/BLACKSITE_PATCH.md
 create mode 100644 third_party/bevy_solari/Cargo.lock
 create mode 100644 third_party/bevy_solari/Cargo.toml
 create mode 100644 third_party/bevy_solari/Cargo.toml.orig
 create mode 100644 third_party/bevy_solari/LICENSE-APACHE
 create mode 100644 third_party/bevy_solari/LICENSE-MIT
 create mode 100644 third_party/bevy_solari/README.md
 create mode 100644 third_party/bevy_solari/src/lib.rs
 create mode 100644 third_party/bevy_solari/src/pathtracer/extract.rs
 create mode 100644 third_party/bevy_solari/src/pathtracer/mod.rs
 create mode 100644 third_party/bevy_solari/src/pathtracer/node.rs
 create mode 100644 third_party/bevy_solari/src/pathtracer/pathtracer.wgsl
 create mode 100644 third_party/bevy_solari/src/pathtracer/prepare.rs
 create mode 100644 third_party/bevy_solari/src/realtime/extract.rs
 create mode 100644 third_party/bevy_solari/src/realtime/gbuffer_utils.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/mod.rs
 create mode 100644 third_party/bevy_solari/src/realtime/node.rs
 create mode 100644 third_party/bevy_solari/src/realtime/prepare.rs
 create mode 100644 third_party/bevy_solari/src/realtime/presample_light_tiles.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/realtime_bindings.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/resolve_dlss_rr_textures.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/restir_di.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/restir_gi.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/specular_gi.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/world_cache_compact.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/world_cache_query.wgsl
 create mode 100644 third_party/bevy_solari/src/realtime/world_cache_update.wgsl
 create mode 100644 third_party/bevy_solari/src/scene/binder.rs
 create mode 100644 third_party/bevy_solari/src/scene/blas.rs
 create mode 100644 third_party/bevy_solari/src/scene/brdf.wgsl
 create mode 100644 third_party/bevy_solari/src/scene/extract.rs
 create mode 100644 third_party/bevy_solari/src/scene/mod.rs
 create mode 100644 third_party/bevy_solari/src/scene/raytracing_scene_bindings.wgsl
 create mode 100644 third_party/bevy_solari/src/scene/sampling.wgsl
 create mode 100644 third_party/bevy_solari/src/scene/types.rs
 create mode 100644 xtask/src/bake_navigation.rs
 create mode 100644 xtask/src/upgrade_project.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 100f9f5..d6822a4 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -7,4 +7,6 @@ rustflags = ["-C", "link-arg=-fuse-ld=mold"]
 [alias]
 clean-target = "run -p xtask --bin clean-target --"
 validate-levels = "run -p xtask --features validate-levels --bin validate-levels --"
+bake-navigation = "run -p xtask --features validate-levels --bin bake-navigation --"
 package-project = "run -p xtask --features validate-levels --bin package-project --"
+upgrade-project = "run -p xtask --features validate-levels --bin upgrade-project --"
diff --git a/.cursor/plans/navigation_authoring_2026-07-11.plan.md b/.cursor/plans/navigation_authoring_2026-07-11.plan.md
new file mode 100644
index 0000000..83807ab
--- /dev/null
+++ b/.cursor/plans/navigation_authoring_2026-07-11.plan.md
@@ -0,0 +1,68 @@
+# Navigation Mesh Authoring, Bake Diagnostics, And Path Preview
+
+Working implementation plan for Gitea issue
+[`#48`](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/48).
+This is the navigation production loop required by the M7 content-production milestone.
+
+## Status
+
+Architecture and dependency compatibility are established. Implementation and production
+acceptance are in progress.
+
+## Outcome
+
+A level designer can author navigation bounds, obstacles, areas, links, and agent profiles; bake a
+deterministic versioned artifact; inspect stale or invalid data; preview a path in the viewport; and
+use the same artifact through a game-owned runtime query API and headless release validation.
+
+## Architecture
+
+- Shared reflected components own bounds, obstacles, area volumes, links, and scene bake settings.
+- The scene crate owns deterministic source fingerprinting, bake artifact IO, and validation.
+- Rerecast performs the 3D walkable-surface bake without coupling navigation to a Bevy plugin
+  release. Polyanya performs proven any-angle runtime and editor-preview path queries.
+- Overlapping primitive and additive-brush triangles enter the deterministic bake source; distant
+  geometry and navigation authoring are excluded from each bounds fingerprint.
+- The game crate owns loading and querying baked artifacts. Editor UI calls that public API for
+  preview rather than implementing a second pathfinder.
+- Generated artifacts live under `assets/navigation/generated/`, are project-relative runtime
+  dependencies, and never serialize viewport helpers into authored scenes.
+
+## Implementation Sequence
+
+1. Add reflected authoring schema, versioned bake artifact, source fingerprint, validation, and
+   exact agent-profile settings.
+2. Add deterministic Rerecast bake input extraction for authored bounds/obstacles and headless bake
+   command coverage.
+3. Add game-owned artifact loading and Polyanya path-query API, including authored off-mesh links.
+4. Add typed inspectors, create commands, bake/stale status, viewport overlay, and start/end path
+   preview.
+5. Add owner-attributed project validation for invalid links, missing/stale artifacts, unreachable
+   preview samples, and bake failures.
+6. Commit a small sample scene/artifact and run automated, headless, live editor, PIE, and packaged
+   runtime acceptance.
+
+## Acceptance Gates
+
+- A designer can create bounds and obstacles, bake, view the resulting mesh, and preview a valid
+  start-to-end path.
+- Agent radius, height, climb, and slope settings deterministically affect the bake fingerprint.
+- Relevant geometry or navigation-authoring changes mark the artifact stale; unrelated scene
+  metadata does not.
+- Invalid or dangling links, samples outside the mesh, isolated regions, and bake failures identify
+  the owning actor or setting and provide a repair action.
+- Runtime path queries and editor preview use the same game-owned API and versioned artifact.
+- Helper meshes, lines, endpoints, and bake state are transient and never serialize.
+- Headless bake and project validation pass for the committed sample fixture, and package dependency
+  collection includes the current artifact.
+
+## Deliberate Boundaries
+
+- V1 supports static baked navigation plus explicit links. Dynamic crowd avoidance and runtime tile
+  carving are separate work.
+- Full partial-tile regeneration waits for upstream Rerecast tiling support. V1 records affected
+  source bounds and debounces a deterministic full bake while reporting the dirty region.
+- Area costs are authored and validated in V1; path-cost weighting beyond walkable/blocked areas is
+  deferred until the runtime exposes per-polygon cost callbacks.
+- Imported static meshes remain obstacle-authored in V1 because their normalized manifests do not
+  yet expose deterministic collision triangles to the headless scene crate.
diff --git a/.cursor/plans/renderer_material_component_foundation_2026-07-11.plan.md b/.cursor/plans/renderer_material_component_foundation_2026-07-11.plan.md
new file mode 100644
index 0000000..a16352b
--- /dev/null
+++ b/.cursor/plans/renderer_material_component_foundation_2026-07-11.plan.md
@@ -0,0 +1,43 @@
+# Renderer, material, and component foundation
+
+## Goal
+
+Separate static and skinned renderer ownership, restore deterministic skinned edit poses, add shared
+material/material-instance slots, and make authoring components registry-driven and composable.
+
+## Component foundation milestone
+
+- Give authoring components immutable IDs distinct from Rust type paths.
+- Split persisted active state from inspector ordering with legacy-state migration.
+- Route presence, persistence, add/remove/reset/copy/paste, and component history through Bevy
+  reflection and atomic transactions.
+- Treat `ActorKind` as a derived compatibility/display hint; validate component data and explicit
+  requirements/conflicts.
+- Provide one statically linked extension registration helper and reflection round-trip fixture.
+- Verify registry integrity, transaction undo/redo, scene save inclusion, composition, and legacy
+  enable-state preservation.
+
+## Related renderer/material milestone
+
+- Keep `StaticMeshRenderer` and `SkinnedMeshRenderer` as separate authoring and hydration paths.
+- Give both renderer types stable imported-source/explicit Material slots and preserve orphaned
+  assignments by ID across source changes.
+- Add versioned Material and direct-base Material Instance assets, sparse editor overrides, shared
+  handle live refresh, and runtime-only property blocks.
+- Capture and restore imported Transform/MorphWeights baselines; sample only the explicitly chosen
+  default edit clip and never reload a rig for a material-only change.
+- Compose one validated Surface evaluator into raster and Solari, including normal/emissive/unlit
+  fields and exact cutout candidate acceptance. Safely omit skinned/morph geometry from Solari until
+  instance-owned deformed vertices and dynamic BLAS updates exist.
+- Upgrade scenes/materials explicitly to schema v4 with dry-run, staged writes, backup, rollback,
+  stable slot normalization, and active-state separation.
+
+## Acceptance
+
+- Shared, scene, game, game-hot, editor, Surface, and maintained Solari-fork tests pass.
+- `cargo --locked validate-levels` reports zero blocking findings.
+- A second project-upgrade dry run reports no changes after apply.
+- Editor evidence shows the stable component cards, static/skinned material slots, Material Instance
+  workflow, deterministic animated actor pose, and Surface/Solari diagnostics.
+- Gitea implementation issue and related roadmap issues link the documentation and screenshot
+  evidence without claiming unsupported dynamic deformed BLAS behavior.
diff --git a/.gitignore b/.gitignore
index 83d8053..8a93262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 # Editor/runtime generated session state
 /assets/levels/.pie_session.scn.ron
 /assets/.trash/
+/.blacksite/backups/
 
 # Backup, temporary, and log files
 **/*.rs.bk
diff --git a/Cargo.lock b/Cargo.lock
index 57c8a65..a9a9dd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -478,12 +478,12 @@ dependencies = [
  "bevy_mesh",
  "bevy_mikktspace",
  "bevy_pbr",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_state",
  "bevy_time",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "bytemuck",
  "disqualified",
@@ -517,7 +517,7 @@ dependencies = [
  "bevy_app",
  "bevy_derive",
  "bevy_ecs",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "serde",
 ]
 
@@ -544,11 +544,11 @@ dependencies = [
  "bevy_ecs",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_time",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "blake3",
  "derive_more 2.1.1",
  "downcast-rs 2.0.2",
@@ -569,7 +569,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fa3d816d7788e27da936b9c7ec27f9828906d53cb1d06e26c58cac5c5ee799f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "quote",
  "syn",
 ]
@@ -589,10 +589,10 @@ dependencies = [
  "bevy_ecs",
  "bevy_image",
  "bevy_math",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "tracing",
 ]
 
@@ -604,10 +604,10 @@ checksum = "671ae6f3a8d84f9ed696c531a138558596e041231a8414b6efeafa8469e841f9"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_tasks",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "console_error_panic_hook",
  "ctrlc",
  "downcast-rs 2.0.2",
@@ -635,10 +635,10 @@ dependencies = [
  "bevy_asset_macros",
  "bevy_diagnostic",
  "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_tasks",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bitflags 2.13.0",
  "blake3",
  "crossbeam-channel",
@@ -667,7 +667,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9444998cc37b51dfd1572c23a501865733ea65619a7d88b47aa654ae2290a4f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -683,7 +683,7 @@ dependencies = [
  "bevy_asset",
  "bevy_ecs",
  "bevy_math",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_transform",
  "rodio",
  "tracing",
@@ -703,16 +703,16 @@ dependencies = [
  "bevy_image",
  "bevy_math",
  "bevy_mesh",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "derive_more 2.1.1",
  "downcast-rs 2.0.2",
  "serde",
  "smallvec",
  "thiserror 2.0.18",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -724,7 +724,7 @@ dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_log",
- "bevy_platform",
+ "bevy_platform 0.19.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -737,13 +737,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e2dfc0091be6eb62fec9158b2d3e6f21b002be7bdb42dd3b8322e949c8426b0"
 dependencies = [
  "bevy_math",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bytemuck",
  "derive_more 2.1.1",
  "encase",
  "serde",
  "thiserror 2.0.18",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -763,12 +763,12 @@ dependencies = [
  "bevy_light",
  "bevy_log",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "bitflags 2.13.0",
  "indexmap",
@@ -781,7 +781,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "293df2b2f7ed65ef2ce02b2e7359faac1a9a92a8cc96c182c9de77eb06049ae0"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "quote",
  "syn",
 ]
@@ -805,8 +805,8 @@ dependencies = [
  "bevy_math",
  "bevy_pbr",
  "bevy_picking",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_state",
@@ -815,7 +815,7 @@ dependencies = [
  "bevy_transform",
  "bevy_ui",
  "bevy_ui_render",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "ron 0.12.1",
  "serde",
@@ -832,7 +832,7 @@ dependencies = [
  "atomic-waker",
  "bevy_app",
  "bevy_ecs",
- "bevy_platform",
+ "bevy_platform 0.19.0",
  "bevy_tasks",
  "bevy_time",
  "const-fnv1a-hash",
@@ -858,11 +858,11 @@ checksum = "4654b9b3535fa7813d2878a50e1b5ad80a361dc1c913b96ded57667f65d70a01"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
- "bevy_platform",
- "bevy_ptr",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_ptr 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_tasks",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bitflags 2.13.0",
  "bumpalo",
  "concurrent-queue",
@@ -884,7 +884,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee0b98a74141ce8dce4654c60020ebbaefab32646f42af6bbae55f282ae65ff7"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -897,7 +897,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dc958a194d226d618404e0fea99a3c8b4146207a00a3ba07fa712bf71607240"
 dependencies = [
  "bevy_ecs_macro_logic",
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -923,14 +923,14 @@ dependencies = [
  "bevy_math",
  "bevy_mesh",
  "bevy_picking",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_time",
  "bevy_transform",
  "bevy_ui_render",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "bevy_winit",
  "bytemuck",
@@ -947,7 +947,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webbrowser",
- "wgpu-types",
+ "wgpu-types 29.0.3",
  "winit",
 ]
 
@@ -957,7 +957,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14dc5bf9e6cb46c4401a66625b5f7eb9654a7f3c8586423c428b79586a1c55cd"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "encase_derive_impl",
 ]
 
@@ -980,8 +980,8 @@ dependencies = [
  "bevy_log",
  "bevy_math",
  "bevy_picking",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_scene",
  "bevy_shader",
@@ -1002,7 +1002,7 @@ dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
- "bevy_platform",
+ "bevy_platform 0.19.0",
  "bevy_time",
  "gilrs",
  "thiserror 2.0.18",
@@ -1025,10 +1025,10 @@ dependencies = [
  "bevy_log",
  "bevy_math",
  "bevy_mesh",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_time",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
 ]
 
@@ -1038,7 +1038,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9903f2614f53bacacb92bef1e407afe3a27a4abddb500bfd479909c5d7b254df"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "quote",
  "syn",
 ]
@@ -1062,12 +1062,12 @@ dependencies = [
  "bevy_math",
  "bevy_mesh",
  "bevy_pbr",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_sprite_render",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bytemuck",
  "tracing",
 ]
@@ -1091,8 +1091,8 @@ dependencies = [
  "bevy_material",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_tasks",
  "bevy_transform",
  "bevy_world_serialization",
@@ -1105,7 +1105,7 @@ dependencies = [
  "smallvec",
  "thiserror 2.0.18",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1115,7 +1115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afbd898e2c06dfba5854db187a3daece1eaf655c8fc385604bbe5b9304ed3f9b"
 dependencies = [
  "bevy_math",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "glam_matrix_extras",
  "serde",
 ]
@@ -1131,9 +1131,9 @@ dependencies = [
  "bevy_color",
  "bevy_ecs",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
+ "bevy_utils 0.19.0",
  "bitflags 2.13.0",
  "bytemuck",
  "futures-lite",
@@ -1146,7 +1146,7 @@ dependencies = [
  "serde",
  "thiserror 2.0.18",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1158,8 +1158,8 @@ dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "derive_more 2.1.1",
  "log",
  "serde",
@@ -1178,7 +1178,7 @@ dependencies = [
  "bevy_input",
  "bevy_math",
  "bevy_picking",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_window",
  "log",
  "thiserror 2.0.18",
@@ -1220,10 +1220,10 @@ dependencies = [
  "bevy_mesh",
  "bevy_pbr",
  "bevy_picking",
- "bevy_platform",
+ "bevy_platform 0.19.0",
  "bevy_post_process",
- "bevy_ptr",
- "bevy_reflect",
+ "bevy_ptr 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_remote",
  "bevy_render",
  "bevy_scene",
@@ -1238,7 +1238,7 @@ dependencies = [
  "bevy_ui",
  "bevy_ui_render",
  "bevy_ui_widgets",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "bevy_winit",
  "bevy_world_serialization",
@@ -1260,14 +1260,14 @@ dependencies = [
  "bevy_log",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "half",
  "smallvec",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1279,8 +1279,8 @@ dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
- "bevy_platform",
- "bevy_utils",
+ "bevy_platform 0.19.0",
+ "bevy_utils 0.19.0",
  "tracing",
  "tracing-log",
  "tracing-oslog",
@@ -1288,6 +1288,18 @@ dependencies = [
  "tracing-wasm",
 ]
 
+[[package]]
+name = "bevy_macro_utils"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b147843b81a7ec548876ff97fa7bfdc646ef2567cb465566259237b39664438"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "toml_edit 0.23.10+spec-1.0.0",
+]
+
 [[package]]
 name = "bevy_macro_utils"
 version = "0.19.0"
@@ -1297,7 +1309,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "toml_edit",
+ "toml_edit 0.25.12+spec-1.1.0",
 ]
 
 [[package]]
@@ -1311,16 +1323,16 @@ dependencies = [
  "bevy_ecs",
  "bevy_material_macros",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_shader",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "encase",
  "smallvec",
  "thiserror 2.0.18",
  "tracing",
  "variadics_please",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1329,7 +1341,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6928e167592472f6ee900f80de199cc2dafd31d4f082a86e8d594b81b973e3d"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "quote",
  "syn",
 ]
@@ -1342,12 +1354,12 @@ checksum = "d7c280440d2a5bc07ea393b5346b5712eec73ea30f0133097b8b13dade385beb"
 dependencies = [
  "approx",
  "arrayvec",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "derive_more 2.1.1",
  "glam 0.32.1",
  "itertools 0.14.0",
  "libm",
- "rand",
+ "rand 0.10.1",
  "rand_distr",
  "serde",
  "thiserror 2.0.18",
@@ -1367,8 +1379,8 @@ dependencies = [
  "bevy_encase_derive",
  "bevy_math",
  "bevy_mikktspace",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_transform",
  "bitflags 2.13.0",
  "bytemuck",
@@ -1380,7 +1392,7 @@ dependencies = [
  "serde",
  "thiserror 2.0.18",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1411,13 +1423,13 @@ dependencies = [
  "bevy_material",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_tasks",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bitflags 2.13.0",
  "bytemuck",
  "derive_more 2.1.1",
@@ -1429,7 +1441,7 @@ dependencies = [
  "static_assertions",
  "thiserror 2.0.18",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1446,8 +1458,8 @@ dependencies = [
  "bevy_input",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_time",
  "bevy_transform",
  "bevy_window",
@@ -1456,6 +1468,25 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "bevy_platform"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec6b36504169b644acd26a5469fd8d371aa6f1d73ee5c01b1b1181ae1cefbf9b"
+dependencies = [
+ "critical-section",
+ "foldhash 0.2.0",
+ "futures-channel",
+ "hashbrown 0.16.1",
+ "js-sys",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "spin",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "bevy_platform"
 version = "0.19.0"
@@ -1494,22 +1525,53 @@ dependencies = [
  "bevy_ecs",
  "bevy_image",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "smallvec",
  "thiserror 2.0.18",
  "tracing",
 ]
 
+[[package]]
+name = "bevy_ptr"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7a9329e8dc4e01ced480eeec4902e6d7cb56e56ec37f6fbc4323e5c937290a7"
+
 [[package]]
 name = "bevy_ptr"
 version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b511e89f7078fd21fdea77061a0ca3e737297c7011bb10c073e0aecb17c9fea6"
 
+[[package]]
+name = "bevy_reflect"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1dfeb67a9fe4f59003a84f5f99ba6302141c70e926601cbc6abfd4a1eea9ca9"
+dependencies = [
+ "assert_type_match",
+ "bevy_platform 0.18.1",
+ "bevy_ptr 0.18.1",
+ "bevy_reflect_derive 0.18.1",
+ "bevy_utils 0.18.1",
+ "derive_more 2.1.1",
+ "disqualified",
+ "downcast-rs 2.0.2",
+ "erased-serde",
+ "foldhash 0.2.0",
+ "glam 0.30.10",
+ "serde",
+ "smol_str",
+ "thiserror 2.0.18",
+ "uuid",
+ "variadics_please",
+ "wgpu-types 27.0.1",
+]
+
 [[package]]
 name = "bevy_reflect"
 version = "0.19.0"
@@ -1517,10 +1579,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92abd59cbba1524c1847e9a50f74d94e6b7836c80a8edfa9c47e59f7fd81021d"
 dependencies = [
  "assert_type_match",
- "bevy_platform",
- "bevy_ptr",
- "bevy_reflect_derive",
- "bevy_utils",
+ "bevy_platform 0.19.0",
+ "bevy_ptr 0.19.0",
+ "bevy_reflect_derive 0.19.0",
+ "bevy_utils 0.19.0",
  "derive_more 2.1.1",
  "disqualified",
  "downcast-rs 2.0.2",
@@ -1536,7 +1598,21 @@ dependencies = [
  "thiserror 2.0.18",
  "uuid",
  "variadics_please",
- "wgpu-types",
+ "wgpu-types 29.0.3",
+]
+
+[[package]]
+name = "bevy_reflect_derive"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "475f68c93e9cd5f17e9167635c8533a4f388f12d38245a202359e4c2721d87ba"
+dependencies = [
+ "bevy_macro_utils 0.18.1",
+ "indexmap",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "uuid",
 ]
 
 [[package]]
@@ -1545,7 +1621,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90fa4e6b97fd2d582dd5ed96762a70d04505a477c833cf4f69d016dcd03d2d04"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "indexmap",
  "proc-macro2",
  "quote",
@@ -1569,11 +1645,11 @@ dependencies = [
  "bevy_dev_tools",
  "bevy_ecs",
  "bevy_log",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_tasks",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "http-body-util",
  "hyper",
  "serde",
@@ -1602,14 +1678,14 @@ dependencies = [
  "bevy_material_macros",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render_macros",
  "bevy_shader",
  "bevy_tasks",
  "bevy_time",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "bitflags 2.13.0",
  "bytemuck",
@@ -1632,7 +1708,7 @@ dependencies = [
  "weak-table",
  "web-sys",
  "wgpu",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1641,7 +1717,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0eb5cffe5253a6ab4e4b84b2e40a6a2f4673deb16fd63ab9dfc4a015449873a"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -1658,10 +1734,10 @@ dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_log",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_scene_macros",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "smallvec",
  "thiserror 2.0.18",
  "tracing",
@@ -1675,7 +1751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4bc33a36a4e9e344985a96cd8b4abc816cf2c5d2fa002d72fd7bcd11396589c"
 dependencies = [
  "bevy_ecs_macro_logic",
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -1688,25 +1764,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa0ac51378bb6a021165ee334f846b515cd06082e24ce962adce58ad7df1c39a"
 dependencies = [
  "bevy_asset",
- "bevy_platform",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
+ "bevy_utils 0.19.0",
  "naga",
  "naga_oil",
  "serde",
  "thiserror 2.0.18",
  "tracing",
  "wgpu-naga-bridge",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
 name = "bevy_solari"
 version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2edac80e47ba799a747eb47c3dff6f9a46a85cf88bb0ceaad8ab5a5c6afdea"
 dependencies = [
- "bevy_anti_alias",
  "bevy_app",
  "bevy_asset",
  "bevy_camera",
@@ -1716,15 +1789,17 @@ dependencies = [
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_image",
+ "bevy_material",
  "bevy_math",
  "bevy_mesh",
  "bevy_pbr",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
+ "blacksite_surface",
  "bytemuck",
  "derive_more 2.1.1",
  "tracing",
@@ -1747,13 +1822,13 @@ dependencies = [
  "bevy_math",
  "bevy_mesh",
  "bevy_picking",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_text",
  "bevy_transform",
  "bevy_window",
  "radsort",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1773,14 +1848,14 @@ dependencies = [
  "bevy_material",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_sprite",
  "bevy_text",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bitflags 2.13.0",
  "bytemuck",
  "derive_more 2.1.1",
@@ -1797,10 +1872,10 @@ checksum = "8c22e694ea52e42994aea6ed2d0b378fa1e9d5a9b615db88626e33508bc03f35"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_state_macros",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "log",
  "variadics_please",
 ]
@@ -1811,7 +1886,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835f45091fa0df1ff3cb10f4ca5a397d4e9249b550f1be6893b08a2a06d6eed7"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.19.0",
  "quote",
  "syn",
 ]
@@ -1826,7 +1901,7 @@ dependencies = [
  "async-executor",
  "async-task",
  "atomic-waker",
- "bevy_platform",
+ "bevy_platform 0.19.0",
  "concurrent-queue",
  "crossbeam-queue",
  "derive_more 2.1.1",
@@ -1850,9 +1925,9 @@ dependencies = [
  "bevy_image",
  "bevy_log",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
+ "bevy_utils 0.19.0",
  "parley",
  "serde",
  "smallvec",
@@ -1861,7 +1936,7 @@ dependencies = [
  "sys-locale",
  "thiserror 2.0.18",
  "tracing",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -1872,8 +1947,8 @@ checksum = "c21e3be2aa4426ea1e0a7036d3d1dbbded84c319459d9f3e2a616b33563372f2"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "crossbeam-channel",
  "log",
  "serde",
@@ -1888,9 +1963,9 @@ dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_tasks",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "derive_more 2.1.1",
  "serde",
  "thiserror 2.0.18",
@@ -1938,13 +2013,13 @@ dependencies = [
  "bevy_log",
  "bevy_math",
  "bevy_picking",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_sprite",
  "bevy_text",
  "bevy_time",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "derive_more 2.1.1",
  "parley",
@@ -1974,8 +2049,8 @@ dependencies = [
  "bevy_input_focus",
  "bevy_math",
  "bevy_mesh",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_sprite",
@@ -1983,7 +2058,7 @@ dependencies = [
  "bevy_text",
  "bevy_transform",
  "bevy_ui",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bytemuck",
  "derive_more 2.1.1",
  "indexmap",
@@ -2006,7 +2081,7 @@ dependencies = [
  "bevy_log",
  "bevy_math",
  "bevy_picking",
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "bevy_text",
  "bevy_ui",
  "bevy_window",
@@ -2014,6 +2089,16 @@ dependencies = [
  "smol_str",
 ]
 
+[[package]]
+name = "bevy_utils"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2111910cd7a4b1e6ce07eaaeb6f68a2c0ea0ca609ed0d0d506e3eb161101435b"
+dependencies = [
+ "bevy_platform 0.18.1",
+ "disqualified",
+]
+
 [[package]]
 name = "bevy_utils"
 version = "0.19.0"
@@ -2021,7 +2106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3aceea6c7ffdd568f866d5ca4dfe50c33440c54f7bc230c13a9ba7ab0c91aed1"
 dependencies = [
  "async-channel",
- "bevy_platform",
+ "bevy_platform 0.19.0",
  "disqualified",
  "indexmap",
  "thread_local",
@@ -2039,8 +2124,8 @@ dependencies = [
  "bevy_image",
  "bevy_input",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "log",
  "raw-window-handle",
  "serde",
@@ -2066,8 +2151,8 @@ dependencies = [
  "bevy_input_focus",
  "bevy_log",
  "bevy_math",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_tasks",
  "bevy_window",
  "bytemuck",
@@ -2075,7 +2160,7 @@ dependencies = [
  "tracing",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types",
+ "wgpu-types 29.0.3",
  "winit",
 ]
 
@@ -2090,10 +2175,10 @@ dependencies = [
  "bevy_camera",
  "bevy_derive",
  "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "derive_more 2.1.1",
  "ron 0.12.1",
  "serde",
@@ -2132,6 +2217,17 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "blacksite_surface"
+version = "0.1.0"
+dependencies = [
+ "bevy",
+ "naga",
+ "ron 0.8.1",
+ "shared",
+ "uuid",
+]
+
 [[package]]
 name = "blake3"
 version = "1.8.5"
@@ -2204,6 +2300,16 @@ version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
+[[package]]
+name = "bvh2d"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2a56b2e919a2fadaedb1fc194ca730d9adbf030e9e9f26bb9e7d3621c4f6622"
+dependencies = [
+ "glam 0.30.10",
+ "serde",
+]
+
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
@@ -2931,6 +3037,16 @@ dependencies = [
  "proc-macro2-diagnostics",
 ]
 
+[[package]]
+name = "earcutr"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01"
+dependencies = [
+ "itertools 0.11.0",
+ "num-traits",
+]
+
 [[package]]
 name = "ecolor"
 version = "0.34.3"
@@ -2960,6 +3076,7 @@ dependencies = [
  "gltf",
  "hot-lib-reloader",
  "notify",
+ "polyanya",
  "protocol",
  "rfd",
  "ron 0.8.1",
@@ -3288,6 +3405,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "float_next_after"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -3457,7 +3580,9 @@ dependencies = [
  "bevy_ufbx",
  "cpal",
  "game_hot",
+ "glam 0.30.10",
  "hot-lib-reloader",
+ "polyanya",
  "protocol",
  "ron 0.12.1",
  "scene",
@@ -3475,12 +3600,55 @@ dependencies = [
  "bevy",
  "bevy_core_pipeline",
  "bevy_solari",
+ "blacksite_surface",
  "protocol",
  "settings",
  "shared",
  "sim",
 ]
 
+[[package]]
+name = "geo"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3901269ec6d4f6068d3f09e5f02f995bd076398dcd1dfec407cd230b02d11b"
+dependencies = [
+ "earcutr",
+ "float_next_after",
+ "geo-types",
+ "geographiclib-rs",
+ "i_overlay",
+ "log",
+ "num-traits",
+ "rand 0.8.7",
+ "robust",
+ "rstar",
+ "sif-itree",
+ "spade",
+]
+
+[[package]]
+name = "geo-types"
+version = "0.7.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94776032c45f950d30a13af6113c2ad5625316c9abfbccee4dd5a6695f8fe0f5"
+dependencies = [
+ "approx",
+ "num-traits",
+ "rayon",
+ "rstar",
+ "serde",
+]
+
+[[package]]
+name = "geographiclib-rs"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5a7f08910fd98737a6eda7568e7c5e645093e073328eeef49758cfe8b0489c7"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "gethostname"
 version = "1.1.0"
@@ -3491,6 +3659,17 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.4"
@@ -3561,6 +3740,16 @@ dependencies = [
  "xml-rs",
 ]
 
+[[package]]
+name = "glam"
+version = "0.30.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
+dependencies = [
+ "approx",
+ "serde_core",
+]
+
 [[package]]
 name = "glam"
 version = "0.31.1"
@@ -3581,7 +3770,7 @@ dependencies = [
  "encase",
  "libm",
  "mint",
- "rand",
+ "rand 0.10.1",
  "serde_core",
 ]
 
@@ -3591,7 +3780,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db060a7f23a5666ccbe9c770cd0e0e419b2eb94c86a7c8bfd091bacf8b4926cd"
 dependencies = [
- "bevy_reflect",
+ "bevy_reflect 0.19.0",
  "glam 0.32.1",
  "serde",
 ]
@@ -3933,6 +4122,49 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "i_float"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "010025c2c532c8d82e42d0b8bb5184afa449fa6f06c709ea9adcb16c49ae405b"
+dependencies = [
+ "libm",
+]
+
+[[package]]
+name = "i_key_sort"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9190f86706ca38ac8add223b2aed8b1330002b5cdbbce28fb58b10914d38fc27"
+
+[[package]]
+name = "i_overlay"
+version = "4.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413183068e6e0289e18d7d0a1f661b81546e6918d5453a44570b9ab30cbed1b3"
+dependencies = [
+ "i_float",
+ "i_key_sort",
+ "i_shape",
+ "i_tree",
+ "rayon",
+]
+
+[[package]]
+name = "i_shape"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ea154b742f7d43dae2897fcd5ead86bc7b5eefcedd305a7ebf9f69d44d61082"
+dependencies = [
+ "i_float",
+]
+
+[[package]]
+name = "i_tree"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35e6d558e6d4c7b82bc51d9c771e7a927862a161a7d87bf2b0541450e0e20915"
+
 [[package]]
 name = "icu_collections"
 version = "2.2.0"
@@ -4181,6 +4413,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -5546,6 +5787,24 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
+[[package]]
+name = "polyanya"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a1cb0a84a11080ff93d943a023e9e386c34d3dcc3c988bc6785f990b1964277"
+dependencies = [
+ "bvh2d",
+ "geo",
+ "glam 0.30.10",
+ "hashbrown 0.16.1",
+ "log",
+ "rerecast",
+ "serde",
+ "smallvec",
+ "spade",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "polycool"
 version = "0.4.0"
@@ -5590,6 +5849,15 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "presser"
 version = "0.3.1"
@@ -5602,7 +5870,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.25.12+spec-1.1.0",
 ]
 
 [[package]]
@@ -5710,6 +5978,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
+[[package]]
+name = "rand"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand"
 version = "0.10.1"
@@ -5717,7 +5996,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
  "getrandom 0.4.3",
- "rand_core",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
 ]
 
 [[package]]
@@ -5733,7 +6031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.10.1",
 ]
 
 [[package]]
@@ -5882,6 +6180,22 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
+[[package]]
+name = "rerecast"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd207dd0644bd506d8017195865d72274dae648923596438255a0da00836f548"
+dependencies = [
+ "anyhow",
+ "bevy_reflect 0.18.1",
+ "bitflags 2.13.0",
+ "glam 0.30.10",
+ "serde",
+ "slotmap",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
 [[package]]
 name = "rfd"
 version = "0.17.2"
@@ -6059,6 +6373,9 @@ name = "scene"
 version = "0.1.0"
 dependencies = [
  "blake3",
+ "glam 0.30.10",
+ "polyanya",
+ "rerecast",
  "ron 0.8.1",
  "ron-edit",
  "serde",
@@ -6196,6 +6513,12 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
+[[package]]
+name = "sif-itree"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7f45b8998ced5134fb1d75732c77842a3e888f19c1ff98481822e8fbfbf930b"
+
 [[package]]
 name = "sim"
 version = "0.1.0"
@@ -6274,6 +6597,7 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
 dependencies = [
+ "serde",
  "version_check",
 ]
 
@@ -6714,6 +7038,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "1.1.1+spec-1.1.0"
@@ -6723,6 +7056,18 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.23.10+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+dependencies = [
+ "indexmap",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "winnow 0.7.15",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.25.12+spec-1.1.0"
@@ -6730,9 +7075,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
 dependencies = [
  "indexmap",
- "toml_datetime",
+ "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
- "winnow",
+ "winnow 1.0.3",
 ]
 
 [[package]]
@@ -6741,7 +7086,7 @@ version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow",
+ "winnow 1.0.3",
 ]
 
 [[package]]
@@ -6862,12 +7207,12 @@ dependencies = [
  "bevy_mesh",
  "bevy_pbr",
  "bevy_picking",
- "bevy_platform",
- "bevy_reflect",
+ "bevy_platform 0.19.0",
+ "bevy_reflect 0.19.0",
  "bevy_render",
  "bevy_shader",
  "bevy_transform",
- "bevy_utils",
+ "bevy_utils 0.19.0",
  "bevy_window",
  "bytemuck",
  "transform-gizmo",
@@ -7331,7 +7676,7 @@ dependencies = [
  "web-sys",
  "wgpu-core",
  "wgpu-hal",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -7364,7 +7709,7 @@ dependencies = [
  "wgpu-core-deps-windows-linux-android",
  "wgpu-hal",
  "wgpu-naga-bridge",
- "wgpu-types",
+ "wgpu-types 29.0.3",
 ]
 
 [[package]]
@@ -7442,7 +7787,7 @@ dependencies = [
  "wayland-sys",
  "web-sys",
  "wgpu-naga-bridge",
- "wgpu-types",
+ "wgpu-types 29.0.3",
  "windows",
  "windows-core",
  "windows-result",
@@ -7455,7 +7800,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59c654c483f058800972c3645e95388a7eca31bf9fe1933bc20e036588a0be02"
 dependencies = [
  "naga",
- "wgpu-types",
+ "wgpu-types 29.0.3",
+]
+
+[[package]]
+name = "wgpu-types"
+version = "27.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
+dependencies = [
+ "bitflags 2.13.0",
+ "bytemuck",
+ "js-sys",
+ "log",
+ "serde",
+ "thiserror 2.0.18",
+ "web-sys",
 ]
 
 [[package]]
@@ -7973,6 +8333,15 @@ dependencies = [
  "xkbcommon-dl",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winnow"
 version = "1.0.3"
diff --git a/Cargo.toml b/Cargo.toml
index 72a7607..3012d30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = [
+    "crates/blacksite_surface",
     "crates/game",
     "crates/game_hot",
     "crates/shared",
@@ -36,6 +37,7 @@ bevy = { version = "0.19", features = [
 ] }
 bevy_core_pipeline = "0.19"
 bevy_solari = "0.19"
+blacksite_surface = { path = "crates/blacksite_surface" }
 bevy_ufbx = "0.18.1-rc.1"
 bevy_egui = "0.40"
 bevy-inspector-egui = "0.37"
@@ -43,6 +45,9 @@ egui_dock = { version = "0.19.1", features = ["serde"] }
 egui_phosphor_icons = { version = "0.3.1", default-features = false }
 transform-gizmo-bevy = "0.9"
 serde = { version = "1", features = ["derive"] }
+nav_glam = { package = "glam", version = "0.30.8", features = ["serde"] }
+polyanya = { version = "0.16.1", default-features = false, features = ["recast", "serde"] }
+rerecast = { version = "0.3.2", default-features = false, features = ["std", "serialize"] }
 shared = { path = "crates/shared" }
 game = { path = "crates/game" }
 game_hot = { path = "crates/game_hot" }
@@ -52,6 +57,8 @@ settings = { path = "crates/settings" }
 scene = { path = "crates/scene" }
 
 [patch.crates-io]
+# Blacksite Surface ABI and deformation-safety integration for Solari.
+bevy_solari = { path = "third_party/bevy_solari" }
 # Local Bevy 0.19 compatibility patch until upstream publishes a matching FBX loader.
 bevy_ufbx = { path = "third_party/bevy_ufbx" }
 # Lossless RON editing fixes used by transactional prefab source edits.
diff --git a/README.md b/README.md
index 5b98f53..ecafa83 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ cargo clippy --workspace --all-targets -- -D warnings
 cargo clippy -p editor -p game --bins --features dev,hot-reload -- -D warnings
 cargo test --workspace
 cargo validate-levels
+cargo bake-navigation --project . --check
 # Machine-readable project dependency and finding report
 cargo validate-levels --json
 cargo package-project --profile development
@@ -149,6 +150,7 @@ deep-stale variants.
 | Asset Browser project/file views | Browse `assets/`, search/filter/sort models, textures, materials, audio clips, levels, and prefabs; switch grid/list; expand model subassets; inspect file details; audition audio; drag supported assets/submeshes into the viewport |
 | Drag audio clip into viewport | Create an authored audio source; when an audio source is selected, assign the clip instead |
 | Asset Browser context/details actions | Apply textures/materials, regenerate thumbnails, reimport models, place assets/submeshes, or move file assets to `assets/.trash/` |
+| Static/Skinned Mesh Renderer material slots | Assign a shared Material/Material Instance per slot; Browse/Select/Locate the reference, or Clear the override to restore the imported source material |
 | `Ctrl+P` | Centered command palette; search human labels or stable command IDs, use arrow keys to select, Enter to run |
 | `F7` | While paused in Play: advance one sim tick |
 | Shift/Ctrl + click (Hierarchy) | Additive selection |
@@ -230,10 +232,21 @@ Viewport shortcut keys require the pointer to be in the viewport and are suspend
   details when you need full `WorldAssetRoot` scene data instead of normalized static slots.
   Expanding a model in the Asset Browser exposes normalized mesh/material/texture plus generated
   skeleton/animation-clip subassets. Dragging a mesh places that part through the static mesh path;
-  dragging a clip creates an animated scene instance or assigns an exact-rig-compatible state to
-  the selected imported model. The Animation Controller inspector edits state IDs, clips,
+  dragging a clip creates a dedicated skinned renderer or assigns an exact-rig-compatible state to
+  the selected skinned actor. **Default animation** in Model Import Settings optionally selects the
+  exact clip sampled and paused as the edit-rest pose; **Imported rest pose** never guesses a clip.
+  Preview stop and PIE exit restore imported transforms and morph weights before resampling that
+  explicit default. The Animation Controller inspector edits state IDs, clips,
   range/loop/speed/default/crossfade and provides non-dirty play/pause/stop/scrub preview. See the
   [animation authoring guide](docs/editor/animation-authoring.md) and [ADR 0031](docs/adr/0031-animation-authoring-runtime-contract.md).
+- Navigation bounds, obstacles, areas, and links are created from **Scene > Navigation** or the path
+  icon in the existing horizontal toolbar. Bounds bake versioned Rerecast artifacts under
+  `assets/navigation/generated/`; overlapping primitive and additive-brush triangles participate
+  in the bake fingerprint while distant authoring is excluded. The Inspector reports
+  stale/current state and provides a Polyanya-backed path test whose mesh, links, and route render
+  in the viewport. Use
+  `cargo bake-navigation --project . --check` in CI. See the
+  [navigation authoring guide](docs/editor/navigation-authoring.md) and [ADR 0032](docs/adr/0032-versioned-navigation-bake-and-runtime-query.md).
 - Brush actors are persisted as `ActorKind::Brush + BrushDesc`; valid convex faces hydrate into
   generated preview meshes. Vertex, edge, and face selections use the standard transform gizmo,
   face material/UV fields are undoable, and clip/intersect/merge/subtract provide conservative
@@ -329,6 +342,7 @@ The `.vscode/` folder is preconfigured:
 - [ADR 0014: Unified Viewport Model](docs/adr/0014-unified-viewport-model.md)
 - [ADR 0016: Unified Rendering Contract](docs/adr/0016-unified-rendering-contract.md)
 - [ADR 0017: Normalized Static Mesh Assets](docs/adr/0017-normalized-static-mesh-assets.md)
+- [ADR 0034: Registry-driven Authoring Components](docs/adr/0034-registry-driven-authoring-components.md)
 
 ## Project Layout
 
@@ -375,12 +389,13 @@ crates/
 - [x] Audio clip catalog/import foundation for Ogg, WAV, MP3, and FLAC with dedicated filtering, file details, and stable runtime-resolvable asset references
 - [x] Audio source/listener authoring, non-dirty spatial audition, viewport icons/range gizmos, stable buses, PIE/runtime parity, device diagnostics, and shared release validation ([ADR 0030](docs/adr/0030-audio-authoring-and-bus-schema.md); production acceptance completed in [Gitea #47](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/47))
 - [x] glTF/GLB skeletal animation manifests, stable controller states, non-dirty preview, PIE/runtime hydration, and exact-signature compatibility validation ([ADR 0031](docs/adr/0031-animation-authoring-runtime-contract.md); production acceptance completed in [Gitea #46](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/46))
+- [ ] Navigation bounds/obstacles/areas/links, deterministic stale-checked bake artifacts, viewport path preview, headless bake, and game runtime query API ([ADR 0032](docs/adr/0032-versioned-navigation-bake-and-runtime-query.md); tracked in [Gitea #48](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/48))
 - [x] Prefab instances (`PrefabInstance`) + save-as-prefab + unpack
 - [x] Independent dirty-tab close confirmation and all-tab save guard when switching projects
 - [x] Transactional scene writes + bounded user-local recovery snapshots ([ADR 0023](docs/adr/0023-transactional-scene-persistence-and-recovery.md))
 - [x] Versioned clean/crash session resume + privacy-bounded diagnostic bundle ([ADR 0024](docs/adr/0024-versioned-editor-session-state.md))
 - [x] Hierarchy multi-select, reparent undo, multi-entity gizmo transform
-- [x] Typed inspector undo (light, rigid body, collider, primitive, material, static mesh renderer) + registry-driven Add Component footer
+- [x] Typed inspector undo (light, rigid body, collider, primitive, material, static mesh renderer) + registry-driven Add Component footer; skinned renderer sources are asset-owned and inspectable
 - [x] Gameplay authoring markers + visualizers (`WeaponSpawn`, `TriggerVolume`, etc.)
 - [x] Command palette execution; PIE sim step (F7); `xtask validate-levels`
 - [x] ADRs 0005–0012 (prefab/registry, scene schema, EditorPlugin, editor structure, authoring/hydration, ActorKind, sun policy, zero-debt)
@@ -392,16 +407,19 @@ crates/
 - [x] Project Browser UI, strict manifest validation, `--project` startup activation, recent filtering, sandbox scaffolding, clean process handoff, and desktop launcher action ([ADR 0025](docs/adr/0025-project-root-is-a-startup-boundary.md))
 - [x] Independent scene tabs + stable subscene composition, recursive validation, ownership locks, active-world PIE consistency, and per-saved-tab recovery ([ADR 0026](docs/adr/0026-stable-scene-composition-and-active-document.md))
 - [x] Editor lib/bin split + `EditorPluginGroup`; game EditorPlugin dogfood panel
-- [x] FBX/glTF model import + normalized `StaticMeshRenderer` placement; explicit scene-instance load via `bevy_ufbx` / `ModelRef`
+- [x] FBX/glTF model import + normalized static/skinned renderer routing; explicit generic scene-instance load via `bevy_ufbx` / `ModelRef`
 - [x] Asset browser model thumbnails (unified `assets/thumbnails/` pipeline; `ThumbnailState` cache; FBX via `FbxThumbnailSource`)
-- [x] Material assets (`assets/materials/*.ron`, inspector picker, drag-drop to selection)
+- [x] Shared Material/Material Instance assets, stable static/skinned renderer material slots, imported-source fallback, orphan preservation, and runtime-only property blocks ([ADR 0035](docs/adr/0035-shared-material-assets-and-renderer-slots.md), [material-system guide](docs/editor/material-system.md))
 - [x] Prefab v2 core: shared stable nested override paths, property/component/structural scopes, recursive graph validation, linked-root variants, conflict recovery, transactional source Apply, and undoable unpack/convert ([ADR 0027](docs/adr/0027-stable-prefab-ownership-and-variants.md))
 - [x] Prefab v2 production acceptance: committed base/nested/variant fixtures pass workspace tests, recursive headless validation, packaged release startup, and live editor placement/inspection regression coverage ([Gitea #43](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/43))
 - [x] Shared project validation: editor Diagnostics and `cargo validate-levels --json` use one owner-attributed dependency/finding report across project settings, registry/import artifacts, materials, shaders, scenes, prefabs, brushes, and colliders; valid/missing/cyclic/incompatible fixtures fail on blocking content errors ([ADR 0028](docs/adr/0028-authoritative-project-content-validation.md), [Gitea #45](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/45))
 - [x] Validation-gated package foundation: versioned development/QA/release profiles, deterministic runtime exclusions, stable input snapshots, transactional staged publication, Cargo-reported artifacts, BLAKE3 metadata, authored default-scene startup, and a non-blocking editor Build panel with live logs/cancel/run/reveal ([ADR 0029](docs/adr/0029-validation-gated-build-profiles-and-packaging.md), [build guide](docs/editor/build-and-package.md), [Gitea #44](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/44))
 - [x] Advanced rendering: `GiMode`, post-process volumes, Rendering panel, requested/effective render stack, Solari integration, emissive materials, post FX assets ([ADR 0013](docs/adr/0013-rendering-tiers-and-post-process-volumes.md), [ADR 0016](docs/adr/0016-unified-rendering-contract.md), [rendering guide](docs/editor/rendering.md))
+- [x] Surface ABI v1 with shared raster/Solari evaluator dispatch, packed typed parameters/textures, exact cutout ray-candidate evaluation, last-good shader fallback, and explicit exclusion of skinned/morph-deformed Solari geometry ([ADR 0036](docs/adr/0036-surface-abi-and-solari-parity.md), [material-system guide](docs/editor/material-system.md))
 - [x] Static mesh renderer component, generated normalized mesh artifacts, source/one-actor hierarchy placement, and inspector renderer slots ([ADR 0017](docs/adr/0017-normalized-static-mesh-assets.md))
+- [x] Dedicated `SkinnedMeshRenderer`/`SkinnedMesh` actor path, skinned-part exclusion from static slots, dedicated runtime hierarchy hydration, and v2-to-v3 animated-scene migration ([ADR 0033](docs/adr/0033-dedicated-skinned-mesh-renderer.md))
 - [x] Componentized actor inspector, unified component cards, thumbnail static mesh slots, imported asset Browse/Locate/Clear refs with inherited source defaults, collider split, shader-aware actor material data, and texture picker/drop refs ([ADR 0018](docs/adr/0018-componentized-actor-inspector-and-materials.md))
+- [x] Stable authoring component IDs, registry-built save filtering, reflected atomic add/remove/reset/copy/paste history, independent active state, static extension registration, and derived composable `ActorKind` hints ([ADR 0034](docs/adr/0034-registry-driven-authoring-components.md), [extensibility guide](docs/editor/extensibility.md))
 - [x] Brush authoring schema MVP with `ActorKind::Brush`, cube `BrushDesc`, generated mesh hydration, scene migration, and inspector Add Component support ([ADR 0021](docs/adr/0021-brush-authoring-schema.md))
 - [x] Brush draw, vertex/edge/face gizmo editing, face material/UV authoring, clip, and bounds-based CSG preview/commit workflow ([brush guide](docs/editor/brushes.md))
 - [x] Searchable command palette with human labels/stable IDs and a status bar that exposes scene I/O, tool, history, mode, and selection feedback
@@ -414,10 +432,12 @@ crates/
   untextured models), material sphere thumbnails, search/filter/sort controls, expandable model
   subasset shelves, and a staged details pane. **File → Import Assets**
   accepts glTF/GLB and **FBX** (binary; copies sibling `.fbm` texture folders when present).
-  Model assets generate normalized static mesh manifests under `assets/meshes/generated/`; drag/drop
-  uses `StaticMeshRenderer` by default with imported asset refs and optional separate static mesh
-  collider components. Expanded mesh subassets generate independent thumbnails and can be placed independently. Asset details can switch
-  placement to **Scene Instance** for `ModelRef`/`WorldAssetRoot` playback, shared material assets can be
+  Model assets generate normalized model manifests under `assets/meshes/generated/`; drag/drop uses
+  **Renderable Asset (Auto)**. Unrigged sources use `StaticMeshRenderer` with imported asset refs
+  and optional separate static mesh colliders. Skin-bound or animated sources and their subasset placement use
+  `SkinnedMeshRenderer`, preserve the source joint hierarchy, and never create static slots or
+  automatic triangle colliders. Expanded mesh subassets generate independent thumbnails. Asset details can switch
+  placement to **Scene Instance** for generic `ModelRef`/`WorldAssetRoot` scenes, shared material assets can be
   edited from the browser, and delete actions move files to `assets/.trash/`. Animation authoring
   supports glTF/GLB rig and clip manifests, stable controller refs, clip drag assignment/placement,
   inspector preview, PIE/runtime playback, and headless compatibility diagnostics. Animated or
@@ -432,7 +452,7 @@ crates/
   **Unpack Layer** preserves nested links; **Convert to Local** recursively removes them. Current
   authoring UI coverage and production-acceptance gaps are tracked in
   [prefab-authoring.md](docs/editor/prefab-authoring.md).
-- Material assets are RON files under `assets/materials/`; shader schemas live under `assets/shaders/`. `MaterialDesc` stores shader kind, typed parameters, texture bindings, and StandardMaterial fields. The Asset Browser material details editor can apply shader schemas, edit typed parameters/textures, and regenerate sphere thumbnails. Actor inspector material edits live on the actor `MaterialDesc`; static mesh source-material refs remain imported defaults and shared material assets are edited from the Asset Browser.
+- Material and direct-base Material Instance assets live under `assets/materials/`; shader schemas live under `assets/shaders/`. In the Asset Browser, select a Material and use **Create Instance** for sparse inherited variants. Static and skinned renderers own stable per-draw material slots, with explicit assignments taking precedence over imported source defaults; shared edits propagate through live-updated handles without reloading skinned geometry. Custom Surface evaluators share one constrained ABI between raster and Solari-eligible non-deformed geometry. Dynamic skinned/morph Solari geometry and a persisted property-block authoring workflow remain future work; see the [material-system guide](docs/editor/material-system.md).
 - Per-field reflect undo for all components remains future work; typed `shared` inspectors cover the common authoring path.
 - The authoring/hydration layer is intentionally small so richer asset workflows (terrain,
   material graphs, lighting profiles) can be added without changing the scene format foundation.
diff --git a/assets/.index/registry.ron b/assets/.index/registry.ron
index 0b2bfe2..cf83459 100644
--- a/assets/.index/registry.ron
+++ b/assets/.index/registry.ron
@@ -12,6 +12,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -28,6 +30,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -44,6 +48,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -60,6 +66,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -76,6 +84,44 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: Some("assets/meshes/generated/b98ef565-3500-49e7-9935-f685fa9b2594.static_mesh.ron"),
+            animation_manifest_path: Some("assets/animations/generated/b98ef565-3500-49e7-9935-f685fa9b2594.animation.ron"),
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("113f74df-e39c-41d4-9b5b-e48efe541f7f"),
+        path: "assets/models/RobotExpressive.glb",
+        label: "RobotExpressive",
+        kind_tag: "Model",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: SceneInstance,
+            hierarchy_mode: SourceHierarchy,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: Some("assets/meshes/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.static_mesh.ron"),
+            animation_manifest_path: Some("assets/animations/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.animation.ron"),
+            default_animation_clip_id: Some("animation:clip:8:standing"),
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("3f63f359-45eb-4cb2-8970-71921cbd7bd0"),
+        path: "assets/models/robot_expressive.glb",
+        label: "robot_expressive",
+        kind_tag: "Model",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: Some("assets/meshes/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.static_mesh.ron"),
+            animation_manifest_path: Some("assets/animations/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation.ron"),
+            default_animation_clip_id: Some("animation:clip:8:standing"),
         ),
         dependencies: [],
     ),
@@ -92,6 +138,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -108,6 +156,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -124,6 +174,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -140,6 +192,26 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("706e604e-1a63-4e97-b35d-eeb1d88fe3a9"),
+        path: "assets/levels/navigation_authoring_showcase.scn.ron",
+        label: "navigation_authoring_showcase.scn",
+        kind_tag: "Level",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -156,6 +228,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -172,6 +246,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -188,6 +264,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -204,6 +282,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -220,6 +300,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -236,6 +318,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -252,6 +336,62 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("04a4e00e-4732-43db-8e99-9cd99b94667b"),
+        path: "assets/animations/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.animation.ron",
+        label: "113f74df-e39c-41d4-9b5b-e48efe541f7f.animation",
+        kind_tag: "Level",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("4937e63f-923b-4270-bdfc-298d63bcb814"),
+        path: "assets/animations/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation.ron",
+        label: "3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation",
+        kind_tag: "Level",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("28f1df44-6d24-4722-bf75-6969879995a4"),
+        path: "assets/animations/generated/b98ef565-3500-49e7-9935-f685fa9b2594.animation.ron",
+        label: "b98ef565-3500-49e7-9935-f685fa9b2594.animation",
+        kind_tag: "Level",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -268,6 +408,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -284,6 +426,26 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("264e2010-0693-4d74-8440-99373c2cedb3"),
+        path: "assets/navigation/generated/navigation_showcase_humanoid.nav.ron",
+        label: "navigation_showcase_humanoid.nav",
+        kind_tag: "Level",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -300,6 +462,26 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("cc2769da-c9a5-4cb3-866a-cc81d0688ee2"),
+        path: "assets/materials/surface_tint_instance.ron",
+        label: "surface_tint_instance",
+        kind_tag: "Material",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -316,6 +498,26 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("d6cb4151-7124-4237-aaf9-f7f8abd5fb76"),
+        path: "assets/materials/surface_tint.ron",
+        label: "surface_tint",
+        kind_tag: "Material",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -332,6 +534,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -348,6 +552,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -364,6 +570,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -380,6 +588,8 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
@@ -396,6 +606,26 @@
             hierarchy_mode: SingleActor,
             material_policy: SourceMaterials,
             static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
+        ),
+        dependencies: [],
+    ),
+    (
+        id: ("a72943d6-3e9d-4629-8887-5c02d99d4f92"),
+        path: "assets/shaders/surface_tint.shader.ron",
+        label: "surface_tint.shader",
+        kind_tag: "ShaderSchema",
+        import_settings: (
+            scale: 1.0,
+            generate_collider: true,
+            lod0_only: true,
+            placement_mode: StaticAsset,
+            hierarchy_mode: SingleActor,
+            material_policy: SourceMaterials,
+            static_mesh_manifest_path: None,
+            animation_manifest_path: None,
+            default_animation_clip_id: None,
         ),
         dependencies: [],
     ),
diff --git a/assets/animations/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.animation.ron b/assets/animations/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.animation.ron
new file mode 100644
index 0000000..0c9f6ca
--- /dev/null
+++ b/assets/animations/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.animation.ron
@@ -0,0 +1,236 @@
+(
+    schema_version: 3,
+    asset_id: "113f74df-e39c-41d4-9b5b-e48efe541f7f",
+    label: "RobotExpressive",
+    default_animation_clip_id: Some("animation:clip:8:standing"),
+    source: (
+        path: "assets/models/RobotExpressive.glb",
+        format: "glb",
+        fingerprint: (
+            byte_len: 463988,
+            modified_unix_secs: 1783799272,
+            content_hash: "5869cb813e6a6093eda7af2824a9c13a582750e0443e88ce7c991a1f83415521",
+        ),
+        dependencies: [],
+    ),
+    runtime_supported: true,
+    skeletons: [
+        (
+            id: "animation:skeleton:0:skeleton_0",
+            label: "Skeleton 0",
+            source_index: 0,
+            signature: ("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b"),
+            joint_paths: [
+                "RootNode/RobotArmature/Bone",
+                "RootNode/RobotArmature/Bone/Foot.L",
+                "RootNode/RobotArmature/Bone/Body",
+                "RootNode/RobotArmature/Bone/Body/Hips",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L/Middle2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L/Thumb2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L/Index2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L/Ring2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R/Middle2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R/Thumb2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R/Index2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R/Ring2.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L/LowerLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R/LowerLeg.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.L",
+                "RootNode/RobotArmature/Bone/Foot.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.R",
+            ],
+        ),
+        (
+            id: "animation:skeleton:1:skeleton_1",
+            label: "Skeleton 1",
+            source_index: 1,
+            signature: ("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b"),
+            joint_paths: [
+                "RootNode/RobotArmature/Bone",
+                "RootNode/RobotArmature/Bone/Foot.L",
+                "RootNode/RobotArmature/Bone/Body",
+                "RootNode/RobotArmature/Bone/Body/Hips",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L/Middle2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L/Thumb2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L/Index2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L/Ring2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R/Middle2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R/Thumb2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R/Index2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R/Ring2.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L/LowerLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R/LowerLeg.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.L",
+                "RootNode/RobotArmature/Bone/Foot.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.R",
+            ],
+        ),
+    ],
+    clips: [
+        (
+            id: "animation:clip:0:dance",
+            label: "Dance",
+            source_index: 0,
+            duration_seconds: 3.3333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:1:death",
+            label: "Death",
+            source_index: 1,
+            duration_seconds: 0.9583333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:2:idle",
+            label: "Idle",
+            source_index: 2,
+            duration_seconds: 3.3333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:3:jump",
+            label: "Jump",
+            source_index: 3,
+            duration_seconds: 0.7083333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:4:no",
+            label: "No",
+            source_index: 4,
+            duration_seconds: 1.6666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:5:punch",
+            label: "Punch",
+            source_index: 5,
+            duration_seconds: 0.8333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:6:running",
+            label: "Running",
+            source_index: 6,
+            duration_seconds: 0.9583333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:7:sitting",
+            label: "Sitting",
+            source_index: 7,
+            duration_seconds: 0.41666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:8:standing",
+            label: "Standing",
+            source_index: 8,
+            duration_seconds: 0.41666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:9:thumbsup",
+            label: "ThumbsUp",
+            source_index: 9,
+            duration_seconds: 1.5833334,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:10:walking",
+            label: "Walking",
+            source_index: 10,
+            duration_seconds: 0.9583333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:11:walkjump",
+            label: "WalkJump",
+            source_index: 11,
+            duration_seconds: 0.8333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:12:wave",
+            label: "Wave",
+            source_index: 12,
+            duration_seconds: 1.8333334,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:13:yes",
+            label: "Yes",
+            source_index: 13,
+            duration_seconds: 1.6666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+    ],
+    diagnostics: [],
+)
\ No newline at end of file
diff --git a/assets/animations/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation.ron b/assets/animations/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation.ron
new file mode 100644
index 0000000..8ae208c
--- /dev/null
+++ b/assets/animations/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.animation.ron
@@ -0,0 +1,236 @@
+(
+    schema_version: 3,
+    asset_id: "3f63f359-45eb-4cb2-8970-71921cbd7bd0",
+    label: "robot_expressive",
+    default_animation_clip_id: Some("animation:clip:8:standing"),
+    source: (
+        path: "assets/models/robot_expressive.glb",
+        format: "glb",
+        fingerprint: (
+            byte_len: 463988,
+            modified_unix_secs: 1783750957,
+            content_hash: "5869cb813e6a6093eda7af2824a9c13a582750e0443e88ce7c991a1f83415521",
+        ),
+        dependencies: [],
+    ),
+    runtime_supported: true,
+    skeletons: [
+        (
+            id: "animation:skeleton:0:skeleton_0",
+            label: "Skeleton 0",
+            source_index: 0,
+            signature: ("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b"),
+            joint_paths: [
+                "RootNode/RobotArmature/Bone",
+                "RootNode/RobotArmature/Bone/Foot.L",
+                "RootNode/RobotArmature/Bone/Body",
+                "RootNode/RobotArmature/Bone/Body/Hips",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L/Middle2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L/Thumb2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L/Index2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L/Ring2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R/Middle2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R/Thumb2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R/Index2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R/Ring2.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L/LowerLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R/LowerLeg.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.L",
+                "RootNode/RobotArmature/Bone/Foot.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.R",
+            ],
+        ),
+        (
+            id: "animation:skeleton:1:skeleton_1",
+            label: "Skeleton 1",
+            source_index: 1,
+            signature: ("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b"),
+            joint_paths: [
+                "RootNode/RobotArmature/Bone",
+                "RootNode/RobotArmature/Bone/Foot.L",
+                "RootNode/RobotArmature/Bone/Body",
+                "RootNode/RobotArmature/Bone/Body/Hips",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm2.L/Middle1.L/Middle2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Thumb.L/Thumb2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm1.L/Index.L/Index2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/LowerArm.L/Palm3.L/Ring1.L/Ring2.L",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm2.R/Middle1.R/Middle2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Thumb.R/Thumb2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm1.R/Index.R/Index2.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R",
+                "RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/LowerArm.R/Palm3.R/Ring1.R/Ring2.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.L/LowerLeg.L",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R",
+                "RootNode/RobotArmature/Bone/Body/UpperLeg.R/LowerLeg.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.L",
+                "RootNode/RobotArmature/Bone/Foot.R",
+                "RootNode/RobotArmature/Bone/PoleTarget.R",
+            ],
+        ),
+    ],
+    clips: [
+        (
+            id: "animation:clip:0:dance",
+            label: "Dance",
+            source_index: 0,
+            duration_seconds: 3.3333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:1:death",
+            label: "Death",
+            source_index: 1,
+            duration_seconds: 0.9583333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:2:idle",
+            label: "Idle",
+            source_index: 2,
+            duration_seconds: 3.3333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:3:jump",
+            label: "Jump",
+            source_index: 3,
+            duration_seconds: 0.7083333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:4:no",
+            label: "No",
+            source_index: 4,
+            duration_seconds: 1.6666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:5:punch",
+            label: "Punch",
+            source_index: 5,
+            duration_seconds: 0.8333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:6:running",
+            label: "Running",
+            source_index: 6,
+            duration_seconds: 0.9583333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:7:sitting",
+            label: "Sitting",
+            source_index: 7,
+            duration_seconds: 0.41666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:8:standing",
+            label: "Standing",
+            source_index: 8,
+            duration_seconds: 0.41666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:9:thumbsup",
+            label: "ThumbsUp",
+            source_index: 9,
+            duration_seconds: 1.5833334,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:10:walking",
+            label: "Walking",
+            source_index: 10,
+            duration_seconds: 0.9583333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:11:walkjump",
+            label: "WalkJump",
+            source_index: 11,
+            duration_seconds: 0.8333333,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:12:wave",
+            label: "Wave",
+            source_index: 12,
+            duration_seconds: 1.8333334,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+        (
+            id: "animation:clip:13:yes",
+            label: "Yes",
+            source_index: 13,
+            duration_seconds: 1.6666666,
+            target_skeleton_signature: Some(("e9761f2a198d6a280afd0fc2aca6e8783dc6237bd85c90b8bc07a2e11271dc2b")),
+            events: [],
+        ),
+    ],
+    diagnostics: [],
+)
\ No newline at end of file
diff --git a/assets/animations/generated/b98ef565-3500-49e7-9935-f685fa9b2594.animation.ron b/assets/animations/generated/b98ef565-3500-49e7-9935-f685fa9b2594.animation.ron
new file mode 100644
index 0000000..6259f6e
--- /dev/null
+++ b/assets/animations/generated/b98ef565-3500-49e7-9935-f685fa9b2594.animation.ron
@@ -0,0 +1,20 @@
+(
+    schema_version: 3,
+    asset_id: "b98ef565-3500-49e7-9935-f685fa9b2594",
+    label: "painted_wooden_chair_02_2k",
+    default_animation_clip_id: None,
+    source: (
+        path: "assets/models/painted_wooden_chair_02_2k.fbx",
+        format: "fbx",
+        fingerprint: (
+            byte_len: 59964,
+            modified_unix_secs: 1780713434,
+            content_hash: "b12973a62dcb44589e380ea833eade726ae98a86c81084c842ee3801866d6a46",
+        ),
+        dependencies: [],
+    ),
+    runtime_supported: false,
+    skeletons: [],
+    clips: [],
+    diagnostics: [],
+)
\ No newline at end of file
diff --git a/assets/levels/audio_authoring_showcase.scn.ron b/assets/levels/audio_authoring_showcase.scn.ron
index d0d48dc..65ae56a 100644
--- a/assets/levels/audio_authoring_showcase.scn.ron
+++ b/assets/levels/audio_authoring_showcase.scn.ron
@@ -1,18 +1,16 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    4294969001: (
-      components: {
-        "bevy_ecs::name::Name": "Audition Tone Source",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        4294969001: (components: {
+            "bevy_ecs::name::Name": "Audition Tone Source",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 1.5, -4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::LevelObject": (),
-        "shared::components::ActorId": ("audio-showcase-source"),
-        "shared::components::ActorKind": AudioSource,
-        "shared::components::AudioSourceDesc": (
+            "shared::components::ActorId": ("audio-showcase-source"),
+            "shared::components::ActorKind": AudioSource,
+            "shared::components::AudioSourceDesc": (
           clip: Some((
             asset_id: "c0a7d10e-53c1-4de0-b0dc-34a66f44ba77",
             sub_asset_id: "audio:source",
@@ -32,25 +30,23 @@
           ),
           bus: "sfx",
         ),
-      },
-    ),
-    4294969002: (
-      components: {
-        "bevy_ecs::name::Name": "Showcase Listener",
-        "bevy_transform::components::transform::Transform": (
+            "shared::components::LevelObject": (),
+        }),
+        4294969002: (components: {
+            "bevy_ecs::name::Name": "Showcase Listener",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 1.7, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::LevelObject": (),
-        "shared::components::ActorId": ("audio-showcase-listener"),
-        "shared::components::ActorKind": AudioListener,
-        "shared::components::AudioListenerDesc": (
+            "shared::components::ActorId": ("audio-showcase-listener"),
+            "shared::components::ActorKind": AudioListener,
+            "shared::components::AudioListenerDesc": (
           enabled: true,
           priority: 100,
           ear_gap: 0.2,
         ),
-      },
-    ),
-  },
-)
+            "shared::components::LevelObject": (),
+        }),
+    },
+)
\ No newline at end of file
diff --git a/assets/levels/editor_scene 2.scn.ron b/assets/levels/editor_scene 2.scn.ron
index 67270d2..53c1d0e 100644
--- a/assets/levels/editor_scene 2.scn.ron	
+++ b/assets/levels/editor_scene 2.scn.ron	
@@ -1,21 +1,20 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    4294967126: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar Copy",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        4294967126: (components: {
+            "bevy_ecs::name::Name": "Pillar Copy",
+            "bevy_transform::components::transform::Transform": (
           translation: (3.7178926, 3.5, -11.932255),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (23),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (23),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -29,7 +28,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -37,27 +36,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    4294967158: (
-      components: {
-        "bevy_ecs::name::Name": "Scene Sun",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294967158: (components: {
+            "bevy_ecs::name::Name": "Scene Sun",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 5.316672, 0.0),
           rotation: (-0.21401538, 0.31161797, 0.67592126, 0.6326311),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": Light,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": Light,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (0),
-        "shared::components::LevelObject": (),
-        "shared::components::LightDesc": (
+            "shared::components::HierarchySiblingIndex": (0),
+            "shared::components::LevelObject": (),
+            "shared::components::LightDesc": (
           kind: Directional,
           color: (
             r: 1.0,
@@ -71,23 +68,21 @@
           inner_angle_deg: 25.0,
           outer_angle_deg: 35.0,
         ),
-      },
-    ),
-    4294967159: (
-      components: {
-        "bevy_ecs::name::Name": "Ground",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294967159: (components: {
+            "bevy_ecs::name::Name": "Ground",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, -0.5, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (1),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (1),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.42,
             g: 0.45,
@@ -101,7 +96,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 200.0,
@@ -109,27 +104,25 @@
             z_length: 200.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (200.0, 1.0, 200.0),
         ),
-      },
-    ),
-    8589934420: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar Copy",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934420: (components: {
+            "bevy_ecs::name::Name": "Pillar Copy",
+            "bevy_transform::components::transform::Transform": (
           translation: (-12.079595, 3.5, -13.098544),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (25),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (25),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -143,7 +136,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -151,44 +144,40 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934456: (
-      components: {
-        "bevy_ecs::name::Name": "Player Start",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934456: (components: {
+            "bevy_ecs::name::Name": "Player Start",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 0.9900649, 12.46175),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": PlayerSpawn,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": PlayerSpawn,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (2),
-        "shared::components::LevelObject": (),
-        "shared::components::PlayerSpawn": (),
-      },
-    ),
-    8589934457: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+            "shared::components::HierarchySiblingIndex": (2),
+            "shared::components::LevelObject": (),
+            "shared::components::PlayerSpawn": (),
+        }),
+        8589934457: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-1.3999996, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (3),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (3),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -202,33 +191,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934458: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934458: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-3.6, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (4),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (4),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -242,33 +229,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934459: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934459: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-5.8, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (5),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (5),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -282,33 +267,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934460: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934460: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-8.0, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (6),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (6),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -322,33 +305,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934461: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934461: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.90000004, 9.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (7),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (7),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -362,7 +343,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -370,27 +351,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.8000001, 0.5),
         ),
-      },
-    ),
-    8589934462: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934462: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.81000006, 10.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (8),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (8),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -404,7 +383,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -412,27 +391,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.6200001, 0.5),
         ),
-      },
-    ),
-    8589934463: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934463: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.72, 10.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (9),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (9),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -446,7 +423,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -454,27 +431,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.44, 0.5),
         ),
-      },
-    ),
-    8589934464: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934464: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.63, 11.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (10),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (10),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -488,7 +463,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -496,27 +471,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.26, 0.5),
         ),
-      },
-    ),
-    8589934465: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934465: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.54, 11.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (11),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (11),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -530,7 +503,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -538,27 +511,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.08, 0.5),
         ),
-      },
-    ),
-    8589934466: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934466: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.45000002, 12.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (12),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (12),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -572,7 +543,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -580,27 +551,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.90000004, 0.5),
         ),
-      },
-    ),
-    8589934467: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934467: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.36, 12.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (13),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (13),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -614,7 +583,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -622,27 +591,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.72, 0.5),
         ),
-      },
-    ),
-    8589934468: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934468: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.27, 13.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (14),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (14),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -656,7 +623,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -664,27 +631,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.54, 0.5),
         ),
-      },
-    ),
-    8589934469: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934469: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.18, 13.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (15),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (15),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -698,7 +663,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -706,27 +671,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.36, 0.5),
         ),
-      },
-    ),
-    8589934470: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934470: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.09, 14.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (16),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (16),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -740,7 +703,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -748,27 +711,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.18, 0.5),
         ),
-      },
-    ),
-    8589934471: (
-      components: {
-        "bevy_ecs::name::Name": "Ramp",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934471: (components: {
+            "bevy_ecs::name::Name": "Ramp",
+            "bevy_transform::components::transform::Transform": (
           translation: (-14.0, 1.6, 0.0),
           rotation: (-0.17364821, 0.0, 0.0, 0.9848078),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (17),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (17),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.3,
             g: 0.45,
@@ -782,7 +743,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -790,27 +751,25 @@
             z_length: 9.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.4, 9.0),
         ),
-      },
-    ),
-    8589934472: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934472: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (5.4, 0.5, 2.4),
           rotation: (0.0, 0.94948566, 0.0, -0.31381062),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (18),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (18),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -824,7 +783,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -832,27 +791,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934473: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934473: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (4.0, 0.75, 2.0),
           rotation: (0.0, 0.9854498, 0.0, 0.16996713),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (19),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (19),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -866,7 +823,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.5,
@@ -874,27 +831,25 @@
             z_length: 1.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.5, 1.5, 1.5),
         ),
-      },
-    ),
-    8589934474: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934474: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (-2.3, 0.5, -3.1),
           rotation: (0.0, 0.72083056, 0.0, -0.6931113),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (20),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (20),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -908,7 +863,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -916,27 +871,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934475: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934475: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (-1.6, 0.5, -3.2),
           rotation: (0.0, -0.53118616, 0.0, 0.8472551),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (21),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (21),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -950,7 +903,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -958,27 +911,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934476: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934476: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (-3.0, 0.5, -3.0),
           rotation: (0.0, 0.86742324, 0.0, -0.49757105),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (22),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (22),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -992,7 +943,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -1000,27 +951,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934477: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934477: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (8.0, 3.5, 6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (23),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (23),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1034,7 +983,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1042,27 +991,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934478: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934478: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (-8.0, 3.5, 6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (24),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (24),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1076,7 +1023,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1084,27 +1031,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934479: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934479: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (8.0, 3.5, -6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (25),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (25),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1118,7 +1063,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1126,27 +1071,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934480: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934480: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (-8.0, 3.5, -6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (26),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (26),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1160,7 +1103,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1168,11 +1111,10 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-  },
+        }),
+    },
 )
\ No newline at end of file
diff --git a/assets/levels/editor_scene 3.scn.ron b/assets/levels/editor_scene 3.scn.ron
index a467119..78ed583 100644
--- a/assets/levels/editor_scene 3.scn.ron	
+++ b/assets/levels/editor_scene 3.scn.ron	
@@ -1,21 +1,20 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    4294967124: (
-      components: {
-        "bevy_ecs::name::Name": "Cube",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        4294967124: (components: {
+            "bevy_ecs::name::Name": "Cube",
+            "bevy_transform::components::transform::Transform": (
           translation: (-14.0, 0.66941494, -1.9732417),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (29),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (29),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.8,
             g: 0.8,
@@ -37,7 +36,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -45,27 +44,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    4294967126: (
-      components: {
-        "bevy_ecs::name::Name": "Cube",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294967126: (components: {
+            "bevy_ecs::name::Name": "Cube",
+            "bevy_transform::components::transform::Transform": (
           translation: (-13.0, 0.5, 2.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (28),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (28),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.8,
             g: 0.8,
@@ -87,7 +84,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -95,27 +92,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    4294967128: (
-      components: {
-        "bevy_ecs::name::Name": "Point Light",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294967128: (components: {
+            "bevy_ecs::name::Name": "Point Light",
+            "bevy_transform::components::transform::Transform": (
           translation: (-10.83656, 1.680895, -1.0713063),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (2.7062726, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": Light,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": Light,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (27),
-        "shared::components::LevelObject": (),
-        "shared::components::LightDesc": (
+            "shared::components::HierarchySiblingIndex": (27),
+            "shared::components::LevelObject": (),
+            "shared::components::LightDesc": (
           kind: Point,
           color: (
             r: 1.0,
@@ -129,23 +124,21 @@
           inner_angle_deg: 25.0,
           outer_angle_deg: 35.0,
         ),
-      },
-    ),
-    4294967158: (
-      components: {
-        "bevy_ecs::name::Name": "Scene Sun",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294967158: (components: {
+            "bevy_ecs::name::Name": "Scene Sun",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 5.316672, 0.0),
           rotation: (0.11260023, -0.04732944, 0.7427888, 0.65829015),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": Light,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": Light,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (0),
-        "shared::components::LevelObject": (),
-        "shared::components::LightDesc": (
+            "shared::components::HierarchySiblingIndex": (0),
+            "shared::components::LevelObject": (),
+            "shared::components::LightDesc": (
           kind: Directional,
           color: (
             r: 1.0,
@@ -159,23 +152,21 @@
           inner_angle_deg: 25.0,
           outer_angle_deg: 35.0,
         ),
-      },
-    ),
-    4294967159: (
-      components: {
-        "bevy_ecs::name::Name": "Ground",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294967159: (components: {
+            "bevy_ecs::name::Name": "Ground",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, -0.5, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (1),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (1),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.42,
             g: 0.45,
@@ -197,7 +188,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 200.0,
@@ -205,27 +196,25 @@
             z_length: 200.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (200.0, 1.0, 200.0),
         ),
-      },
-    ),
-    8589934417: (
-      components: {
-        "bevy_ecs::name::Name": "Spot Light",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934417: (components: {
+            "bevy_ecs::name::Name": "Spot Light",
+            "bevy_transform::components::transform::Transform": (
           translation: (-13.387727, 0.9319196, -5.454666),
           rotation: (-0.1494833, 0.0, 0.0, 0.9887642),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": Light,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": Light,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (30),
-        "shared::components::LevelObject": (),
-        "shared::components::LightDesc": (
+            "shared::components::HierarchySiblingIndex": (30),
+            "shared::components::LevelObject": (),
+            "shared::components::LightDesc": (
           kind: Spot,
           color: (
             r: 1.0,
@@ -239,40 +228,36 @@
           inner_angle_deg: 25.0,
           outer_angle_deg: 35.0,
         ),
-      },
-    ),
-    8589934456: (
-      components: {
-        "bevy_ecs::name::Name": "Player Start",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934456: (components: {
+            "bevy_ecs::name::Name": "Player Start",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 0.9900649, 12.46175),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": PlayerSpawn,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": PlayerSpawn,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (2),
-        "shared::components::LevelObject": (),
-        "shared::components::PlayerSpawn": (),
-      },
-    ),
-    8589934457: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+            "shared::components::HierarchySiblingIndex": (2),
+            "shared::components::LevelObject": (),
+            "shared::components::PlayerSpawn": (),
+        }),
+        8589934457: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-1.3999996, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (3),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (3),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -294,33 +279,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934458: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934458: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-3.6, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (4),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (4),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -342,33 +325,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934459: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934459: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-5.8, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (5),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (5),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -390,33 +371,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934460: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934460: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
           translation: (-8.0, 0.6, 4.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (6),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (6),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.9,
             g: 0.9,
@@ -438,33 +417,31 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Sphere(
             radius: 0.6,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Sphere,
           size: (1.2, 1.2, 1.2),
         ),
-      },
-    ),
-    8589934461: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934461: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.90000004, 9.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (7),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (7),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -486,7 +463,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -494,27 +471,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.8000001, 0.5),
         ),
-      },
-    ),
-    8589934462: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934462: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.81000006, 10.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (8),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (8),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -536,7 +511,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -544,27 +519,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.6200001, 0.5),
         ),
-      },
-    ),
-    8589934463: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934463: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.72, 10.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (9),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (9),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -586,7 +559,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -594,27 +567,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.44, 0.5),
         ),
-      },
-    ),
-    8589934464: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934464: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.63, 11.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (10),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (10),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -636,7 +607,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -644,27 +615,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.26, 0.5),
         ),
-      },
-    ),
-    8589934465: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934465: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.54, 11.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (11),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (11),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -686,7 +655,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -694,27 +663,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 1.08, 0.5),
         ),
-      },
-    ),
-    8589934466: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934466: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.45000002, 12.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (12),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (12),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -736,7 +703,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -744,27 +711,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.90000004, 0.5),
         ),
-      },
-    ),
-    8589934467: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934467: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.36, 12.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (13),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (13),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -786,7 +751,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -794,27 +759,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.72, 0.5),
         ),
-      },
-    ),
-    8589934468: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934468: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.27, 13.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (14),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (14),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -836,7 +799,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -844,27 +807,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.54, 0.5),
         ),
-      },
-    ),
-    8589934469: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934469: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.18, 13.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (15),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (15),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -886,7 +847,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -894,27 +855,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.36, 0.5),
         ),
-      },
-    ),
-    8589934470: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934470: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
           translation: (12.0, 0.09, 14.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (16),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (16),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.55,
             g: 0.52,
@@ -936,7 +895,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -944,27 +903,25 @@
             z_length: 0.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.18, 0.5),
         ),
-      },
-    ),
-    8589934471: (
-      components: {
-        "bevy_ecs::name::Name": "Ramp",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934471: (components: {
+            "bevy_ecs::name::Name": "Ramp",
+            "bevy_transform::components::transform::Transform": (
           translation: (-14.0, 2.292737, 0.0),
           rotation: (-0.17364821, 0.0, 0.0, 0.9848078),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (17),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (17),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.3,
             g: 0.45,
@@ -986,7 +943,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 5.0,
@@ -994,27 +951,25 @@
             z_length: 9.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (5.0, 0.4, 9.0),
         ),
-      },
-    ),
-    8589934472: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934472: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (5.4, 0.5, 2.4),
           rotation: (0.0, 0.94948566, 0.0, -0.31381062),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (18),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (18),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -1036,7 +991,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -1044,27 +999,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934473: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934473: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (4.0, 0.75, 2.0),
           rotation: (0.0, 0.9854498, 0.0, 0.16996713),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (19),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (19),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -1086,7 +1039,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.5,
@@ -1094,27 +1047,25 @@
             z_length: 1.5,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.5, 1.5, 1.5),
         ),
-      },
-    ),
-    8589934474: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934474: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (-2.3, 0.5, -3.1),
           rotation: (0.0, 0.72083056, 0.0, -0.6931113),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (20),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (20),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -1136,7 +1087,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -1144,27 +1095,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934475: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934475: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (-1.6, 0.5, -3.2),
           rotation: (0.0, -0.53118616, 0.0, 0.8472551),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (21),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (21),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -1186,7 +1135,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -1194,27 +1143,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934476: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934476: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
           translation: (-3.0, 0.5, -3.0),
           rotation: (0.0, 0.86742324, 0.0, -0.49757105),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (22),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (22),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.72,
             g: 0.45,
@@ -1236,7 +1183,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -1244,27 +1191,25 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-    8589934477: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934477: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (8.0, 3.5, 6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (23),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (23),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1286,7 +1231,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1294,27 +1239,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934478: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934478: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (-8.0, 3.5, 6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (24),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (24),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1336,7 +1279,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1344,27 +1287,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934479: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934479: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (8.0, 3.5, -6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (25),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (25),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1386,7 +1327,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1394,27 +1335,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    8589934480: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        8589934480: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
           translation: (-8.0, 3.5, -6.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (26),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (26),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.85,
             g: 0.85,
@@ -1436,7 +1375,7 @@
           metallic_roughness_texture: None,
           material_asset_path: None,
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.2,
@@ -1444,27 +1383,25 @@
             z_length: 1.2,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.2, 7.0, 1.2),
         ),
-      },
-    ),
-    12884901711: (
-      components: {
-        "bevy_ecs::name::Name": "Cube",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        12884901711: (components: {
+            "bevy_ecs::name::Name": "Cube",
+            "bevy_transform::components::transform::Transform": (
           translation: (-13.391208, 0.5, -6.673126),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (31),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (31),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           base_color: (
             r: 0.7322267,
             g: 0.0,
@@ -1486,7 +1423,7 @@
           metallic_roughness_texture: None,
           material_asset_path: Some("assets/materials/concrete.ron"),
         ),
-        "shared::components::PhysicsBody": (
+            "shared::components::PhysicsBody": (
           body: Static,
           collider: Cuboid(
             x_length: 1.0,
@@ -1494,11 +1431,10 @@
             z_length: 1.0,
           ),
         ),
-        "shared::components::Primitive": (
+            "shared::components::Primitive": (
           shape: Box,
           size: (1.0, 1.0, 1.0),
         ),
-      },
-    ),
-  },
+        }),
+    },
 )
\ No newline at end of file
diff --git a/assets/levels/editor_scene.scn.ron b/assets/levels/editor_scene.scn.ron
index 5055b76..4a58538 100644
--- a/assets/levels/editor_scene.scn.ron
+++ b/assets/levels/editor_scene.scn.ron
@@ -1,1075 +1,30 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    4294967158: (
-      components: {
-        "bevy_ecs::name::Name": "Scene Sun",
-        "bevy_transform::components::transform::Transform": (
-          translation: (0.0, 5.316672, 0.0),
-          rotation: (-0.21401538, 0.31161797, 0.67592126, 0.6326311),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": Light,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (0),
-        "shared::components::LevelObject": (),
-        "shared::components::LightDesc": (
-          kind: Directional,
-          color: (
-            r: 1.0,
-            g: 0.95,
-            b: 0.85,
-            a: 1.0,
-          ),
-          intensity: 100000.0,
-          range: 0.0,
-          shadows: true,
-          inner_angle_deg: 25.0,
-          outer_angle_deg: 35.0,
-        ),
-      },
-    ),
-    4294967159: (
-      components: {
-        "bevy_ecs::name::Name": "Ground",
-        "bevy_transform::components::transform::Transform": (
-          translation: (0.0, -0.5, 0.0),
+(schema_version: 4,resources: {
+        "shared::components::SceneComposition": (scene_id:"legacy:assets/levels/editor_scene.scn.ron",subscenes:[]),
+    },
+    entities: {
+        4294966587: (components: {
+            "bevy_ecs::name::Name": "Brush Part 2",
+            "bevy_transform::components::transform::Transform": (
+          translation: (25.75, 0.0, 9.5),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (1),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.42,
-            g: 0.45,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.92,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 200.0,
-            y_length: 1.0,
-            z_length: 200.0,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (200.0, 1.0, 200.0),
-        ),
-      },
-    ),
-    8589934456: (
-      components: {
-        "bevy_ecs::name::Name": "Player Start",
-        "bevy_transform::components::transform::Transform": (
-          translation: (0.0, 0.9900649, 12.46175),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": PlayerSpawn,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (2),
-        "shared::components::LevelObject": (),
-        "shared::components::PlayerSpawn": (),
-      },
-    ),
-    8589934457: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-1.3999996, 0.6, 4.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (3),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.9,
-            g: 0.9,
-            b: 0.92,
-            a: 1.0,
-          ),
-          metallic: 1.0,
-          roughness: 0.95,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Sphere(
-            radius: 0.6,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Sphere,
-          size: (1.2, 1.2, 1.2),
-        ),
-      },
-    ),
-    8589934458: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-3.6, 0.6, 4.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (4),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.9,
-            g: 0.9,
-            b: 0.92,
-            a: 1.0,
-          ),
-          metallic: 1.0,
-          roughness: 0.6,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Sphere(
-            radius: 0.6,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Sphere,
-          size: (1.2, 1.2, 1.2),
-        ),
-      },
-    ),
-    8589934459: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-5.8, 0.6, 4.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (5),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.9,
-            g: 0.9,
-            b: 0.92,
-            a: 1.0,
-          ),
-          metallic: 1.0,
-          roughness: 0.3,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Sphere(
-            radius: 0.6,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Sphere,
-          size: (1.2, 1.2, 1.2),
-        ),
-      },
-    ),
-    8589934460: (
-      components: {
-        "bevy_ecs::name::Name": "ShowcaseSphere",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-8.0, 0.6, 4.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (6),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.9,
-            g: 0.9,
-            b: 0.92,
-            a: 1.0,
-          ),
-          metallic: 1.0,
-          roughness: 0.05,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Sphere(
-            radius: 0.6,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Sphere,
-          size: (1.2, 1.2, 1.2),
-        ),
-      },
-    ),
-    8589934461: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.90000004, 9.5),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (7),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 1.8000001,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 1.8000001, 0.5),
-        ),
-      },
-    ),
-    8589934462: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.81000006, 10.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (8),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 1.6200001,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 1.6200001, 0.5),
-        ),
-      },
-    ),
-    8589934463: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.72, 10.5),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (9),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 1.44,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 1.44, 0.5),
-        ),
-      },
-    ),
-    8589934464: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.63, 11.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (10),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 1.26,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 1.26, 0.5),
-        ),
-      },
-    ),
-    8589934465: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.54, 11.5),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (11),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 1.08,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 1.08, 0.5),
-        ),
-      },
-    ),
-    8589934466: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.45000002, 12.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (12),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 0.90000004,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 0.90000004, 0.5),
-        ),
-      },
-    ),
-    8589934467: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.36, 12.5),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (13),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 0.72,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 0.72, 0.5),
-        ),
-      },
-    ),
-    8589934468: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.27, 13.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (14),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 0.54,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 0.54, 0.5),
-        ),
-      },
-    ),
-    8589934469: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.18, 13.5),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (15),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 0.36,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 0.36, 0.5),
-        ),
-      },
-    ),
-    8589934470: (
-      components: {
-        "bevy_ecs::name::Name": "Stair",
-        "bevy_transform::components::transform::Transform": (
-          translation: (12.0, 0.09, 14.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (16),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.55,
-            g: 0.52,
-            b: 0.48,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.8,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 0.18,
-            z_length: 0.5,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 0.18, 0.5),
-        ),
-      },
-    ),
-    8589934471: (
-      components: {
-        "bevy_ecs::name::Name": "Ramp",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-14.0, 1.6, 0.0),
-          rotation: (-0.17364821, 0.0, 0.0, 0.9848078),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (17),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.3,
-            g: 0.45,
-            b: 0.7,
-            a: 1.0,
-          ),
-          metallic: 0.1,
-          roughness: 0.55,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 5.0,
-            y_length: 0.4,
-            z_length: 9.0,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (5.0, 0.4, 9.0),
-        ),
-      },
-    ),
-    8589934472: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
-          translation: (5.4, 0.5, 2.4),
-          rotation: (0.0, 0.94948566, 0.0, -0.31381062),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (18),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.72,
-            g: 0.45,
-            b: 0.2,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.85,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.0,
-            y_length: 1.0,
-            z_length: 1.0,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.0, 1.0, 1.0),
-        ),
-      },
-    ),
-    8589934473: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
-          translation: (14.575503, 4.5, -15.5),
-          rotation: (0.77714586, -0.0, -0.6293205, -0.0),
-          scale: (8.5, 6.7, 5.6),
-        ),
-        "shared::components::ActorKind": Brush,
-        "shared::components::BrushDesc": (
+            "shared::components::ActorId": ("2b066a80-77aa-4b5b-85c2-2cfdd15ad922"),
+            "shared::components::ActorKind": Brush,
+            "shared::components::BrushDesc": (
           kind: Additive,
           faces: [
-            (
-              id: ("face:+x"),
-              plane: (
-                normal: (1.0, 0.0, 0.0),
-                distance: 0.5,
-              ),
-              vertices: [
-                (0.5, -0.5, -0.5),
-                (0.5, 0.5, -0.5),
-                (0.5, 0.5, 0.5),
-                (0.5, -0.5, 0.5),
-              ],
-              material: None,
-              texture: None,
-              uv_offset: (0.0, 0.0),
-              uv_scale: (1.0, 1.0),
-              uv_rotation: 0.0,
-              smoothing_group: 0,
-            ),
-            (
-              id: ("face:-x"),
-              plane: (
-                normal: (-1.0, 0.0, 0.0),
-                distance: 0.5,
-              ),
-              vertices: [
-                (-0.5, -0.5, 0.5),
-                (-0.5, 0.5, 0.5),
-                (-0.5, 0.5, -0.5),
-                (-0.5, -0.5, -0.5),
-              ],
-              material: None,
-              texture: None,
-              uv_offset: (0.0, 0.0),
-              uv_scale: (1.0, 1.0),
-              uv_rotation: 0.0,
-              smoothing_group: 0,
-            ),
             (
               id: ("face:+y"),
               plane: (
                 normal: (0.0, 1.0, 0.0),
-                distance: 0.5,
+                distance: 2.3,
               ),
               vertices: [
-                (-0.5, 0.5, -0.5),
-                (-0.5, 0.5, 0.5),
-                (0.5, 0.5, 0.5),
-                (0.5, 0.5, -0.5),
+                (-1.75, 2.3, 0.5),
+                (0.25, 2.3, 0.5),
+                (2.25, 2.3, -0.5),
+                (-0.75, 2.3, -0.5),
               ],
               material: None,
               texture: None,
@@ -1082,13 +37,13 @@
               id: ("face:-y"),
               plane: (
                 normal: (0.0, -1.0, 0.0),
-                distance: 0.5,
+                distance: -0.0,
               ),
               vertices: [
-                (-0.5, -0.5, 0.5),
-                (-0.5, -0.5, -0.5),
-                (0.5, -0.5, -0.5),
-                (0.5, -0.5, 0.5),
+                (-0.75, 0.0, -0.5),
+                (2.25, 0.0, -0.5),
+                (0.25, 0.0, 0.5),
+                (-1.75, 0.0, 0.5),
               ],
               material: None,
               texture: None,
@@ -1098,35 +53,73 @@
               smoothing_group: 0,
             ),
             (
-              id: ("face:+z"),
-              plane: (
-                normal: (0.0, 0.0, 1.0),
-                distance: 0.5,
-              ),
-              vertices: [
-                (0.5, -0.5, 0.5),
-                (0.5, 0.5, 0.5),
-                (-0.5, 0.5, 0.5),
-                (-0.5, -0.5, 0.5),
-              ],
-              material: None,
-              texture: None,
-              uv_offset: (0.0, 0.0),
-              uv_scale: (1.0, 1.0),
-              uv_rotation: 0.0,
-              smoothing_group: 0,
-            ),
-            (
-              id: ("face:-z"),
+              id: ("face:side:0"),
               plane: (
                 normal: (0.0, 0.0, -1.0),
                 distance: 0.5,
               ),
               vertices: [
-                (-0.5, -0.5, -0.5),
-                (-0.5, 0.5, -0.5),
-                (0.5, 0.5, -0.5),
-                (0.5, -0.5, -0.5),
+                (-0.75, 0.0, -0.5),
+                (-0.75, 2.3, -0.5),
+                (2.25, 2.3, -0.5),
+                (2.25, 0.0, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:side:1"),
+              plane: (
+                normal: (0.4472136, 0.0, 0.8944272),
+                distance: 0.559017,
+              ),
+              vertices: [
+                (2.25, 0.0, -0.5),
+                (2.25, 2.3, -0.5),
+                (0.25, 2.3, 0.5),
+                (0.25, 0.0, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:side:2"),
+              plane: (
+                normal: (0.0, 0.0, 1.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (0.25, 0.0, 0.5),
+                (0.25, 2.3, 0.5),
+                (-1.75, 2.3, 0.5),
+                (-1.75, 0.0, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:side:3"),
+              plane: (
+                normal: (-0.70710677, 0.0, -0.70710677),
+                distance: 0.8838835,
+              ),
+              vertices: [
+                (-1.75, 0.0, 0.5),
+                (-1.75, 2.3, 0.5),
+                (-0.75, 2.3, -0.5),
+                (-0.75, 0.0, -0.5),
               ],
               material: None,
               texture: None,
@@ -1139,70 +132,25 @@
           cast_shadows: true,
           receive_shadows: true,
         ),
-        "shared::components::EditorVisibility": (
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (19),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (0),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           shader: (
             kind: StandardLit,
             schema_path: None,
             shader_path: None,
           ),
           base_color: (
-            r: 0.55,
-            g: 0.54,
-            b: 0.52,
+            r: 0.8,
+            g: 0.8,
+            b: 0.8,
             a: 1.0,
           ),
           metallic: 0.0,
-          roughness: 0.85,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: Some("assets/materials/concrete.ron"),
-          parameters: [],
-          textures: [],
-        ),
-      },
-    ),
-    8589934474: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-2.3, 0.5, -3.1),
-          rotation: (0.0, 0.72083056, 0.0, -0.6931113),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (20),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.72,
-            g: 0.45,
-            b: 0.2,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.85,
+          roughness: 0.65,
           emissive_color: (
             r: 1.0,
             g: 1.0,
@@ -1218,424 +166,30 @@
           parameters: [],
           textures: [],
         ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.0,
-            y_length: 1.0,
-            z_length: 1.0,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.0, 1.0, 1.0),
-        ),
-      },
-    ),
-    8589934475: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-1.6, 0.5, -3.2),
-          rotation: (0.0, -0.53118616, 0.0, 0.8472551),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (21),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.72,
-            g: 0.45,
-            b: 0.2,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.85,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.0,
-            y_length: 1.0,
-            z_length: 1.0,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.0, 1.0, 1.0),
-        ),
-      },
-    ),
-    8589934476: (
-      components: {
-        "bevy_ecs::name::Name": "Crate",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-3.0, 0.5, -3.0),
-          rotation: (0.0, 0.86742324, 0.0, -0.49757105),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (22),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.72,
-            g: 0.45,
-            b: 0.2,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.85,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.0,
-            y_length: 1.0,
-            z_length: 1.0,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.0, 1.0, 1.0),
-        ),
-      },
-    ),
-    8589934477: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
-          translation: (8.0, 3.5, 6.0),
+        }),
+        4294966588: (components: {
+            "bevy_ecs::name::Name": "Brush Part 1",
+            "bevy_transform::components::transform::Transform": (
+          translation: (24.5, 0.0, 7.75),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (23),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.85,
-            g: 0.85,
-            b: 0.88,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.3,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.2,
-            y_length: 7.0,
-            z_length: 1.2,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.2, 7.0, 1.2),
-        ),
-      },
-    ),
-    8589934478: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-8.0, 3.5, 6.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (24),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.85,
-            g: 0.85,
-            b: 0.88,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.3,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.2,
-            y_length: 7.0,
-            z_length: 1.2,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.2, 7.0, 1.2),
-        ),
-      },
-    ),
-    8589934479: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
-          translation: (8.0, 3.5, -6.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (25),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.85,
-            g: 0.85,
-            b: 0.88,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.3,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.2,
-            y_length: 7.0,
-            z_length: 1.2,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.2, 7.0, 1.2),
-        ),
-      },
-    ),
-    8589934480: (
-      components: {
-        "bevy_ecs::name::Name": "Pillar",
-        "bevy_transform::components::transform::Transform": (
-          translation: (-8.0, 3.5, -6.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (1.0, 1.0, 1.0),
-        ),
-        "shared::components::ActorKind": StaticMesh,
-        "shared::components::EditorVisibility": (
-          visible: true,
-        ),
-        "shared::components::HierarchySiblingIndex": (26),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
-          shader: (
-            kind: StandardLit,
-            schema_path: None,
-            shader_path: None,
-          ),
-          base_color: (
-            r: 0.85,
-            g: 0.85,
-            b: 0.88,
-            a: 1.0,
-          ),
-          metallic: 0.0,
-          roughness: 0.3,
-          emissive_color: (
-            r: 1.0,
-            g: 1.0,
-            b: 1.0,
-            a: 1.0,
-          ),
-          emissive_intensity: 0.0,
-          base_color_texture: None,
-          emissive_texture: None,
-          normal_map_texture: None,
-          metallic_roughness_texture: None,
-          material_asset_path: None,
-          parameters: [],
-          textures: [],
-        ),
-        "shared::components::PhysicsBody": (
-          body: Static,
-          collider: Cuboid(
-            x_length: 1.2,
-            y_length: 7.0,
-            z_length: 1.2,
-          ),
-        ),
-        "shared::components::Primitive": (
-          shape: Box,
-          size: (1.2, 7.0, 1.2),
-        ),
-      },
-    ),
-    21474836282: (
-      components: {
-        "bevy_ecs::name::Name": "Post Process Volume",
-        "bevy_transform::components::transform::Transform": (
-          translation: (28.0, 2.0, -1.0),
-          rotation: (0.0, 0.0, 0.0, 1.0),
-          scale: (8.257915, 1.0, 1.0),
-        ),
-        "shared::components::ActorId": ("77e41415-e7c0-4fef-82ba-8dacad7ad0a0"),
-        "shared::components::ActorKind": Brush,
-        "shared::components::BrushDesc": (
+            "shared::components::ActorId": ("962cd555-de58-4fce-ba29-fed8dc24543c"),
+            "shared::components::ActorKind": Brush,
+            "shared::components::BrushDesc": (
           kind: Additive,
           faces: [
-            (
-              id: ("face:+x"),
-              plane: (
-                normal: (1.0, 0.0, 0.0),
-                distance: 0.5,
-              ),
-              vertices: [
-                (0.5, -0.5, -0.5),
-                (0.5, 0.5, -0.5),
-                (0.5, 0.5, 0.5),
-                (0.5, -0.5, 0.5),
-              ],
-              material: None,
-              texture: None,
-              uv_offset: (0.0, 0.0),
-              uv_scale: (1.0, 1.0),
-              uv_rotation: 0.0,
-              smoothing_group: 0,
-            ),
-            (
-              id: ("face:-x"),
-              plane: (
-                normal: (-1.0, 0.0, 0.0),
-                distance: 0.5,
-              ),
-              vertices: [
-                (-0.5, -0.5, 0.5),
-                (-0.5, 0.5, 0.5),
-                (-0.5, 0.5, -0.5),
-                (-0.5, -0.5, -0.5),
-              ],
-              material: None,
-              texture: None,
-              uv_offset: (0.0, 0.0),
-              uv_scale: (1.0, 1.0),
-              uv_rotation: 0.0,
-              smoothing_group: 0,
-            ),
             (
               id: ("face:+y"),
               plane: (
                 normal: (0.0, 1.0, 0.0),
-                distance: 0.5,
+                distance: 2.3,
               ),
               vertices: [
-                (-0.5, 0.5, -0.5),
-                (-0.5, 0.5, 0.5),
-                (0.5, 0.5, 0.5),
-                (0.5, 0.5, -0.5),
+                (-0.5, 2.3, 2.25),
+                (0.5, 2.3, 1.25),
+                (0.5, 2.3, -2.75),
+                (-0.5, 2.3, -0.75),
               ],
               material: None,
               texture: None,
@@ -1648,13 +202,13 @@
               id: ("face:-y"),
               plane: (
                 normal: (0.0, -1.0, 0.0),
-                distance: 0.5,
+                distance: -0.0,
               ),
               vertices: [
-                (-0.5, -0.5, 0.5),
-                (-0.5, -0.5, -0.5),
-                (0.5, -0.5, -0.5),
-                (0.5, -0.5, 0.5),
+                (-0.5, 0.0, -0.75),
+                (0.5, 0.0, -2.75),
+                (0.5, 0.0, 1.25),
+                (-0.5, 0.0, 2.25),
               ],
               material: None,
               texture: None,
@@ -1664,16 +218,16 @@
               smoothing_group: 0,
             ),
             (
-              id: ("face:+z"),
+              id: ("face:side:0"),
               plane: (
-                normal: (0.0, 0.0, 1.0),
-                distance: 0.5,
+                normal: (-0.8944272, 0.0, -0.4472136),
+                distance: 0.78262377,
               ),
               vertices: [
-                (0.5, -0.5, 0.5),
-                (0.5, 0.5, 0.5),
-                (-0.5, 0.5, 0.5),
-                (-0.5, -0.5, 0.5),
+                (-0.5, 0.0, -0.75),
+                (-0.5, 2.3, -0.75),
+                (0.5, 2.3, -2.75),
+                (0.5, 0.0, -2.75),
               ],
               material: None,
               texture: None,
@@ -1683,16 +237,54 @@
               smoothing_group: 0,
             ),
             (
-              id: ("face:-z"),
+              id: ("face:side:1"),
               plane: (
-                normal: (0.0, 0.0, -1.0),
+                normal: (1.0, 0.0, -0.0),
                 distance: 0.5,
               ),
               vertices: [
-                (-0.5, -0.5, -0.5),
-                (-0.5, 0.5, -0.5),
-                (0.5, 0.5, -0.5),
-                (0.5, -0.5, -0.5),
+                (0.5, 0.0, -2.75),
+                (0.5, 2.3, -2.75),
+                (0.5, 2.3, 1.25),
+                (0.5, 0.0, 1.25),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:side:2"),
+              plane: (
+                normal: (0.70710677, 0.0, 0.70710677),
+                distance: 1.2374369,
+              ),
+              vertices: [
+                (0.5, 0.0, 1.25),
+                (0.5, 2.3, 1.25),
+                (-0.5, 2.3, 2.25),
+                (-0.5, 0.0, 2.25),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:side:3"),
+              plane: (
+                normal: (-1.0, 0.0, -0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, 0.0, 2.25),
+                (-0.5, 2.3, 2.25),
+                (-0.5, 2.3, -0.75),
+                (-0.5, 0.0, -0.75),
               ],
               material: None,
               texture: None,
@@ -1705,43 +297,51 @@
           cast_shadows: true,
           receive_shadows: true,
         ),
-        "shared::components::EditorVisibility": (
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (27),
-        "shared::components::LevelObject": (),
-        "shared::components::PostProcessVolumeDesc": (
-          half_extents: (4.0, 2.0, 4.0),
-          priority: 0,
-          blend_distance: 2.0,
-          overrides: (
-            exposure_ev100: None,
-            fog_color: None,
-            fog_density: None,
-            bloom: None,
-            taa: None,
-            ssao: None,
-            tonemapping_aces: None,
-            atmosphere: None,
-            hdr: None,
+            "shared::components::HierarchySiblingIndex": (1),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
           ),
-          fullscreen_effect: None,
-          profile: None,
-          label: None,
+          base_color: (
+            r: 0.8,
+            g: 0.8,
+            b: 0.8,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.65,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
         ),
-      },
-    ),
-    21474836285: (
-      components: {
-        "bevy_ecs::name::Name": "Crate Copy",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294966589: (components: {
+            "bevy_ecs::name::Name": "Crate Copy",
+            "bevy_transform::components::transform::Transform": (
           translation: (15.624287, 0.75, 1.8058548),
           rotation: (0.0, 0.77714604, 0.0, -0.62932026),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorId": ("a3abc97b-7560-4b41-9670-023efb5d61bd"),
-        "shared::components::ActorKind": Brush,
-        "shared::components::BrushDesc": (
+            "shared::components::ActorId": ("a3abc97b-7560-4b41-9670-023efb5d61bd"),
+            "shared::components::ActorKind": Brush,
+            "shared::components::BrushDesc": (
           kind: SubtractiveMarker,
           faces: [
             (
@@ -1862,12 +462,12 @@
           cast_shadows: true,
           receive_shadows: true,
         ),
-        "shared::components::EditorVisibility": (
+            "shared::components::EditorVisibility": (
           visible: true,
         ),
-        "shared::components::HierarchySiblingIndex": (19),
-        "shared::components::LevelObject": (),
-        "shared::components::MaterialDesc": (
+            "shared::components::HierarchySiblingIndex": (2),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
           shader: (
             kind: StandardLit,
             schema_path: None,
@@ -1896,7 +496,1680 @@
           parameters: [],
           textures: [],
         ),
-      },
-    ),
-  },
+        }),
+        4294966590: (components: {
+            "bevy_ecs::name::Name": "Post Process Volume",
+            "bevy_transform::components::transform::Transform": (
+          translation: (28.0, 2.0, -1.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (8.257915, 1.0, 1.0),
+        ),
+            "shared::components::ActorId": ("77e41415-e7c0-4fef-82ba-8dacad7ad0a0"),
+            "shared::components::ActorKind": Brush,
+            "shared::components::BrushDesc": (
+          kind: Additive,
+          faces: [
+            (
+              id: ("face:+x"),
+              plane: (
+                normal: (1.0, 0.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (0.5, -0.5, -0.5),
+                (0.5, 0.5, -0.5),
+                (0.5, 0.5, 0.5),
+                (0.5, -0.5, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:-x"),
+              plane: (
+                normal: (-1.0, 0.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, -0.5, 0.5),
+                (-0.5, 0.5, 0.5),
+                (-0.5, 0.5, -0.5),
+                (-0.5, -0.5, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:+y"),
+              plane: (
+                normal: (0.0, 1.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, 0.5, -0.5),
+                (-0.5, 0.5, 0.5),
+                (0.5, 0.5, 0.5),
+                (0.5, 0.5, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:-y"),
+              plane: (
+                normal: (0.0, -1.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, -0.5, 0.5),
+                (-0.5, -0.5, -0.5),
+                (0.5, -0.5, -0.5),
+                (0.5, -0.5, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:+z"),
+              plane: (
+                normal: (0.0, 0.0, 1.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (0.5, -0.5, 0.5),
+                (0.5, 0.5, 0.5),
+                (-0.5, 0.5, 0.5),
+                (-0.5, -0.5, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:-z"),
+              plane: (
+                normal: (0.0, 0.0, -1.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, -0.5, -0.5),
+                (-0.5, 0.5, -0.5),
+                (0.5, 0.5, -0.5),
+                (0.5, -0.5, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+          ],
+          cast_shadows: true,
+          receive_shadows: true,
+        ),
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (3),
+            "shared::components::LevelObject": (),
+            "shared::components::PostProcessVolumeDesc": (
+          half_extents: (4.0, 2.0, 4.0),
+          priority: 0,
+          blend_distance: 2.0,
+          overrides: (
+            exposure_ev100: None,
+            fog_color: None,
+            fog_density: None,
+            bloom: None,
+            taa: None,
+            ssao: None,
+            tonemapping_aces: None,
+            atmosphere: None,
+            hdr: None,
+          ),
+          fullscreen_effect: None,
+          profile: None,
+          label: None,
+        ),
+        }),
+        4294966591: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-8.0, 3.5, -6.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (8),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.85,
+            g: 0.85,
+            b: 0.88,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.3,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.2,
+            y_length: 7.0,
+            z_length: 1.2,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.2, 7.0, 1.2),
+        ),
+        }),
+        4294966592: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
+          translation: (8.0, 3.5, -6.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (9),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.85,
+            g: 0.85,
+            b: 0.88,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.3,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.2,
+            y_length: 7.0,
+            z_length: 1.2,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.2, 7.0, 1.2),
+        ),
+        }),
+        4294966593: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-8.0, 3.5, 6.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (10),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.85,
+            g: 0.85,
+            b: 0.88,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.3,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.2,
+            y_length: 7.0,
+            z_length: 1.2,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.2, 7.0, 1.2),
+        ),
+        }),
+        4294966594: (components: {
+            "bevy_ecs::name::Name": "Pillar",
+            "bevy_transform::components::transform::Transform": (
+          translation: (8.0, 3.5, 6.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (11),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.85,
+            g: 0.85,
+            b: 0.88,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.3,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.2,
+            y_length: 7.0,
+            z_length: 1.2,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.2, 7.0, 1.2),
+        ),
+        }),
+        4294966595: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-0.8005953, 0.3732614, 0.21393776),
+          rotation: (0.0, 0.86742324, 0.0, -0.49757105),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (1),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.72,
+            g: 0.45,
+            b: 0.2,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.85,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.0,
+            y_length: 1.0,
+            z_length: 1.0,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.0, 1.0, 1.0),
+        ),
+        }),
+        4294966596: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
+          translation: (0.59940434, 0.3732614, 0.013936996),
+          rotation: (0.0, -0.53118616, 0.0, 0.8472551),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (2),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.72,
+            g: 0.45,
+            b: 0.2,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.85,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.0,
+            y_length: 1.0,
+            z_length: 1.0,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.0, 1.0, 1.0),
+        ),
+        }),
+        4294966597: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-0.10059604, 1.3955705, 0.11393738),
+          rotation: (0.0, 0.72083056, 0.0, -0.6931113),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (0),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.72,
+            g: 0.45,
+            b: 0.2,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.85,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.0,
+            y_length: 1.0,
+            z_length: 1.0,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.0, 1.0, 1.0),
+        ),
+        }),
+        4294966598: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
+          translation: (14.575503, 4.5, -15.5),
+          rotation: (0.77714586, -0.0, -0.6293205, -0.0),
+          scale: (8.5, 6.7, 5.6),
+        ),
+            "shared::components::ActorKind": Brush,
+            "shared::components::BrushDesc": (
+          kind: Additive,
+          faces: [
+            (
+              id: ("face:+x"),
+              plane: (
+                normal: (1.0, 0.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (0.5, -0.5, -0.5),
+                (0.5, 0.5, -0.5),
+                (0.5, 0.5, 0.5),
+                (0.5, -0.5, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:-x"),
+              plane: (
+                normal: (-1.0, 0.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, -0.5, 0.5),
+                (-0.5, 0.5, 0.5),
+                (-0.5, 0.5, -0.5),
+                (-0.5, -0.5, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:+y"),
+              plane: (
+                normal: (0.0, 1.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, 0.5, -0.5),
+                (-0.5, 0.5, 0.5),
+                (0.5, 0.5, 0.5),
+                (0.5, 0.5, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:-y"),
+              plane: (
+                normal: (0.0, -1.0, 0.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, -0.5, 0.5),
+                (-0.5, -0.5, -0.5),
+                (0.5, -0.5, -0.5),
+                (0.5, -0.5, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:+z"),
+              plane: (
+                normal: (0.0, 0.0, 1.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (0.5, -0.5, 0.5),
+                (0.5, 0.5, 0.5),
+                (-0.5, 0.5, 0.5),
+                (-0.5, -0.5, 0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+            (
+              id: ("face:-z"),
+              plane: (
+                normal: (0.0, 0.0, -1.0),
+                distance: 0.5,
+              ),
+              vertices: [
+                (-0.5, -0.5, -0.5),
+                (-0.5, 0.5, -0.5),
+                (0.5, 0.5, -0.5),
+                (0.5, -0.5, -0.5),
+              ],
+              material: None,
+              texture: None,
+              uv_offset: (0.0, 0.0),
+              uv_scale: (1.0, 1.0),
+              uv_rotation: 0.0,
+              smoothing_group: 0,
+            ),
+          ],
+          cast_shadows: true,
+          receive_shadows: true,
+        ),
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (4),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.54,
+            b: 0.52,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.85,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: Some("assets/materials/concrete.ron"),
+          parameters: [],
+          textures: [],
+        ),
+        }),
+        4294966599: (components: {
+            "bevy_ecs::name::Name": "Crate",
+            "bevy_transform::components::transform::Transform": (
+          translation: (5.4, 0.5, 2.4),
+          rotation: (0.0, 0.94948566, 0.0, -0.31381056),
+          scale: (1.0000002, 1.0, 1.0000002),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (28),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.72,
+            g: 0.45,
+            b: 0.2,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.85,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 1.0,
+            y_length: 1.0,
+            z_length: 1.0,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (1.0, 1.0, 1.0),
+        ),
+        }),
+        4294966600: (components: {
+            "bevy_ecs::name::Name": "Ramp",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-14.0, 1.6, 0.0),
+          rotation: (-0.17364825, 0.0, 0.0, 0.9848077),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (16),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.3,
+            g: 0.45,
+            b: 0.7,
+            a: 1.0,
+          ),
+          metallic: 0.1,
+          roughness: 0.55,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 0.4,
+            z_length: 9.0,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 0.4, 9.0),
+        ),
+        }),
+        4294966601: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.09, 14.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (17),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 0.18,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 0.18, 0.5),
+        ),
+        }),
+        4294966602: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.18, 13.5),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (18),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 0.36,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 0.36, 0.5),
+        ),
+        }),
+        4294966603: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.27, 13.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (19),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 0.54,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 0.54, 0.5),
+        ),
+        }),
+        4294966604: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.36, 12.5),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (20),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 0.72,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 0.72, 0.5),
+        ),
+        }),
+        4294966605: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.45000002, 12.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (21),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 0.90000004,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 0.90000004, 0.5),
+        ),
+        }),
+        4294966606: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.54, 11.5),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (22),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 1.08,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 1.08, 0.5),
+        ),
+        }),
+        4294966607: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.63, 11.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (23),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 1.26,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 1.26, 0.5),
+        ),
+        }),
+        4294966608: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.72, 10.5),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (24),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 1.44,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 1.44, 0.5),
+        ),
+        }),
+        4294966609: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.81000006, 10.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (25),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 1.6200001,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 1.6200001, 0.5),
+        ),
+        }),
+        4294966610: (components: {
+            "bevy_ecs::name::Name": "Stair",
+            "bevy_transform::components::transform::Transform": (
+          translation: (12.0, 0.90000004, 9.5),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (26),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.55,
+            g: 0.52,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.8,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 5.0,
+            y_length: 1.8000001,
+            z_length: 0.5,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (5.0, 1.8000001, 0.5),
+        ),
+        }),
+        4294966611: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-8.0, 0.6, 4.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (15),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.9,
+            g: 0.9,
+            b: 0.92,
+            a: 1.0,
+          ),
+          metallic: 1.0,
+          roughness: 0.05,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Sphere(
+            radius: 0.6,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Sphere,
+          size: (1.2, 1.2, 1.2),
+        ),
+        }),
+        4294966612: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-5.8, 0.6, 4.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (13),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.9,
+            g: 0.9,
+            b: 0.92,
+            a: 1.0,
+          ),
+          metallic: 1.0,
+          roughness: 0.3,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Sphere(
+            radius: 0.6,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Sphere,
+          size: (1.2, 1.2, 1.2),
+        ),
+        }),
+        4294966613: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-3.6, 0.6, 4.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (14),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.9,
+            g: 0.9,
+            b: 0.92,
+            a: 1.0,
+          ),
+          metallic: 1.0,
+          roughness: 0.6,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Sphere(
+            radius: 0.6,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Sphere,
+          size: (1.2, 1.2, 1.2),
+        ),
+        }),
+        4294966614: (components: {
+            "bevy_ecs::name::Name": "ShowcaseSphere",
+            "bevy_transform::components::transform::Transform": (
+          translation: (-1.3999996, 0.6, 4.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (7),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.9,
+            g: 0.9,
+            b: 0.92,
+            a: 1.0,
+          ),
+          metallic: 1.0,
+          roughness: 0.95,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Sphere(
+            radius: 0.6,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Sphere,
+          size: (1.2, 1.2, 1.2),
+        ),
+        }),
+        4294966615: (components: {
+            "bevy_ecs::name::Name": "Player Start",
+            "bevy_transform::components::transform::Transform": (
+          translation: (0.0, 0.9900649, 12.46175),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": PlayerSpawn,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (5),
+            "shared::components::LevelObject": (),
+            "shared::components::PlayerSpawn": (),
+        }),
+        4294966616: (components: {
+            "bevy_ecs::name::Name": "Ground",
+            "bevy_transform::components::transform::Transform": (
+          translation: (0.0, -0.5, 0.0),
+          rotation: (0.0, 0.0, 0.0, 1.0),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (12),
+            "shared::components::LevelObject": (),
+            "shared::components::MaterialDesc": (
+          shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+          ),
+          base_color: (
+            r: 0.42,
+            g: 0.45,
+            b: 0.48,
+            a: 1.0,
+          ),
+          metallic: 0.0,
+          roughness: 0.92,
+          emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+          ),
+          emissive_intensity: 0.0,
+          base_color_texture: None,
+          emissive_texture: None,
+          normal_map_texture: None,
+          metallic_roughness_texture: None,
+          material_asset_path: None,
+          parameters: [],
+          textures: [],
+        ),
+            "shared::components::PhysicsBody": (
+          body: Static,
+          collider: Cuboid(
+            x_length: 200.0,
+            y_length: 1.0,
+            z_length: 200.0,
+          ),
+        ),
+            "shared::components::Primitive": (
+          shape: Box,
+          size: (200.0, 1.0, 200.0),
+        ),
+        }),
+        4294966617: (components: {
+            "bevy_ecs::name::Name": "Scene Sun",
+            "bevy_transform::components::transform::Transform": (
+          translation: (0.0, 5.316672, 0.0),
+          rotation: (-0.21401538, 0.31161797, 0.67592126, 0.6326311),
+          scale: (1.0, 1.0, 1.0),
+        ),
+            "shared::components::ActorKind": Light,
+            "shared::components::EditorVisibility": (
+          visible: true,
+        ),
+            "shared::components::HierarchySiblingIndex": (6),
+            "shared::components::LevelObject": (),
+            "shared::components::LightDesc": (
+          kind: Directional,
+          color: (
+            r: 1.0,
+            g: 0.95,
+            b: 0.85,
+            a: 1.0,
+          ),
+          intensity: 100000.0,
+          range: 0.0,
+          shadows: true,
+          inner_angle_deg: 25.0,
+          outer_angle_deg: 35.0,
+        ),
+        }),
+    },
 )
\ No newline at end of file
diff --git a/assets/levels/navigation_authoring_showcase.scn.ron b/assets/levels/navigation_authoring_showcase.scn.ron
new file mode 100644
index 0000000..4aa012f
--- /dev/null
+++ b/assets/levels/navigation_authoring_showcase.scn.ron
@@ -0,0 +1,70 @@
+(schema_version: 4,resources: {
+    },
+    entities: {
+        1: (components: {
+            "bevy_ecs::name::Name": "Navigation Bounds",
+            "bevy_transform::components::transform::Transform": (translation: (0.0, 0.0, 0.0), rotation: (0.0, 0.0, 0.0, 1.0), scale: (1.0, 1.0, 1.0)),
+            "shared::components::ActorId": ("navigation-bounds-main"),
+            "shared::components::ActorKind": Navigation,
+            "shared::components::EditorVisibility": (visible: true),
+            "shared::components::HierarchySiblingIndex": (0),
+            "shared::components::LevelObject": (),
+            "shared::navigation::NavigationBounds": (
+      half_extents: (8.0, 2.0, 8.0),
+      agent: (
+        id: "humanoid",
+        radius: 0.35,
+        height: 1.8,
+        max_climb: 0.45,
+        max_slope_deg: 45.0,
+        cell_size_fraction: 3.0,
+        cell_height_fraction: 6.0,
+        min_region_size: 1,
+        merge_region_size: 2,
+      ),
+      artifact_path: "assets/navigation/generated/navigation_showcase_humanoid.nav.ron",
+      auto_bake: false,
+    ),
+        }),
+        2: (components: {
+            "bevy_ecs::name::Name": "Center Obstacle",
+            "bevy_transform::components::transform::Transform": (translation: (0.0, 0.5, 0.0), rotation: (0.0, 0.0, 0.0, 1.0), scale: (1.0, 1.0, 1.0)),
+            "shared::components::ActorId": ("navigation-obstacle-center"),
+            "shared::components::ActorKind": Navigation,
+            "shared::components::EditorVisibility": (visible: true),
+            "shared::components::HierarchySiblingIndex": (1),
+            "shared::components::LevelObject": (),
+            "shared::navigation::NavigationObstacle": (half_extents: (1.0, 1.0, 2.5), dynamic: false),
+        }),
+        3: (components: {
+            "bevy_ecs::name::Name": "Slow Area",
+            "bevy_transform::components::transform::Transform": (translation: (-4.0, 0.5, -4.0), rotation: (0.0, 0.0, 0.0, 1.0), scale: (1.0, 1.0, 1.0)),
+            "shared::components::ActorId": ("navigation-area-slow"),
+            "shared::components::ActorKind": Navigation,
+            "shared::components::EditorVisibility": (visible: true),
+            "shared::components::HierarchySiblingIndex": (2),
+            "shared::components::LevelObject": (),
+            "shared::navigation::NavigationArea": (id: "slow", half_extents: (1.5, 1.0, 1.5), cost: 1.5, walkable: true),
+        }),
+        4: (components: {
+            "bevy_ecs::name::Name": "Obstacle Link",
+            "bevy_transform::components::transform::Transform": (translation: (0.0, 0.0, 0.0), rotation: (0.0, 0.0, 0.0, 1.0), scale: (1.0, 1.0, 1.0)),
+            "shared::components::ActorId": ("navigation-link-center"),
+            "shared::components::ActorKind": Navigation,
+            "shared::components::EditorVisibility": (visible: true),
+            "shared::components::HierarchySiblingIndex": (3),
+            "shared::components::LevelObject": (),
+            "shared::navigation::NavigationLink": (start: (-1.5, 0.0, 0.0), end: (1.5, 0.0, 0.0), bidirectional: true, cost: 1.2, enabled: true),
+        }),
+        5: (components: {
+            "bevy_ecs::name::Name": "Walkable Floor Geometry",
+            "bevy_transform::components::transform::Transform": (translation: (0.0, -0.25, 0.0), rotation: (0.0, 0.0, 0.0, 1.0), scale: (1.0, 1.0, 1.0)),
+            "shared::components::ActorId": ("navigation-floor-geometry"),
+            "shared::components::ActorKind": StaticMesh,
+            "shared::components::EditorVisibility": (visible: true),
+            "shared::components::HierarchySiblingIndex": (4),
+            "shared::components::LevelObject": (),
+            "shared::components::Primitive": (shape: Box, size: (16.0, 0.5, 16.0)),
+        }),
+    },
+)
\ No newline at end of file
diff --git a/assets/levels/rendering_showcase.scn.ron b/assets/levels/rendering_showcase.scn.ron
index 4f16031..54be998 100644
--- a/assets/levels/rendering_showcase.scn.ron
+++ b/assets/levels/rendering_showcase.scn.ron
@@ -1,17 +1,16 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    4294968001: (
-      components: {
-        "bevy_ecs::name::Name": "Fog Volume",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        4294968001: (components: {
+            "bevy_ecs::name::Name": "Fog Volume",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 2.0, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::LevelObject": (),
-        "shared::components::ActorKind": PostProcessVolume,
-        "shared::components::PostProcessVolumeDesc": (
+            "shared::components::ActorKind": PostProcessVolume,
+            "shared::components::LevelObject": (),
+            "shared::components::PostProcessVolumeDesc": (
           half_extents: (6.0, 3.0, 6.0),
           priority: 0,
           blend_distance: 2.0,
@@ -23,19 +22,17 @@
           profile: None,
           label: Some("Foggy courtyard"),
         ),
-      },
-    ),
-    4294968002: (
-      components: {
-        "bevy_ecs::name::Name": "Dark Exposure Volume",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294968002: (components: {
+            "bevy_ecs::name::Name": "Dark Exposure Volume",
+            "bevy_transform::components::transform::Transform": (
           translation: (14.0, 2.0, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::LevelObject": (),
-        "shared::components::ActorKind": PostProcessVolume,
-        "shared::components::PostProcessVolumeDesc": (
+            "shared::components::ActorKind": PostProcessVolume,
+            "shared::components::LevelObject": (),
+            "shared::components::PostProcessVolumeDesc": (
           half_extents: (4.0, 2.5, 4.0),
           priority: 5,
           blend_distance: 1.5,
@@ -47,19 +44,17 @@
           profile: Some("assets/rendering_profiles/cave_dark.ron"),
           label: Some("Cave mouth"),
         ),
-      },
-    ),
-    4294968003: (
-      components: {
-        "bevy_ecs::name::Name": "Vignette FX Volume",
-        "bevy_transform::components::transform::Transform": (
+        }),
+        4294968003: (components: {
+            "bevy_ecs::name::Name": "Vignette FX Volume",
+            "bevy_transform::components::transform::Transform": (
           translation: (-12.0, 2.0, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::LevelObject": (),
-        "shared::components::ActorKind": PostProcessVolume,
-        "shared::components::PostProcessVolumeDesc": (
+            "shared::components::ActorKind": PostProcessVolume,
+            "shared::components::LevelObject": (),
+            "shared::components::PostProcessVolumeDesc": (
           half_extents: (5.0, 2.0, 5.0),
           priority: 2,
           blend_distance: 2.0,
@@ -68,7 +63,6 @@
           profile: None,
           label: Some("Vignette demo"),
         ),
-      },
-    ),
-  },
-)
+        }),
+    },
+)
\ No newline at end of file
diff --git a/assets/materials/concrete.ron b/assets/materials/concrete.ron
index 091f375..dc8ffd8 100644
--- a/assets/materials/concrete.ron
+++ b/assets/materials/concrete.ron
@@ -1,12 +1,40 @@
 (
+    schema_version: 1,
     label: "Concrete",
+    shader: None,
+    shader_ref: None,
+    render_state: (
+        alpha_mode: Opaque,
+        alpha_cutoff: 0.5,
+        double_sided: false,
+    ),
     material: (
-        base_color: (r: 0.55, g: 0.54, b: 0.52, a: 1.0),
+        shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+        ),
+        base_color: (
+            r: 0.55,
+            g: 0.54,
+            b: 0.52,
+            a: 1.0,
+        ),
         metallic: 0.0,
         roughness: 0.85,
+        emissive_color: (
+            r: 1.0,
+            g: 1.0,
+            b: 1.0,
+            a: 1.0,
+        ),
+        emissive_intensity: 0.0,
         base_color_texture: None,
+        emissive_texture: None,
         normal_map_texture: None,
         metallic_roughness_texture: None,
         material_asset_path: None,
+        parameters: [],
+        textures: [],
     ),
-)
+)
\ No newline at end of file
diff --git a/assets/materials/emissive_panel.ron b/assets/materials/emissive_panel.ron
index 449e3f8..e9d296c 100644
--- a/assets/materials/emissive_panel.ron
+++ b/assets/materials/emissive_panel.ron
@@ -1,15 +1,40 @@
 (
+    schema_version: 1,
     label: "Emissive Panel",
+    shader: None,
+    shader_ref: None,
+    render_state: (
+        alpha_mode: Opaque,
+        alpha_cutoff: 0.5,
+        double_sided: false,
+    ),
     material: (
-        base_color: (r: 0.15, g: 0.22, b: 0.28, a: 1.0),
+        shader: (
+            kind: StandardLit,
+            schema_path: None,
+            shader_path: None,
+        ),
+        base_color: (
+            r: 0.15,
+            g: 0.22,
+            b: 0.28,
+            a: 1.0,
+        ),
         metallic: 0.0,
         roughness: 0.35,
-        emissive_color: (r: 0.55, g: 0.85, b: 1.0, a: 1.0),
+        emissive_color: (
+            r: 0.55,
+            g: 0.85,
+            b: 1.0,
+            a: 1.0,
+        ),
         emissive_intensity: 2500.0,
         base_color_texture: None,
         emissive_texture: None,
         normal_map_texture: None,
         metallic_roughness_texture: None,
         material_asset_path: None,
+        parameters: [],
+        textures: [],
     ),
-)
+)
\ No newline at end of file
diff --git a/assets/materials/surface_tint.ron b/assets/materials/surface_tint.ron
new file mode 100644
index 0000000..3844b3a
--- /dev/null
+++ b/assets/materials/surface_tint.ron
@@ -0,0 +1,71 @@
+(
+    schema_version: 1,
+    label: "Surface Tint",
+    shader: Some("assets/shaders/surface_tint.shader.ron"),
+    shader_ref: None,
+    render_state: (
+        alpha_mode: Opaque,
+        alpha_cutoff: 0.5,
+        double_sided: false,
+    ),
+    material: (
+        shader: (
+            kind: Custom,
+            schema_path: Some("assets/shaders/surface_tint.shader.ron"),
+            shader_path: Some("assets/shaders/surface_tint.wgsl"),
+        ),
+        base_color: (
+            r: 0.12,
+            g: 0.42,
+            b: 0.95,
+            a: 1.0,
+        ),
+        metallic: 0.15,
+        roughness: 0.28,
+        emissive_color: (
+            r: 0.02,
+            g: 0.08,
+            b: 0.25,
+            a: 1.0,
+        ),
+        emissive_intensity: 3.0,
+        base_color_texture: None,
+        emissive_texture: None,
+        normal_map_texture: None,
+        metallic_roughness_texture: None,
+        material_asset_path: None,
+        parameters: [
+            (
+                name: "tint",
+                value: Color((
+                    r: 0.12,
+                    g: 0.42,
+                    b: 0.95,
+                    a: 1.0,
+                )),
+            ),
+            (
+                name: "roughness",
+                value: Float(0.28),
+            ),
+            (
+                name: "metallic",
+                value: Float(0.15),
+            ),
+            (
+                name: "emissive",
+                value: Color((
+                    r: 0.02,
+                    g: 0.08,
+                    b: 0.25,
+                    a: 1.0,
+                )),
+            ),
+            (
+                name: "emissive_intensity",
+                value: Float(3.0),
+            ),
+        ],
+        textures: [],
+    ),
+)
\ No newline at end of file
diff --git a/assets/materials/surface_tint_instance.ron b/assets/materials/surface_tint_instance.ron
new file mode 100644
index 0000000..c0b16a2
--- /dev/null
+++ b/assets/materials/surface_tint_instance.ron
@@ -0,0 +1,12 @@
+(
+    schema_version: 1,
+    label: "surface_tint Instance",
+    base: ((
+        asset_id: "d6cb4151-7124-4237-aaf9-f7f8abd5fb76",
+        sub_asset_id: "material:source",
+        label: "surface_tint",
+        source_path: Some("assets/materials/surface_tint.ron"),
+    )),
+    parameters: [],
+    textures: [],
+)
\ No newline at end of file
diff --git a/assets/meshes/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.static_mesh.ron b/assets/meshes/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.static_mesh.ron
new file mode 100644
index 0000000..303ecca
--- /dev/null
+++ b/assets/meshes/generated/113f74df-e39c-41d4-9b5b-e48efe541f7f.static_mesh.ron
@@ -0,0 +1,360 @@
+(
+    schema_version: 3,
+    asset_id: "113f74df-e39c-41d4-9b5b-e48efe541f7f",
+    label: "RobotExpressive",
+    source: (
+        path: "assets/models/RobotExpressive.glb",
+        format: "glb",
+        fingerprint: (
+            byte_len: 463988,
+            modified_unix_secs: 1783799272,
+        ),
+        dependencies: [],
+    ),
+    import: (
+        scale: 1.0,
+        generate_collider: true,
+        lod0_only: true,
+        placement_mode: SceneInstance,
+        hierarchy_mode: SourceHierarchy,
+        material_policy: SourceMaterials,
+    ),
+    metadata: (
+        mesh_count: 14,
+        material_count: 3,
+        node_count: 74,
+        animation_count: 14,
+        skin_count: 2,
+        light_count: 0,
+        camera_count: 0,
+    ),
+    parts: [
+        (
+            id: "draw:scene0:node4:mesh0:primitive0",
+            name: "Foot.L / Primitive 0",
+            mesh_label: "Mesh0/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (0.62405795, 0.39766362, 0.19111444),
+                rotation: (0.7071068, 0.00000005228401, 0.000000015504241, -0.70710665),
+                scale: (100.0, 99.999985, 100.0),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Foot.L/Foot.L"),
+            source_mesh: Some("Mesh0"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node7:mesh1:primitive0",
+            name: "Torso / Primitive 0",
+            mesh_label: "Mesh1/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.0027156367, 2.1737509, -0.019581214),
+                rotation: (0.70710677, 0.000000000000031351603, 0.000000000000055267226, -0.7071067),
+                scale: (100.0, 99.99998, 99.99998),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Torso"),
+            source_mesh: Some("Mesh1"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node7:mesh1:primitive1",
+            name: "Torso / Primitive 1",
+            mesh_label: "Mesh1/Primitive1",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.0027156367, 2.1737509, -0.019581214),
+                rotation: (0.70710677, 0.000000000000031351603, 0.000000000000055267226, -0.7071067),
+                scale: (100.0, 99.99998, 99.99998),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Torso"),
+            source_mesh: Some("Mesh1"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node61:mesh10:primitive0",
+            name: "Leg.R / Primitive 0",
+            mesh_label: "Mesh10/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.6746981, 1.1586236, 0.046261936),
+                rotation: (0.7693698, 0.080835514, 0.110868365, -0.6238942),
+                scale: (99.99999, 99.99886, 100.00024),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.R/Leg.R"),
+            source_mesh: Some("Mesh10"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node63:mesh11:primitive0",
+            name: "LowerLeg.R / Primitive 0",
+            mesh_label: "Mesh11/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.73626167, 0.34982973, 0.22594015),
+                rotation: (-0.65091395, -0.099058665, -0.09436109, 0.7467224),
+                scale: (99.99999, 99.998604, 100.00058),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.R/LowerLeg.R/LowerLeg.R"),
+            source_mesh: Some("Mesh11"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node72:mesh12:primitive0",
+            name: "Hand.R / Primitive 0",
+            mesh_label: "Mesh12/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.R"),
+            source_mesh: Some("Mesh12"),
+            source_material: Some("Main"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node72:mesh12:primitive1",
+            name: "Hand.R / Primitive 1",
+            mesh_label: "Mesh12/Primitive1",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.R"),
+            source_mesh: Some("Mesh12"),
+            source_material: Some("Grey"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node73:mesh13:primitive0",
+            name: "Hand.L / Primitive 0",
+            mesh_label: "Mesh13/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.L"),
+            source_mesh: Some("Mesh13"),
+            source_material: Some("Main"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node73:mesh13:primitive1",
+            name: "Hand.L / Primitive 1",
+            mesh_label: "Mesh13/Primitive1",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.L"),
+            source_mesh: Some("Mesh13"),
+            source_material: Some("Grey"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node13:mesh2:primitive0",
+            name: "Head / Primitive 0",
+            mesh_label: "Mesh2/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.05334633, 3.6175368, -0.0068152454),
+                rotation: (0.7249889, 0.0852804, 0.05460569, -0.6812757),
+                scale: (99.99997, 99.99996, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head/Head"),
+            source_mesh: Some("Mesh2"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node13:mesh2:primitive1",
+            name: "Head / Primitive 1",
+            mesh_label: "Mesh2/Primitive1",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.05334633, 3.6175368, -0.0068152454),
+                rotation: (0.7249889, 0.0852804, 0.05460569, -0.6812757),
+                scale: (99.99997, 99.99996, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head/Head"),
+            source_mesh: Some("Mesh2"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node13:mesh2:primitive2",
+            name: "Head / Primitive 2",
+            mesh_label: "Mesh2/Primitive2",
+            material_id: Some("material:material2"),
+            material_slot_name: "Black",
+            material_label: Some("Material2"),
+            local_transform: (
+                translation: (-0.05334633, 3.6175368, -0.0068152454),
+                rotation: (0.7249889, 0.0852804, 0.05460569, -0.6812757),
+                scale: (99.99997, 99.99996, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head/Head"),
+            source_mesh: Some("Mesh2"),
+            source_material: Some("Black"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node68:mesh3:primitive0",
+            name: "Foot.R / Primitive 0",
+            mesh_label: "Mesh3/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.637997, 0.3976636, 0.19111452),
+                rotation: (0.70710677, 0.00000005201811, 0.000000015770217, -0.7071067),
+                scale: (100.0, 99.999985, 100.0),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Foot.R/Foot.R"),
+            source_mesh: Some("Mesh3"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node16:mesh4:primitive0",
+            name: "Shoulder.L / Primitive 0",
+            mesh_label: "Mesh4/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.58268076, 2.3724597, -0.020994142),
+                rotation: (-0.59886926, 0.37597278, -0.37597266, 0.59886944),
+                scale: (99.99996, 99.999954, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/Shoulder.L"),
+            source_mesh: Some("Mesh4"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node18:mesh5:primitive0",
+            name: "Arm.L / Primitive 0",
+            mesh_label: "Mesh5/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.26500192, 2.8489676, 0.13069445),
+                rotation: (-0.5164575, 0.4218856, -0.32294926, 0.67155623),
+                scale: (99.99994, 99.99994, 99.99999),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/Arm.L"),
+            source_mesh: Some("Mesh5"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node36:mesh6:primitive0",
+            name: "Shoulder.R / Primitive 0",
+            mesh_label: "Mesh6/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.6369861, 2.3718858, -0.020994166),
+                rotation: (0.6017577, 0.37133226, -0.37133226, -0.6017577),
+                scale: (99.999954, 99.99997, 99.99994),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/Shoulder.R"),
+            source_mesh: Some("Mesh6"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node38:mesh7:primitive0",
+            name: "Arm.R / Primitive 0",
+            mesh_label: "Mesh7/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.82568955, 1.9825263, 0.040243305),
+                rotation: (0.6276481, 0.35463694, -0.3873087, -0.5747021),
+                scale: (22.70405, 22.704054, 22.704046),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/Arm.R"),
+            source_mesh: Some("Mesh7"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node56:mesh8:primitive0",
+            name: "Leg.L / Primitive 0",
+            mesh_label: "Mesh8/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.6488191, 1.1620699, 0.057466835),
+                rotation: (0.76387787, -0.05410902, -0.070370995, -0.6392268),
+                scale: (99.99999, 100.00079, 100.00024),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.L/Leg.L"),
+            source_mesh: Some("Mesh8"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node58:mesh9:primitive0",
+            name: "LowerLeg.L / Primitive 0",
+            mesh_label: "Mesh9/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.68805873, 0.3497491, 0.23465614),
+                rotation: (-0.6547612, 0.06408298, 0.061960325, 0.7505613),
+                scale: (100.000015, 100.0006, 100.000496),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.L/LowerLeg.L/LowerLeg.L"),
+            source_mesh: Some("Mesh9"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+    ],
+    warnings: [
+        "Animations are recorded as metadata; animated placement uses SkinnedMeshRenderer.",
+        "Skinned primitives are excluded from StaticMeshRenderer and use SkinnedMeshRenderer.",
+    ],
+)
\ No newline at end of file
diff --git a/assets/meshes/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.static_mesh.ron b/assets/meshes/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.static_mesh.ron
new file mode 100644
index 0000000..bbf92f0
--- /dev/null
+++ b/assets/meshes/generated/3f63f359-45eb-4cb2-8970-71921cbd7bd0.static_mesh.ron
@@ -0,0 +1,360 @@
+(
+    schema_version: 3,
+    asset_id: "3f63f359-45eb-4cb2-8970-71921cbd7bd0",
+    label: "robot_expressive",
+    source: (
+        path: "assets/models/robot_expressive.glb",
+        format: "glb",
+        fingerprint: (
+            byte_len: 463988,
+            modified_unix_secs: 1783750957,
+        ),
+        dependencies: [],
+    ),
+    import: (
+        scale: 1.0,
+        generate_collider: true,
+        lod0_only: true,
+        placement_mode: StaticAsset,
+        hierarchy_mode: SingleActor,
+        material_policy: SourceMaterials,
+    ),
+    metadata: (
+        mesh_count: 14,
+        material_count: 3,
+        node_count: 74,
+        animation_count: 14,
+        skin_count: 2,
+        light_count: 0,
+        camera_count: 0,
+    ),
+    parts: [
+        (
+            id: "draw:scene0:node4:mesh0:primitive0",
+            name: "Foot.L / Primitive 0",
+            mesh_label: "Mesh0/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (0.62405795, 0.39766362, 0.19111444),
+                rotation: (0.7071068, 0.00000005228401, 0.000000015504241, -0.70710665),
+                scale: (100.0, 99.999985, 100.0),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Foot.L/Foot.L"),
+            source_mesh: Some("Mesh0"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node7:mesh1:primitive0",
+            name: "Torso / Primitive 0",
+            mesh_label: "Mesh1/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.0027156367, 2.1737509, -0.019581214),
+                rotation: (0.70710677, 0.000000000000031351603, 0.000000000000055267226, -0.7071067),
+                scale: (100.0, 99.99998, 99.99998),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Torso"),
+            source_mesh: Some("Mesh1"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node7:mesh1:primitive1",
+            name: "Torso / Primitive 1",
+            mesh_label: "Mesh1/Primitive1",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.0027156367, 2.1737509, -0.019581214),
+                rotation: (0.70710677, 0.000000000000031351603, 0.000000000000055267226, -0.7071067),
+                scale: (100.0, 99.99998, 99.99998),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Torso"),
+            source_mesh: Some("Mesh1"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node61:mesh10:primitive0",
+            name: "Leg.R / Primitive 0",
+            mesh_label: "Mesh10/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.6746981, 1.1586236, 0.046261936),
+                rotation: (0.7693698, 0.080835514, 0.110868365, -0.6238942),
+                scale: (99.99999, 99.99886, 100.00024),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.R/Leg.R"),
+            source_mesh: Some("Mesh10"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node63:mesh11:primitive0",
+            name: "LowerLeg.R / Primitive 0",
+            mesh_label: "Mesh11/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.73626167, 0.34982973, 0.22594015),
+                rotation: (-0.65091395, -0.099058665, -0.09436109, 0.7467224),
+                scale: (99.99999, 99.998604, 100.00058),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.R/LowerLeg.R/LowerLeg.R"),
+            source_mesh: Some("Mesh11"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node72:mesh12:primitive0",
+            name: "Hand.R / Primitive 0",
+            mesh_label: "Mesh12/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.R"),
+            source_mesh: Some("Mesh12"),
+            source_material: Some("Main"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node72:mesh12:primitive1",
+            name: "Hand.R / Primitive 1",
+            mesh_label: "Mesh12/Primitive1",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.R"),
+            source_mesh: Some("Mesh12"),
+            source_material: Some("Grey"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node73:mesh13:primitive0",
+            name: "Hand.L / Primitive 0",
+            mesh_label: "Mesh13/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.L"),
+            source_mesh: Some("Mesh13"),
+            source_material: Some("Main"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node73:mesh13:primitive1",
+            name: "Hand.L / Primitive 1",
+            mesh_label: "Mesh13/Primitive1",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.002715637, 2.3702974, -0.020994147),
+                rotation: (0.70710677, 0.0, 0.0, -0.7071067),
+                scale: (100.0, 99.99999, 99.99999),
+            ),
+            source_node: Some("RootNode/Hand.L"),
+            source_mesh: Some("Mesh13"),
+            source_material: Some("Grey"),
+            skinned: true,
+        ),
+        (
+            id: "draw:scene0:node13:mesh2:primitive0",
+            name: "Head / Primitive 0",
+            mesh_label: "Mesh2/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.05334633, 3.6175368, -0.0068152454),
+                rotation: (0.7249889, 0.0852804, 0.05460569, -0.6812757),
+                scale: (99.99997, 99.99996, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head/Head"),
+            source_mesh: Some("Mesh2"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node13:mesh2:primitive1",
+            name: "Head / Primitive 1",
+            mesh_label: "Mesh2/Primitive1",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.05334633, 3.6175368, -0.0068152454),
+                rotation: (0.7249889, 0.0852804, 0.05460569, -0.6812757),
+                scale: (99.99997, 99.99996, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head/Head"),
+            source_mesh: Some("Mesh2"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node13:mesh2:primitive2",
+            name: "Head / Primitive 2",
+            mesh_label: "Mesh2/Primitive2",
+            material_id: Some("material:material2"),
+            material_slot_name: "Black",
+            material_label: Some("Material2"),
+            local_transform: (
+                translation: (-0.05334633, 3.6175368, -0.0068152454),
+                rotation: (0.7249889, 0.0852804, 0.05460569, -0.6812757),
+                scale: (99.99997, 99.99996, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Neck/Head/Head"),
+            source_mesh: Some("Mesh2"),
+            source_material: Some("Black"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node68:mesh3:primitive0",
+            name: "Foot.R / Primitive 0",
+            mesh_label: "Mesh3/Primitive0",
+            material_id: Some("material:material0"),
+            material_slot_name: "Grey",
+            material_label: Some("Material0"),
+            local_transform: (
+                translation: (-0.637997, 0.3976636, 0.19111452),
+                rotation: (0.70710677, 0.00000005201811, 0.000000015770217, -0.7071067),
+                scale: (100.0, 99.999985, 100.0),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Foot.R/Foot.R"),
+            source_mesh: Some("Mesh3"),
+            source_material: Some("Grey"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node16:mesh4:primitive0",
+            name: "Shoulder.L / Primitive 0",
+            mesh_label: "Mesh4/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.58268076, 2.3724597, -0.020994142),
+                rotation: (-0.59886926, 0.37597278, -0.37597266, 0.59886944),
+                scale: (99.99996, 99.999954, 99.99997),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/Shoulder.L"),
+            source_mesh: Some("Mesh4"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node18:mesh5:primitive0",
+            name: "Arm.L / Primitive 0",
+            mesh_label: "Mesh5/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.26500192, 2.8489676, 0.13069445),
+                rotation: (-0.5164575, 0.4218856, -0.32294926, 0.67155623),
+                scale: (99.99994, 99.99994, 99.99999),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.L/UpperArm.L/Arm.L"),
+            source_mesh: Some("Mesh5"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node36:mesh6:primitive0",
+            name: "Shoulder.R / Primitive 0",
+            mesh_label: "Mesh6/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.6369861, 2.3718858, -0.020994166),
+                rotation: (0.6017577, 0.37133226, -0.37133226, -0.6017577),
+                scale: (99.999954, 99.99997, 99.99994),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/Shoulder.R"),
+            source_mesh: Some("Mesh6"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node38:mesh7:primitive0",
+            name: "Arm.R / Primitive 0",
+            mesh_label: "Mesh7/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (-0.82568955, 1.9825263, 0.040243305),
+                rotation: (0.6276481, 0.35463694, -0.3873087, -0.5747021),
+                scale: (22.70405, 22.704054, 22.704046),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/Hips/Abdomen/Torso/Shoulder.R/UpperArm.R/Arm.R"),
+            source_mesh: Some("Mesh7"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node56:mesh8:primitive0",
+            name: "Leg.L / Primitive 0",
+            mesh_label: "Mesh8/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.6488191, 1.1620699, 0.057466835),
+                rotation: (0.76387787, -0.05410902, -0.070370995, -0.6392268),
+                scale: (99.99999, 100.00079, 100.00024),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.L/Leg.L"),
+            source_mesh: Some("Mesh8"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+        (
+            id: "draw:scene0:node58:mesh9:primitive0",
+            name: "LowerLeg.L / Primitive 0",
+            mesh_label: "Mesh9/Primitive0",
+            material_id: Some("material:material1"),
+            material_slot_name: "Main",
+            material_label: Some("Material1"),
+            local_transform: (
+                translation: (0.68805873, 0.3497491, 0.23465614),
+                rotation: (-0.6547612, 0.06408298, 0.061960325, 0.7505613),
+                scale: (100.000015, 100.0006, 100.000496),
+            ),
+            source_node: Some("RootNode/RobotArmature/Bone/Body/UpperLeg.L/LowerLeg.L/LowerLeg.L"),
+            source_mesh: Some("Mesh9"),
+            source_material: Some("Main"),
+            skinned: false,
+        ),
+    ],
+    warnings: [
+        "Animations are recorded as metadata; animated placement uses SkinnedMeshRenderer.",
+        "Skinned primitives are excluded from StaticMeshRenderer and use SkinnedMeshRenderer.",
+    ],
+)
\ No newline at end of file
diff --git a/assets/meshes/generated/b98ef565-3500-49e7-9935-f685fa9b2594.static_mesh.ron b/assets/meshes/generated/b98ef565-3500-49e7-9935-f685fa9b2594.static_mesh.ron
index fbcee12..683980a 100644
--- a/assets/meshes/generated/b98ef565-3500-49e7-9935-f685fa9b2594.static_mesh.ron
+++ b/assets/meshes/generated/b98ef565-3500-49e7-9935-f685fa9b2594.static_mesh.ron
@@ -1,5 +1,5 @@
 (
-    schema_version: 1,
+    schema_version: 3,
     asset_id: "b98ef565-3500-49e7-9935-f685fa9b2594",
     label: "painted_wooden_chair_02_2k",
     source: (
@@ -30,7 +30,7 @@
     ),
     parts: [
         (
-            id: "mesh:mesh1000",
+            id: "draw:scene0:node1:material0",
             name: "painted_wooden_chair_02 / Material 0",
             mesh_label: "Mesh1000",
             material_id: Some("material:material0"),
@@ -44,6 +44,7 @@
             source_node: Some("Node1"),
             source_mesh: Some("Mesh1"),
             source_material: Some("painted_wooden_chair_02"),
+            skinned: false,
         ),
     ],
     warnings: [],
diff --git a/assets/models/RobotExpressive.glb b/assets/models/RobotExpressive.glb
new file mode 100644
index 0000000..7cb7550
--- /dev/null
+++ b/assets/models/RobotExpressive.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:047f5e5fb3bb6d378bd1df16ca6137f2a596c99b3a1b5690b4020c05aaf6f319
+size 463988
diff --git a/assets/navigation/generated/navigation_showcase_humanoid.nav.ron b/assets/navigation/generated/navigation_showcase_humanoid.nav.ron
new file mode 100644
index 0000000..316112f
--- /dev/null
+++ b/assets/navigation/generated/navigation_showcase_humanoid.nav.ron
@@ -0,0 +1,963 @@
+(
+    schema_version: 1,
+    generator: "rerecast-0.3/polyanya-0.16",
+    source_scene: "assets/levels/navigation_authoring_showcase.scn.ron",
+    source_fingerprint: "c3f7b1f6eb8cb9ab5d4bb3a9b0d09ce47641c563f47fa75df4e7eb30862d039c",
+    bounds_actor_id: "navigation-bounds-main",
+    center: (0.0, 0.0, 0.0),
+    half_extents: (8.0, 2.0, 8.0),
+    agent: (
+        id: "humanoid",
+        radius: 0.35,
+        height: 1.8,
+        max_climb: 0.45,
+        max_slope_deg: 45.0,
+        cell_size_fraction: 3.0,
+        cell_height_fraction: 6.0,
+        min_region_size: 1,
+        merge_region_size: 2,
+    ),
+    mesh: (
+        layers: [
+            (
+                vertices: [
+                    (
+                        coords: (-1.0, -2.516667),
+                        polygons: [
+                            0,
+                            4294967295,
+                            1,
+                            3,
+                            2,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.3000002, -2.516667),
+                        polygons: [
+                            4,
+                            4294967295,
+                            0,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.41666698, -7.3),
+                        polygons: [
+                            5,
+                            4,
+                            0,
+                            2,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, -1.5833335),
+                        polygons: [
+                            3,
+                            1,
+                            10,
+                            12,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, -1.5833335),
+                        polygons: [
+                            10,
+                            1,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, -2.516667),
+                        polygons: [
+                            0,
+                            4294967295,
+                            1,
+                            3,
+                            2,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, -2.516667),
+                        polygons: [
+                            0,
+                            4294967295,
+                            1,
+                            3,
+                            2,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.41666698, -7.3),
+                        polygons: [
+                            5,
+                            4,
+                            0,
+                            2,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, -7.3),
+                        polygons: [
+                            2,
+                            3,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, -1.5833335),
+                        polygons: [
+                            3,
+                            1,
+                            10,
+                            12,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.3000002, -2.516667),
+                        polygons: [
+                            4,
+                            4294967295,
+                            0,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.2833333, -2.516667),
+                        polygons: [
+                            6,
+                            4294967295,
+                            4,
+                            5,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.39999962, -7.3),
+                        polygons: [
+                            8,
+                            6,
+                            5,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.41666698, -7.3),
+                        polygons: [
+                            5,
+                            4,
+                            0,
+                            2,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.39999962, -7.3),
+                        polygons: [
+                            8,
+                            6,
+                            5,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.2833333, -2.516667),
+                        polygons: [
+                            6,
+                            4294967295,
+                            4,
+                            5,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -2.516667),
+                        polygons: [
+                            8,
+                            9,
+                            7,
+                            4294967295,
+                            6,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -2.516667),
+                        polygons: [
+                            8,
+                            9,
+                            7,
+                            4294967295,
+                            6,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -1.5833335),
+                        polygons: [
+                            7,
+                            13,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, -1.5833335),
+                        polygons: [
+                            15,
+                            13,
+                            7,
+                            9,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -2.516667),
+                        polygons: [
+                            8,
+                            9,
+                            7,
+                            4294967295,
+                            6,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, -1.5833335),
+                        polygons: [
+                            15,
+                            13,
+                            7,
+                            9,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, -7.3),
+                        polygons: [
+                            9,
+                            8,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.39999962, -7.3),
+                        polygons: [
+                            8,
+                            6,
+                            5,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, -0.0666666),
+                        polygons: [
+                            11,
+                            12,
+                            10,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, -1.5833335),
+                        polygons: [
+                            10,
+                            1,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, -1.5833335),
+                        polygons: [
+                            3,
+                            1,
+                            10,
+                            12,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, 1.5666666),
+                        polygons: [
+                            12,
+                            11,
+                            17,
+                            19,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, 1.5666666),
+                        polygons: [
+                            17,
+                            11,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, -0.0666666),
+                        polygons: [
+                            11,
+                            12,
+                            10,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, -1.5833335),
+                        polygons: [
+                            3,
+                            1,
+                            10,
+                            12,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, -1.5833335),
+                        polygons: [
+                            15,
+                            13,
+                            7,
+                            9,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -1.5833335),
+                        polygons: [
+                            7,
+                            13,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -0.0666666),
+                        polygons: [
+                            13,
+                            15,
+                            14,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, 1.5666666),
+                        polygons: [
+                            23,
+                            21,
+                            14,
+                            15,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, -1.5833335),
+                        polygons: [
+                            15,
+                            13,
+                            7,
+                            9,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, -0.0666666),
+                        polygons: [
+                            13,
+                            15,
+                            14,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, 1.5666666),
+                        polygons: [
+                            14,
+                            21,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.41666698, 7.283333),
+                        polygons: [
+                            24,
+                            25,
+                            4294967295,
+                            18,
+                            16,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.3000002, 2.5),
+                        polygons: [
+                            24,
+                            16,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, 2.5),
+                        polygons: [
+                            16,
+                            18,
+                            19,
+                            17,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, 2.5),
+                        polygons: [
+                            16,
+                            18,
+                            19,
+                            17,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, 1.5666666),
+                        polygons: [
+                            17,
+                            11,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, 1.5666666),
+                        polygons: [
+                            12,
+                            11,
+                            17,
+                            19,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, 7.283333),
+                        polygons: [
+                            19,
+                            18,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.41666698, 7.283333),
+                        polygons: [
+                            24,
+                            25,
+                            4294967295,
+                            18,
+                            16,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-1.0, 2.5),
+                        polygons: [
+                            16,
+                            18,
+                            19,
+                            17,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-7.3, 1.5666666),
+                        polygons: [
+                            12,
+                            11,
+                            17,
+                            19,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, 2.5),
+                        polygons: [
+                            21,
+                            23,
+                            22,
+                            20,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.2833333, 2.5),
+                        polygons: [
+                            20,
+                            25,
+                            24,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.39999962, 7.283333),
+                        polygons: [
+                            20,
+                            22,
+                            4294967295,
+                            25,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, 1.5666666),
+                        polygons: [
+                            23,
+                            21,
+                            14,
+                            15,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, 1.5666666),
+                        polygons: [
+                            14,
+                            21,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, 2.5),
+                        polygons: [
+                            21,
+                            23,
+                            22,
+                            20,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.9833336, 2.5),
+                        polygons: [
+                            21,
+                            23,
+                            22,
+                            20,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.39999962, 7.283333),
+                        polygons: [
+                            20,
+                            22,
+                            4294967295,
+                            25,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, 7.283333),
+                        polygons: [
+                            22,
+                            23,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (7.283333, 1.5666666),
+                        polygons: [
+                            23,
+                            21,
+                            14,
+                            15,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.41666698, 7.283333),
+                        polygons: [
+                            24,
+                            25,
+                            4294967295,
+                            18,
+                            16,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.39999962, 7.283333),
+                        polygons: [
+                            20,
+                            22,
+                            4294967295,
+                            25,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (0.2833333, 2.5),
+                        polygons: [
+                            20,
+                            25,
+                            24,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                    (
+                        coords: (-0.3000002, 2.5),
+                        polygons: [
+                            24,
+                            16,
+                            4294967295,
+                        ],
+                        is_corner: true,
+                    ),
+                ],
+                polygons: [
+                    (
+                        vertices: [
+                            2,
+                            1,
+                            0,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            4,
+                            3,
+                            5,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            6,
+                            8,
+                            7,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            6,
+                            9,
+                            8,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            13,
+                            11,
+                            10,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            13,
+                            12,
+                            11,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            15,
+                            14,
+                            16,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            18,
+                            17,
+                            19,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            22,
+                            20,
+                            23,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            22,
+                            21,
+                            20,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            25,
+                            24,
+                            26,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            27,
+                            29,
+                            28,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            27,
+                            30,
+                            29,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            32,
+                            31,
+                            33,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            36,
+                            34,
+                            37,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            36,
+                            35,
+                            34,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            40,
+                            39,
+                            38,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            42,
+                            41,
+                            43,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            44,
+                            46,
+                            45,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            44,
+                            47,
+                            46,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            49,
+                            48,
+                            50,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            52,
+                            51,
+                            53,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            54,
+                            56,
+                            55,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            54,
+                            57,
+                            56,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            60,
+                            58,
+                            61,
+                        ],
+                        is_one_way: false,
+                    ),
+                    (
+                        vertices: [
+                            60,
+                            59,
+                            58,
+                        ],
+                        is_one_way: false,
+                    ),
+                ],
+                offset: (0.0, 0.0),
+                baked_polygons: None,
+                islands: None,
+                height: [
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                    0.10000008,
+                ],
+            ),
+        ],
+        search_delta: 0.1,
+        search_steps: 2,
+    ),
+    links: [
+        (
+            actor_id: "navigation-link-center",
+            start: (-1.5, 0.0, 0.0),
+            end: (1.5, 0.0, 0.0),
+            bidirectional: true,
+            cost: 1.2,
+            enabled: true,
+        ),
+    ],
+    areas: [
+        (
+            actor_id: "navigation-area-slow",
+            id: "slow",
+            center: (-4.0, 0.5, -4.0),
+            half_extents: (1.5, 1.0, 1.5),
+            cost: 1.5,
+            walkable: true,
+        ),
+    ],
+)
\ No newline at end of file
diff --git a/assets/prefabs/example_base.scn.ron b/assets/prefabs/example_base.scn.ron
index 23ca1dc..e3f91e6 100644
--- a/assets/prefabs/example_base.scn.ron
+++ b/assets/prefabs/example_base.scn.ron
@@ -1,19 +1,17 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    1: (
-      components: {
-        "bevy_ecs::name::Name": "Example Base Mesh",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        1: (components: {
+            "bevy_ecs::name::Name": "Example Base Mesh",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 0.0, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorId": ("base-mesh"),
-        "shared::components::ActorKind": Empty,
-        "shared::components::EditorVisibility": (visible: true),
-        "shared::components::LevelObject": (),
-      },
-    ),
-  },
-)
+            "shared::components::ActorId": ("base-mesh"),
+            "shared::components::ActorKind": Empty,
+            "shared::components::EditorVisibility": (visible: true),
+            "shared::components::LevelObject": (),
+        }),
+    },
+)
\ No newline at end of file
diff --git a/assets/prefabs/example_nested.scn.ron b/assets/prefabs/example_nested.scn.ron
index 8039fbd..a98c3c4 100644
--- a/assets/prefabs/example_nested.scn.ron
+++ b/assets/prefabs/example_nested.scn.ron
@@ -1,23 +1,21 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    1: (
-      components: {
-        "bevy_ecs::name::Name": "Example Base Link",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        1: (components: {
+            "bevy_ecs::name::Name": "Example Base Link",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 0.0, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorId": ("base-link"),
-        "shared::components::ActorKind": PrefabAnchor,
-        "shared::components::LevelObject": (),
-        "shared::components::PrefabInstance": (
+            "shared::components::ActorId": ("base-link"),
+            "shared::components::ActorKind": PrefabAnchor,
+            "shared::components::LevelObject": (),
+            "shared::components::PrefabInstance": (
           asset_id: "11111111-1111-4111-8111-111111111111",
           source_path: "assets/prefabs/example_base.scn.ron",
           overrides_ron: None,
         ),
-      },
-    ),
-  },
-)
+        }),
+    },
+)
\ No newline at end of file
diff --git a/assets/prefabs/example_variant.scn.ron b/assets/prefabs/example_variant.scn.ron
index 852daf7..58623bd 100644
--- a/assets/prefabs/example_variant.scn.ron
+++ b/assets/prefabs/example_variant.scn.ron
@@ -1,23 +1,21 @@
-(schema_version: 2,
-  resources: {},
-  entities: {
-    1: (
-      components: {
-        "bevy_ecs::name::Name": "Example Nested Variant Link",
-        "bevy_transform::components::transform::Transform": (
+(schema_version: 4,resources: {
+    },
+    entities: {
+        1: (components: {
+            "bevy_ecs::name::Name": "Example Nested Variant Link",
+            "bevy_transform::components::transform::Transform": (
           translation: (0.0, 0.0, 0.0),
           rotation: (0.0, 0.0, 0.0, 1.0),
           scale: (1.0, 1.0, 1.0),
         ),
-        "shared::components::ActorId": ("nested-link"),
-        "shared::components::ActorKind": PrefabAnchor,
-        "shared::components::LevelObject": (),
-        "shared::components::PrefabInstance": (
+            "shared::components::ActorId": ("nested-link"),
+            "shared::components::ActorKind": PrefabAnchor,
+            "shared::components::LevelObject": (),
+            "shared::components::PrefabInstance": (
           asset_id: "22222222-2222-4222-8222-222222222222",
           source_path: "assets/prefabs/example_nested.scn.ron",
           overrides_ron: Some("(format_version:2,source_revision:None,transform:None,material:None,child_visibility:{},properties:[],components:[(target:(instance_chain:[\"base-link\"],actor_id:\"base-mesh\"),component_type:\"shared::components::EditorVisibility\",base_component_ron:Some(\"(visible:true)\"),value_component_ron:Some(\"(visible:false)\"))],structural:[])"),
         ),
-      },
-    ),
-  },
-)
+        }),
+    },
+)
\ No newline at end of file
diff --git a/assets/shaders/blacksite_surface.wgsl b/assets/shaders/blacksite_surface.wgsl
new file mode 100644
index 0000000..5f76d10
--- /dev/null
+++ b/assets/shaders/blacksite_surface.wgsl
@@ -0,0 +1,42 @@
+#import bevy_pbr::{
+    pbr_fragment::pbr_input_from_standard_material,
+    pbr_functions::alpha_discard,
+}
+
+#ifdef PREPASS_PIPELINE
+#import bevy_pbr::{
+    prepass_io::{VertexOutput, FragmentOutput},
+    pbr_deferred_functions::deferred_output,
+}
+#else
+#import bevy_pbr::{
+    forward_io::{VertexOutput, FragmentOutput},
+    pbr_functions::{apply_pbr_lighting, main_pass_post_lighting_processing},
+}
+#endif
+
+struct SurfaceUniform {
+    shader_id: u32,
+    flags: u32,
+    alpha_cutoff: f32,
+    abi_version: u32,
+    params: array<vec4<f32>, 16>,
+    uv_transforms: array<vec4<f32>, 8>,
+}
+
+@group(#{MATERIAL_BIND_GROUP}) @binding(100) var<uniform> surface_uniform: SurfaceUniform;
+
+@fragment
+fn fragment(in: VertexOutput, @builtin(front_facing) is_front: bool) -> FragmentOutput {
+    var pbr_input = pbr_input_from_standard_material(in, is_front);
+    pbr_input.material.base_color = alpha_discard(pbr_input.material, pbr_input.material.base_color);
+#ifdef PREPASS_PIPELINE
+    return deferred_output(in, pbr_input);
+#else
+    var out: FragmentOutput;
+    out.color = apply_pbr_lighting(pbr_input);
+    out.color = main_pass_post_lighting_processing(pbr_input, out.color);
+    return out;
+#endif
+}
+
diff --git a/assets/shaders/standard_lit.shader.ron b/assets/shaders/standard_lit.shader.ron
index 37a2c19..02d4ca7 100644
--- a/assets/shaders/standard_lit.shader.ron
+++ b/assets/shaders/standard_lit.shader.ron
@@ -1,18 +1,73 @@
 (
+    schema_version: 1,
     label: "Standard Lit",
     kind: StandardLit,
     wgsl_path: None,
     parameters: [
-        (name: "base_color", display_name: "Base Color", group: "Surface", property_type: Color),
-        (name: "metallic", display_name: "Metallic", group: "Surface", property_type: Float(min: Some(0.0), max: Some(1.0))),
-        (name: "roughness", display_name: "Roughness", group: "Surface", property_type: Float(min: Some(0.0), max: Some(1.0))),
-        (name: "emissive_color", display_name: "Emissive Color", group: "Emission", property_type: Color),
-        (name: "emissive_intensity", display_name: "Emissive Nits", group: "Emission", property_type: Float(min: Some(0.0), max: Some(20000.0))),
-        (name: "base_color_texture", display_name: "Base Color Texture", group: "Textures", property_type: Texture),
-        (name: "normal_map_texture", display_name: "Normal Map", group: "Textures", property_type: Texture),
-        (name: "metallic_roughness_texture", display_name: "Metallic/Roughness Texture", group: "Textures", property_type: Texture),
-        (name: "emissive_texture", display_name: "Emissive Texture", group: "Textures", property_type: Texture),
+        (
+            name: "base_color",
+            display_name: "Base Color",
+            group: "Surface",
+            property_type: Color,
+        ),
+        (
+            name: "metallic",
+            display_name: "Metallic",
+            group: "Surface",
+            property_type: Float(
+                min: Some(0.0),
+                max: Some(1.0),
+            ),
+        ),
+        (
+            name: "roughness",
+            display_name: "Roughness",
+            group: "Surface",
+            property_type: Float(
+                min: Some(0.0),
+                max: Some(1.0),
+            ),
+        ),
+        (
+            name: "emissive_color",
+            display_name: "Emissive Color",
+            group: "Emission",
+            property_type: Color,
+        ),
+        (
+            name: "emissive_intensity",
+            display_name: "Emissive Nits",
+            group: "Emission",
+            property_type: Float(
+                min: Some(0.0),
+                max: Some(20000.0),
+            ),
+        ),
+        (
+            name: "base_color_texture",
+            display_name: "Base Color Texture",
+            group: "Textures",
+            property_type: Texture,
+        ),
+        (
+            name: "normal_map_texture",
+            display_name: "Normal Map",
+            group: "Textures",
+            property_type: Texture,
+        ),
+        (
+            name: "metallic_roughness_texture",
+            display_name: "Metallic/Roughness Texture",
+            group: "Textures",
+            property_type: Texture,
+        ),
+        (
+            name: "emissive_texture",
+            display_name: "Emissive Texture",
+            group: "Textures",
+            property_type: Texture,
+        ),
     ],
     default_values: [],
     default_textures: [],
-)
+)
\ No newline at end of file
diff --git a/assets/shaders/surface_tint.shader.ron b/assets/shaders/surface_tint.shader.ron
new file mode 100644
index 0000000..6c346a3
--- /dev/null
+++ b/assets/shaders/surface_tint.shader.ron
@@ -0,0 +1,80 @@
+(
+    schema_version: 1,
+    label: "Surface Tint",
+    kind: Custom,
+    wgsl_path: Some("assets/shaders/surface_tint.wgsl"),
+    parameters: [
+        (
+            name: "tint",
+            display_name: "Tint",
+            group: "Surface",
+            property_type: Color,
+        ),
+        (
+            name: "roughness",
+            display_name: "Roughness",
+            group: "Surface",
+            property_type: Float(
+                min: Some(0.001),
+                max: Some(1.0),
+            ),
+        ),
+        (
+            name: "metallic",
+            display_name: "Metallic",
+            group: "Surface",
+            property_type: Float(
+                min: Some(0.0),
+                max: Some(1.0),
+            ),
+        ),
+        (
+            name: "emissive",
+            display_name: "Emissive",
+            group: "Emission",
+            property_type: Color,
+        ),
+        (
+            name: "emissive_intensity",
+            display_name: "Emissive Nits",
+            group: "Emission",
+            property_type: Float(
+                min: Some(0.0),
+                max: Some(20000.0),
+            ),
+        ),
+    ],
+    default_values: [
+        (
+            name: "tint",
+            value: Color((
+                r: 0.12,
+                g: 0.42,
+                b: 0.95,
+                a: 1.0,
+            )),
+        ),
+        (
+            name: "roughness",
+            value: Float(0.28),
+        ),
+        (
+            name: "metallic",
+            value: Float(0.15),
+        ),
+        (
+            name: "emissive",
+            value: Color((
+                r: 0.02,
+                g: 0.08,
+                b: 0.25,
+                a: 1.0,
+            )),
+        ),
+        (
+            name: "emissive_intensity",
+            value: Float(3.0),
+        ),
+    ],
+    default_textures: [],
+)
\ No newline at end of file
diff --git a/assets/shaders/surface_tint.wgsl b/assets/shaders/surface_tint.wgsl
new file mode 100644
index 0000000..afa02d8
--- /dev/null
+++ b/assets/shaders/surface_tint.wgsl
@@ -0,0 +1,14 @@
+fn evaluate(
+    input: SurfaceInput,
+    params: SurfaceParams,
+    samples: SurfaceSamples,
+) -> Surface {
+    var surface = surface_default();
+    surface.base_color = params.lanes[0];
+    surface.perceptual_roughness = params.lanes[1].x;
+    surface.metallic = params.lanes[2].x;
+    surface.emissive = params.lanes[3].rgb * params.lanes[4].x;
+    surface.reflectance = 0.5;
+    surface.occlusion = 1.0;
+    return surface;
+}
diff --git a/assets/shaders/unlit.shader.ron b/assets/shaders/unlit.shader.ron
index 31d2686..bf04d97 100644
--- a/assets/shaders/unlit.shader.ron
+++ b/assets/shaders/unlit.shader.ron
@@ -1,13 +1,37 @@
 (
+    schema_version: 1,
     label: "Unlit",
     kind: Unlit,
     wgsl_path: None,
     parameters: [
-        (name: "base_color", display_name: "Base Color", group: "Surface", property_type: Color),
-        (name: "base_color_texture", display_name: "Base Color Texture", group: "Textures", property_type: Texture),
-        (name: "emissive_color", display_name: "Emissive Color", group: "Emission", property_type: Color),
-        (name: "emissive_intensity", display_name: "Emissive Nits", group: "Emission", property_type: Float(min: Some(0.0), max: Some(20000.0))),
+        (
+            name: "base_color",
+            display_name: "Base Color",
+            group: "Surface",
+            property_type: Color,
+        ),
+        (
+            name: "base_color_texture",
+            display_name: "Base Color Texture",
+            group: "Textures",
+            property_type: Texture,
+        ),
+        (
+            name: "emissive_color",
+            display_name: "Emissive Color",
+            group: "Emission",
+            property_type: Color,
+        ),
+        (
+            name: "emissive_intensity",
+            display_name: "Emissive Nits",
+            group: "Emission",
+            property_type: Float(
+                min: Some(0.0),
+                max: Some(20000.0),
+            ),
+        ),
     ],
     default_values: [],
     default_textures: [],
-)
+)
\ No newline at end of file
diff --git a/crates/blacksite_surface/Cargo.toml b/crates/blacksite_surface/Cargo.toml
new file mode 100644
index 0000000..1e40fc5
--- /dev/null
+++ b/crates/blacksite_surface/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "blacksite_surface"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "Blacksite raster and ray-tracing Surface ABI material runtime"
+
+[dependencies]
+bevy.workspace = true
+naga = { version = "29", features = ["wgsl-in"] }
+ron = "0.8"
+shared.workspace = true
+uuid = "1"
diff --git a/crates/blacksite_surface/src/lib.rs b/crates/blacksite_surface/src/lib.rs
new file mode 100644
index 0000000..f029f75
--- /dev/null
+++ b/crates/blacksite_surface/src/lib.rs
@@ -0,0 +1,777 @@
+//! Blacksite Surface ABI v1.
+//!
+//! The authoring layer persists named values. This crate validates and packs them into a fixed GPU
+//! contract and supplies the same surface evaluator source to raster and Solari integrations.
+
+use std::collections::HashMap;
+use std::fs;
+
+use bevy::mesh::MeshVertexBufferLayoutRef;
+use bevy::pbr::{
+    ExtendedMaterial, MaterialExtension, MaterialExtensionKey, MaterialExtensionPipeline,
+};
+use bevy::prelude::*;
+use bevy::render::extract_resource::ExtractResource;
+use bevy::render::render_resource::{
+    AsBindGroup, RenderPipelineDescriptor, ShaderType, SpecializedMeshPipelineError,
+};
+use bevy::shader::{Shader, ShaderRef};
+use shared::{
+    asset_server_path, material_from_desc, HydratedRendererMaterialBinding, MaterialAsset,
+    MaterialInstanceAsset, MaterialParameterValue, MaterialRef, ShaderPropertyType,
+    ShaderSchemaAsset, MATERIAL_INSTANCE_SCHEMA_VERSION,
+};
+
+pub const SURFACE_ABI_VERSION: u32 = 1;
+pub const SURFACE_PARAMETER_LANES: usize = 16;
+pub const SURFACE_TEXTURE_SLOTS: usize = 8;
+pub const DEFAULT_SURFACE_SHADER_PATH: &str = "shaders/blacksite_surface.wgsl";
+
+#[derive(ShaderType, Reflect, Debug, Clone, Copy, PartialEq)]
+pub struct SurfaceUniform {
+    pub shader_id: u32,
+    pub flags: u32,
+    pub alpha_cutoff: f32,
+    pub abi_version: u32,
+    pub params: [Vec4; SURFACE_PARAMETER_LANES],
+    pub uv_transforms: [Vec4; SURFACE_TEXTURE_SLOTS],
+}
+
+impl Default for SurfaceUniform {
+    fn default() -> Self {
+        Self {
+            shader_id: 0,
+            flags: 0,
+            alpha_cutoff: 0.5,
+            abi_version: SURFACE_ABI_VERSION,
+            params: [Vec4::ZERO; SURFACE_PARAMETER_LANES],
+            uv_transforms: [Vec4::new(1.0, 1.0, 0.0, 0.0); SURFACE_TEXTURE_SLOTS],
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct SurfaceExtensionKey {
+    shader: AssetId<Shader>,
+}
+
+impl From<&SurfaceExtension> for SurfaceExtensionKey {
+    fn from(extension: &SurfaceExtension) -> Self {
+        Self {
+            shader: extension.shader.id(),
+        }
+    }
+}
+
+#[derive(Asset, AsBindGroup, Reflect, Debug, Clone)]
+#[bind_group_data(SurfaceExtensionKey)]
+pub struct SurfaceExtension {
+    #[uniform(100)]
+    pub uniform: SurfaceUniform,
+    #[texture(101)]
+    #[sampler(102)]
+    pub texture0: Option<Handle<Image>>,
+    #[texture(103)]
+    #[sampler(104)]
+    pub texture1: Option<Handle<Image>>,
+    #[texture(105)]
+    #[sampler(106)]
+    pub texture2: Option<Handle<Image>>,
+    #[texture(107)]
+    #[sampler(108)]
+    pub texture3: Option<Handle<Image>>,
+    #[texture(109)]
+    #[sampler(110)]
+    pub texture4: Option<Handle<Image>>,
+    #[texture(111)]
+    #[sampler(112)]
+    pub texture5: Option<Handle<Image>>,
+    #[texture(113)]
+    #[sampler(114)]
+    pub texture6: Option<Handle<Image>>,
+    #[texture(115)]
+    #[sampler(116)]
+    pub texture7: Option<Handle<Image>>,
+    #[reflect(ignore)]
+    pub shader: Handle<Shader>,
+}
+
+impl Default for SurfaceExtension {
+    fn default() -> Self {
+        Self {
+            uniform: SurfaceUniform::default(),
+            texture0: None,
+            texture1: None,
+            texture2: None,
+            texture3: None,
+            texture4: None,
+            texture5: None,
+            texture6: None,
+            texture7: None,
+            shader: Handle::default(),
+        }
+    }
+}
+
+impl SurfaceExtension {
+    pub fn set_texture(&mut self, index: usize, handle: Option<Handle<Image>>) {
+        match index {
+            0 => self.texture0 = handle,
+            1 => self.texture1 = handle,
+            2 => self.texture2 = handle,
+            3 => self.texture3 = handle,
+            4 => self.texture4 = handle,
+            5 => self.texture5 = handle,
+            6 => self.texture6 = handle,
+            7 => self.texture7 = handle,
+            _ => {}
+        }
+    }
+}
+
+impl MaterialExtension for SurfaceExtension {
+    fn fragment_shader() -> ShaderRef {
+        DEFAULT_SURFACE_SHADER_PATH.into()
+    }
+
+    fn deferred_fragment_shader() -> ShaderRef {
+        DEFAULT_SURFACE_SHADER_PATH.into()
+    }
+
+    fn prepass_fragment_shader() -> ShaderRef {
+        DEFAULT_SURFACE_SHADER_PATH.into()
+    }
+
+    fn specialize(
+        _pipeline: &MaterialExtensionPipeline,
+        descriptor: &mut RenderPipelineDescriptor,
+        _layout: &MeshVertexBufferLayoutRef,
+        key: MaterialExtensionKey<Self>,
+    ) -> Result<(), SpecializedMeshPipelineError> {
+        if let (AssetId::Uuid { uuid }, Some(fragment)) =
+            (key.bind_group_data.shader, descriptor.fragment.as_mut())
+        {
+            fragment.shader = Handle::Uuid(uuid, Default::default());
+        }
+        Ok(())
+    }
+}
+
+pub type SurfaceMaterial = ExtendedMaterial<StandardMaterial, SurfaceExtension>;
+
+#[derive(Resource, Default)]
+pub struct SurfaceMaterialCache {
+    handles: HashMap<MaterialRef, Handle<SurfaceMaterial>>,
+    standard_handles: HashMap<MaterialRef, Handle<StandardMaterial>>,
+    revisions: HashMap<MaterialRef, u64>,
+    standard_only: HashMap<MaterialRef, u64>,
+    dependencies: HashMap<MaterialRef, Vec<String>>,
+    failed_revisions: HashMap<MaterialRef, u64>,
+}
+
+enum BuiltRendererMaterial {
+    Standard(StandardMaterial),
+    Surface(SurfaceMaterial),
+}
+
+#[derive(Resource, Default, Debug, Clone)]
+pub struct SurfaceDiagnostics(pub Vec<String>);
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SurfaceEvaluatorRecord {
+    pub shader_id: u32,
+    pub evaluator_source: String,
+    pub revision: u64,
+    pub alpha_mode: shared::MaterialAlphaMode,
+}
+
+/// Active, validated evaluator generation consumed by both raster and Solari render worlds.
+#[derive(Resource, ExtractResource, Default, Debug, Clone)]
+pub struct SurfaceEvaluatorRegistry {
+    pub evaluators: HashMap<u32, SurfaceEvaluatorRecord>,
+}
+
+pub struct SurfaceMaterialPlugin;
+
+impl Plugin for SurfaceMaterialPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(MaterialPlugin::<SurfaceMaterial>::default())
+            .init_resource::<SurfaceMaterialCache>()
+            .init_resource::<SurfaceDiagnostics>()
+            .init_resource::<SurfaceEvaluatorRegistry>()
+            .add_systems(Update, sync_surface_material_bindings);
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+fn sync_surface_material_bindings(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    mut shaders: ResMut<Assets<Shader>>,
+    mut standard_materials: ResMut<Assets<StandardMaterial>>,
+    mut surface_materials: ResMut<Assets<SurfaceMaterial>>,
+    mut cache: ResMut<SurfaceMaterialCache>,
+    mut diagnostics: ResMut<SurfaceDiagnostics>,
+    mut evaluator_registry: ResMut<SurfaceEvaluatorRegistry>,
+    bindings: Query<(
+        Entity,
+        &HydratedRendererMaterialBinding,
+        Option<&MeshMaterial3d<StandardMaterial>>,
+        Option<&MeshMaterial3d<SurfaceMaterial>>,
+    )>,
+) {
+    for (entity, binding, standard_handle, surface_handle) in &bindings {
+        let Some(reference) = binding.effective_material.as_ref() else {
+            continue;
+        };
+        let Some(path) = reference.0.source_path.as_deref() else {
+            continue;
+        };
+        let dependencies = cache
+            .dependencies
+            .get(reference)
+            .cloned()
+            .unwrap_or_else(|| vec![path.to_string()]);
+        let revision = dependency_revision(&dependencies);
+        if cache.failed_revisions.get(reference) == Some(&revision) {
+            continue;
+        }
+        if cache.standard_only.get(reference) == Some(&revision) {
+            if let Some(handle) = cache.standard_handles.get(reference).cloned() {
+                if standard_handle.is_none_or(|current| current.0 != handle)
+                    || surface_handle.is_some()
+                {
+                    commands
+                        .entity(entity)
+                        .remove::<MeshMaterial3d<SurfaceMaterial>>()
+                        .insert(MeshMaterial3d(handle));
+                }
+            }
+            continue;
+        }
+        let stale = cache.revisions.get(reference) != Some(&revision);
+        let handle = if !stale {
+            cache.handles.get(reference).cloned()
+        } else {
+            None
+        };
+        let handle = match handle {
+            Some(handle) => handle,
+            None => match build_surface_material(
+                reference,
+                path,
+                &asset_server,
+                &mut shaders,
+                &mut standard_materials,
+                standard_handle,
+                &mut evaluator_registry,
+            ) {
+                Ok(BuiltRendererMaterial::Surface(material)) => {
+                    cache.standard_only.remove(reference);
+                    cache.standard_handles.remove(reference);
+                    cache.failed_revisions.remove(reference);
+                    if let Some(existing) = cache.handles.get(reference).cloned() {
+                        if let Some(mut slot) = surface_materials.get_mut(&existing) {
+                            *slot = material;
+                        }
+                        existing
+                    } else {
+                        let handle = surface_materials.add(material);
+                        cache.handles.insert(reference.clone(), handle.clone());
+                        handle
+                    }
+                }
+                Ok(BuiltRendererMaterial::Standard(material)) => {
+                    // Plain Material assets stay on Bevy's StandardMaterial path, while still
+                    // sharing one live-updated handle across every renderer slot.
+                    let handle = standard_handle
+                        .map(|handle| handle.0.clone())
+                        .or_else(|| cache.standard_handles.get(reference).cloned())
+                        .unwrap_or_else(|| standard_materials.add(material.clone()));
+                    if let Some(mut slot) = standard_materials.get_mut(&handle) {
+                        *slot = material;
+                    }
+                    cache.handles.remove(reference);
+                    cache.revisions.remove(reference);
+                    cache
+                        .standard_handles
+                        .insert(reference.clone(), handle.clone());
+                    let next_dependencies =
+                        material_dependency_paths(path).unwrap_or_else(|_| vec![path.to_string()]);
+                    let next_revision = dependency_revision(&next_dependencies);
+                    cache
+                        .dependencies
+                        .insert(reference.clone(), next_dependencies);
+                    cache.standard_only.insert(reference.clone(), next_revision);
+                    cache.failed_revisions.remove(reference);
+                    evaluator_registry
+                        .evaluators
+                        .remove(&stable_shader_id(reference));
+                    if standard_handle.is_none_or(|current| current.0 != handle)
+                        || surface_handle.is_some()
+                    {
+                        commands
+                            .entity(entity)
+                            .remove::<MeshMaterial3d<SurfaceMaterial>>()
+                            .insert(MeshMaterial3d(handle));
+                    }
+                    continue;
+                }
+                Err(error) => {
+                    cache.failed_revisions.insert(reference.clone(), revision);
+                    diagnostics.0.push(format!(
+                        "material {} could not build Surface ABI: {error}",
+                        reference.0.label
+                    ));
+                    continue;
+                }
+            },
+        };
+        let next_dependencies =
+            material_dependency_paths(path).unwrap_or_else(|_| vec![path.to_string()]);
+        let next_revision = dependency_revision(&next_dependencies);
+        cache
+            .dependencies
+            .insert(reference.clone(), next_dependencies);
+        cache.revisions.insert(reference.clone(), next_revision);
+        if surface_handle.is_none_or(|current| current.0 != handle) {
+            commands
+                .entity(entity)
+                .remove::<MeshMaterial3d<StandardMaterial>>()
+                .insert(MeshMaterial3d(handle));
+        }
+    }
+}
+
+fn build_surface_material(
+    reference: &MaterialRef,
+    path: &str,
+    asset_server: &AssetServer,
+    shaders: &mut Assets<Shader>,
+    standard_materials: &mut Assets<StandardMaterial>,
+    existing_standard: Option<&MeshMaterial3d<StandardMaterial>>,
+    evaluator_registry: &mut SurfaceEvaluatorRegistry,
+) -> Result<BuiltRendererMaterial, String> {
+    let (mut asset, instance) = match MaterialAsset::load_from_path(path) {
+        Ok(asset) => (asset, None),
+        Err(_) => {
+            let instance = MaterialInstanceAsset::load_from_path(path)?;
+            if instance.schema_version != MATERIAL_INSTANCE_SCHEMA_VERSION {
+                return Err(format!(
+                    "unsupported material-instance schema {}",
+                    instance.schema_version
+                ));
+            }
+            let base_path = instance
+                .base
+                .0
+                .source_path
+                .as_deref()
+                .ok_or_else(|| "material instance base has no loadable path".to_string())?;
+            (MaterialAsset::load_from_path(base_path)?, Some(instance))
+        }
+    };
+    if let Some(instance) = instance.as_ref() {
+        instance.apply_to(&mut asset.material);
+    }
+    let schema_path = asset
+        .shader_ref
+        .as_ref()
+        .and_then(|reference| reference.source_path.as_deref())
+        .or(asset.material.shader.schema_path.as_deref())
+        .or(asset
+            .shader
+            .as_deref()
+            .filter(|path| path.ends_with(".ron")));
+    let schema = schema_path
+        .map(ShaderSchemaAsset::load_from_path)
+        .transpose()?;
+    let evaluator_source = schema
+        .as_ref()
+        .and_then(|schema| schema.wgsl_path.as_deref())
+        .map(fs::read_to_string)
+        .transpose()
+        .map_err(|error| format!("could not read surface WGSL: {error}"))?;
+
+    let mut base = existing_standard
+        .and_then(|handle| standard_materials.get(&handle.0).cloned())
+        .unwrap_or_else(|| material_from_desc(asset_server, &asset.material));
+    base.alpha_mode = match asset.render_state.alpha_mode {
+        shared::MaterialAlphaMode::Opaque => AlphaMode::Opaque,
+        shared::MaterialAlphaMode::Cutout => AlphaMode::Mask(asset.render_state.alpha_cutoff),
+    };
+    base.cull_mode =
+        (!asset.render_state.double_sided).then_some(bevy::render::render_resource::Face::Back);
+
+    let Some(evaluator) = evaluator_source.as_deref() else {
+        return Ok(BuiltRendererMaterial::Standard(base));
+    };
+    validate_surface_evaluator(evaluator)?;
+    let runtime_shader_id = stable_shader_id(reference);
+    evaluator_registry.evaluators.insert(
+        runtime_shader_id,
+        SurfaceEvaluatorRecord {
+            shader_id: runtime_shader_id,
+            evaluator_source: evaluator.to_string(),
+            revision: evaluator_revision(evaluator),
+            alpha_mode: asset.render_state.alpha_mode,
+        },
+    );
+    let virtual_path = format!("generated://surface/{}.wgsl", reference.0.asset_id);
+    let shader_uuid = shader_uuid_for_material(reference);
+    let shader_id = AssetId::<Shader>::Uuid { uuid: shader_uuid };
+    shaders
+        .insert(
+            shader_id,
+            Shader::from_wgsl(compose_surface_shader(evaluator), virtual_path),
+        )
+        .map_err(|error| format!("could not replace generated surface shader: {error}"))?;
+    let shader = Handle::Uuid(shader_uuid, Default::default());
+
+    let mut extension = SurfaceExtension {
+        shader,
+        ..default()
+    };
+    extension.uniform.alpha_cutoff = asset.render_state.alpha_cutoff;
+    extension.uniform.shader_id = runtime_shader_id;
+    if let Some(schema) = schema.as_ref() {
+        pack_schema_values(
+            &mut extension,
+            schema,
+            &asset.material,
+            instance.as_ref(),
+            asset_server,
+        )?;
+    }
+    Ok(BuiltRendererMaterial::Surface(ExtendedMaterial {
+        base,
+        extension,
+    }))
+}
+
+fn material_dependency_paths(path: &str) -> Result<Vec<String>, String> {
+    let mut dependencies = vec![path.to_string()];
+    let asset = match MaterialAsset::load_from_path(path) {
+        Ok(asset) => asset,
+        Err(_) => {
+            let instance = MaterialInstanceAsset::load_from_path(path)?;
+            let base_path = instance
+                .base
+                .0
+                .source_path
+                .as_deref()
+                .ok_or_else(|| "material instance base has no loadable path".to_string())?;
+            dependencies.push(base_path.to_string());
+            MaterialAsset::load_from_path(base_path)?
+        }
+    };
+    let schema_path = asset
+        .shader_ref
+        .as_ref()
+        .and_then(|reference| reference.source_path.as_deref())
+        .or(asset.material.shader.schema_path.as_deref())
+        .or(asset
+            .shader
+            .as_deref()
+            .filter(|path| path.ends_with(".ron")));
+    if let Some(schema_path) = schema_path {
+        dependencies.push(schema_path.to_string());
+        if let Some(wgsl_path) = ShaderSchemaAsset::load_from_path(schema_path)?.wgsl_path {
+            dependencies.push(wgsl_path);
+        }
+    }
+    dependencies.sort();
+    dependencies.dedup();
+    Ok(dependencies)
+}
+
+fn dependency_revision(paths: &[String]) -> u64 {
+    let mut hash = 0xcbf29ce484222325u64;
+    for path in paths {
+        for byte in path.bytes() {
+            hash ^= u64::from(byte);
+            hash = hash.wrapping_mul(0x100000001b3);
+        }
+        match fs::metadata(path) {
+            Ok(metadata) => {
+                for byte in metadata.len().to_le_bytes() {
+                    hash ^= u64::from(byte);
+                    hash = hash.wrapping_mul(0x100000001b3);
+                }
+                if let Ok(modified) = metadata.modified() {
+                    if let Ok(duration) = modified.duration_since(std::time::UNIX_EPOCH) {
+                        for byte in duration.as_nanos().to_le_bytes() {
+                            hash ^= u64::from(byte);
+                            hash = hash.wrapping_mul(0x100000001b3);
+                        }
+                    }
+                }
+            }
+            Err(_) => {
+                hash ^= u64::MAX;
+                hash = hash.wrapping_mul(0x100000001b3);
+            }
+        }
+    }
+    hash
+}
+
+fn stable_shader_id(reference: &MaterialRef) -> u32 {
+    let mut hash = 0x811c9dc5u32;
+    for byte in reference.0.asset_id.bytes() {
+        hash ^= u32::from(byte);
+        hash = hash.wrapping_mul(0x01000193);
+    }
+    hash
+}
+
+fn evaluator_revision(source: &str) -> u64 {
+    let mut hash = 0xcbf29ce484222325u64;
+    for byte in source.bytes() {
+        hash ^= u64::from(byte);
+        hash = hash.wrapping_mul(0x100000001b3);
+    }
+    hash
+}
+
+fn shader_uuid_for_material(reference: &MaterialRef) -> uuid::Uuid {
+    if let Ok(source) = uuid::Uuid::parse_str(&reference.0.asset_id) {
+        let mixed = source.as_u128() ^ 0x7f8c_4e90_f9ab_4f28_9b44_47c1_b2d5_5ac1u128;
+        return uuid::Uuid::from_u128(mixed);
+    }
+    let mut bytes = [0u8; 16];
+    for (index, byte) in reference.0.asset_id.bytes().enumerate() {
+        bytes[index % 16] = bytes[index % 16].wrapping_mul(31).wrapping_add(byte);
+    }
+    uuid::Uuid::from_bytes(bytes)
+}
+
+fn pack_schema_values(
+    extension: &mut SurfaceExtension,
+    schema: &ShaderSchemaAsset,
+    material: &shared::MaterialDesc,
+    instance: Option<&MaterialInstanceAsset>,
+    asset_server: &AssetServer,
+) -> Result<(), String> {
+    let mut numeric_index = 0usize;
+    let mut texture_index = 0usize;
+    for property in &schema.parameters {
+        if matches!(property.property_type, ShaderPropertyType::Texture) {
+            if texture_index >= SURFACE_TEXTURE_SLOTS {
+                return Err(format!(
+                    "surface schema exceeds {SURFACE_TEXTURE_SLOTS} textures"
+                ));
+            }
+            let binding = instance
+                .and_then(|instance| {
+                    instance
+                        .textures
+                        .iter()
+                        .find(|value| value.name == property.name)
+                })
+                .or_else(|| {
+                    material
+                        .textures
+                        .iter()
+                        .find(|value| value.name == property.name)
+                });
+            let handle = binding
+                .and_then(|binding| binding.texture.as_ref())
+                .and_then(|reference| reference.source_path.as_deref())
+                .map(asset_server_path)
+                .map(|path| asset_server.load(path));
+            extension.set_texture(texture_index, handle);
+            texture_index += 1;
+            continue;
+        }
+        if numeric_index >= SURFACE_PARAMETER_LANES {
+            return Err(format!(
+                "surface schema exceeds {SURFACE_PARAMETER_LANES} parameter lanes"
+            ));
+        }
+        let value = instance
+            .and_then(|instance| {
+                instance
+                    .parameters
+                    .iter()
+                    .find(|value| value.name == property.name)
+            })
+            .or_else(|| {
+                material
+                    .parameters
+                    .iter()
+                    .find(|value| value.name == property.name)
+            })
+            .or_else(|| {
+                schema
+                    .default_values
+                    .iter()
+                    .find(|value| value.name == property.name)
+            });
+        extension.uniform.params[numeric_index] = value
+            .map(|value| parameter_lane(&value.value, &property.property_type))
+            .transpose()?
+            .unwrap_or(Vec4::ZERO);
+        numeric_index += 1;
+    }
+    Ok(())
+}
+
+fn parameter_lane(
+    value: &MaterialParameterValue,
+    property_type: &ShaderPropertyType,
+) -> Result<Vec4, String> {
+    match (value, property_type) {
+        (MaterialParameterValue::Bool(value), ShaderPropertyType::Bool) => {
+            Ok(Vec4::new(u32::from(*value) as f32, 0.0, 0.0, 0.0))
+        }
+        (MaterialParameterValue::Float(value), ShaderPropertyType::Float { .. }) => {
+            Ok(Vec4::new(*value, 0.0, 0.0, 0.0))
+        }
+        (MaterialParameterValue::Vec2(value), ShaderPropertyType::Vec2) => {
+            Ok(Vec4::new(value.x, value.y, 0.0, 0.0))
+        }
+        (MaterialParameterValue::Vec3(value), ShaderPropertyType::Vec3) => Ok(value.extend(0.0)),
+        (MaterialParameterValue::Color(value), ShaderPropertyType::Color) => {
+            Ok(Vec4::new(value.r, value.g, value.b, value.a))
+        }
+        (MaterialParameterValue::Enum(value), ShaderPropertyType::Enum { options }) => {
+            let index = options
+                .iter()
+                .position(|option| option == value)
+                .ok_or_else(|| format!("enum value `{value}` is not declared by the schema"))?;
+            Ok(Vec4::new(index as f32, 0.0, 0.0, 0.0))
+        }
+        _ => Err("material value does not match shader schema type".into()),
+    }
+}
+
+pub fn validate_surface_evaluator(source: &str) -> Result<(), String> {
+    if !source.contains("fn evaluate(") {
+        return Err("surface WGSL must define `fn evaluate(`".into());
+    }
+    for forbidden in [
+        "@group",
+        "@binding",
+        "@vertex",
+        "@fragment",
+        "@compute",
+        "var<",
+        "rayQuery",
+        "dpdx",
+        "dpdy",
+        "fwidth",
+        "discard",
+        "Barrier",
+        "subgroup",
+        "textureStore",
+        "atomic",
+    ] {
+        if source.contains(forbidden) {
+            return Err(format!(
+                "surface WGSL uses forbidden construct `{forbidden}`"
+            ));
+        }
+    }
+    let validation_source = format!("{EVALUATOR_VALIDATION_PRELUDE}\n{source}");
+    let module = naga::front::wgsl::parse_str(&validation_source)
+        .map_err(|error| format!("surface WGSL syntax error: {error}"))?;
+    naga::valid::Validator::new(
+        naga::valid::ValidationFlags::all(),
+        naga::valid::Capabilities::empty(),
+    )
+    .validate(&module)
+    .map_err(|error| format!("surface WGSL validation error: {error}"))?;
+    Ok(())
+}
+
+const EVALUATOR_VALIDATION_PRELUDE: &str = r#"
+struct SurfaceInput {
+    uv0: vec2<f32>,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+}
+struct SurfaceParams { lanes: array<vec4<f32>, 16>, }
+struct SurfaceSamples { values: array<vec4<f32>, 8>, }
+struct Surface {
+    base_color: vec4<f32>,
+    normal_ts: vec3<f32>,
+    emissive: vec3<f32>,
+    metallic: f32,
+    perceptual_roughness: f32,
+    reflectance: f32,
+    occlusion: f32,
+    model: u32,
+}
+fn surface_default() -> Surface {
+    var surface: Surface;
+    surface.base_color = vec4<f32>(1.0);
+    surface.normal_ts = vec3<f32>(0.0, 0.0, 1.0);
+    surface.emissive = vec3<f32>(0.0);
+    surface.metallic = 0.0;
+    surface.perceptual_roughness = 0.5;
+    surface.reflectance = 0.5;
+    surface.occlusion = 1.0;
+    surface.model = 0u;
+    return surface;
+}
+"#;
+
+pub fn compose_surface_shader(evaluator: &str) -> String {
+    format!(
+        "{}\n{}\n{}",
+        include_str!("surface_header.wgsl"),
+        evaluator,
+        include_str!("surface_footer.wgsl")
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn rejects_resource_bindings_and_missing_entry() {
+        assert!(validate_surface_evaluator("fn nope() {}").is_err());
+        assert!(validate_surface_evaluator(
+            "@group(0) @binding(0) var t: texture_2d<f32>; fn evaluate() {}"
+        )
+        .is_err());
+        for compute_incompatible in [
+            "dpdx(input.uv0.x)",
+            "dpdy(input.uv0.y)",
+            "fwidth(input.uv0.x)",
+            "discard",
+            "workgroupBarrier()",
+            "subgroupAdd(1u)",
+        ] {
+            let source = format!(
+                "fn evaluate(input: SurfaceInput, params: SurfaceParams, samples: SurfaceSamples) -> Surface {{ let invalid = {compute_incompatible}; return surface_default(); }}"
+            );
+            assert!(
+                validate_surface_evaluator(&source).is_err(),
+                "accepted compute-incompatible evaluator: {compute_incompatible}"
+            );
+        }
+        assert!(validate_surface_evaluator(
+            "fn evaluate(input: SurfaceInput, params: SurfaceParams, samples: SurfaceSamples) -> Surface { return missing_symbol; }"
+        )
+        .is_err());
+    }
+
+    #[test]
+    fn accepts_surface_only_module_and_composes_wrapper() {
+        let source = "fn evaluate(input: SurfaceInput, params: SurfaceParams, samples: SurfaceSamples) -> Surface { return surface_default(); }";
+        validate_surface_evaluator(source).unwrap();
+        let composed = compose_surface_shader(source);
+        assert!(composed.contains(source));
+        assert!(composed.contains("@fragment"));
+    }
+
+    #[test]
+    fn abi_limits_are_stable() {
+        assert_eq!(SURFACE_PARAMETER_LANES, 16);
+        assert_eq!(SURFACE_TEXTURE_SLOTS, 8);
+        assert_eq!(std::mem::size_of::<SurfaceUniform>(), 400);
+    }
+}
diff --git a/crates/blacksite_surface/src/surface_footer.wgsl b/crates/blacksite_surface/src/surface_footer.wgsl
new file mode 100644
index 0000000..de272d8
--- /dev/null
+++ b/crates/blacksite_surface/src/surface_footer.wgsl
@@ -0,0 +1,41 @@
+@fragment
+fn fragment(in: VertexOutput, @builtin(front_facing) is_front: bool) -> FragmentOutput {
+    var pbr_input = pbr_input_from_standard_material(in, is_front);
+#ifdef VERTEX_UVS_A
+    let uv0 = in.uv;
+#else
+    let uv0 = vec2<f32>(0.0);
+#endif
+    let input = SurfaceInput(uv0, pbr_input.world_position.xyz, pbr_input.N);
+    let params = SurfaceParams(surface_uniform.params);
+    let surface = evaluate(input, params, surface_samples(uv0));
+    pbr_input.material.base_color = surface.base_color;
+    pbr_input.material.emissive = vec4<f32>(surface.emissive, 1.0);
+    pbr_input.material.metallic = clamp(surface.metallic, 0.0, 1.0);
+    pbr_input.material.perceptual_roughness = clamp(surface.perceptual_roughness, 0.001, 1.0);
+    pbr_input.material.reflectance = vec3<f32>(clamp(surface.reflectance, 0.0, 1.0));
+    pbr_input.diffuse_occlusion = vec3<f32>(clamp(surface.occlusion, 0.0, 1.0));
+#ifdef VERTEX_TANGENTS
+    let surface_tbn = calculate_tbn_mikktspace(pbr_input.world_normal, in.world_tangent);
+    let surface_nt = normalize(surface.normal_ts);
+    pbr_input.N = normalize(
+        surface_nt.x * surface_tbn[0]
+        + surface_nt.y * surface_tbn[1]
+        + surface_nt.z * surface_tbn[2]
+    );
+#endif
+    if surface.model == BLACKSITE_SURFACE_UNLIT {
+        pbr_input.material.flags |= STANDARD_MATERIAL_FLAGS_UNLIT_BIT;
+    } else {
+        pbr_input.material.flags &= ~STANDARD_MATERIAL_FLAGS_UNLIT_BIT;
+    }
+    pbr_input.material.base_color = alpha_discard(pbr_input.material, pbr_input.material.base_color);
+#ifdef PREPASS_PIPELINE
+    return deferred_output(in, pbr_input);
+#else
+    var out: FragmentOutput;
+    out.color = apply_pbr_lighting(pbr_input);
+    out.color = main_pass_post_lighting_processing(pbr_input, out.color);
+    return out;
+#endif
+}
diff --git a/crates/blacksite_surface/src/surface_header.wgsl b/crates/blacksite_surface/src/surface_header.wgsl
new file mode 100644
index 0000000..a1a845f
--- /dev/null
+++ b/crates/blacksite_surface/src/surface_header.wgsl
@@ -0,0 +1,103 @@
+#import bevy_pbr::{
+    pbr_fragment::pbr_input_from_standard_material,
+    pbr_functions::{alpha_discard, calculate_tbn_mikktspace},
+}
+
+#ifdef PREPASS_PIPELINE
+#import bevy_pbr::{
+    prepass_io::{VertexOutput, FragmentOutput},
+    pbr_deferred_functions::deferred_output,
+}
+#else
+#import bevy_pbr::{
+    forward_io::{VertexOutput, FragmentOutput},
+    pbr_functions::{apply_pbr_lighting, main_pass_post_lighting_processing},
+}
+#endif
+
+const BLACKSITE_SURFACE_ABI_VERSION: u32 = 1u;
+const BLACKSITE_SURFACE_UNLIT: u32 = 1u;
+const STANDARD_MATERIAL_FLAGS_UNLIT_BIT: u32 = 1u << 5u;
+
+struct SurfaceUniform {
+    shader_id: u32,
+    flags: u32,
+    alpha_cutoff: f32,
+    abi_version: u32,
+    params: array<vec4<f32>, 16>,
+    uv_transforms: array<vec4<f32>, 8>,
+}
+
+@group(#{MATERIAL_BIND_GROUP}) @binding(100) var<uniform> surface_uniform: SurfaceUniform;
+@group(#{MATERIAL_BIND_GROUP}) @binding(101) var surface_texture0: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(102) var surface_sampler0: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(103) var surface_texture1: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(104) var surface_sampler1: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(105) var surface_texture2: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(106) var surface_sampler2: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(107) var surface_texture3: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(108) var surface_sampler3: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(109) var surface_texture4: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(110) var surface_sampler4: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(111) var surface_texture5: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(112) var surface_sampler5: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(113) var surface_texture6: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(114) var surface_sampler6: sampler;
+@group(#{MATERIAL_BIND_GROUP}) @binding(115) var surface_texture7: texture_2d<f32>;
+@group(#{MATERIAL_BIND_GROUP}) @binding(116) var surface_sampler7: sampler;
+
+struct SurfaceInput {
+    uv0: vec2<f32>,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+}
+
+struct SurfaceParams {
+    lanes: array<vec4<f32>, 16>,
+}
+
+struct SurfaceSamples {
+    values: array<vec4<f32>, 8>,
+}
+
+struct Surface {
+    base_color: vec4<f32>,
+    normal_ts: vec3<f32>,
+    emissive: vec3<f32>,
+    metallic: f32,
+    perceptual_roughness: f32,
+    reflectance: f32,
+    occlusion: f32,
+    model: u32,
+}
+
+fn surface_default() -> Surface {
+    var surface: Surface;
+    surface.base_color = vec4<f32>(1.0);
+    surface.normal_ts = vec3<f32>(0.0, 0.0, 1.0);
+    surface.emissive = vec3<f32>(0.0);
+    surface.metallic = 0.0;
+    surface.perceptual_roughness = 0.5;
+    surface.reflectance = 0.5;
+    surface.occlusion = 1.0;
+    surface.model = 0u;
+    return surface;
+}
+
+fn surface_uv(index: u32, uv: vec2<f32>) -> vec2<f32> {
+    let transform = surface_uniform.uv_transforms[index];
+    return uv * transform.xy + transform.zw;
+}
+
+fn surface_samples(uv: vec2<f32>) -> SurfaceSamples {
+    var samples: SurfaceSamples;
+    samples.values[0] = textureSample(surface_texture0, surface_sampler0, surface_uv(0u, uv));
+    samples.values[1] = textureSample(surface_texture1, surface_sampler1, surface_uv(1u, uv));
+    samples.values[2] = textureSample(surface_texture2, surface_sampler2, surface_uv(2u, uv));
+    samples.values[3] = textureSample(surface_texture3, surface_sampler3, surface_uv(3u, uv));
+    samples.values[4] = textureSample(surface_texture4, surface_sampler4, surface_uv(4u, uv));
+    samples.values[5] = textureSample(surface_texture5, surface_sampler5, surface_uv(5u, uv));
+    samples.values[6] = textureSample(surface_texture6, surface_sampler6, surface_uv(6u, uv));
+    samples.values[7] = textureSample(surface_texture7, surface_sampler7, surface_uv(7u, uv));
+    return samples;
+}
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index f5a06b9..be885a7 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -33,6 +33,7 @@ egui_phosphor_icons.workspace = true
 bevy_ufbx.workspace = true
 ufbx = "0.9"
 game.workspace = true
+polyanya.workspace = true
 game_hot.workspace = true
 hot-lib-reloader = { version = "0.8.2", optional = true }
 notify = { version = "6.1", optional = true }
diff --git a/crates/editor/src/assets/animation.rs b/crates/editor/src/assets/animation.rs
index 7e5d38d..d1b236d 100644
--- a/crates/editor/src/assets/animation.rs
+++ b/crates/editor/src/assets/animation.rs
@@ -210,6 +210,13 @@ fn build_gltf_manifest(
         });
     }
 
+    let default_animation_clip_id = record.import_settings.default_animation_clip_id.clone();
+    validate_default_animation_clip(
+        default_animation_clip_id.as_deref(),
+        &clips,
+        &mut diagnostics,
+    );
+
     let runtime_supported = animation_roots.len() <= 1;
     if !runtime_supported {
         let roots = animation_roots
@@ -232,6 +239,7 @@ fn build_gltf_manifest(
         schema_version: ANIMATION_MANIFEST_SCHEMA_VERSION,
         asset_id: record.id.as_string(),
         label: record.label.clone(),
+        default_animation_clip_id,
         source: AnimationManifestSource {
             path: record.path.clone(),
             format,
@@ -313,15 +321,22 @@ fn build_fbx_manifest(
         })
         .collect::<Vec<_>>();
 
-    let (runtime_supported, diagnostics) = fbx_runtime_support(
+    let (runtime_supported, mut diagnostics) = fbx_runtime_support(
         scene.anim_stacks.as_ref().len(),
         scene.skin_deformers.as_ref().len(),
     );
+    let default_animation_clip_id = record.import_settings.default_animation_clip_id.clone();
+    validate_default_animation_clip(
+        default_animation_clip_id.as_deref(),
+        &clips,
+        &mut diagnostics,
+    );
 
     Ok(AnimationManifest {
         schema_version: ANIMATION_MANIFEST_SCHEMA_VERSION,
         asset_id: record.id.as_string(),
         label: record.label.clone(),
+        default_animation_clip_id,
         source: AnimationManifestSource {
             path: record.path.clone(),
             format,
@@ -335,6 +350,27 @@ fn build_fbx_manifest(
     })
 }
 
+fn validate_default_animation_clip(
+    default_clip_id: Option<&str>,
+    clips: &[AnimationClipRecord],
+    diagnostics: &mut Vec<AnimationImportDiagnostic>,
+) {
+    let Some(default_clip_id) = default_clip_id.filter(|id| !id.trim().is_empty()) else {
+        return;
+    };
+    if clips.iter().any(|clip| clip.id == default_clip_id) {
+        return;
+    }
+    diagnostics.push(AnimationImportDiagnostic {
+        severity: AnimationDiagnosticSeverity::Error,
+        code: "animation.default_clip_missing".into(),
+        message: format!(
+            "configured default animation clip `{default_clip_id}` no longer exists in the imported source"
+        ),
+        repair: "Choose an existing Default animation in Model Import Settings, or select Imported rest pose, then reimport.".into(),
+    });
+}
+
 fn fbx_runtime_support(
     animation_count: usize,
     skin_count: usize,
@@ -696,7 +732,8 @@ mod tests {
         let second = build_animation_manifest(&record).unwrap();
 
         assert_eq!(first, second);
-        assert_eq!(first.schema_version, 2);
+        assert_eq!(first.schema_version, ANIMATION_MANIFEST_SCHEMA_VERSION);
+        assert!(first.default_animation_clip_id.is_none());
         assert!(first.runtime_supported);
         assert_eq!(first.source.dependencies.len(), 1);
         assert_eq!(first.skeletons.len(), 1);
@@ -717,6 +754,32 @@ mod tests {
         fs::remove_dir_all(root).unwrap();
     }
 
+    #[test]
+    fn explicit_default_clip_is_stable_and_stale_ids_are_diagnostic() {
+        let root =
+            std::env::temp_dir().join(format!("blacksite-animation-default-{}", Uuid::new_v4()));
+        let path = write_animated_gltf(&root);
+        let mut record = fixture_record(&path);
+        record.import_settings.default_animation_clip_id =
+            Some("animation:clip:0:idle_loop".into());
+
+        let manifest = build_animation_manifest(&record).unwrap();
+        assert_eq!(
+            manifest.default_animation_clip_id.as_deref(),
+            Some("animation:clip:0:idle_loop")
+        );
+        assert!(manifest.diagnostics.is_empty());
+
+        record.import_settings.default_animation_clip_id = Some("animation:clip:99:removed".into());
+        let stale = build_animation_manifest(&record).unwrap();
+        assert!(stale.diagnostics.iter().any(|diagnostic| {
+            diagnostic.code == "animation.default_clip_missing"
+                && diagnostic.severity == AnimationDiagnosticSeverity::Error
+        }));
+
+        fs::remove_dir_all(root).unwrap();
+    }
+
     #[test]
     fn exact_signature_changes_with_joint_path_or_bind_pose() {
         let identity = identity_matrix_bytes();
diff --git a/crates/editor/src/assets/asset_db.rs b/crates/editor/src/assets/asset_db.rs
index 3f75e7d..63d1afb 100644
--- a/crates/editor/src/assets/asset_db.rs
+++ b/crates/editor/src/assets/asset_db.rs
@@ -27,8 +27,12 @@ impl Default for AssetId {
 
 #[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq, Eq)]
 pub enum ModelPlacementMode {
+    /// Place renderable content through the appropriate normalized renderer. Imports containing
+    /// skins or animation route to `SkinnedMeshRenderer`; unrigged, non-animated content routes to
+    /// `StaticMeshRenderer`.
     #[default]
     StaticAsset,
+    /// Instantiate the complete source scene as a generic imported model.
     SceneInstance,
 }
 
@@ -61,6 +65,10 @@ pub struct ImportSettings {
     pub static_mesh_manifest_path: Option<String>,
     #[serde(default)]
     pub animation_manifest_path: Option<String>,
+    /// Stable animation clip sub-asset ID used as this model's edit-mode rest presentation.
+    /// `None` preserves the imported node pose and never guesses a clip.
+    #[serde(default)]
+    pub default_animation_clip_id: Option<String>,
 }
 
 impl Default for ImportSettings {
@@ -74,6 +82,7 @@ impl Default for ImportSettings {
             material_policy: MaterialImportPolicy::default(),
             static_mesh_manifest_path: None,
             animation_manifest_path: None,
+            default_animation_clip_id: None,
         }
     }
 }
@@ -336,6 +345,7 @@ mod tests {
             schema_version: ANIMATION_MANIFEST_SCHEMA_VERSION,
             asset_id: id.as_string(),
             label: "Moved Model".into(),
+            default_animation_clip_id: None,
             source: AnimationManifestSource {
                 path: old_path.clone(),
                 format: "glb".into(),
diff --git a/crates/editor/src/assets/catalog.rs b/crates/editor/src/assets/catalog.rs
index f49e961..baf8803 100644
--- a/crates/editor/src/assets/catalog.rs
+++ b/crates/editor/src/assets/catalog.rs
@@ -524,6 +524,7 @@ fn empty_snapshot_for_asset(asset: &EditorAsset, translation: Vec3) -> EditorEnt
         primitive: None,
         brush: None,
         static_mesh_renderer: None,
+        skinned_mesh_renderer: None,
         material: None,
         material_override: None,
         rigid_body: None,
@@ -542,8 +543,18 @@ fn empty_snapshot_for_asset(asset: &EditorAsset, translation: Vec3) -> EditorEnt
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: 0,
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     }
 }
@@ -672,17 +683,33 @@ pub fn spawn_asset_at(world: &mut World, asset: &EditorAsset, translation: Vec3)
                         record.import_settings.placement_mode,
                         ModelPlacementMode::StaticAsset
                     ) {
-                        if let Some(renderer) = static_mesh_renderer_for_asset(world, path) {
-                            let collider = record
-                                .import_settings
-                                .generate_collider
-                                .then(|| static_mesh_collider_for_renderer(&renderer));
-                            apply_static_mesh_placement_mode(
-                                &mut snapshot,
-                                renderer,
-                                collider,
-                                record.import_settings.hierarchy_mode,
-                            );
+                        if let Some((renderer, requires_skinned_renderer)) =
+                            static_mesh_renderer_for_asset(world, path)
+                        {
+                            if requires_skinned_renderer {
+                                apply_skinned_mesh_placement_mode_with_materials(
+                                    &mut snapshot,
+                                    renderer.materials.clone(),
+                                );
+                                match default_animation_controller_for_record(&record) {
+                                    Ok(controller) => snapshot.animation_controller = controller,
+                                    Err(error) => warn!(
+                                        "Default animation was not applied while placing {}: {error}",
+                                        record.path
+                                    ),
+                                }
+                            } else {
+                                let collider = record
+                                    .import_settings
+                                    .generate_collider
+                                    .then(|| static_mesh_collider_for_renderer(&renderer));
+                                apply_static_mesh_placement_mode(
+                                    &mut snapshot,
+                                    renderer,
+                                    collider,
+                                    record.import_settings.hierarchy_mode,
+                                );
+                            }
                         } else {
                             warn!(
                                 "Static mesh placement fell back to SceneRoot for {} because no renderer manifest was available",
@@ -760,6 +787,11 @@ pub fn spawn_subasset_at(
         .parts
         .iter()
         .find(|part| part_effective_id_for_selection(part) == *sub_asset_id)?;
+    let part_requires_skinned_renderer = manifest.metadata.animation_count > 0
+        || part.skinned
+        || (manifest.schema_version < 2
+            && crate::assets::gltf_skinned_primitive_labels(parent_path)
+                .contains(&part.mesh_label));
 
     let mesh_ref = shared::EditorAssetRef::new(
         manifest.asset_id.clone(),
@@ -784,6 +816,10 @@ pub fn spawn_subasset_at(
         id: shared::ComponentInstanceId::new("slot:0"),
         name: label.clone(),
         mesh: mesh_ref.clone(),
+        material_slot_id: shared::ComponentInstanceId::new(format!(
+            "slot:{}",
+            part_effective_id_for_selection(part)
+        )),
         material,
         local_transform: part.local_transform,
         visible: true,
@@ -800,6 +836,7 @@ pub fn spawn_subasset_at(
         primitive: None,
         brush: None,
         static_mesh_renderer: Some(shared::StaticMeshRenderer::single(slot)),
+        skinned_mesh_renderer: None,
         material: None,
         material_override: None,
         rigid_body: None,
@@ -818,11 +855,41 @@ pub fn spawn_subasset_at(
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: 0,
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     };
     snapshot.transform.scale *= record.import_settings.scale;
+    if part_requires_skinned_renderer {
+        snapshot.actor_kind = ActorKind::SkinnedMesh;
+        snapshot.static_mesh_renderer = None;
+        snapshot.skinned_mesh_renderer = Some(shared::SkinnedMeshRenderer {
+            materials: crate::assets::static_mesh::renderer_materials_from_manifest(
+                &manifest,
+                &record.import_settings,
+            ),
+            ..shared::SkinnedMeshRenderer::new(parent_path.clone())
+                .with_asset_id(record.id.as_string())
+        });
+        match default_animation_controller_for_record(&record) {
+            Ok(controller) => snapshot.animation_controller = controller,
+            Err(error) => warn!(
+                "Default animation was not applied while placing {}: {error}",
+                record.path
+            ),
+        }
+        return Some(spawn_with_history(world, snapshot));
+    }
     if record.import_settings.generate_collider {
         snapshot.rigid_body = Some(RigidBodyDesc::default());
         snapshot.collider = Some(ColliderDesc::static_mesh(vec![mesh_ref]));
@@ -840,6 +907,7 @@ pub struct AnimationClipAuthoringData {
     pub skeleton: shared::EditorAssetRef,
     pub skeleton_signature: shared::AnimationSkeletonSignature,
     pub state: shared::AnimationStateDesc,
+    pub renderer_materials: shared::RendererMaterialSet,
 }
 
 pub fn animation_clip_authoring_data(
@@ -905,6 +973,18 @@ pub fn animation_clip_authoring_data(
     let clip_ref = shared::EditorAssetRef::new(asset_id, clip.id.clone(), clip.label.clone())
         .with_source_path(parent_path);
     let state_id = animation_state_id(&clip.label, clip.source_index);
+    let renderer_materials = record
+        .import_settings
+        .static_mesh_manifest_path
+        .as_deref()
+        .and_then(|path| load_static_mesh_manifest(path).ok())
+        .map(|render_manifest| {
+            crate::assets::static_mesh::renderer_materials_from_manifest(
+                &render_manifest,
+                &record.import_settings,
+            )
+        })
+        .unwrap_or_default();
     Ok(AnimationClipAuthoringData {
         model_asset_id: record.id.as_string(),
         model_path: parent_path.clone(),
@@ -920,6 +1000,7 @@ pub fn animation_clip_authoring_data(
             speed: 1.0,
             range: shared::AnimationPlaybackRange::default(),
         },
+        renderer_materials,
     })
 }
 
@@ -957,7 +1038,7 @@ pub fn animation_skeleton_signature_for_ref(
 
 pub fn compatible_animation_skeleton_for_model(
     world: &World,
-    model: &ModelRef,
+    model: &shared::SkinnedMeshRenderer,
     signature: &shared::AnimationSkeletonSignature,
 ) -> Result<shared::EditorAssetRef, String> {
     let record = world
@@ -1017,6 +1098,82 @@ fn animation_state_id(label: &str, source_index: usize) -> String {
     }
 }
 
+fn default_animation_controller_for_record(
+    record: &crate::asset_db::AssetRecord,
+) -> Result<Option<shared::AnimationControllerDesc>, String> {
+    let Some(manifest_path) = record.import_settings.animation_manifest_path.as_deref() else {
+        return Ok(None);
+    };
+    let manifest = load_animation_manifest(manifest_path)?;
+    if manifest.default_animation_clip_id != record.import_settings.default_animation_clip_id {
+        return Err(
+            "model import settings and generated animation manifest disagree; reimport the model"
+                .into(),
+        );
+    }
+    let Some(default_clip_id) = manifest
+        .default_animation_clip_id
+        .as_deref()
+        .filter(|id| !id.trim().is_empty())
+    else {
+        return Ok(None);
+    };
+    if !manifest.runtime_supported {
+        return Err(format!(
+            "configured clip `{default_clip_id}` belongs to a model unsupported by the animation runtime"
+        ));
+    }
+    let clip = manifest
+        .clips
+        .iter()
+        .find(|clip| clip.id == default_clip_id)
+        .ok_or_else(|| {
+            format!(
+                "configured clip `{default_clip_id}` is missing from {manifest_path}; choose an existing clip or Imported rest pose"
+            )
+        })?;
+    let signature = clip.target_skeleton_signature.as_ref().ok_or_else(|| {
+        format!(
+            "configured clip `{}` has no uniquely resolved target skeleton",
+            clip.label
+        )
+    })?;
+    let skeleton = manifest
+        .skeletons
+        .iter()
+        .find(|skeleton| &skeleton.signature == signature)
+        .ok_or_else(|| {
+            format!(
+                "configured clip `{}` targets skeleton `{}` but no exact match exists",
+                clip.label, signature.0
+            )
+        })?;
+    let state_id = animation_state_id(&clip.label, clip.source_index);
+    let source_path = manifest.source.path.clone();
+    let asset_id = manifest.asset_id.clone();
+    Ok(Some(shared::AnimationControllerDesc {
+        skeleton: Some(
+            shared::EditorAssetRef::new(
+                asset_id.clone(),
+                skeleton.id.clone(),
+                skeleton.label.clone(),
+            )
+            .with_source_path(&source_path),
+        ),
+        states: vec![shared::AnimationStateDesc {
+            id: state_id.clone(),
+            label: clip.label.clone(),
+            clip: shared::EditorAssetRef::new(asset_id, clip.id.clone(), clip.label.clone())
+                .with_source_path(source_path),
+            looping: true,
+            speed: 1.0,
+            range: shared::AnimationPlaybackRange::default(),
+        }],
+        default_state: state_id,
+        ..default()
+    }))
+}
+
 fn spawn_animation_clip_at(
     world: &mut World,
     selection: &AssetSelection,
@@ -1035,7 +1192,7 @@ fn spawn_animation_clip_at(
     let default_state = authored.state.id.clone();
     let snapshot = EditorEntitySnapshot {
         actor_id: None,
-        actor_kind: ActorKind::ImportedModel,
+        actor_kind: ActorKind::SkinnedMesh,
         actor_name: None,
         name: Some(authored.model_label),
         transform: Transform {
@@ -1046,6 +1203,11 @@ fn spawn_animation_clip_at(
         primitive: None,
         brush: None,
         static_mesh_renderer: None,
+        skinned_mesh_renderer: Some(shared::SkinnedMeshRenderer {
+            materials: authored.renderer_materials,
+            ..shared::SkinnedMeshRenderer::new(authored.model_path)
+                .with_asset_id(authored.model_asset_id)
+        }),
         material: None,
         material_override: None,
         rigid_body: None,
@@ -1061,7 +1223,7 @@ fn spawn_animation_clip_at(
         audio_source: None,
         audio_listener: None,
         player_spawn: false,
-        model: Some(ModelRef::new(authored.model_path).with_asset_id(authored.model_asset_id)),
+        model: None,
         prefab: None,
         prefab_instance: None,
         weapon_spawn: None,
@@ -1069,8 +1231,18 @@ fn spawn_animation_clip_at(
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: 0,
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     };
     Some(spawn_with_history(world, snapshot))
@@ -1118,6 +1290,7 @@ fn apply_static_mesh_placement_mode(
                         primitive: None,
                         brush: None,
                         static_mesh_renderer: Some(shared::StaticMeshRenderer::single(entry)),
+                        skinned_mesh_renderer: None,
                         material: None,
                         material_override: None,
                         rigid_body: collider.as_ref().map(|_| RigidBodyDesc::default()),
@@ -1136,8 +1309,18 @@ fn apply_static_mesh_placement_mode(
                         post_process_volume: None,
                         team_spawn: None,
                         objective: None,
+
+                        navigation_bounds: None,
+
+                        navigation_obstacle: None,
+
+                        navigation_area: None,
+
+                        navigation_link: None,
                         hierarchy_sibling_index: index as i32,
                         editor_visibility: EditorVisibility::default(),
+                        inspector_order: None,
+                        component_states: None,
                         children: Vec::new(),
                     }
                 })
@@ -1146,6 +1329,35 @@ fn apply_static_mesh_placement_mode(
     }
 }
 
+#[cfg(test)]
+fn apply_skinned_mesh_placement_mode(snapshot: &mut EditorEntitySnapshot) {
+    apply_skinned_mesh_placement_mode_with_materials(
+        snapshot,
+        shared::RendererMaterialSet::default(),
+    );
+}
+
+fn apply_skinned_mesh_placement_mode_with_materials(
+    snapshot: &mut EditorEntitySnapshot,
+    materials: shared::RendererMaterialSet,
+) {
+    let Some(model) = snapshot.model.take() else {
+        return;
+    };
+    snapshot.actor_kind = ActorKind::SkinnedMesh;
+    snapshot.static_mesh_renderer = None;
+    snapshot.skinned_mesh_renderer = Some(shared::SkinnedMeshRenderer {
+        asset_id: model.asset_id,
+        path: model.path,
+        scene_index: model.scene_index,
+        materials,
+    });
+    // Triangle-mesh colliders are a static-geometry concern. Animated collision must be authored
+    // explicitly (capsules, hitboxes, or another gameplay-specific representation).
+    snapshot.rigid_body = None;
+    snapshot.collider = None;
+}
+
 fn static_mesh_collider_for_renderer(renderer: &shared::StaticMeshRenderer) -> ColliderDesc {
     ColliderDesc::static_mesh(
         renderer
@@ -1177,14 +1389,26 @@ fn part_effective_material_id_for_selection(
 fn static_mesh_renderer_for_asset(
     world: &mut World,
     path: &str,
-) -> Option<shared::StaticMeshRenderer> {
+) -> Option<(shared::StaticMeshRenderer, bool)> {
     let mut manifest_path = None;
     if let Some(mut registry) = world.get_resource_mut::<AssetRegistry>() {
         let mut renderer = None;
         if let Some(record) = find_asset_mut_by_path(&mut registry, path) {
             match super::refresh_model_artifacts(record) {
                 Ok(manifest) => {
-                    renderer = Some(renderer_from_manifest(&manifest, &record.import_settings));
+                    let requires_skinned_renderer = manifest.metadata.animation_count > 0
+                        || manifest.metadata.skin_count > 0
+                        || manifest.parts.iter().any(|part| part.skinned);
+                    let mut authored_renderer =
+                        renderer_from_manifest(&manifest, &record.import_settings);
+                    if requires_skinned_renderer {
+                        authored_renderer.materials =
+                            crate::assets::static_mesh::renderer_materials_from_manifest(
+                                &manifest,
+                                &record.import_settings,
+                            );
+                    }
+                    renderer = Some((authored_renderer, requires_skinned_renderer));
                     registry.index_dirty = true;
                 }
                 Err(error) => {
@@ -1207,7 +1431,17 @@ fn static_mesh_renderer_for_asset(
     let registry = world.get_resource::<AssetRegistry>()?;
     let record = find_asset_by_path(registry, path)?;
     let manifest = load_static_mesh_manifest(&manifest_path).ok()?;
-    Some(renderer_from_manifest(&manifest, &record.import_settings))
+    let requires_skinned_renderer = manifest.metadata.animation_count > 0
+        || manifest.metadata.skin_count > 0
+        || manifest.parts.iter().any(|part| part.skinned);
+    let mut renderer = renderer_from_manifest(&manifest, &record.import_settings);
+    if requires_skinned_renderer {
+        renderer.materials = crate::assets::static_mesh::renderer_materials_from_manifest(
+            &manifest,
+            &record.import_settings,
+        );
+    }
+    Some((renderer, requires_skinned_renderer))
 }
 
 pub fn import_external_assets(paths: &[PathBuf]) -> Result<usize, String> {
@@ -1348,4 +1582,106 @@ mod tests {
         );
         assert!(world.resource::<crate::history::EditorHistory>().can_undo());
     }
+
+    #[test]
+    fn skinned_model_placement_replaces_static_and_generic_model_renderers() {
+        let asset = EditorAsset {
+            label: "Hero".into(),
+            path: Some("assets/models/hero.glb".into()),
+            folder_path: "assets/models".into(),
+            kind: EditorAssetKind::Model,
+        };
+        let mut snapshot = snapshot_for_asset(&asset, Vec3::ZERO).unwrap();
+        snapshot.model.as_mut().unwrap().asset_id = "hero-id".into();
+        snapshot.static_mesh_renderer = Some(shared::StaticMeshRenderer::default());
+        snapshot.rigid_body = Some(RigidBodyDesc::default());
+        snapshot.collider = Some(ColliderDesc::static_cuboid(Vec3::ONE));
+
+        apply_skinned_mesh_placement_mode(&mut snapshot);
+
+        assert_eq!(snapshot.actor_kind, ActorKind::SkinnedMesh);
+        assert!(snapshot.model.is_none());
+        assert!(snapshot.static_mesh_renderer.is_none());
+        assert!(snapshot.rigid_body.is_none());
+        assert!(snapshot.collider.is_none());
+        assert_eq!(
+            snapshot.skinned_mesh_renderer,
+            Some(
+                shared::SkinnedMeshRenderer::new("assets/models/hero.glb").with_asset_id("hero-id")
+            )
+        );
+    }
+
+    #[test]
+    fn model_default_clip_builds_one_explicit_controller_state() {
+        let key = Uuid::new_v4();
+        let manifest_path =
+            std::env::temp_dir().join(format!("blacksite-default-animation-{key}.animation.ron"));
+        let asset_id = key.to_string();
+        let signature = shared::AnimationSkeletonSignature::new("rig-signature");
+        let clip_id = shared::animation_clip_sub_asset_id(8, "Standing");
+        let manifest = shared::AnimationManifest {
+            schema_version: shared::ANIMATION_MANIFEST_SCHEMA_VERSION,
+            asset_id: asset_id.clone(),
+            label: "Robot".into(),
+            default_animation_clip_id: Some(clip_id.clone()),
+            source: shared::AnimationManifestSource {
+                path: "assets/models/robot.glb".into(),
+                format: "glb".into(),
+                fingerprint: shared::AnimationSourceFingerprint {
+                    byte_len: 1,
+                    modified_unix_secs: 0,
+                    content_hash: "fixture".into(),
+                },
+                dependencies: Vec::new(),
+            },
+            runtime_supported: true,
+            skeletons: vec![shared::AnimationSkeletonRecord {
+                id: shared::animation_skeleton_sub_asset_id(0, "Rig"),
+                label: "Rig".into(),
+                source_index: 0,
+                signature: signature.clone(),
+                joint_paths: vec!["Root".into()],
+            }],
+            clips: vec![shared::AnimationClipRecord {
+                id: clip_id.clone(),
+                label: "Standing".into(),
+                source_index: 8,
+                duration_seconds: 0.4,
+                target_skeleton_signature: Some(signature),
+                events: Vec::new(),
+            }],
+            diagnostics: Vec::new(),
+        };
+        std::fs::write(
+            &manifest_path,
+            ron::ser::to_string_pretty(&manifest, ron::ser::PrettyConfig::default()).unwrap(),
+        )
+        .unwrap();
+        let record = AssetRecord {
+            id: AssetId(key),
+            path: "assets/models/robot.glb".into(),
+            label: "Robot".into(),
+            kind_tag: "Model".into(),
+            import_settings: crate::asset_db::ImportSettings {
+                animation_manifest_path: Some(manifest_path.to_string_lossy().into_owned()),
+                default_animation_clip_id: Some(clip_id.clone()),
+                ..Default::default()
+            },
+            dependencies: Vec::new(),
+        };
+
+        let controller = default_animation_controller_for_record(&record)
+            .unwrap()
+            .expect("explicit default should produce a controller");
+        assert_eq!(controller.default_state, "standing");
+        assert_eq!(controller.states.len(), 1);
+        assert_eq!(controller.states[0].clip.sub_asset_id, clip_id);
+        assert_eq!(
+            controller.skeleton.unwrap().sub_asset_id,
+            shared::animation_skeleton_sub_asset_id(0, "Rig")
+        );
+
+        std::fs::remove_file(manifest_path).unwrap();
+    }
 }
diff --git a/crates/editor/src/assets/materials.rs b/crates/editor/src/assets/materials.rs
index fffb3a5..362f95c 100644
--- a/crates/editor/src/assets/materials.rs
+++ b/crates/editor/src/assets/materials.rs
@@ -2,10 +2,13 @@
 
 use bevy::prelude::*;
 use bevy_egui::egui;
-use shared::{LevelObject, MaterialAsset, MaterialDesc};
+use shared::{
+    ComponentInstanceId, LevelObject, MaterialAsset, MaterialDesc, MaterialRef,
+    RendererMaterialSlot,
+};
 
 use crate::assets::{EditorAsset, EditorAssetKind, EditorAssets};
-use crate::history::set_material_group_with_history;
+use crate::history::{reflected_component_transaction, set_material_group_with_history};
 use crate::ui::inspector::property_row;
 
 pub fn load_material_asset(catalog_path: &str) -> Result<MaterialAsset, String> {
@@ -28,18 +31,105 @@ pub fn apply_material_asset_to_selection(
         .path
         .clone()
         .ok_or_else(|| format!("Material has no source path: {}", asset.label))?;
-    let desc = material_desc_from_asset(&path)?;
-    let changes = crate::ui::helpers::selected_level_entities(world, selected)
-        .into_iter()
-        .filter(|entity| world.get::<LevelObject>(*entity).is_some())
-        .map(|entity| (entity, desc.clone()))
-        .collect::<Vec<_>>();
-    set_material_group_with_history(world, changes);
+    let record = world
+        .get_resource::<crate::asset_db::AssetRegistry>()
+        .and_then(|registry| crate::asset_db::find_asset_by_path(registry, &path))
+        .ok_or_else(|| format!("Material is missing from the asset registry: {path}"))?;
+    let sub_asset_id = if shared::MaterialInstanceAsset::load_from_path(&path).is_ok() {
+        "material:instance"
+    } else {
+        "material:source"
+    };
+    let material_ref = MaterialRef::new(
+        shared::EditorAssetRef::new(record.id.as_string(), sub_asset_id, asset.label.clone())
+            .with_source_path(path.clone()),
+    );
+    let desc = material_desc_from_asset(&path).ok();
+    let entities = crate::ui::helpers::selected_level_entities(world, selected);
+    let mut renderer_changes = 0usize;
+    let mut legacy_changes = Vec::new();
+    for entity in entities {
+        if world.get::<LevelObject>(entity).is_none() {
+            continue;
+        }
+        if let Some(mut renderer) = world.get::<shared::StaticMeshRenderer>(entity).cloned() {
+            ensure_static_material_slots(&mut renderer);
+            for slot in &mut renderer.materials.slots {
+                slot.material = Some(material_ref.clone());
+            }
+            reflected_component_transaction(
+                world,
+                entity,
+                "Assign Material Slots",
+                shared::AUTHORING_COMPONENT_STATIC_MESH_RENDERER,
+                shared::COMPONENT_STATIC_MESH_RENDERER,
+                move |world, entity| {
+                    world.entity_mut(entity).insert(renderer);
+                    Ok(())
+                },
+            )?;
+            renderer_changes += 1;
+            continue;
+        }
+        if let Some(mut renderer) = world.get::<shared::SkinnedMeshRenderer>(entity).cloned() {
+            if renderer.materials.slots.is_empty() {
+                return Err(format!(
+                    "Skinned renderer `{}` has no imported material slots; reimport its model",
+                    renderer.path
+                ));
+            }
+            for slot in &mut renderer.materials.slots {
+                slot.material = Some(material_ref.clone());
+            }
+            reflected_component_transaction(
+                world,
+                entity,
+                "Assign Material Slots",
+                shared::AUTHORING_COMPONENT_SKINNED_MESH_RENDERER,
+                shared::COMPONENT_SKINNED_MESH_RENDERER,
+                move |world, entity| {
+                    world.entity_mut(entity).insert(renderer);
+                    Ok(())
+                },
+            )?;
+            renderer_changes += 1;
+            continue;
+        }
+        if let Some(desc) = desc.as_ref() {
+            legacy_changes.push((entity, desc.clone()));
+        }
+    }
+    if !legacy_changes.is_empty() {
+        set_material_group_with_history(world, legacy_changes);
+    }
+    if renderer_changes == 0 && desc.is_none() {
+        return Err("No selected renderable actor accepts this material".into());
+    }
     world.resource_mut::<crate::scene_io::SceneIo>().status =
-        format!("Applied material {}", asset.label);
+        format!("Applied shared material {}", asset.label);
     Ok(())
 }
 
+fn ensure_static_material_slots(renderer: &mut shared::StaticMeshRenderer) {
+    for part in &mut renderer.slots {
+        if part.material_slot_id.0.trim().is_empty() {
+            part.material_slot_id = if part.id.0.trim().is_empty() {
+                ComponentInstanceId::new("slot:legacy")
+            } else {
+                ComponentInstanceId::new(format!("slot:{}", part.id.0))
+            };
+        }
+        if renderer.materials.slot(&part.material_slot_id).is_none() {
+            renderer.materials.slots.push(RendererMaterialSlot {
+                id: part.material_slot_id.clone(),
+                name: part.name.clone(),
+                source_material: part.material.clone().map(MaterialRef::new),
+                material: None,
+            });
+        }
+    }
+}
+
 pub fn material_asset_picker_ui(
     world: &mut World,
     ui: &mut egui::Ui,
diff --git a/crates/editor/src/assets/operators.rs b/crates/editor/src/assets/operators.rs
index 0ff8253..03e0320 100644
--- a/crates/editor/src/assets/operators.rs
+++ b/crates/editor/src/assets/operators.rs
@@ -119,10 +119,10 @@ pub fn assign_animation_clip_operator(
     selection: AssetSelection,
     entity: Entity,
 ) -> bool {
-    let availability = if world.get::<shared::ModelRef>(entity).is_some() {
+    let availability = if world.get::<shared::SkinnedMeshRenderer>(entity).is_some() {
         OperatorAvailability::Ready
     } else {
-        OperatorAvailability::Disabled("Select an authored imported-model actor".to_string())
+        OperatorAvailability::Disabled("Select an authored skinned-mesh actor".to_string())
     };
     let label = format!("Assign Animation Clip {}", selection.display_label());
     run_immediate_operator(
@@ -133,9 +133,9 @@ pub fn assign_animation_clip_operator(
         move |world| {
             let authored = animation_clip_authoring_data(world, &selection)?;
             let model = world
-                .get::<shared::ModelRef>(entity)
+                .get::<shared::SkinnedMeshRenderer>(entity)
                 .cloned()
-                .ok_or_else(|| "Selected actor has no ModelRef".to_string())?;
+                .ok_or_else(|| "Selected actor has no SkinnedMeshRenderer".to_string())?;
             let mut controller = world
                 .get::<shared::AnimationControllerDesc>(entity)
                 .cloned()
@@ -197,7 +197,7 @@ mod tests {
         animation_clip_sub_asset_id, animation_skeleton_sub_asset_id, ActorKind,
         AnimationClipRecord, AnimationControllerDesc, AnimationManifest, AnimationManifestSource,
         AnimationSkeletonRecord, AnimationSkeletonSignature, AnimationSourceFingerprint,
-        AudioSourceDesc, LevelObject, MaterialDesc, ModelRef, PrimitiveShape,
+        AudioSourceDesc, LevelObject, MaterialDesc, PrimitiveShape, SkinnedMeshRenderer,
         ANIMATION_MANIFEST_SCHEMA_VERSION,
     };
 
@@ -222,6 +222,7 @@ mod tests {
             schema_version: ANIMATION_MANIFEST_SCHEMA_VERSION,
             asset_id: asset_id.as_string(),
             label: "Operator Fixture".into(),
+            default_animation_clip_id: None,
             source: AnimationManifestSource {
                 path: model_path.clone(),
                 format: "glb".into(),
@@ -301,6 +302,43 @@ mod tests {
         assert_undo_redo_round_trip(&mut world, 0, 1, authored_count);
     }
 
+    #[test]
+    fn animation_clip_placement_creates_only_the_skinned_renderer_path() {
+        let mut world = World::new();
+        world.init_resource::<ActiveOperator>();
+        world.init_resource::<EditorHistory>();
+        world.init_resource::<SceneIo>();
+        world.init_resource::<SelectedEntity>();
+        let (manifest_path, record, selection) = animation_fixture();
+        world.insert_resource(AssetRegistry {
+            records: vec![record],
+            index_dirty: false,
+        });
+        let harness = OperatorInvariantHarness::capture(&mut world);
+
+        assert!(place_subasset_operator(
+            &mut world,
+            selection,
+            Vec3::new(1.0, 2.0, 3.0),
+        ));
+
+        let entity = world
+            .query_filtered::<Entity, With<LevelObject>>()
+            .single(&world)
+            .unwrap();
+        assert_eq!(
+            world.get::<ActorKind>(entity),
+            Some(&ActorKind::SkinnedMesh)
+        );
+        assert!(world.get::<SkinnedMeshRenderer>(entity).is_some());
+        assert!(world.get::<AnimationControllerDesc>(entity).is_some());
+        assert!(world.get::<shared::ModelRef>(entity).is_none());
+        assert!(world.get::<shared::StaticMeshRenderer>(entity).is_none());
+        harness.assert_committed(&mut world, 1, 1);
+        assert_undo_redo_round_trip(&mut world, 0, 1, authored_count);
+        let _ = std::fs::remove_file(manifest_path);
+    }
+
     #[test]
     fn audio_clip_assignment_is_one_undoable_operator() {
         let mut world = World::new();
@@ -363,8 +401,8 @@ mod tests {
         let entity = world
             .spawn((
                 LevelObject,
-                ActorKind::ImportedModel,
-                ModelRef::new(model_path),
+                ActorKind::SkinnedMesh,
+                SkinnedMeshRenderer::new(model_path),
             ))
             .id();
         let harness = OperatorInvariantHarness::capture(&mut world);
diff --git a/crates/editor/src/assets/static_mesh.rs b/crates/editor/src/assets/static_mesh.rs
index db8d374..61aed72 100644
--- a/crates/editor/src/assets/static_mesh.rs
+++ b/crates/editor/src/assets/static_mesh.rs
@@ -14,9 +14,12 @@ use serde::{Deserialize, Serialize};
 use crate::asset_db::{
     AssetRecord, ImportSettings, MaterialImportPolicy, ModelHierarchyMode, ModelPlacementMode,
 };
-use shared::{ComponentInstanceId, EditorAssetRef, StaticMeshRenderer, StaticMeshRendererEntry};
+use shared::{
+    ComponentInstanceId, EditorAssetRef, MaterialRef, RendererMaterialSet, RendererMaterialSlot,
+    StaticMeshRenderer, StaticMeshRendererEntry,
+};
 
-pub const STATIC_MESH_MANIFEST_SCHEMA: u32 = 1;
+pub const STATIC_MESH_MANIFEST_SCHEMA: u32 = 3;
 pub const STATIC_MESH_ARTIFACT_DIR: &str = "assets/meshes/generated";
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -80,6 +83,10 @@ pub struct StaticMeshPart {
     pub source_node: Option<String>,
     pub source_mesh: Option<String>,
     pub source_material: Option<String>,
+    /// Whether the source primitive is bound to a skin and therefore must never become a static
+    /// renderer slot.
+    #[serde(default)]
+    pub skinned: bool,
 }
 
 pub fn static_mesh_manifest_path(asset_id: &str) -> String {
@@ -94,6 +101,17 @@ pub fn material_id_from_label(label: &str) -> String {
     format!("material:{}", stable_sub_asset_slug(label))
 }
 
+fn gltf_draw_id(node_index: Option<usize>, mesh_index: usize, primitive_index: usize) -> String {
+    let node = node_index
+        .map(|index| index.to_string())
+        .unwrap_or_else(|| "unbound".into());
+    format!("draw:scene0:node{node}:mesh{mesh_index}:primitive{primitive_index}")
+}
+
+fn fbx_draw_id(node_index: usize, material_index: usize) -> String {
+    format!("draw:scene0:node{node_index}:material{material_index}")
+}
+
 fn stable_sub_asset_slug(label: &str) -> String {
     let mut slug = String::new();
     for ch in label.chars() {
@@ -151,38 +169,106 @@ pub fn renderer_from_manifest(
         MaterialImportPolicy::SourceMaterials
     );
 
-    StaticMeshRenderer {
+    let parts: Vec<_> = manifest
+        .parts
+        .iter()
+        .filter(|part| !part.skinned && manifest.metadata.animation_count == 0)
+        .map(|part| StaticMeshRendererEntry {
+            id: ComponentInstanceId::new(part_effective_id(part)),
+            name: part.name.clone(),
+            mesh: EditorAssetRef::new(
+                manifest.asset_id.clone(),
+                part_effective_id(part),
+                part.name.clone(),
+            ),
+            material_slot_id: ComponentInstanceId::new(material_slot_id(part)),
+            material: use_source_materials
+                .then(|| {
+                    part_effective_material_id(part).map(|id| {
+                        EditorAssetRef::new(
+                            manifest.asset_id.clone(),
+                            id,
+                            part.material_slot_name.clone(),
+                        )
+                    })
+                })
+                .flatten(),
+            local_transform: part.local_transform,
+            visible: true,
+            cast_shadows: true,
+            receive_shadows: true,
+        })
+        .collect();
+    let materials = RendererMaterialSet {
         slots: manifest
             .parts
             .iter()
-            .map(|part| StaticMeshRendererEntry {
-                id: ComponentInstanceId::new(part_effective_id(part)),
-                name: part.name.clone(),
-                mesh: EditorAssetRef::new(
-                    manifest.asset_id.clone(),
-                    part_effective_id(part),
-                    part.name.clone(),
-                ),
-                material: use_source_materials
+            .filter(|part| !part.skinned && manifest.metadata.animation_count == 0)
+            .map(|part| RendererMaterialSlot {
+                id: ComponentInstanceId::new(material_slot_id(part)),
+                name: part.material_slot_name.clone(),
+                source_material: use_source_materials
                     .then(|| {
                         part_effective_material_id(part).map(|id| {
-                            EditorAssetRef::new(
+                            MaterialRef::new(EditorAssetRef::new(
                                 manifest.asset_id.clone(),
                                 id,
                                 part.material_slot_name.clone(),
-                            )
+                            ))
                         })
                     })
                     .flatten(),
-                local_transform: part.local_transform,
-                visible: true,
-                cast_shadows: true,
-                receive_shadows: true,
+                material: None,
             })
             .collect(),
+        orphaned_assignments: Vec::new(),
+    };
+
+    StaticMeshRenderer {
+        slots: parts,
+        materials,
     }
 }
 
+/// Builds the shared material slots for a full imported hierarchy. Unlike static renderer
+/// construction this intentionally includes skin-bound and rigid animated draw bindings.
+pub fn renderer_materials_from_manifest(
+    manifest: &StaticMeshManifest,
+    settings: &ImportSettings,
+) -> RendererMaterialSet {
+    let use_source_materials = matches!(
+        settings.material_policy,
+        MaterialImportPolicy::SourceMaterials
+    );
+    RendererMaterialSet {
+        slots: manifest
+            .parts
+            .iter()
+            .map(|part| RendererMaterialSlot {
+                id: ComponentInstanceId::new(material_slot_id(part)),
+                name: part.material_slot_name.clone(),
+                source_material: use_source_materials
+                    .then(|| {
+                        part_effective_material_id(part).map(|id| {
+                            MaterialRef::new(EditorAssetRef::new(
+                                manifest.asset_id.clone(),
+                                id,
+                                part.material_slot_name.clone(),
+                            ))
+                        })
+                    })
+                    .flatten(),
+                material: None,
+            })
+            .collect(),
+        orphaned_assignments: Vec::new(),
+    }
+}
+
+fn material_slot_id(part: &StaticMeshPart) -> String {
+    format!("slot:{}", part_effective_id(part))
+}
+
 fn part_effective_id(part: &StaticMeshPart) -> String {
     if part.id.trim().is_empty() {
         part_id_from_label(&part.mesh_label)
@@ -255,23 +341,23 @@ fn build_gltf_manifest(
         .or_else(|| gltf.document.scenes().next())
     {
         for node in scene.nodes() {
-            collect_gltf_node_parts(node, Mat4::IDENTITY, &mut parts);
+            collect_gltf_node_parts(node, Mat4::IDENTITY, "", &mut parts);
         }
     } else {
         for mesh in gltf.document.meshes() {
-            collect_gltf_mesh_parts(None, None, mesh, Mat4::IDENTITY, &mut parts);
+            collect_gltf_mesh_parts(None, None, None, mesh, Mat4::IDENTITY, false, &mut parts);
         }
     }
 
     if gltf.document.animations().count() > 0 {
         warnings.push(
-            "Animations are recorded as metadata; use Scene Instance placement for playback."
+            "Animations are recorded as metadata; animated placement uses SkinnedMeshRenderer."
                 .into(),
         );
     }
     if gltf.document.skins().count() > 0 {
         warnings.push(
-            "Skins are recorded as metadata; skinned playback stays on the Scene Instance path."
+            "Skinned primitives are excluded from StaticMeshRenderer and use SkinnedMeshRenderer."
                 .into(),
         );
     }
@@ -306,29 +392,44 @@ fn build_gltf_manifest(
 fn collect_gltf_node_parts(
     node: gltf::Node<'_>,
     parent_transform: Mat4,
+    parent_path: &str,
     parts: &mut Vec<StaticMeshPart>,
 ) {
     let local = Mat4::from_cols_array_2d(&node.transform().matrix());
     let world_transform = parent_transform * local;
+    let segment = node
+        .name()
+        .map(str::to_string)
+        .unwrap_or_else(|| format!("Node{}", node.index()));
+    let node_path = if parent_path.is_empty() {
+        segment
+    } else {
+        format!("{parent_path}/{segment}")
+    };
+    let skinned = node.skin().is_some();
     if let Some(mesh) = node.mesh() {
         collect_gltf_mesh_parts(
             node.name().map(str::to_string),
             Some(node.index()),
+            Some(node_path.clone()),
             mesh,
             world_transform,
+            skinned,
             parts,
         );
     }
     for child in node.children() {
-        collect_gltf_node_parts(child, world_transform, parts);
+        collect_gltf_node_parts(child, world_transform, &node_path, parts);
     }
 }
 
 fn collect_gltf_mesh_parts(
     node_name: Option<String>,
     node_index: Option<usize>,
+    node_path: Option<String>,
     mesh: gltf::Mesh<'_>,
     transform: Mat4,
+    skinned: bool,
     parts: &mut Vec<StaticMeshPart>,
 ) {
     let mesh_index = mesh.index();
@@ -359,9 +460,11 @@ fn collect_gltf_mesh_parts(
             .clone()
             .or_else(|| mesh_name.clone())
             .unwrap_or_else(|| format!("Mesh {mesh_index}"));
-        let source_node = node_index.map(|index| format!("Node{index}"));
+        let source_node = node_path
+            .clone()
+            .or_else(|| node_index.map(|index| format!("Node{index}")));
         parts.push(StaticMeshPart {
-            id: part_id_from_label(&mesh_label),
+            id: gltf_draw_id(node_index, mesh_index, primitive_index),
             name: format!("{name} / Primitive {primitive_index}"),
             material_id: material_label
                 .as_ref()
@@ -373,6 +476,7 @@ fn collect_gltf_mesh_parts(
             source_node,
             source_mesh: Some(format!("Mesh{mesh_index}")),
             source_material: Some(material_name),
+            skinned,
         });
     }
 }
@@ -405,6 +509,7 @@ fn build_fbx_manifest(
         if mesh.num_vertices == 0 || mesh.faces.as_ref().is_empty() {
             continue;
         }
+        let skinned = !mesh.skin_deformers.as_ref().is_empty();
 
         let mut groups: Vec<(usize, Vec<u32>)> =
             group_faces_by_material(mesh).into_iter().collect();
@@ -428,7 +533,7 @@ fn build_fbx_manifest(
             };
             let mesh_label = FbxAssetLabel::Mesh(node_index * 1000 + material_index).to_string();
             parts.push(StaticMeshPart {
-                id: part_id_from_label(&mesh_label),
+                id: fbx_draw_id(node_index, material_index),
                 name: format!("{node_name} / Material {material_index}"),
                 material_id: material_label
                     .as_ref()
@@ -440,19 +545,20 @@ fn build_fbx_manifest(
                 source_node: Some(format!("Node{node_index}")),
                 source_mesh: Some(format!("Mesh{node_index}")),
                 source_material: Some(material_name),
+                skinned,
             });
         }
     }
 
     if !scene.anim_stacks.as_ref().is_empty() {
         warnings.push(
-            "Animations are recorded as metadata; use Scene Instance placement for playback."
+            "Animations are recorded as metadata; animated placement uses SkinnedMeshRenderer."
                 .into(),
         );
     }
     if !scene.skin_deformers.as_ref().is_empty() {
         warnings.push(
-            "Skins are recorded as metadata; skinned playback stays on the Scene Instance path."
+            "Skinned primitives are excluded from StaticMeshRenderer and use SkinnedMeshRenderer."
                 .into(),
         );
     }
@@ -554,6 +660,7 @@ fn resolve_dependency(source_path: &str, uri: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::asset_db::AssetId;
 
     fn test_manifest() -> StaticMeshManifest {
         StaticMeshManifest {
@@ -597,6 +704,7 @@ mod tests {
                 source_node: Some("Node0".into()),
                 source_mesh: Some("Mesh0".into()),
                 source_material: Some("Wood".into()),
+                skinned: false,
             }],
             warnings: Vec::new(),
         }
@@ -645,4 +753,48 @@ mod tests {
 
         assert!(renderer.slots[0].material.is_none());
     }
+
+    #[test]
+    fn renderer_from_manifest_excludes_skinned_primitives() {
+        let mut manifest = test_manifest();
+        manifest.parts[0].skinned = true;
+
+        let renderer = renderer_from_manifest(&manifest, &ImportSettings::default());
+
+        assert!(renderer.slots.is_empty());
+    }
+
+    #[test]
+    fn renderer_from_manifest_excludes_node_animated_geometry() {
+        let mut manifest = test_manifest();
+        manifest.metadata.animation_count = 1;
+
+        let renderer = renderer_from_manifest(&manifest, &ImportSettings::default());
+
+        assert!(renderer.slots.is_empty());
+    }
+
+    #[test]
+    fn committed_rigged_fixture_never_builds_static_renderer_slots() {
+        let path = Path::new(env!("CARGO_MANIFEST_DIR"))
+            .join("../../assets/models/robot_expressive.glb")
+            .to_string_lossy()
+            .into_owned();
+        let record = AssetRecord {
+            id: AssetId::new(),
+            path,
+            label: "Robot Expressive".into(),
+            kind_tag: "Model".into(),
+            import_settings: ImportSettings::default(),
+            dependencies: Vec::new(),
+        };
+
+        let manifest = build_static_mesh_manifest(&record).unwrap();
+        let renderer = renderer_from_manifest(&manifest, &record.import_settings);
+
+        assert!(manifest.metadata.skin_count > 0);
+        assert!(manifest.metadata.animation_count > 0);
+        assert!(manifest.parts.iter().any(|part| part.skinned));
+        assert!(renderer.slots.is_empty());
+    }
 }
diff --git a/crates/editor/src/assets/thumbnails/studio.rs b/crates/editor/src/assets/thumbnails/studio.rs
index 6792577..5c7f020 100644
--- a/crates/editor/src/assets/thumbnails/studio.rs
+++ b/crates/editor/src/assets/thumbnails/studio.rs
@@ -21,6 +21,10 @@ use crate::infra::EditorOnly;
 
 pub(crate) const THUMB_SIZE: u32 = 128;
 pub(crate) const THUMBNAIL_LAYER: usize = 31;
+const THUMBNAIL_VERTICAL_FOV: f32 = 40.0_f32.to_radians();
+const THUMBNAIL_HALF_VERTICAL_FOV: f32 = THUMBNAIL_VERTICAL_FOV * 0.5;
+const SCENE_FRAME_PADDING: f32 = 1.35;
+const MATERIAL_SPHERE_FRAME_PADDING: f32 = 1.28;
 const MESH_WARMUP_FRAMES: u8 = 12;
 const POST_ATTACH_FRAMES: u8 = 8;
 const RENDER_FRAMES: u8 = 3;
@@ -61,6 +65,25 @@ struct ActiveModelThumbnail {
     framed: bool,
     frames_remaining: u8,
     wait_frames: u32,
+    framing: ThumbnailFraming,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum ThumbnailFraming {
+    SceneBounds,
+    MaterialSphere,
+}
+
+impl ThumbnailFraming {
+    fn for_source(source: &ThumbnailJobSource) -> Self {
+        match source {
+            ThumbnailJobSource::SourceMaterial { .. }
+            | ThumbnailJobSource::MaterialAsset { .. } => Self::MaterialSphere,
+            ThumbnailJobSource::Model { .. } | ThumbnailJobSource::MeshSubAsset { .. } => {
+                Self::SceneBounds
+            }
+        }
+    }
 }
 
 pub struct ThumbnailStudioPlugin;
@@ -143,7 +166,7 @@ fn setup_thumbnail_studio(mut commands: Commands, mut images: ResMut<Assets<Imag
             RenderTarget::Image(render_image.clone().into()),
             Transform::from_xyz(2.0, 1.4, 2.0).looking_at(Vec3::new(0.0, 0.5, 0.0), Vec3::Y),
             Projection::Perspective(PerspectiveProjection {
-                fov: 40.0_f32.to_radians(),
+                fov: THUMBNAIL_VERTICAL_FOV,
                 ..default()
             }),
         ))
@@ -229,6 +252,7 @@ fn process_thumbnail_studio(
                 &mesh3d,
                 &mesh_storage,
                 &mut camera_transforms,
+                active.framing,
             ) {
                 active.framed = true;
                 active.post_attach_frames = 0;
@@ -322,6 +346,7 @@ fn process_thumbnail_studio(
         .id();
 
     let label = job.source.label().to_string();
+    let framing = ThumbnailFraming::for_source(&job.source);
     let content_spawned = spawn_thumbnail_job_content(
         &mut commands,
         &mut mesh_storage,
@@ -350,6 +375,7 @@ fn process_thumbnail_studio(
                 framed: false,
                 frames_remaining: 0,
                 wait_frames: 0,
+                framing,
             },
             "no renderable meshes",
             true,
@@ -369,6 +395,7 @@ fn process_thumbnail_studio(
         framed: false,
         frames_remaining: 0,
         wait_frames: 0,
+        framing,
     });
 }
 
@@ -588,6 +615,7 @@ fn frame_thumbnail_scene(
     meshes: &Query<&Mesh3d>,
     mesh_assets: &Assets<Mesh>,
     camera_transforms: &mut Query<&mut Transform, With<ThumbnailStudioCamera>>,
+    framing: ThumbnailFraming,
 ) -> bool {
     let mut entities = Vec::new();
     collect_descendants(root, children, &mut entities);
@@ -633,8 +661,7 @@ fn frame_thumbnail_scene(
     }
 
     let center = (min + max) * 0.5;
-    let radius = (max - min).length().max(0.25) * 0.5;
-    let distance = radius / (20.0_f32.to_radians()).tan() * 1.35;
+    let distance = thumbnail_camera_distance(min, max, framing);
     let eye = center + Vec3::new(1.0, 0.75, 1.0).normalize() * distance;
 
     if let Ok(mut transform) = camera_transforms.single_mut() {
@@ -644,6 +671,20 @@ fn frame_thumbnail_scene(
     true
 }
 
+fn thumbnail_camera_distance(min: Vec3, max: Vec3, framing: ThumbnailFraming) -> f32 {
+    let bounds_size = max - min;
+    let (radius, padding) = match framing {
+        ThumbnailFraming::SceneBounds => {
+            (bounds_size.length().max(0.25) * 0.5, SCENE_FRAME_PADDING)
+        }
+        ThumbnailFraming::MaterialSphere => (
+            bounds_size.max_element().max(0.5) * 0.5,
+            MATERIAL_SPHERE_FRAME_PADDING,
+        ),
+    };
+    radius / THUMBNAIL_HALF_VERTICAL_FOV.tan() * padding
+}
+
 fn collect_descendants(entity: Entity, children: &Query<&Children>, out: &mut Vec<Entity>) {
     out.push(entity);
     let Ok(child_list) = children.get(entity) else {
@@ -673,3 +714,24 @@ fn aabb_corners(aabb: &Aabb3d) -> [Vec3; 8] {
 pub fn model_file_exists(catalog_path: &str) -> bool {
     Path::new(catalog_path).is_file()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn material_sphere_framing_fills_more_of_the_thumbnail_with_padding() {
+        let sphere_radius = 0.65;
+        let min = Vec3::splat(-sphere_radius);
+        let max = Vec3::splat(sphere_radius);
+
+        let scene_distance = thumbnail_camera_distance(min, max, ThumbnailFraming::SceneBounds);
+        let material_distance =
+            thumbnail_camera_distance(min, max, ThumbnailFraming::MaterialSphere);
+        let projected_radius_fraction =
+            sphere_radius / (material_distance * THUMBNAIL_HALF_VERTICAL_FOV.tan());
+
+        assert!(material_distance < scene_distance * 0.6);
+        assert!((0.75..0.82).contains(&projected_radius_fraction));
+    }
+}
diff --git a/crates/editor/src/history/commands.rs b/crates/editor/src/history/commands.rs
index 392859f..464ba21 100644
--- a/crates/editor/src/history/commands.rs
+++ b/crates/editor/src/history/commands.rs
@@ -3,9 +3,10 @@ use std::path::PathBuf;
 use bevy::prelude::*;
 use shared::{
     ActorId, ActorKind, ActorName, AnimationControllerDesc, AudioListenerDesc, AudioSourceDesc,
-    BrushDesc, ColliderDesc, EditorVisibility, InspectorOrder, LightDesc, MaterialDesc,
-    MaterialOverride, ModelRef, ObjectiveMarker, PhysicsBody, PostProcessVolumeDesc,
-    PrefabInstance, PrefabRef, Primitive, RigidBodyDesc, SceneComposition, StaticMeshRenderer,
+    AuthoringComponentStates, BrushDesc, ColliderDesc, EditorVisibility, InspectorOrder, LightDesc,
+    MaterialDesc, MaterialOverride, ModelRef, NavigationArea, NavigationBounds, NavigationLink,
+    NavigationObstacle, ObjectiveMarker, PhysicsBody, PostProcessVolumeDesc, PrefabInstance,
+    PrefabRef, Primitive, RigidBodyDesc, SceneComposition, SkinnedMeshRenderer, StaticMeshRenderer,
     TeamSpawn, TriggerVolume, WeaponSpawn,
 };
 #[derive(Debug, Clone)]
@@ -18,6 +19,7 @@ pub struct EditorEntitySnapshot {
     pub primitive: Option<Primitive>,
     pub brush: Option<BrushDesc>,
     pub static_mesh_renderer: Option<StaticMeshRenderer>,
+    pub skinned_mesh_renderer: Option<SkinnedMeshRenderer>,
     pub material: Option<MaterialDesc>,
     pub material_override: Option<MaterialOverride>,
     pub rigid_body: Option<RigidBodyDesc>,
@@ -36,11 +38,52 @@ pub struct EditorEntitySnapshot {
     pub post_process_volume: Option<PostProcessVolumeDesc>,
     pub team_spawn: Option<TeamSpawn>,
     pub objective: Option<ObjectiveMarker>,
+    pub navigation_bounds: Option<NavigationBounds>,
+    pub navigation_obstacle: Option<NavigationObstacle>,
+    pub navigation_area: Option<NavigationArea>,
+    pub navigation_link: Option<NavigationLink>,
     pub hierarchy_sibling_index: i32,
     pub editor_visibility: EditorVisibility,
+    pub inspector_order: Option<InspectorOrder>,
+    pub component_states: Option<AuthoringComponentStates>,
     pub children: Vec<EditorEntitySnapshot>,
 }
 
+/// One reflected component value used by registry-driven editor transactions.
+/// `component_id` is stable; `type_path` is retained only to resolve Bevy's
+/// reflection adapter for this build.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ReflectedComponentValue {
+    pub component_id: String,
+    pub type_path: String,
+    pub ron: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ComponentDelta {
+    pub component_id: String,
+    pub type_path: String,
+    pub before: Option<ReflectedComponentValue>,
+    pub after: Option<ReflectedComponentValue>,
+}
+
+/// An atomic add/remove/reset/paste operation. Requirements, dependent removals,
+/// and the derived ActorKind hint can be represented as additional deltas.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ComponentTransaction {
+    pub entity: Entity,
+    pub label: &'static str,
+    pub deltas: Vec<ComponentDelta>,
+}
+
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct NavigationComponentState {
+    pub bounds: Option<NavigationBounds>,
+    pub obstacle: Option<NavigationObstacle>,
+    pub area: Option<NavigationArea>,
+    pub link: Option<NavigationLink>,
+}
+
 #[derive(Debug, Clone)]
 pub struct SiblingChange {
     pub entity: Entity,
@@ -174,6 +217,11 @@ pub enum EditorCommand {
         old: Option<PostProcessVolumeDesc>,
         new: PostProcessVolumeDesc,
     },
+    SetNavigation {
+        entity: Entity,
+        old: NavigationComponentState,
+        new: NavigationComponentState,
+    },
     SetTransformGroup {
         entities: Vec<Entity>,
         olds: Vec<Transform>,
@@ -239,6 +287,7 @@ pub enum EditorCommand {
         entity: Entity,
         snapshot: EditorEntitySnapshot,
     },
+    ComponentTransaction(ComponentTransaction),
 }
 
 impl EditorCommand {
@@ -266,6 +315,7 @@ impl EditorCommand {
             EditorCommand::ApplyBrushCsg { .. } => "Brush CSG",
             EditorCommand::SetStaticMeshRenderer { .. } => "Set Static Mesh Renderer",
             EditorCommand::SetPostProcessVolume { .. } => "Set Post Process Volume",
+            EditorCommand::SetNavigation { .. } => "Set Navigation",
             EditorCommand::SetTransformGroup { .. } => "Move Selection",
             EditorCommand::Reparent { .. } => "Reparent",
             EditorCommand::SetActorKind { .. } => "Set Actor Kind",
@@ -283,6 +333,7 @@ impl EditorCommand {
             } => "Unpack Prefab Layer",
             EditorCommand::AddComponent { .. } => "Add Component",
             EditorCommand::RemoveComponent { .. } => "Remove Component",
+            EditorCommand::ComponentTransaction(transaction) => transaction.label,
         }
     }
 }
diff --git a/crates/editor/src/history/mod.rs b/crates/editor/src/history/mod.rs
index 43a0901..cc3d391 100644
--- a/crates/editor/src/history/mod.rs
+++ b/crates/editor/src/history/mod.rs
@@ -1,14 +1,20 @@
 use std::collections::HashSet;
 
+use bevy::ecs::reflect::ReflectComponent;
 use bevy::prelude::*;
+use bevy::reflect::serde::{TypedReflectDeserializer, TypedReflectSerializer};
+use bevy::reflect::std_traits::ReflectDefault;
 use bevy::world_serialization::WorldInstance;
+use serde::de::DeserializeSeed;
 use shared::{
     infer_actor_kind, ActorId, ActorKind, ActorName, AnimationControllerDesc, AudioListenerDesc,
-    AudioSourceDesc, BrushDesc, ColliderDesc, EditorVisibility, HierarchySiblingIndex,
-    HydratedPrefabMember, HydratedPrefabReady, InspectorOrder, LevelObject, LightDesc,
-    MaterialDesc, MaterialOverride, ModelRef, ObjectiveMarker, PhysicsBody, PlayerSpawn,
+    AudioSourceDesc, AuthoringComponentStates, BrushDesc, ColliderDesc, EditorVisibility,
+    HierarchySiblingIndex, HydratedPrefabMember, HydratedPrefabReady, InspectorOrder, LevelObject,
+    LightDesc, MaterialDesc, MaterialOverride, ModelRef, NavigationArea, NavigationBounds,
+    NavigationLink, NavigationObstacle, ObjectiveMarker, PhysicsBody, PlayerSpawn,
     PostProcessVolumeDesc, PrefabHydrationBlocked, PrefabInstance, PrefabRef, Primitive,
-    RigidBodyDesc, SceneComposition, StaticMeshRenderer, TeamSpawn, TriggerVolume, WeaponSpawn,
+    RigidBodyDesc, SceneComposition, SkinnedMeshRenderer, StaticMeshRenderer, TeamSpawn,
+    TriggerVolume, WeaponSpawn,
 };
 
 use crate::scene_io::{SceneIo, SceneIoRequest};
@@ -22,7 +28,10 @@ use crate::ui::selection_ops::is_mutable_level_object;
 use crate::ui::{egui_captures_keyboard_from_world, UiState};
 
 mod commands;
-pub use commands::{EditorCommand, EditorEntitySnapshot, PrefabEditState, SiblingChange};
+pub use commands::{
+    ComponentDelta, ComponentTransaction, EditorCommand, EditorEntitySnapshot,
+    NavigationComponentState, PrefabEditState, ReflectedComponentValue, SiblingChange,
+};
 
 #[derive(Resource, Debug, Default)]
 pub struct EditorHistory {
@@ -138,6 +147,7 @@ pub fn snapshot_entity(world: &World, entity: Entity) -> Option<EditorEntitySnap
         primitive: entity_ref.get::<Primitive>().cloned(),
         brush: entity_ref.get::<BrushDesc>().cloned(),
         static_mesh_renderer: entity_ref.get::<StaticMeshRenderer>().cloned(),
+        skinned_mesh_renderer: entity_ref.get::<SkinnedMeshRenderer>().cloned(),
         material: entity_ref.get::<MaterialDesc>().cloned(),
         material_override: entity_ref.get::<MaterialOverride>().cloned(),
         rigid_body: entity_ref.get::<RigidBodyDesc>().cloned(),
@@ -156,6 +166,10 @@ pub fn snapshot_entity(world: &World, entity: Entity) -> Option<EditorEntitySnap
         post_process_volume: entity_ref.get::<PostProcessVolumeDesc>().cloned(),
         team_spawn: entity_ref.get::<TeamSpawn>().cloned(),
         objective: entity_ref.get::<ObjectiveMarker>().cloned(),
+        navigation_bounds: entity_ref.get::<NavigationBounds>().cloned(),
+        navigation_obstacle: entity_ref.get::<NavigationObstacle>().cloned(),
+        navigation_area: entity_ref.get::<NavigationArea>().cloned(),
+        navigation_link: entity_ref.get::<NavigationLink>().cloned(),
         hierarchy_sibling_index: entity_ref
             .get::<HierarchySiblingIndex>()
             .map(|index| index.0)
@@ -164,6 +178,8 @@ pub fn snapshot_entity(world: &World, entity: Entity) -> Option<EditorEntitySnap
             .get::<EditorVisibility>()
             .copied()
             .unwrap_or_default(),
+        inspector_order: entity_ref.get::<InspectorOrder>().cloned(),
+        component_states: entity_ref.get::<AuthoringComponentStates>().cloned(),
         children,
     })
 }
@@ -204,6 +220,9 @@ fn spawn_snapshot_with_parent(
     if let Some(renderer) = &snapshot.static_mesh_renderer {
         entity_mut.insert(renderer.clone());
     }
+    if let Some(renderer) = &snapshot.skinned_mesh_renderer {
+        entity_mut.insert(renderer.clone());
+    }
     if let Some(material) = &snapshot.material {
         entity_mut.insert(material.clone());
     }
@@ -258,8 +277,26 @@ fn spawn_snapshot_with_parent(
     if let Some(objective) = &snapshot.objective {
         entity_mut.insert(objective.clone());
     }
+    if let Some(bounds) = &snapshot.navigation_bounds {
+        entity_mut.insert(bounds.clone());
+    }
+    if let Some(obstacle) = &snapshot.navigation_obstacle {
+        entity_mut.insert(obstacle.clone());
+    }
+    if let Some(area) = &snapshot.navigation_area {
+        entity_mut.insert(area.clone());
+    }
+    if let Some(link) = &snapshot.navigation_link {
+        entity_mut.insert(link.clone());
+    }
     entity_mut.insert(HierarchySiblingIndex(snapshot.hierarchy_sibling_index));
     entity_mut.insert(snapshot.editor_visibility);
+    if let Some(order) = &snapshot.inspector_order {
+        entity_mut.insert(order.clone());
+    }
+    if let Some(states) = &snapshot.component_states {
+        entity_mut.insert(states.clone());
+    }
     if let Some(parent) = parent {
         entity_mut.insert(ChildOf(parent));
     }
@@ -561,6 +598,31 @@ pub fn set_post_process_volume_with_history(
     );
 }
 
+pub fn navigation_component_state(world: &World, entity: Entity) -> NavigationComponentState {
+    NavigationComponentState {
+        bounds: world.get::<NavigationBounds>(entity).cloned(),
+        obstacle: world.get::<NavigationObstacle>(entity).cloned(),
+        area: world.get::<NavigationArea>(entity).cloned(),
+        link: world.get::<NavigationLink>(entity).cloned(),
+    }
+}
+
+pub fn set_navigation_with_history(
+    world: &mut World,
+    entity: Entity,
+    new: NavigationComponentState,
+) {
+    if !is_mutable_level_object(world, entity) {
+        return;
+    }
+    let old = navigation_component_state(world, entity);
+    if old == new {
+        return;
+    }
+    apply_navigation_state(world, entity, &new);
+    push_history(world, EditorCommand::SetNavigation { entity, old, new });
+}
+
 pub fn set_physics_with_history(world: &mut World, entity: Entity, new: PhysicsBody) {
     if !is_mutable_level_object(world, entity) {
         return;
@@ -818,6 +880,7 @@ pub fn group_selection_with_history(world: &mut World, entities: &[Entity]) {
         primitive: None,
         brush: None,
         static_mesh_renderer: None,
+        skinned_mesh_renderer: None,
         material: None,
         material_override: None,
         rigid_body: None,
@@ -836,8 +899,18 @@ pub fn group_selection_with_history(world: &mut World, entities: &[Entity]) {
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: next_sibling_index(world, None),
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     };
     let group = spawn_snapshot(world, &snapshot);
@@ -868,6 +941,7 @@ pub fn create_empty_child_with_history(world: &mut World, parent: Entity) {
         primitive: None,
         brush: None,
         static_mesh_renderer: None,
+        skinned_mesh_renderer: None,
         material: None,
         material_override: None,
         rigid_body: None,
@@ -886,8 +960,18 @@ pub fn create_empty_child_with_history(world: &mut World, parent: Entity) {
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: next_sibling_index(world, Some(parent)),
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     };
     let entity = spawn_snapshot_with_parent(world, &snapshot, Some(parent));
@@ -1235,6 +1319,215 @@ pub fn apply_actor_kind(world: &mut World, entity: Entity, kind: ActorKind) {
     }
 }
 
+pub const ACTOR_KIND_COMPONENT_ID: &str = "core.actor_kind";
+pub const ACTOR_KIND_TYPE_PATH: &str = "shared::components::ActorKind";
+
+/// Captures any reflected component without adding a typed history branch.
+pub fn capture_reflected_component(
+    world: &World,
+    entity: Entity,
+    component_id: &str,
+    type_path: &str,
+) -> Result<Option<ReflectedComponentValue>, String> {
+    let entity_ref = world
+        .get_entity(entity)
+        .map_err(|_| format!("entity {entity:?} no longer exists"))?;
+    let app_registry = world
+        .get_resource::<AppTypeRegistry>()
+        .ok_or_else(|| "AppTypeRegistry is unavailable".to_string())?;
+    let type_registry = app_registry.read();
+    let registration = type_registry
+        .get_with_type_path(type_path)
+        .ok_or_else(|| format!("component type `{type_path}` is not registered"))?;
+    let reflect_component = registration
+        .data::<ReflectComponent>()
+        .ok_or_else(|| format!("component `{type_path}` has no ReflectComponent adapter"))?;
+    let Some(value) = reflect_component.reflect(entity_ref) else {
+        return Ok(None);
+    };
+    let ron = ron::ser::to_string(&TypedReflectSerializer::new(value, &type_registry))
+        .map_err(|error| format!("could not serialize `{type_path}`: {error}"))?;
+    Ok(Some(ReflectedComponentValue {
+        component_id: component_id.to_string(),
+        type_path: type_path.to_string(),
+        ron,
+    }))
+}
+
+/// Applies or removes one reflected component value.
+pub fn apply_reflected_component(
+    world: &mut World,
+    entity: Entity,
+    type_path: &str,
+    value: Option<&ReflectedComponentValue>,
+) -> Result<(), String> {
+    if world.get_entity(entity).is_err() {
+        return Err(format!("entity {entity:?} no longer exists"));
+    }
+    world.resource_scope(|world, app_registry: Mut<AppTypeRegistry>| {
+        let type_registry = app_registry.read();
+        let registration = type_registry
+            .get_with_type_path(type_path)
+            .ok_or_else(|| format!("component type `{type_path}` is not registered"))?;
+        let reflect_component = registration
+            .data::<ReflectComponent>()
+            .cloned()
+            .ok_or_else(|| format!("component `{type_path}` has no ReflectComponent adapter"))?;
+        match value {
+            Some(value) => {
+                if value.type_path != type_path {
+                    return Err(format!(
+                        "clipboard type `{}` does not match `{type_path}`",
+                        value.type_path
+                    ));
+                }
+                let mut deserializer = ron::de::Deserializer::from_str(&value.ron)
+                    .map_err(|error| error.to_string())?;
+                let reflected = TypedReflectDeserializer::new(registration, &type_registry)
+                    .deserialize(&mut deserializer)
+                    .map_err(|error| error.to_string())?;
+                let exists = reflect_component.reflect(world.entity(entity)).is_some();
+                if exists {
+                    reflect_component.apply(world.entity_mut(entity), reflected.as_ref());
+                } else {
+                    reflect_component.insert(
+                        &mut world.entity_mut(entity),
+                        reflected.as_ref(),
+                        &type_registry,
+                    );
+                }
+            }
+            None => reflect_component.remove(&mut world.entity_mut(entity)),
+        }
+        Ok(())
+    })
+}
+
+/// Inserts the reflected `Default` for a registered authoring component.
+pub fn apply_reflected_default(
+    world: &mut World,
+    entity: Entity,
+    type_path: &str,
+) -> Result<(), String> {
+    world.resource_scope(|world, app_registry: Mut<AppTypeRegistry>| {
+        let type_registry = app_registry.read();
+        let registration = type_registry
+            .get_with_type_path(type_path)
+            .ok_or_else(|| format!("component type `{type_path}` is not registered"))?;
+        let reflect_component = registration
+            .data::<ReflectComponent>()
+            .cloned()
+            .ok_or_else(|| format!("component `{type_path}` has no ReflectComponent adapter"))?;
+        let default = registration
+            .data::<ReflectDefault>()
+            .ok_or_else(|| format!("component `{type_path}` has no reflected Default"))?
+            .default();
+        let exists = reflect_component.reflect(world.entity(entity)).is_some();
+        if exists {
+            reflect_component.apply(world.entity_mut(entity), default.as_ref());
+        } else {
+            reflect_component.insert(
+                &mut world.entity_mut(entity),
+                default.as_ref(),
+                &type_registry,
+            );
+        }
+        Ok(())
+    })
+}
+
+pub fn sync_actor_kind_hint(world: &mut World, entity: Entity) {
+    let kind = world
+        .get_entity(entity)
+        .ok()
+        .and_then(infer_actor_kind)
+        .unwrap_or(ActorKind::Empty);
+    if let Ok(mut entity_mut) = world.get_entity_mut(entity) {
+        entity_mut.insert(kind);
+    }
+}
+
+/// Executes one atomic reflected component edit and records all changed values,
+/// including the derived ActorKind presentation hint, as a single history item.
+pub fn reflected_component_transaction(
+    world: &mut World,
+    entity: Entity,
+    label: &'static str,
+    component_id: &str,
+    type_path: &str,
+    edit: impl FnOnce(&mut World, Entity) -> Result<(), String>,
+) -> Result<(), String> {
+    if !is_mutable_level_object(world, entity) {
+        return Err("actor is not editable".to_string());
+    }
+    let tracked = [
+        (component_id, type_path),
+        (ACTOR_KIND_COMPONENT_ID, ACTOR_KIND_TYPE_PATH),
+    ];
+    let before = tracked
+        .iter()
+        .map(|(id, path)| capture_reflected_component(world, entity, id, path))
+        .collect::<Result<Vec<_>, _>>()?;
+    if let Err(error) = edit(world, entity) {
+        for ((_, path), value) in tracked.iter().zip(before.iter()) {
+            let _ = apply_reflected_component(world, entity, path, value.as_ref());
+        }
+        return Err(error);
+    }
+    sync_actor_kind_hint(world, entity);
+    let after = tracked
+        .iter()
+        .map(|(id, path)| capture_reflected_component(world, entity, id, path))
+        .collect::<Result<Vec<_>, _>>()?;
+    let deltas = tracked
+        .iter()
+        .zip(before)
+        .zip(after)
+        .filter_map(|(((id, path), before), after)| {
+            (before != after).then(|| ComponentDelta {
+                component_id: (*id).to_string(),
+                type_path: (*path).to_string(),
+                before,
+                after,
+            })
+        })
+        .collect::<Vec<_>>();
+    if !deltas.is_empty() {
+        push_history(
+            world,
+            EditorCommand::ComponentTransaction(ComponentTransaction {
+                entity,
+                label,
+                deltas,
+            }),
+        );
+    }
+    Ok(())
+}
+
+fn apply_component_transaction(
+    world: &mut World,
+    transaction: &ComponentTransaction,
+    use_after: bool,
+) {
+    for delta in &transaction.deltas {
+        let value = if use_after {
+            delta.after.as_ref()
+        } else {
+            delta.before.as_ref()
+        };
+        if let Err(error) =
+            apply_reflected_component(world, transaction.entity, &delta.type_path, value)
+        {
+            world.resource_mut::<EditorHistory>().status = format!(
+                "{} partially failed for {}: {error}",
+                transaction.label, delta.component_id
+            );
+            break;
+        }
+    }
+}
+
 pub fn set_scene_composition_with_history(world: &mut World, new: SceneComposition) {
     let old = world.resource::<SceneComposition>().clone();
     if old == new {
@@ -1372,6 +1665,9 @@ fn undo_command(world: &mut World, command: &mut EditorCommand) {
         EditorCommand::SetPostProcessVolume { entity, old, .. } => {
             apply_post_process_volume(world, *entity, old);
         }
+        EditorCommand::SetNavigation { entity, old, .. } => {
+            apply_navigation_state(world, *entity, old);
+        }
         EditorCommand::SetPhysics { entity, old, .. } => {
             apply_physics(world, *entity, old);
         }
@@ -1485,6 +1781,9 @@ fn undo_command(world: &mut World, command: &mut EditorCommand) {
         EditorCommand::RemoveComponent { entity, snapshot } => {
             apply_authored_components(world, *entity, snapshot);
         }
+        EditorCommand::ComponentTransaction(transaction) => {
+            apply_component_transaction(world, transaction, false);
+        }
     }
 }
 
@@ -1573,6 +1872,9 @@ fn redo_command(world: &mut World, command: &mut EditorCommand) {
                 entity_mut.insert(new.clone());
             }
         }
+        EditorCommand::SetNavigation { entity, new, .. } => {
+            apply_navigation_state(world, *entity, new);
+        }
         EditorCommand::SetPhysics { entity, new, .. } => {
             if let Ok(mut entity_mut) = world.get_entity_mut(*entity) {
                 entity_mut.insert(new.clone());
@@ -1706,6 +2008,9 @@ fn redo_command(world: &mut World, command: &mut EditorCommand) {
         EditorCommand::RemoveComponent { entity, snapshot } => {
             remove_authored_components(world, *entity, snapshot);
         }
+        EditorCommand::ComponentTransaction(transaction) => {
+            apply_component_transaction(world, transaction, true);
+        }
     }
 }
 
@@ -1862,6 +2167,45 @@ fn apply_post_process_volume(
     }
 }
 
+fn apply_navigation_state(world: &mut World, entity: Entity, state: &NavigationComponentState) {
+    let has_navigation = state.bounds.is_some()
+        || state.obstacle.is_some()
+        || state.area.is_some()
+        || state.link.is_some();
+    if let Ok(mut entity_mut) = world.get_entity_mut(entity) {
+        entity_mut
+            .remove::<NavigationBounds>()
+            .remove::<NavigationObstacle>()
+            .remove::<NavigationArea>()
+            .remove::<NavigationLink>();
+        if let Some(value) = &state.bounds {
+            entity_mut.insert(value.clone());
+        }
+        if let Some(value) = &state.obstacle {
+            entity_mut.insert(value.clone());
+        }
+        if let Some(value) = &state.area {
+            entity_mut.insert(value.clone());
+        }
+        if let Some(value) = &state.link {
+            entity_mut.insert(value.clone());
+        }
+        if has_navigation {
+            entity_mut.insert(ActorKind::Navigation);
+        }
+    }
+    if !has_navigation {
+        let fallback = world
+            .get_entity(entity)
+            .ok()
+            .and_then(infer_actor_kind)
+            .unwrap_or(ActorKind::Empty);
+        if let Ok(mut entity_mut) = world.get_entity_mut(entity) {
+            entity_mut.insert(fallback);
+        }
+    }
+}
+
 fn apply_physics(world: &mut World, entity: Entity, physics: &Option<PhysicsBody>) {
     if let Ok(mut entity_mut) = world.get_entity_mut(entity) {
         match physics {
@@ -1986,6 +2330,9 @@ fn apply_authored_components(world: &mut World, entity: Entity, snapshot: &Edito
         if let Some(v) = &snapshot.static_mesh_renderer {
             entity_mut.insert(v.clone());
         }
+        if let Some(v) = &snapshot.skinned_mesh_renderer {
+            entity_mut.insert(v.clone());
+        }
         if let Some(v) = &snapshot.material {
             entity_mut.insert(v.clone());
         }
@@ -2040,6 +2387,24 @@ fn apply_authored_components(world: &mut World, entity: Entity, snapshot: &Edito
         if let Some(v) = &snapshot.objective {
             entity_mut.insert(v.clone());
         }
+        if let Some(v) = &snapshot.navigation_bounds {
+            entity_mut.insert(v.clone());
+        }
+        if let Some(v) = &snapshot.navigation_obstacle {
+            entity_mut.insert(v.clone());
+        }
+        if let Some(v) = &snapshot.navigation_area {
+            entity_mut.insert(v.clone());
+        }
+        if let Some(v) = &snapshot.navigation_link {
+            entity_mut.insert(v.clone());
+        }
+        if let Some(v) = &snapshot.inspector_order {
+            entity_mut.insert(v.clone());
+        }
+        if let Some(v) = &snapshot.component_states {
+            entity_mut.insert(v.clone());
+        }
     }
 }
 
@@ -2061,6 +2426,9 @@ fn remove_authored_components(world: &mut World, entity: Entity, snapshot: &Edit
         if snapshot.static_mesh_renderer.is_some() {
             entity_mut.remove::<StaticMeshRenderer>();
         }
+        if snapshot.skinned_mesh_renderer.is_some() {
+            entity_mut.remove::<SkinnedMeshRenderer>();
+        }
         if snapshot.material.is_some() {
             entity_mut.remove::<MaterialDesc>();
         }
@@ -2115,6 +2483,24 @@ fn remove_authored_components(world: &mut World, entity: Entity, snapshot: &Edit
         if snapshot.objective.is_some() {
             entity_mut.remove::<ObjectiveMarker>();
         }
+        if snapshot.navigation_bounds.is_some() {
+            entity_mut.remove::<NavigationBounds>();
+        }
+        if snapshot.navigation_obstacle.is_some() {
+            entity_mut.remove::<NavigationObstacle>();
+        }
+        if snapshot.navigation_area.is_some() {
+            entity_mut.remove::<NavigationArea>();
+        }
+        if snapshot.navigation_link.is_some() {
+            entity_mut.remove::<NavigationLink>();
+        }
+        if snapshot.inspector_order.is_some() {
+            entity_mut.remove::<InspectorOrder>();
+        }
+        if snapshot.component_states.is_some() {
+            entity_mut.remove::<AuthoringComponentStates>();
+        }
     }
     if removed_dedicated_audio_kind {
         let fallback = world
@@ -2383,6 +2769,88 @@ mod tests {
     use crate::operators::test_harness::{assert_undo_redo_round_trip, OperatorInvariantHarness};
     use crate::operators::{ActiveOperator, OperatorPhase, OperatorStatus};
 
+    #[derive(Component, Reflect, Default, Debug, Clone, PartialEq)]
+    #[reflect(Component, Default)]
+    struct StaticExtensionFixture {
+        value: u32,
+    }
+
+    #[test]
+    fn reflected_extension_component_transaction_round_trips_atomically() {
+        let mut app = App::new();
+        app.register_type::<ActorKind>()
+            .register_type::<StaticExtensionFixture>();
+        let world = app.world_mut();
+        world.init_resource::<EditorHistory>();
+        world.init_resource::<SceneIo>();
+        let entity = world
+            .spawn((LevelObject, ActorKind::Light, Transform::default()))
+            .id();
+        let type_path = std::any::type_name::<StaticExtensionFixture>();
+
+        reflected_component_transaction(
+            world,
+            entity,
+            "Add Fixture",
+            "game.static_extension_fixture",
+            type_path,
+            |world, entity| {
+                world
+                    .entity_mut(entity)
+                    .insert(StaticExtensionFixture { value: 42 });
+                Ok(())
+            },
+        )
+        .unwrap();
+
+        assert_eq!(
+            world.get::<StaticExtensionFixture>(entity).unwrap().value,
+            42
+        );
+        assert_eq!(world.get::<ActorKind>(entity), Some(&ActorKind::Empty));
+        assert_eq!(world.resource::<EditorHistory>().undo_depth(), 1);
+
+        apply_command_undo(world);
+        assert!(world.get::<StaticExtensionFixture>(entity).is_none());
+        assert_eq!(world.get::<ActorKind>(entity), Some(&ActorKind::Light));
+
+        apply_command_redo(world);
+        assert_eq!(
+            world.get::<StaticExtensionFixture>(entity).unwrap().value,
+            42
+        );
+        assert_eq!(world.get::<ActorKind>(entity), Some(&ActorKind::Empty));
+    }
+
+    #[test]
+    fn snapshots_preserve_component_order_and_independent_active_state() {
+        let mut world = World::new();
+        let mut order = InspectorOrder::default();
+        order.component_ids = vec![shared::AUTHORING_COMPONENT_LIGHT.to_string()];
+        let mut states = AuthoringComponentStates::default();
+        states.set_component_active(shared::COMPONENT_LIGHT_DESC, false);
+        let entity = world
+            .spawn((
+                LevelObject,
+                ActorKind::Light,
+                Transform::default(),
+                LightDesc::default(),
+                order.clone(),
+                states.clone(),
+            ))
+            .id();
+
+        let snapshot = snapshot_entity(&world, entity).unwrap();
+        world.entity_mut(entity).despawn();
+        let restored = spawn_snapshot(&mut world, &snapshot);
+
+        assert_eq!(world.get::<InspectorOrder>(restored), Some(&order));
+        assert_eq!(
+            world.get::<AuthoringComponentStates>(restored),
+            Some(&states)
+        );
+    }
+
     fn animation_controller(state_id: &str, crossfade_seconds: f32) -> AnimationControllerDesc {
         AnimationControllerDesc {
             skeleton: Some(
@@ -2420,7 +2888,7 @@ mod tests {
         let entity = world
             .spawn((
                 LevelObject,
-                ActorKind::ImportedModel,
+                ActorKind::SkinnedMesh,
                 Transform::IDENTITY,
                 old.clone(),
             ))
@@ -2439,6 +2907,36 @@ mod tests {
         assert_eq!(world.get::<AnimationControllerDesc>(entity), Some(&new));
     }
 
+    #[test]
+    fn navigation_component_history_round_trips_and_preserves_kind() {
+        let mut world = World::new();
+        world.init_resource::<EditorHistory>();
+        world.init_resource::<SceneIo>();
+        let entity = world
+            .spawn((LevelObject, ActorKind::Empty, Transform::IDENTITY))
+            .id();
+        let bounds = NavigationBounds::default();
+
+        set_navigation_with_history(
+            &mut world,
+            entity,
+            NavigationComponentState {
+                bounds: Some(bounds.clone()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(world.get::<NavigationBounds>(entity), Some(&bounds));
+        assert_eq!(world.get::<ActorKind>(entity), Some(&ActorKind::Navigation));
+
+        apply_command_undo(&mut world);
+        assert!(world.get::<NavigationBounds>(entity).is_none());
+        assert_eq!(world.get::<ActorKind>(entity), Some(&ActorKind::Empty));
+
+        apply_command_redo(&mut world);
+        assert_eq!(world.get::<NavigationBounds>(entity), Some(&bounds));
+        assert_eq!(world.get::<ActorKind>(entity), Some(&ActorKind::Navigation));
+    }
+
     #[test]
     fn undoing_a_new_animation_controller_removes_the_component() {
         let mut world = World::new();
@@ -2446,7 +2944,7 @@ mod tests {
         world.init_resource::<SceneIo>();
         let controller = animation_controller("idle", 0.2);
         let entity = world
-            .spawn((LevelObject, ActorKind::ImportedModel, Transform::IDENTITY))
+            .spawn((LevelObject, ActorKind::SkinnedMesh, Transform::IDENTITY))
             .id();
 
         set_animation_controller_with_history(&mut world, entity, controller.clone());
@@ -2467,9 +2965,10 @@ mod tests {
         let source = world
             .spawn((
                 LevelObject,
-                ActorKind::ImportedModel,
+                ActorKind::SkinnedMesh,
                 Name::new("Animated Robot"),
                 Transform::from_xyz(1.0, 2.0, 3.0),
+                SkinnedMeshRenderer::new("assets/models/robot.glb").with_asset_id("robot-asset"),
                 controller.clone(),
             ))
             .id();
@@ -2486,6 +2985,10 @@ mod tests {
             world.get::<Name>(respawned).map(Name::as_str),
             Some("Animated Robot")
         );
+        assert_eq!(
+            world.get::<SkinnedMeshRenderer>(respawned),
+            Some(&SkinnedMeshRenderer::new("assets/models/robot.glb").with_asset_id("robot-asset"))
+        );
     }
 
     #[test]
diff --git a/crates/editor/src/play/session.rs b/crates/editor/src/play/session.rs
index 1b44049..40f0447 100644
--- a/crates/editor/src/play/session.rs
+++ b/crates/editor/src/play/session.rs
@@ -6,7 +6,10 @@ use bevy::window::WindowRef;
 use game::player::PlayerCamera;
 use protocol::PlayerInputIntent;
 use settings::SimTuning;
-use shared::{inspector_component_active, InspectorOrder, PlayerSpawn, COMPONENT_PLAYER_SPAWN};
+use shared::{
+    authoring_component_active, AuthoringComponentStates, InspectorOrder, PlayerSpawn,
+    COMPONENT_PLAYER_SPAWN,
+};
 use sim::{Crouching, Grounded, JumpState, Player, PlayerVelocity};
 
 use crate::render_target::ViewportRenderTarget;
@@ -66,10 +69,16 @@ fn bootstrap_player_on_play(world: &mut World) {
         .unwrap_or_else(|| SimTuning::from_physics(&settings::PhysicsSettings::default()));
 
     let spawn = world
-        .query_filtered::<(&Transform, Option<&InspectorOrder>), With<PlayerSpawn>>()
+        .query_filtered::<(
+            &Transform,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ), With<PlayerSpawn>>()
         .iter(world)
-        .filter(|(_, order)| inspector_component_active(*order, COMPONENT_PLAYER_SPAWN))
-        .map(|(transform, _)| transform)
+        .filter(|(_, states, legacy_order)| {
+            authoring_component_active(*states, *legacy_order, COMPONENT_PLAYER_SPAWN)
+        })
+        .map(|(transform, _, _)| transform)
         .next()
         .copied()
         .unwrap_or_else(default_player_spawn);
diff --git a/crates/editor/src/project/settings_ui.rs b/crates/editor/src/project/settings_ui.rs
index 2c02b3b..8977b55 100644
--- a/crates/editor/src/project/settings_ui.rs
+++ b/crates/editor/src/project/settings_ui.rs
@@ -377,7 +377,11 @@ fn apply_project_settings_changes(
     settings: Res<ProjectSettings>,
     tuning: ResMut<settings::SimTuning>,
     scene_suns: Query<
-        (&shared::LightDesc, Option<&shared::InspectorOrder>),
+        (
+            &shared::LightDesc,
+            Option<&shared::AuthoringComponentStates>,
+            Option<&shared::InspectorOrder>,
+        ),
         With<shared::LevelObject>,
     >,
     project_suns: Query<(&mut DirectionalLight, &mut Visibility), With<shared::ProjectSun>>,
diff --git a/crates/editor/src/scene/scene_io.rs b/crates/editor/src/scene/scene_io.rs
index bbf60af..4714f98 100644
--- a/crates/editor/src/scene/scene_io.rs
+++ b/crates/editor/src/scene/scene_io.rs
@@ -6,17 +6,19 @@ use bevy::ecs::system::SystemState;
 use bevy::prelude::*;
 use bevy::window::PrimaryWindow;
 use bevy::world_serialization::serde::WorldDeserializer;
-use bevy::world_serialization::{DynamicWorld, DynamicWorldBuilder, WorldInstance};
+use bevy::world_serialization::{DynamicWorld, DynamicWorldBuilder, WorldFilter, WorldInstance};
 use scene::{document::SceneDocument, strip_schema_version, validate_level_text};
 use serde::de::DeserializeSeed;
 use shared::{
     infer_actor_kind, validate_actor, ActorId, ActorKind, ActorName, ActorValidationError,
-    AnimationControllerDesc, AudioListenerDesc, AudioSourceDesc, BrushDesc, ColliderDesc,
-    EditorVisibility, HierarchySiblingIndex, HydratedPrefabMember, HydratedPrefabReady,
-    InspectorOrder, LevelObject, LightDesc, MaterialDesc, MaterialOverride, ModelRef,
-    ObjectiveMarker, PhysicsBody, PlayerSpawn, PostProcessVolumeDesc, PrefabHydrationBlocked,
-    PrefabInstance, PrefabRef, Primitive, RigidBodyDesc, SceneComposition, StaticMeshRenderer,
-    TeamSpawn, TriggerVolume, WeaponSpawn,
+    AuthoringComponentStates, EditorVisibility, HierarchySiblingIndex, HydratedPrefabMember,
+    HydratedPrefabReady, InspectorOrder, LevelObject, LightDesc, PrefabHydrationBlocked,
+    PrefabInstance, PrefabRef, SceneComposition,
+};
+
+#[cfg(test)]
+use shared::{
+    AnimationControllerDesc, AudioSourceDesc, BrushDesc, ColliderDesc, SkinnedMeshRenderer,
 };
 
 use crate::assets::{import_external_assets, EditorAssets, IMPORTABLE_ASSET_EXTENSIONS};
@@ -1006,6 +1008,27 @@ fn format_actor_validation(err: ActorValidationError) -> String {
         ActorValidationError::ImportedModelHasStaticMeshRenderer => {
             "Save failed: ImportedModel actor cannot have StaticMeshRenderer".into()
         }
+        ActorValidationError::SkinnedMeshMissingRenderer => {
+            "Save failed: SkinnedMesh actor requires SkinnedMeshRenderer".into()
+        }
+        ActorValidationError::SkinnedMeshInvalidRenderer => {
+            "Save failed: SkinnedMeshRenderer requires a model source path".into()
+        }
+        ActorValidationError::SkinnedMeshHasPrimitive => {
+            "Save failed: SkinnedMesh actor cannot have Primitive".into()
+        }
+        ActorValidationError::SkinnedMeshHasStaticMeshRenderer => {
+            "Save failed: SkinnedMesh actor cannot have StaticMeshRenderer".into()
+        }
+        ActorValidationError::SkinnedMeshHasModelRef => {
+            "Save failed: SkinnedMesh actor cannot have ModelRef".into()
+        }
+        ActorValidationError::SkinnedMeshRendererActorKindMismatch => {
+            "Save failed: SkinnedMeshRenderer requires ActorKind::SkinnedMesh".into()
+        }
+        ActorValidationError::ConflictingGeometrySources => {
+            "Save failed: actor has more than one primary geometry source component".into()
+        }
         ActorValidationError::LightMissingLightDesc => {
             "Save failed: Light actor requires LightDesc".into()
         }
@@ -1048,8 +1071,9 @@ fn format_actor_validation(err: ActorValidationError) -> String {
         ActorValidationError::AudioListenerInvalidEarGap => {
             "Save failed: audio listener ear gap must be positive and finite".into()
         }
-        ActorValidationError::AnimationControllerMissingModelRef => {
-            "Save failed: animation controller requires ModelRef on the same actor".into()
+        ActorValidationError::AnimationControllerMissingSkinnedMeshRenderer => {
+            "Save failed: animation controller requires SkinnedMeshRenderer on the same actor"
+                .into()
         }
         ActorValidationError::AnimationControllerMissingSkeleton => {
             "Save failed: animation controller requires an assigned skeleton".into()
@@ -1093,6 +1117,9 @@ fn format_actor_validation(err: ActorValidationError) -> String {
         ActorValidationError::PostProcessVolumeInvalidOverrideScalar => {
             "Save failed: post-process volume override contains invalid scalar".into()
         }
+        ActorValidationError::InvalidNavigation(message) => {
+            format!("Save failed: invalid navigation authoring: {message}")
+        }
     }
 }
 
@@ -1179,39 +1206,26 @@ fn serialize_entities_inner_with_resources(
     let result = (|| {
         let ron = {
             let registry = world.resource::<AppTypeRegistry>().read();
+            let mut component_filter = WorldFilter::deny_all()
+                .allow::<Name>()
+                .allow::<Transform>()
+                .allow::<ChildOf>()
+                .allow::<LevelObject>()
+                .allow::<ActorId>()
+                .allow::<ActorName>()
+                .allow::<HierarchySiblingIndex>()
+                .allow::<EditorVisibility>();
+            let component_registry = world
+                .get_resource::<crate::ui::component_registry::EditorComponentRegistry>()
+                .cloned()
+                .unwrap_or_default();
+            for descriptor in &component_registry.descriptors {
+                if let Some(registration) = registry.get_with_type_path(descriptor.type_name) {
+                    component_filter = component_filter.allow_by_id(registration.type_id());
+                }
+            }
             let builder = DynamicWorldBuilder::from_world(world, &registry)
-                .deny_all()
-                .allow_component::<Name>()
-                .allow_component::<Transform>()
-                .allow_component::<ChildOf>()
-                .allow_component::<LevelObject>()
-                .allow_component::<ActorId>()
-                .allow_component::<ActorName>()
-                .allow_component::<ActorKind>()
-                .allow_component::<InspectorOrder>()
-                .allow_component::<Primitive>()
-                .allow_component::<BrushDesc>()
-                .allow_component::<StaticMeshRenderer>()
-                .allow_component::<MaterialDesc>()
-                .allow_component::<MaterialOverride>()
-                .allow_component::<RigidBodyDesc>()
-                .allow_component::<ColliderDesc>()
-                .allow_component::<PhysicsBody>()
-                .allow_component::<LightDesc>()
-                .allow_component::<AnimationControllerDesc>()
-                .allow_component::<AudioSourceDesc>()
-                .allow_component::<AudioListenerDesc>()
-                .allow_component::<PlayerSpawn>()
-                .allow_component::<ModelRef>()
-                .allow_component::<PrefabRef>()
-                .allow_component::<PrefabInstance>()
-                .allow_component::<WeaponSpawn>()
-                .allow_component::<TriggerVolume>()
-                .allow_component::<PostProcessVolumeDesc>()
-                .allow_component::<TeamSpawn>()
-                .allow_component::<ObjectiveMarker>()
-                .allow_component::<HierarchySiblingIndex>()
-                .allow_component::<EditorVisibility>()
+                .with_component_filter(component_filter)
                 .extract_entities(entities.into_iter());
             let scene = if include_scene_resources {
                 builder
@@ -1781,7 +1795,14 @@ fn finalize_scene_load(world: &mut World) {
 
     let mut state: SystemState<(
         Res<settings::ProjectSettings>,
-        Query<(&LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
+        Query<
+            (
+                &LightDesc,
+                Option<&AuthoringComponentStates>,
+                Option<&InspectorOrder>,
+            ),
+            With<LevelObject>,
+        >,
         Query<(&mut DirectionalLight, &mut Visibility), With<shared::ProjectSun>>,
     )> = SystemState::new(world);
 
@@ -1801,10 +1822,8 @@ fn backfill_missing_actor_kinds(world: &mut World) {
         let Ok(entity_ref) = world.get_entity(entity) else {
             continue;
         };
-        if entity_ref.get::<ActorKind>().is_some() {
-            continue;
-        }
-        if let Some(kind) = infer_actor_kind(entity_ref) {
+        let current = entity_ref.get::<ActorKind>().copied();
+        if let Some(kind) = infer_actor_kind(entity_ref).filter(|kind| current != Some(*kind)) {
             world.entity_mut(entity).insert(kind);
         }
     }
@@ -1856,6 +1875,12 @@ mod tests {
 
     struct NoAssetLoads;
 
+    #[derive(Component, Reflect, Default)]
+    #[reflect(Component, Default)]
+    struct RegisteredSceneExtension {
+        value: u32,
+    }
+
     impl LoadFromPath for NoAssetLoads {
         fn load_from_path_erased(
             &mut self,
@@ -1866,6 +1891,43 @@ mod tests {
         }
     }
 
+    #[test]
+    fn registry_registered_extension_is_included_in_scene_persistence() {
+        let mut app = App::new();
+        app.register_type::<Name>()
+            .register_type::<Transform>()
+            .register_type::<LevelObject>()
+            .register_type::<ActorKind>()
+            .register_type::<SceneComposition>()
+            .register_type::<RegisteredSceneExtension>();
+        let mut component_registry =
+            crate::ui::component_registry::EditorComponentRegistry::default();
+        let mut descriptor = component_registry.descriptors[0].clone();
+        descriptor.id = "game.registered_scene_extension";
+        descriptor.type_name = std::any::type_name::<RegisteredSceneExtension>();
+        descriptor.display_name = "Registered Scene Extension";
+        descriptor.recommended = &[];
+        descriptor.conflicts_with = &[];
+        component_registry.register(descriptor).unwrap();
+        app.insert_resource(component_registry);
+        app.insert_resource(SceneComposition::default());
+        let entity = app
+            .world_mut()
+            .spawn((
+                Name::new("Extension"),
+                Transform::default(),
+                LevelObject,
+                ActorKind::Empty,
+                RegisteredSceneExtension { value: 73 },
+            ))
+            .id();
+
+        let text = serialize_entities_inner(app.world_mut(), vec![entity]).unwrap();
+
+        assert!(text.contains(std::any::type_name::<RegisteredSceneExtension>()));
+        assert!(text.contains("value: 73") || text.contains("value:73"));
+    }
+
     #[test]
     fn restored_recovery_remains_available_until_save_or_discard() {
         let authored = PathBuf::from("assets/levels/authored.scn.ron");
@@ -2152,8 +2214,8 @@ mod tests {
                 Transform::IDENTITY,
                 LevelObject,
                 ActorId::new("animated-model"),
-                ActorKind::ImportedModel,
-                ModelRef::new(source_path),
+                ActorKind::SkinnedMesh,
+                SkinnedMeshRenderer::new(source_path),
                 controller.clone(),
                 AnimationPlayer::default(),
                 AnimationGraphHandle::default(),
@@ -2171,6 +2233,8 @@ mod tests {
         let decoded: AnimationControllerDesc = ron::from_str(&component.ron).unwrap();
 
         assert_eq!(decoded, controller);
+        assert!(text.contains("shared::animation::SkinnedMeshRenderer"));
+        assert!(!text.contains("shared::components::ModelRef"));
         assert!(!text.contains("AnimationPlayer"));
         assert!(!text.contains("AnimationGraphHandle"));
         assert!(!text.contains("AnimationTransitions"));
diff --git a/crates/editor/src/ui/actor_inspector/mod.rs b/crates/editor/src/ui/actor_inspector/mod.rs
index a1cd786..c9b1e86 100644
--- a/crates/editor/src/ui/actor_inspector/mod.rs
+++ b/crates/editor/src/ui/actor_inspector/mod.rs
@@ -5,7 +5,7 @@ mod transform;
 use bevy::prelude::*;
 use bevy_egui::egui;
 use egui_phosphor_icons::icons;
-use shared::{ActorId, ActorKind, ActorName, HydratedPrefabMember, LevelObject};
+use shared::{infer_actor_kind, ActorId, ActorKind, ActorName, HydratedPrefabMember, LevelObject};
 
 use crate::ext::extensibility::ActorInspectorSectionRegistry;
 use crate::ui::inspector;
@@ -29,9 +29,8 @@ pub fn draw_actor_inspector(world: &mut World, ui: &mut egui::Ui, entity: Entity
         return;
     }
 
-    let kind = entity_ref
-        .get::<ActorKind>()
-        .copied()
+    let kind = infer_actor_kind(entity_ref)
+        .or_else(|| entity_ref.get::<ActorKind>().copied())
         .unwrap_or(ActorKind::Empty);
 
     egui::Frame::new()
@@ -111,6 +110,7 @@ pub fn draw_actor_inspector(world: &mut World, ui: &mut egui::Ui, entity: Entity
 
                 match kind {
                     ActorKind::StaticMesh
+                    | ActorKind::SkinnedMesh
                     | ActorKind::Brush
                     | ActorKind::ImportedModel
                     | ActorKind::Light
@@ -123,7 +123,8 @@ pub fn draw_actor_inspector(world: &mut World, ui: &mut egui::Ui, entity: Entity
                     | ActorKind::TeamSpawn
                     | ActorKind::Objective
                     | ActorKind::AudioSource
-                    | ActorKind::AudioListener => {
+                    | ActorKind::AudioListener
+                    | ActorKind::Navigation => {
                         inspector::authoring_inspector_ui(world, ui, entity);
                     }
                 }
@@ -139,7 +140,10 @@ pub fn draw_actor_inspector(world: &mut World, ui: &mut egui::Ui, entity: Entity
 
 fn actor_icon(kind: ActorKind) -> egui_phosphor_icons::Icon {
     match kind {
-        ActorKind::StaticMesh | ActorKind::Brush | ActorKind::ImportedModel => icons::CUBE,
+        ActorKind::StaticMesh
+        | ActorKind::SkinnedMesh
+        | ActorKind::Brush
+        | ActorKind::ImportedModel => icons::CUBE,
         ActorKind::Light => icons::LIGHTBULB,
         ActorKind::PrefabAnchor => icons::PACKAGE,
         ActorKind::PlayerSpawn => icons::PERSON_SIMPLE_RUN,
@@ -149,6 +153,7 @@ fn actor_icon(kind: ActorKind) -> egui_phosphor_icons::Icon {
         ActorKind::TeamSpawn | ActorKind::Objective => icons::FLAG,
         ActorKind::AudioSource => icons::SPEAKER_HIGH,
         ActorKind::AudioListener => icons::HEADPHONES,
+        ActorKind::Navigation => icons::PATH,
         ActorKind::Empty => icons::CIRCLE,
     }
 }
diff --git a/crates/editor/src/ui/animation_inspector.rs b/crates/editor/src/ui/animation_inspector.rs
index bbe7bf9..46db655 100644
--- a/crates/editor/src/ui/animation_inspector.rs
+++ b/crates/editor/src/ui/animation_inspector.rs
@@ -7,7 +7,7 @@ use bevy_egui::egui;
 use egui_phosphor_icons::icons;
 use shared::{
     AnimationClipRecord, AnimationControllerDesc, AnimationManifest, AnimationSkeletonRecord,
-    AnimationStateDesc, EditorAssetRef, ModelRef, COMPONENT_ANIMATION_CONTROLLER_DESC,
+    AnimationStateDesc, EditorAssetRef, SkinnedMeshRenderer, COMPONENT_ANIMATION_CONTROLLER_DESC,
 };
 
 use crate::assets::animation::load_animation_manifest;
@@ -656,8 +656,8 @@ fn manifest_summary(ui: &mut egui::Ui, manifest: &Result<AnimationManifest, Stri
 
 fn manifest_for_actor(world: &World, entity: Entity) -> Result<AnimationManifest, String> {
     let model = world
-        .get::<ModelRef>(entity)
-        .ok_or_else(|| "actor has no ModelRef".to_string())?;
+        .get::<SkinnedMeshRenderer>(entity)
+        .ok_or_else(|| "actor has no SkinnedMeshRenderer".to_string())?;
     let registry = world
         .get_resource::<AssetRegistry>()
         .ok_or_else(|| "asset registry is unavailable".to_string())?;
@@ -878,6 +878,7 @@ mod tests {
             schema_version: 1,
             asset_id: "model-id".into(),
             label: "Robot".into(),
+            default_animation_clip_id: None,
             source: AnimationManifestSource {
                 path: "assets/models/robot.glb".into(),
                 format: "glb".into(),
diff --git a/crates/editor/src/ui/asset_browser/panel.rs b/crates/editor/src/ui/asset_browser/panel.rs
index eef2988..0d7fabb 100644
--- a/crates/editor/src/ui/asset_browser/panel.rs
+++ b/crates/editor/src/ui/asset_browser/panel.rs
@@ -10,9 +10,10 @@ use bevy_egui::egui;
 use bevy_inspector_egui::bevy_inspector::hierarchy::SelectedEntities;
 use egui_phosphor_icons::{icons, Icon};
 use shared::{
-    ColorDesc, EditorAssetRef, MaterialAsset, MaterialDesc, MaterialParameter,
-    MaterialParameterValue, MaterialShaderKind, MaterialTextureBinding, ShaderPropertyDesc,
-    ShaderPropertyType, ShaderSchemaAsset,
+    ColorDesc, EditorAssetRef, MaterialAlphaMode, MaterialAsset, MaterialDesc,
+    MaterialInstanceAsset, MaterialParameter, MaterialParameterValue, MaterialRef,
+    MaterialShaderKind, MaterialTextureBinding, ShaderPropertyDesc, ShaderPropertyType,
+    ShaderSchemaAsset,
 };
 
 use crate::assets::{
@@ -23,11 +24,12 @@ use crate::scene_io::{SceneIo, SceneIoRequest};
 
 use super::state::{
     AssetBrowserUiState, AssetBrowserView, AssetDeleteRequest, AssetKindFilter, AssetSort,
-    ImportSettingsDraft, MaterialAssetDraft,
+    ImportSettingsDraft, MaterialAssetDraft, MaterialInstanceAssetDraft,
 };
 use crate::asset_db::{
-    find_asset_by_path, find_asset_mut_by_path, save_registry, update_import_settings,
-    ImportSettings, MaterialImportPolicy, ModelHierarchyMode, ModelPlacementMode,
+    ensure_asset_record, find_asset_by_path, find_asset_mut_by_path, save_registry,
+    update_import_settings, ImportSettings, MaterialImportPolicy, ModelHierarchyMode,
+    ModelPlacementMode,
 };
 use crate::assets::animation::load_animation_manifest;
 use crate::assets::operators::{
@@ -83,7 +85,29 @@ struct EmbeddedAsset {
     thumbnail_key: String,
     mesh_label: Option<String>,
     material_label: Option<String>,
-    requires_scene_instance: bool,
+    requires_skinned_hierarchy: bool,
+}
+
+#[derive(Clone, Debug)]
+struct MaterialTextureCandidate {
+    label: String,
+    detail: String,
+    path: String,
+    reference: EditorAssetRef,
+    selection: AssetSelection,
+}
+
+#[derive(Clone, Copy)]
+enum TextureSlotSelection<'a> {
+    Path(Option<&'a str>),
+    Reference(Option<&'a EditorAssetRef>),
+}
+
+#[derive(Default)]
+struct TextureSlotResponse {
+    selected: Option<MaterialTextureCandidate>,
+    clear: bool,
+    accepted_drop: bool,
 }
 
 fn fit_width(ui: &egui::Ui, min: f32, max: f32) -> f32 {
@@ -352,12 +376,18 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
         .static_mesh_manifest_path
         .as_deref()
         .and_then(|path| load_static_mesh_manifest(path).ok());
-    let skinned_primitives = crate::assets::gltf_skinned_primitive_labels(parent_path.as_str());
+    let legacy_skinned_primitives = static_manifest
+        .as_ref()
+        .filter(|manifest| manifest.schema_version < 2)
+        .map(|_| crate::assets::gltf_skinned_primitive_labels(parent_path.as_str()))
+        .unwrap_or_default();
     if let Some(manifest) = static_manifest.as_ref() {
         for part in &manifest.parts {
             let mesh_id = part_effective_id(part);
             let material_label = part.material_label.clone();
-            let requires_scene_instance = skinned_primitives.contains(&part.mesh_label);
+            let requires_skinned_hierarchy = manifest.metadata.animation_count > 0
+                || part.skinned
+                || legacy_skinned_primitives.contains(&part.mesh_label);
             embedded.push(EmbeddedAsset {
                 selection: AssetSelection::SubAsset {
                     parent_path: parent_path.clone(),
@@ -368,8 +398,8 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
                 },
                 label: part.name.clone(),
                 kind: AssetSubAssetKind::Mesh,
-                detail: if requires_scene_instance {
-                    "Skinned | place model or animation clip".to_string()
+                detail: if requires_skinned_hierarchy {
+                    "Skinned | dedicated renderer".to_string()
                 } else {
                     part.source_mesh
                         .clone()
@@ -383,7 +413,7 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
                 ),
                 mesh_label: Some(part.mesh_label.clone()),
                 material_label,
-                requires_scene_instance,
+                requires_skinned_hierarchy,
             });
         }
 
@@ -427,7 +457,7 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
                 ),
                 mesh_label: None,
                 material_label: part.material_label.clone(),
-                requires_scene_instance: false,
+                requires_skinned_hierarchy: false,
             });
         }
 
@@ -460,7 +490,7 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
                 ),
                 mesh_label: None,
                 material_label: None,
-                requires_scene_instance: false,
+                requires_skinned_hierarchy: false,
             });
         }
     }
@@ -497,7 +527,7 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
                 ),
                 mesh_label: None,
                 material_label: None,
-                requires_scene_instance: false,
+                requires_skinned_hierarchy: false,
             });
         }
         for clip in manifest.clips {
@@ -525,7 +555,7 @@ fn embedded_assets_for_asset(world: &World, asset: &EditorAsset) -> Vec<Embedded
                 ),
                 mesh_label: None,
                 material_label: None,
-                requires_scene_instance: false,
+                requires_skinned_hierarchy: false,
             });
         }
     }
@@ -805,11 +835,13 @@ fn selection_footer(world: &mut World, ui: &mut egui::Ui, selected_entities: &Se
             AssetSubAssetKind::Mesh => {
                 if selected_embedded
                     .as_ref()
-                    .is_some_and(|embedded| embedded.requires_scene_instance)
+                    .is_some_and(|embedded| embedded.requires_skinned_hierarchy)
                 {
-                    ui.small(
-                        egui::RichText::new("Place the model or an animation clip").color(TEXT_DIM),
-                    );
+                    if ui.button("Place Skinned Model").clicked() {
+                        if let Some(selection) = selection.as_ref() {
+                            place_subasset_operator(world, selection.clone(), Vec3::ZERO);
+                        }
+                    }
                 } else if ui.button("Place At Origin").clicked() {
                     if let Some(selection) = selection.as_ref() {
                         place_subasset_operator(world, selection.clone(), Vec3::ZERO);
@@ -834,7 +866,7 @@ fn selection_footer(world: &mut World, ui: &mut egui::Ui, selected_entities: &Se
                     .as_slice()
                     .iter()
                     .copied()
-                    .find(|entity| world.get::<shared::ModelRef>(*entity).is_some());
+                    .find(|entity| world.get::<shared::SkinnedMeshRenderer>(*entity).is_some());
                 let action = if animated_actor.is_some() {
                     "Assign To Selected Actor"
                 } else {
@@ -1257,7 +1289,7 @@ fn prefetch_embedded_thumbnails(
                             parent_path.clone(),
                             mesh_label,
                             embedded_asset.material_label.clone(),
-                            embedded_asset.requires_scene_instance,
+                            embedded_asset.requires_skinned_hierarchy,
                             &mut studio,
                         );
                     }
@@ -1317,9 +1349,9 @@ fn draw_embedded_asset_cell(
     let thumb_size = thumbnail_size.clamp(44.0, 64.0);
     let cell_size = egui::vec2(104.0, thumb_size + 50.0);
     let (rect, response) = ui.allocate_exact_size(cell_size, egui::Sense::click_and_drag());
-    let response = if embedded.requires_scene_instance {
+    let response = if embedded.requires_skinned_hierarchy {
         response.on_hover_text(
-            "Skinned primitives require their model hierarchy. Place the model or an animation clip instead.",
+            "Skinned primitives place through the dedicated renderer so their joint hierarchy remains intact.",
         )
     } else {
         response
@@ -1400,10 +1432,7 @@ fn draw_embedded_asset_cell(
             .resource_mut::<EditorAssets>()
             .select(embedded.selection.clone());
     }
-    if response.drag_started()
-        && embedded.kind != AssetSubAssetKind::Skeleton
-        && !embedded.requires_scene_instance
-    {
+    if response.drag_started() && embedded.kind != AssetSubAssetKind::Skeleton {
         world
             .resource_mut::<EditorAssets>()
             .start_drag(embedded.selection.clone());
@@ -1872,7 +1901,11 @@ fn top_level_asset_details_panel(
         if matches!(asset.kind, EditorAssetKind::Material) {
             ui.separator();
             ui.label(panel_heading("Material"));
-            material_asset_editor(world, ui, asset, path);
+            if MaterialInstanceAsset::load_from_path(path).is_ok() {
+                material_instance_asset_editor(world, ui, asset, path);
+            } else {
+                material_asset_editor(world, ui, asset, path);
+            }
         }
         if matches!(asset.kind, EditorAssetKind::AudioClip) {
             detail_row(ui, "Format", audio_format_label(path));
@@ -1970,13 +2003,10 @@ fn subasset_details_panel(
     ui.separator();
     match embedded.kind {
         AssetSubAssetKind::Mesh => {
-            if embedded.requires_scene_instance {
-                ui.small(
-                    egui::RichText::new(
-                        "This skinned primitive needs its source hierarchy. Place the model or an animation clip instead.",
-                    )
-                    .color(TEXT_DIM),
-                );
+            if embedded.requires_skinned_hierarchy {
+                if ui.button("Place Skinned Model At Origin").clicked() {
+                    place_subasset_operator(world, selection.clone(), Vec3::ZERO);
+                }
             } else if ui.button("Place At Origin").clicked() {
                 place_subasset_operator(world, selection.clone(), Vec3::ZERO);
             }
@@ -2009,7 +2039,7 @@ fn subasset_details_panel(
                 .as_slice()
                 .iter()
                 .copied()
-                .find(|entity| world.get::<shared::ModelRef>(*entity).is_some());
+                .find(|entity| world.get::<shared::SkinnedMeshRenderer>(*entity).is_some());
             let action = if animated_actor.is_some() {
                 "Assign To Selected Actor"
             } else {
@@ -2090,6 +2120,18 @@ fn import_settings_editor(
     path: &str,
     current: &ImportSettings,
 ) {
+    let animation_clip_options = current
+        .animation_manifest_path
+        .as_deref()
+        .and_then(|manifest_path| load_animation_manifest(manifest_path).ok())
+        .map(|manifest| {
+            manifest
+                .clips
+                .into_iter()
+                .map(|clip| (clip.id, clip.label))
+                .collect::<Vec<_>>()
+        })
+        .unwrap_or_default();
     {
         let mut state = world.resource_mut::<AssetBrowserUiState>();
         let reset = state
@@ -2116,14 +2158,14 @@ fn import_settings_editor(
         ui.checkbox(&mut draft.settings.lod0_only, "LOD0 only");
         egui::ComboBox::from_id_salt("model_placement_mode")
             .selected_text(match draft.settings.placement_mode {
-                ModelPlacementMode::StaticAsset => "Static Asset",
+                ModelPlacementMode::StaticAsset => "Renderable Asset (Auto)",
                 ModelPlacementMode::SceneInstance => "Scene Instance",
             })
             .show_ui(ui, |ui| {
                 ui.selectable_value(
                     &mut draft.settings.placement_mode,
                     ModelPlacementMode::StaticAsset,
-                    "Static Asset",
+                    "Renderable Asset (Auto)",
                 );
                 ui.selectable_value(
                     &mut draft.settings.placement_mode,
@@ -2165,6 +2207,42 @@ fn import_settings_editor(
                     "Authoring Override",
                 );
             });
+        if !animation_clip_options.is_empty() {
+            let selected_default = draft
+                .settings
+                .default_animation_clip_id
+                .as_deref()
+                .and_then(|id| {
+                    animation_clip_options
+                        .iter()
+                        .find(|(clip_id, _)| clip_id == id)
+                        .map(|(_, label)| label.as_str())
+                })
+                .unwrap_or_else(|| {
+                    if draft.settings.default_animation_clip_id.is_some() {
+                        "Missing clip"
+                    } else {
+                        "Imported rest pose"
+                    }
+                });
+            egui::ComboBox::from_id_salt("model_default_animation_clip")
+                .selected_text(selected_default)
+                .show_ui(ui, |ui| {
+                    ui.selectable_value(
+                        &mut draft.settings.default_animation_clip_id,
+                        None,
+                        "Imported rest pose",
+                    );
+                    for (clip_id, label) in &animation_clip_options {
+                        ui.selectable_value(
+                            &mut draft.settings.default_animation_clip_id,
+                            Some(clip_id.clone()),
+                            label,
+                        );
+                    }
+                });
+            ui.small("Default animation is sampled and paused in edit mode; no clip is guessed.");
+        }
         ui.horizontal(|ui| {
             if ui.button("Apply").clicked() {
                 apply = Some(draft.settings.clone());
@@ -2217,9 +2295,20 @@ fn apply_import_settings(
 fn material_asset_editor(world: &mut World, ui: &mut egui::Ui, asset: &EditorAsset, path: &str) {
     ensure_material_draft(world, path, &asset.label);
     let shader_schemas = shader_schema_assets(world);
-    let texture_assets = texture_asset_refs(world);
+    let texture_assets = material_texture_candidates(world);
+    let texture_drop_candidate = world
+        .resource::<EditorAssets>()
+        .dragging_selection()
+        .and_then(|selection| {
+            texture_assets
+                .iter()
+                .find(|candidate| candidate.selection == *selection)
+        })
+        .cloned();
     let mut apply = false;
     let mut revert = false;
+    let mut create_instance = false;
+    let mut accepted_texture_drop = false;
     {
         let mut state = world.resource_mut::<AssetBrowserUiState>();
         let Some(draft) = state.material_draft.as_mut() else {
@@ -2229,7 +2318,43 @@ fn material_asset_editor(world: &mut World, ui: &mut egui::Ui, asset: &EditorAss
             ui.colored_label(egui::Color32::YELLOW, error);
         }
         compact_text_edit(ui, "Label", &mut draft.asset.label);
-        material_shader_interface(ui, &mut draft.asset, &shader_schemas, &texture_assets);
+        material_shader_interface(
+            ui,
+            &mut draft.asset,
+            &shader_schemas,
+            &texture_assets,
+            texture_drop_candidate.as_ref(),
+            &mut accepted_texture_drop,
+        );
+        ui.separator();
+        ui.label(panel_heading("Render State"));
+        ui.horizontal(|ui| {
+            ui.add_sized([92.0, 20.0], egui::Label::new("Alpha mode"));
+            egui::ComboBox::from_id_salt("material_alpha_mode")
+                .selected_text(match draft.asset.render_state.alpha_mode {
+                    MaterialAlphaMode::Opaque => "Opaque",
+                    MaterialAlphaMode::Cutout => "Cutout",
+                })
+                .show_ui(ui, |ui| {
+                    ui.selectable_value(
+                        &mut draft.asset.render_state.alpha_mode,
+                        MaterialAlphaMode::Opaque,
+                        "Opaque",
+                    );
+                    ui.selectable_value(
+                        &mut draft.asset.render_state.alpha_mode,
+                        MaterialAlphaMode::Cutout,
+                        "Cutout",
+                    );
+                });
+        });
+        if draft.asset.render_state.alpha_mode == MaterialAlphaMode::Cutout {
+            ui.add(
+                egui::Slider::new(&mut draft.asset.render_state.alpha_cutoff, 0.0..=1.0)
+                    .text("Alpha cutoff"),
+            );
+        }
+        ui.checkbox(&mut draft.asset.render_state.double_sided, "Double sided");
         ui.separator();
         ui.label(panel_heading("Standard Surface"));
         color_desc_edit(ui, "Base color", &mut draft.asset.material.base_color);
@@ -2240,25 +2365,37 @@ fn material_asset_editor(world: &mut World, ui: &mut egui::Ui, asset: &EditorAss
             egui::Slider::new(&mut draft.asset.material.emissive_intensity, 0.0..=50_000.0)
                 .text("Emissive nits"),
         );
-        optional_path_edit(
+        accepted_texture_drop |= material_texture_path_ui(
             ui,
             "Base texture",
+            "standard_base_color",
             &mut draft.asset.material.base_color_texture,
+            &texture_assets,
+            texture_drop_candidate.as_ref(),
         );
-        optional_path_edit(
+        accepted_texture_drop |= material_texture_path_ui(
             ui,
             "Emissive texture",
+            "standard_emissive",
             &mut draft.asset.material.emissive_texture,
+            &texture_assets,
+            texture_drop_candidate.as_ref(),
         );
-        optional_path_edit(
+        accepted_texture_drop |= material_texture_path_ui(
             ui,
             "Normal map",
+            "standard_normal_map",
             &mut draft.asset.material.normal_map_texture,
+            &texture_assets,
+            texture_drop_candidate.as_ref(),
         );
-        optional_path_edit(
+        accepted_texture_drop |= material_texture_path_ui(
             ui,
             "Metal/rough",
+            "standard_metallic_roughness",
             &mut draft.asset.material.metallic_roughness_texture,
+            &texture_assets,
+            texture_drop_candidate.as_ref(),
         );
         ui.horizontal(|ui| {
             if ui.button("Apply").clicked() {
@@ -2267,6 +2404,9 @@ fn material_asset_editor(world: &mut World, ui: &mut egui::Ui, asset: &EditorAss
             if ui.button("Revert").clicked() {
                 revert = true;
             }
+            if ui.button("Create Instance").clicked() {
+                create_instance = true;
+            }
         });
     }
 
@@ -2277,6 +2417,12 @@ fn material_asset_editor(world: &mut World, ui: &mut egui::Ui, asset: &EditorAss
     if apply {
         save_material_draft(world);
     }
+    if create_instance {
+        create_material_instance_from_base(world, path, &asset.label);
+    }
+    if accepted_texture_drop {
+        world.resource_mut::<EditorAssets>().clear_drag();
+    }
 }
 
 fn ensure_material_draft(world: &mut World, path: &str, fallback_label: &str) {
@@ -2297,8 +2443,11 @@ fn ensure_material_draft(world: &mut World, path: &str, fallback_label: &str) {
         Err(error) => MaterialAssetDraft {
             path: path.to_string(),
             asset: MaterialAsset {
+                schema_version: shared::MATERIAL_ASSET_SCHEMA_VERSION,
                 label: fallback_label.to_string(),
                 shader: None,
+                shader_ref: None,
+                render_state: shared::MaterialRenderState::default(),
                 material: MaterialDesc::default(),
             },
             error: Some(error),
@@ -2347,43 +2496,642 @@ fn save_material_draft(world: &mut World) {
     }
 }
 
-fn shader_schema_assets(world: &World) -> Vec<(String, String)> {
-    let mut schemas: Vec<(String, String)> = world
+fn create_material_instance_from_base(world: &mut World, base_path: &str, base_label: &str) {
+    let base_reference = world
+        .get_resource_mut::<crate::asset_db::AssetRegistry>()
+        .ok_or_else(|| "Asset registry is unavailable".to_string())
+        .and_then(|mut registry| {
+            ensure_asset_record(
+                &mut registry,
+                base_path.to_string(),
+                base_label.to_string(),
+                "Material",
+            )
+            .map(|record| {
+                MaterialRef::new(
+                    EditorAssetRef::new(
+                        record.id.as_string(),
+                        "material:source",
+                        base_label.to_string(),
+                    )
+                    .with_source_path(base_path),
+                )
+            })
+        });
+    let base_reference = match base_reference {
+        Ok(reference) => reference,
+        Err(error) => {
+            world.resource_mut::<SceneIo>().status = error;
+            return;
+        }
+    };
+    let base = Path::new(base_path);
+    let parent = base
+        .parent()
+        .unwrap_or_else(|| Path::new("assets/materials"));
+    let stem = base
+        .file_stem()
+        .and_then(|value| value.to_str())
+        .unwrap_or("material");
+    let mut index = 1usize;
+    let path = loop {
+        let suffix = if index == 1 {
+            "instance".to_string()
+        } else {
+            format!("instance_{index}")
+        };
+        let candidate = parent.join(format!("{stem}_{suffix}.ron"));
+        if !candidate.exists() {
+            break candidate;
+        }
+        index += 1;
+    };
+    let instance = MaterialInstanceAsset {
+        schema_version: shared::MATERIAL_INSTANCE_SCHEMA_VERSION,
+        label: format!("{base_label} Instance"),
+        base: base_reference,
+        parameters: Vec::new(),
+        textures: Vec::new(),
+    };
+    let result = ron::ser::to_string_pretty(&instance, ron::ser::PrettyConfig::default())
+        .map_err(|error| format!("could not serialize material instance: {error}"))
+        .and_then(|text| {
+            fs::write(&path, text)
+                .map_err(|error| format!("could not write {}: {error}", path.display()))
+        });
+    if let Err(error) = result {
+        world.resource_mut::<SceneIo>().status = error;
+        return;
+    }
+    let normalized = path.to_string_lossy().replace('\\', "/");
+    let registry_error =
+        if let Some(mut registry) = world.get_resource_mut::<crate::asset_db::AssetRegistry>() {
+            ensure_asset_record(
+                &mut registry,
+                normalized.clone(),
+                instance.label.clone(),
+                "Material",
+            )
+            .map(|_| ())
+            .and_then(|_| save_registry(&registry))
+            .err()
+        } else {
+            Some("Asset registry is unavailable".to_string())
+        };
+    if let Some(error) = registry_error {
+        world.resource_mut::<SceneIo>().status =
+            format!("Created {normalized}, but registry update failed: {error}");
+        return;
+    }
+    world.resource_mut::<EditorAssets>().refresh();
+    world
+        .resource_mut::<EditorAssets>()
+        .select(AssetSelection::File(normalized.clone()));
+    invalidate_on_catalog_refresh(world);
+    world.resource_mut::<SceneIo>().status = format!("Created material instance {normalized}");
+}
+
+fn material_base_candidates(world: &World) -> Vec<(String, MaterialRef)> {
+    let registry = world.get_resource::<crate::asset_db::AssetRegistry>();
+    let mut candidates = world
+        .resource::<EditorAssets>()
+        .assets
+        .iter()
+        .filter(|asset| matches!(asset.kind, EditorAssetKind::Material))
+        .filter_map(|asset| {
+            let path = asset.path.as_deref()?;
+            MaterialAsset::load_from_path(path).ok()?;
+            let record = registry.and_then(|registry| find_asset_by_path(registry, path))?;
+            Some((
+                asset.label.clone(),
+                MaterialRef::new(
+                    EditorAssetRef::new(
+                        record.id.as_string(),
+                        "material:source",
+                        asset.label.clone(),
+                    )
+                    .with_source_path(path),
+                ),
+            ))
+        })
+        .collect::<Vec<_>>();
+    candidates.sort_by(|left, right| natural_cmp(&left.0, &right.0));
+    candidates
+}
+
+fn material_instance_asset_editor(
+    world: &mut World,
+    ui: &mut egui::Ui,
+    asset: &EditorAsset,
+    path: &str,
+) {
+    ensure_material_instance_draft(world, path, &asset.label);
+    let base_candidates = material_base_candidates(world);
+    let texture_assets = material_texture_candidates(world);
+    let texture_drop_candidate = world
+        .resource::<EditorAssets>()
+        .dragging_selection()
+        .and_then(|selection| {
+            texture_assets
+                .iter()
+                .find(|candidate| candidate.selection == *selection)
+        })
+        .cloned();
+    let base_asset = world
+        .resource::<AssetBrowserUiState>()
+        .material_instance_draft
+        .as_ref()
+        .and_then(|draft| draft.asset.base.0.source_path.as_deref())
+        .and_then(|path| MaterialAsset::load_from_path(path).ok());
+    let schema = base_asset.as_ref().and_then(material_schema_for_asset);
+    let mut apply = false;
+    let mut revert = false;
+    let mut accepted_texture_drop = false;
+    {
+        let mut state = world.resource_mut::<AssetBrowserUiState>();
+        let Some(draft) = state.material_instance_draft.as_mut() else {
+            return;
+        };
+        if let Some(error) = draft.error.as_ref() {
+            ui.colored_label(egui::Color32::YELLOW, error);
+        }
+        compact_text_edit(ui, "Label", &mut draft.asset.label);
+        ui.horizontal(|ui| {
+            ui.add_sized([92.0, 20.0], egui::Label::new("Base material"));
+            let selected = base_candidates
+                .iter()
+                .find(|(_, candidate)| candidate.0.asset_id == draft.asset.base.0.asset_id)
+                .map(|(label, _)| label.as_str())
+                .unwrap_or("Missing base");
+            egui::ComboBox::from_id_salt("material_instance_base")
+                .selected_text(selected)
+                .show_ui(ui, |ui| {
+                    for (label, reference) in &base_candidates {
+                        if ui
+                            .selectable_label(
+                                reference.0.asset_id == draft.asset.base.0.asset_id,
+                                label,
+                            )
+                            .clicked()
+                        {
+                            draft.asset.base = reference.clone();
+                        }
+                    }
+                });
+        });
+        ui.small("Overrides are sparse; unchecked properties continue to inherit the base asset.");
+        ui.separator();
+        ui.label(panel_heading("Standard Overrides"));
+        let base_desc = base_asset
+            .as_ref()
+            .map(|asset| &asset.material)
+            .cloned()
+            .unwrap_or_default();
+        material_instance_parameter_override_ui(
+            ui,
+            "Base color",
+            "base_color",
+            ShaderPropertyType::Color,
+            MaterialParameterValue::Color(base_desc.base_color),
+            &mut draft.asset.parameters,
+        );
+        material_instance_parameter_override_ui(
+            ui,
+            "Metallic",
+            "metallic",
+            ShaderPropertyType::Float {
+                min: Some(0.0),
+                max: Some(1.0),
+            },
+            MaterialParameterValue::Float(base_desc.metallic),
+            &mut draft.asset.parameters,
+        );
+        material_instance_parameter_override_ui(
+            ui,
+            "Roughness",
+            "roughness",
+            ShaderPropertyType::Float {
+                min: Some(0.0),
+                max: Some(1.0),
+            },
+            MaterialParameterValue::Float(base_desc.roughness),
+            &mut draft.asset.parameters,
+        );
+        material_instance_parameter_override_ui(
+            ui,
+            "Emissive",
+            "emissive_color",
+            ShaderPropertyType::Color,
+            MaterialParameterValue::Color(base_desc.emissive_color),
+            &mut draft.asset.parameters,
+        );
+        material_instance_parameter_override_ui(
+            ui,
+            "Emissive nits",
+            "emissive_intensity",
+            ShaderPropertyType::Float {
+                min: Some(0.0),
+                max: Some(50_000.0),
+            },
+            MaterialParameterValue::Float(base_desc.emissive_intensity),
+            &mut draft.asset.parameters,
+        );
+        if let Some(schema) = schema.as_ref() {
+            let custom = schema
+                .parameters
+                .iter()
+                .filter(|property| {
+                    !matches!(property.property_type, ShaderPropertyType::Texture)
+                        && !matches!(
+                            property.name.as_str(),
+                            "base_color"
+                                | "metallic"
+                                | "roughness"
+                                | "emissive_color"
+                                | "emissive_intensity"
+                        )
+                })
+                .collect::<Vec<_>>();
+            if !custom.is_empty() {
+                ui.separator();
+                ui.label(panel_heading("Shader Overrides"));
+                for property in custom {
+                    let inherited = base_desc
+                        .parameters
+                        .iter()
+                        .find(|value| value.name == property.name)
+                        .or_else(|| {
+                            schema
+                                .default_values
+                                .iter()
+                                .find(|value| value.name == property.name)
+                        })
+                        .map(|value| value.value.clone())
+                        .unwrap_or_else(|| {
+                            default_value_for_shader_property(&property.property_type)
+                        });
+                    material_instance_parameter_override_ui(
+                        ui,
+                        &property.display_name,
+                        &property.name,
+                        property.property_type.clone(),
+                        inherited,
+                        &mut draft.asset.parameters,
+                    );
+                }
+            }
+        }
+        ui.separator();
+        ui.label(panel_heading("Texture Overrides"));
+        let mut texture_properties = vec![
+            ("Base color", "base_color_texture"),
+            ("Normal map", "normal_map_texture"),
+            ("Metallic / roughness", "metallic_roughness_texture"),
+            ("Emissive", "emissive_texture"),
+        ];
+        if let Some(schema) = schema.as_ref() {
+            for property in schema
+                .parameters
+                .iter()
+                .filter(|property| matches!(property.property_type, ShaderPropertyType::Texture))
+            {
+                if !texture_properties
+                    .iter()
+                    .any(|(_, name)| *name == property.name)
+                {
+                    texture_properties.push((&property.display_name, &property.name));
+                }
+            }
+        }
+        for (label, name) in texture_properties {
+            accepted_texture_drop |= material_instance_texture_override_ui(
+                ui,
+                label,
+                name,
+                &mut draft.asset.textures,
+                &texture_assets,
+                texture_drop_candidate.as_ref(),
+            );
+        }
+        ui.horizontal(|ui| {
+            if ui.button("Apply").clicked() {
+                apply = true;
+            }
+            if ui.button("Revert").clicked() {
+                revert = true;
+            }
+        });
+    }
+    if revert {
+        world
+            .resource_mut::<AssetBrowserUiState>()
+            .material_instance_draft = None;
+        ensure_material_instance_draft(world, path, &asset.label);
+    }
+    if apply {
+        save_material_instance_draft(world);
+    }
+    if accepted_texture_drop {
+        world.resource_mut::<EditorAssets>().clear_drag();
+    }
+}
+
+fn ensure_material_instance_draft(world: &mut World, path: &str, fallback_label: &str) {
+    let needs_load = world
+        .resource::<AssetBrowserUiState>()
+        .material_instance_draft
+        .as_ref()
+        .is_none_or(|draft| draft.path != path);
+    if !needs_load {
+        return;
+    }
+    let draft = match MaterialInstanceAsset::load_from_path(path) {
+        Ok(asset) => MaterialInstanceAssetDraft {
+            path: path.to_string(),
+            asset,
+            error: None,
+        },
+        Err(error) => MaterialInstanceAssetDraft {
+            path: path.to_string(),
+            asset: MaterialInstanceAsset {
+                schema_version: shared::MATERIAL_INSTANCE_SCHEMA_VERSION,
+                label: fallback_label.to_string(),
+                base: MaterialRef::default(),
+                parameters: Vec::new(),
+                textures: Vec::new(),
+            },
+            error: Some(error),
+        },
+    };
+    world
+        .resource_mut::<AssetBrowserUiState>()
+        .material_instance_draft = Some(draft);
+}
+
+fn save_material_instance_draft(world: &mut World) {
+    let Some(draft) = world
+        .resource::<AssetBrowserUiState>()
+        .material_instance_draft
+        .clone()
+    else {
+        return;
+    };
+    let result = if !draft.asset.base.is_resolved()
+        || draft.asset.base.0.sub_asset_id != "material:source"
+    {
+        Err("Material Instance base must resolve directly to a Material asset".to_string())
+    } else {
+        ron::ser::to_string_pretty(&draft.asset, ron::ser::PrettyConfig::default())
+            .map_err(|error| format!("could not serialize material instance: {error}"))
+            .and_then(|text| {
+                fs::write(&draft.path, text)
+                    .map_err(|error| format!("could not write {}: {error}", draft.path))
+            })
+    };
+    match result {
+        Ok(()) => {
+            if let Some(current) = world
+                .resource_mut::<AssetBrowserUiState>()
+                .material_instance_draft
+                .as_mut()
+            {
+                current.error = None;
+            }
+            world.resource_mut::<EditorAssets>().refresh();
+            invalidate_on_catalog_refresh(world);
+            world.resource_mut::<SceneIo>().status =
+                format!("Saved material instance {}", draft.path);
+        }
+        Err(error) => {
+            if let Some(current) = world
+                .resource_mut::<AssetBrowserUiState>()
+                .material_instance_draft
+                .as_mut()
+            {
+                current.error = Some(error.clone());
+            }
+            world.resource_mut::<SceneIo>().status = error;
+        }
+    }
+}
+
+fn material_schema_for_asset(asset: &MaterialAsset) -> Option<ShaderSchemaAsset> {
+    asset
+        .shader_ref
+        .as_ref()
+        .and_then(|reference| reference.source_path.as_deref())
+        .or(asset.material.shader.schema_path.as_deref())
+        .or(asset
+            .shader
+            .as_deref()
+            .filter(|path| path.ends_with(".ron")))
+        .and_then(|path| ShaderSchemaAsset::load_from_path(path).ok())
+}
+
+fn material_instance_parameter_override_ui(
+    ui: &mut egui::Ui,
+    label: &str,
+    name: &str,
+    property_type: ShaderPropertyType,
+    inherited: MaterialParameterValue,
+    parameters: &mut Vec<MaterialParameter>,
+) {
+    let index = parameters.iter().position(|value| value.name == name);
+    let mut enabled = index.is_some();
+    if ui
+        .checkbox(&mut enabled, format!("Override {label}"))
+        .changed()
+    {
+        if enabled {
+            parameters.push(MaterialParameter {
+                name: name.to_string(),
+                value: inherited,
+            });
+        } else {
+            parameters.retain(|value| value.name != name);
+        }
+    }
+    if let Some(value) = parameters.iter_mut().find(|value| value.name == name) {
+        material_parameter_value_ui(ui, label, &property_type, &mut value.value);
+    }
+}
+
+fn material_instance_texture_override_ui(
+    ui: &mut egui::Ui,
+    label: &str,
+    name: &str,
+    textures: &mut Vec<MaterialTextureBinding>,
+    texture_assets: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+) -> bool {
+    let mut enabled = textures.iter().any(|value| value.name == name);
+    if ui
+        .checkbox(&mut enabled, format!("Override {label}"))
+        .changed()
+    {
+        if enabled {
+            textures.push(MaterialTextureBinding {
+                name: name.to_string(),
+                texture: None,
+            });
+        } else {
+            textures.retain(|value| value.name != name);
+        }
+    }
+
+    let current = textures
+        .iter()
+        .find(|value| value.name == name)
+        .and_then(|binding| binding.texture.as_ref())
+        .cloned();
+    let response = texture_slot_ui(
+        ui,
+        label,
+        format!("instance_{name}"),
+        TextureSlotSelection::Reference(current.as_ref()),
+        if enabled { "(none)" } else { "(inherits base)" },
+        texture_assets,
+        drop_candidate,
+    );
+    let accepted_drop = response.accepted_drop;
+    if response.clear {
+        textures.retain(|value| value.name != name);
+    } else if let Some(candidate) = response.selected {
+        set_material_instance_texture_override(textures, name, Some(candidate.reference));
+    }
+    accepted_drop
+}
+
+fn set_material_instance_texture_override(
+    textures: &mut Vec<MaterialTextureBinding>,
+    name: &str,
+    texture: Option<EditorAssetRef>,
+) {
+    match texture {
+        Some(texture) => {
+            if let Some(binding) = textures.iter_mut().find(|value| value.name == name) {
+                binding.texture = Some(texture);
+            } else {
+                textures.push(MaterialTextureBinding {
+                    name: name.to_string(),
+                    texture: Some(texture),
+                });
+            }
+        }
+        None => textures.retain(|value| value.name != name),
+    }
+}
+
+fn shader_schema_assets(world: &World) -> Vec<(String, String, EditorAssetRef)> {
+    let registry = world.get_resource::<crate::asset_db::AssetRegistry>();
+    let mut schemas: Vec<(String, String, EditorAssetRef)> = world
         .resource::<EditorAssets>()
         .assets
         .iter()
         .filter(|asset| matches!(asset.kind, EditorAssetKind::ShaderSchema))
-        .filter_map(|asset| Some((asset.label.clone(), asset.path.clone()?)))
+        .filter_map(|asset| {
+            let path = asset.path.clone()?;
+            let record = registry.and_then(|registry| find_asset_by_path(registry, &path))?;
+            Some((
+                asset.label.clone(),
+                path.clone(),
+                EditorAssetRef::new(record.id.as_string(), "shader:schema", asset.label.clone())
+                    .with_source_path(path),
+            ))
+        })
         .collect();
     schemas.sort_by(|a, b| natural_cmp(&a.0, &b.0));
     schemas
 }
 
-fn texture_asset_refs(world: &World) -> Vec<(String, EditorAssetRef)> {
-    let registry = world.get_resource::<crate::asset_db::AssetRegistry>();
-    let mut textures: Vec<(String, EditorAssetRef)> = world
-        .resource::<EditorAssets>()
-        .assets
+fn material_texture_candidates(world: &World) -> Vec<MaterialTextureCandidate> {
+    let Some(registry) = world.get_resource::<crate::asset_db::AssetRegistry>() else {
+        return Vec::new();
+    };
+    let assets = &world.resource::<EditorAssets>().assets;
+    let mut textures = Vec::new();
+    let mut seen = HashSet::new();
+
+    for asset in assets
         .iter()
         .filter(|asset| matches!(asset.kind, EditorAssetKind::Texture))
-        .filter_map(|asset| {
-            let path = asset.path.as_deref()?;
-            let record = registry.and_then(|registry| find_asset_by_path(registry, path))?;
-            Some((
-                asset.label.clone(),
-                EditorAssetRef::new(record.id.as_string(), "texture:source", asset.label.clone()),
-            ))
-        })
-        .collect();
-    textures.sort_by(|a, b| natural_cmp(&a.0, &b.0));
+    {
+        let Some(path) = asset.path.as_deref() else {
+            continue;
+        };
+        let Some(record) = find_asset_by_path(registry, path) else {
+            continue;
+        };
+        let reference =
+            EditorAssetRef::new(record.id.as_string(), "texture:source", asset.label.clone())
+                .with_source_path(path);
+        if !seen.insert((reference.asset_id.clone(), reference.sub_asset_id.clone())) {
+            continue;
+        }
+        textures.push(MaterialTextureCandidate {
+            label: asset.label.clone(),
+            detail: path.to_string(),
+            path: path.to_string(),
+            reference,
+            selection: AssetSelection::File(path.to_string()),
+        });
+    }
+
+    for asset in assets
+        .iter()
+        .filter(|asset| matches!(asset.kind, EditorAssetKind::Model))
+    {
+        let Some(parent_path) = asset.path.as_deref() else {
+            continue;
+        };
+        let Some(record) = find_asset_by_path(registry, parent_path) else {
+            continue;
+        };
+        for embedded in embedded_assets_for_asset(world, asset)
+            .into_iter()
+            .filter(|embedded| embedded.kind == AssetSubAssetKind::Texture)
+        {
+            let AssetSelection::SubAsset {
+                sub_asset_id,
+                source_path: Some(source_path),
+                ..
+            } = &embedded.selection
+            else {
+                continue;
+            };
+            let reference = EditorAssetRef::new(
+                record.id.as_string(),
+                sub_asset_id.clone(),
+                embedded.label.clone(),
+            )
+            .with_source_path(source_path);
+            if !seen.insert((reference.asset_id.clone(), reference.sub_asset_id.clone())) {
+                continue;
+            }
+            textures.push(MaterialTextureCandidate {
+                label: embedded.label,
+                detail: format!("{} | {source_path}", asset.label),
+                path: source_path.clone(),
+                reference,
+                selection: embedded.selection,
+            });
+        }
+    }
+
+    textures.sort_by(|left, right| {
+        natural_cmp(&left.label, &right.label)
+            .then_with(|| natural_cmp(&left.detail, &right.detail))
+    });
     textures
 }
 
 fn material_shader_interface(
     ui: &mut egui::Ui,
     asset: &mut MaterialAsset,
-    shader_schemas: &[(String, String)],
-    texture_assets: &[(String, EditorAssetRef)],
+    shader_schemas: &[(String, String, EditorAssetRef)],
+    texture_assets: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+    accepted_texture_drop: &mut bool,
 ) {
     shader_kind_picker(ui, &mut asset.material.shader.kind);
     if matches!(asset.material.shader.kind, MaterialShaderKind::Custom) {
@@ -2397,8 +3145,8 @@ fn material_shader_interface(
                         .and_then(|path| {
                             shader_schemas
                                 .iter()
-                                .find(|(_, schema_path)| schema_path == path)
-                                .map(|(label, _)| label.as_str())
+                                .find(|(_, schema_path, _)| schema_path == path)
+                                .map(|(label, _, _)| label.as_str())
                         })
                         .unwrap_or("(none)"),
                 )
@@ -2409,7 +3157,7 @@ fn material_shader_interface(
                     {
                         selected_schema = None;
                     }
-                    for (label, path) in shader_schemas {
+                    for (label, path, _) in shader_schemas {
                         if ui
                             .selectable_label(selected_schema.as_deref() == Some(path), label)
                             .clicked()
@@ -2422,9 +3170,15 @@ fn material_shader_interface(
         if selected_schema != asset.material.shader.schema_path {
             asset.material.shader.schema_path = selected_schema.clone();
             if let Some(path) = selected_schema.as_deref() {
+                asset.shader_ref = shader_schemas
+                    .iter()
+                    .find(|(_, schema_path, _)| schema_path == path)
+                    .map(|(_, _, reference)| reference.clone());
                 if let Err(error) = apply_shader_schema(asset, path) {
                     ui.colored_label(egui::Color32::YELLOW, error);
                 }
+            } else {
+                asset.shader_ref = None;
             }
         }
         optional_path_edit(ui, "WGSL shader", &mut asset.material.shader.shader_path);
@@ -2439,6 +3193,7 @@ fn material_shader_interface(
             });
         }
     } else {
+        asset.shader_ref = None;
         asset.material.shader.schema_path = None;
         asset.material.shader.shader_path = None;
     }
@@ -2458,12 +3213,20 @@ fn material_shader_interface(
             &schema.parameters,
             &mut asset.material.textures,
             texture_assets,
+            drop_candidate,
+            accepted_texture_drop,
         );
     } else if !asset.material.parameters.is_empty() || !asset.material.textures.is_empty() {
         ui.separator();
         ui.label(panel_heading("Stored Shader Values"));
         raw_material_parameter_editor(ui, &mut asset.material.parameters);
-        raw_material_texture_editor(ui, &mut asset.material.textures, texture_assets);
+        raw_material_texture_editor(
+            ui,
+            &mut asset.material.textures,
+            texture_assets,
+            drop_candidate,
+            accepted_texture_drop,
+        );
     }
 }
 
@@ -2543,7 +3306,9 @@ fn shader_schema_texture_editor(
     ui: &mut egui::Ui,
     properties: &[ShaderPropertyDesc],
     textures: &mut Vec<MaterialTextureBinding>,
-    texture_assets: &[(String, EditorAssetRef)],
+    texture_assets: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+    accepted_texture_drop: &mut bool,
 ) {
     let texture_props: Vec<&ShaderPropertyDesc> = properties
         .iter()
@@ -2556,7 +3321,13 @@ fn shader_schema_texture_editor(
     ui.label(panel_heading("Shader Textures"));
     for property in texture_props {
         let texture = ensure_material_texture_binding(textures, &property.name);
-        texture_binding_ui(ui, &property.display_name, texture, texture_assets);
+        *accepted_texture_drop |= texture_binding_ui(
+            ui,
+            &property.display_name,
+            texture,
+            texture_assets,
+            drop_candidate,
+        );
     }
 }
 
@@ -2570,7 +3341,9 @@ fn raw_material_parameter_editor(ui: &mut egui::Ui, parameters: &mut [MaterialPa
 fn raw_material_texture_editor(
     ui: &mut egui::Ui,
     textures: &mut [MaterialTextureBinding],
-    texture_assets: &[(String, EditorAssetRef)],
+    texture_assets: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+    accepted_texture_drop: &mut bool,
 ) {
     if textures.is_empty() {
         return;
@@ -2579,7 +3352,8 @@ fn raw_material_texture_editor(
     ui.label(panel_heading("Stored Shader Textures"));
     for texture in textures {
         let label = texture.name.clone();
-        texture_binding_ui(ui, &label, texture, texture_assets);
+        *accepted_texture_drop |=
+            texture_binding_ui(ui, &label, texture, texture_assets, drop_candidate);
     }
 }
 
@@ -2690,42 +3464,189 @@ fn texture_binding_ui(
     ui: &mut egui::Ui,
     label: &str,
     binding: &mut MaterialTextureBinding,
-    texture_assets: &[(String, EditorAssetRef)],
-) {
-    ui.horizontal(|ui| {
-        ui.add_sized([92.0, 20.0], egui::Label::new(label));
-        let selected = binding
-            .texture
-            .as_ref()
-            .and_then(|current| {
-                texture_assets
-                    .iter()
-                    .find(|(_, candidate)| *candidate == *current)
-                    .map(|(label, _)| label.as_str())
-            })
-            .unwrap_or("(none)");
-        egui::ComboBox::from_id_salt(format!("texture_binding_{}", binding.name))
-            .selected_text(selected)
-            .show_ui(ui, |ui| {
-                if ui
-                    .selectable_label(binding.texture.is_none(), "(none)")
-                    .clicked()
-                {
-                    binding.texture = None;
-                }
-                for (label, reference) in texture_assets {
-                    if ui
-                        .selectable_label(binding.texture.as_ref() == Some(reference), label)
-                        .clicked()
-                    {
-                        binding.texture = Some(reference.clone());
-                    }
-                }
+    texture_assets: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+) -> bool {
+    let response = texture_slot_ui(
+        ui,
+        label,
+        format!("binding_{}", binding.name),
+        TextureSlotSelection::Reference(binding.texture.as_ref()),
+        "(none)",
+        texture_assets,
+        drop_candidate,
+    );
+    let accepted_drop = response.accepted_drop;
+    if response.clear {
+        binding.texture = None;
+    } else if let Some(candidate) = response.selected {
+        binding.texture = Some(candidate.reference);
+    }
+    accepted_drop
+}
+
+fn material_texture_path_ui(
+    ui: &mut egui::Ui,
+    label: &str,
+    slot_id: &str,
+    value: &mut Option<String>,
+    texture_assets: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+) -> bool {
+    let response = texture_slot_ui(
+        ui,
+        label,
+        slot_id,
+        TextureSlotSelection::Path(value.as_deref()),
+        "(none)",
+        texture_assets,
+        drop_candidate,
+    );
+    let accepted_drop = response.accepted_drop;
+    if response.clear {
+        *value = None;
+    } else if let Some(candidate) = response.selected {
+        *value = Some(candidate.path);
+    }
+    accepted_drop
+}
+
+fn texture_slot_ui(
+    ui: &mut egui::Ui,
+    label: &str,
+    slot_id: impl std::hash::Hash,
+    current: TextureSlotSelection<'_>,
+    empty_label: &str,
+    candidates: &[MaterialTextureCandidate],
+    drop_candidate: Option<&MaterialTextureCandidate>,
+) -> TextureSlotResponse {
+    let mut result = TextureSlotResponse::default();
+    ui.push_id(slot_id, |ui| {
+        ui.horizontal(|ui| {
+            ui.add_sized([92.0, 20.0], egui::Label::new(label));
+            let width = ui.available_width().max(1.0);
+            let (rect, hover) =
+                ui.allocate_exact_size(egui::vec2(width, 30.0), egui::Sense::hover());
+            let valid_drag = drop_candidate.is_some();
+            let drop_hovered = valid_drag && ui.rect_contains_pointer(rect);
+            let row_hovered = hover.hovered();
+            let stroke = if drop_hovered {
+                egui::Stroke::new(2.0, egui::Color32::from_rgb(125, 198, 255))
+            } else if valid_drag {
+                egui::Stroke::new(1.0, egui::Color32::from_rgb(58, 88, 122))
+            } else if row_hovered {
+                egui::Stroke::new(1.0, egui::Color32::from_rgb(92, 102, 118))
+            } else {
+                egui::Stroke::new(1.0, BORDER)
+            };
+            let fill = if drop_hovered {
+                egui::Color32::from_rgb(29, 57, 86)
+            } else if row_hovered {
+                WIDGET_BG.linear_multiply(1.05)
+            } else {
+                WIDGET_BG.linear_multiply(0.75)
+            };
+            ui.painter()
+                .rect(rect, 4.0, fill, stroke, egui::StrokeKind::Inside);
+
+            let selected_candidate = candidates.iter().find(|candidate| match current {
+                TextureSlotSelection::Path(path) => path == Some(candidate.path.as_str()),
+                TextureSlotSelection::Reference(reference) => reference.is_some_and(|reference| {
+                    reference.asset_id == candidate.reference.asset_id
+                        && reference.sub_asset_id == candidate.reference.sub_asset_id
+                }),
             });
-        if ui.button("Clear").clicked() {
-            binding.texture = None;
-        }
+            let current_present = match current {
+                TextureSlotSelection::Path(path) => path.is_some(),
+                TextureSlotSelection::Reference(reference) => reference.is_some(),
+            };
+            let display_label = selected_candidate
+                .map(|candidate| candidate.label.as_str())
+                .or_else(|| match current {
+                    TextureSlotSelection::Path(path) => path,
+                    TextureSlotSelection::Reference(reference) => {
+                        reference.map(|reference| reference.label.as_str())
+                    }
+                })
+                .unwrap_or(empty_label);
+
+            let mut child = ui.new_child(
+                egui::UiBuilder::new()
+                    .max_rect(rect.shrink2(egui::vec2(5.0, 3.0)))
+                    .layout(egui::Layout::left_to_right(egui::Align::Center)),
+            );
+            child.set_clip_rect(rect);
+            child.add_sized(
+                [18.0, 20.0],
+                egui::Label::new(icon_text(icons::IMAGE, 13.0).color(TEXT_DIM)),
+            );
+            let action_width = 56.0;
+            let text_width =
+                (child.available_width() - action_width - child.spacing().item_spacing.x).max(1.0);
+            child.allocate_ui_with_layout(
+                egui::vec2(text_width, 22.0),
+                egui::Layout::left_to_right(egui::Align::Center),
+                |ui| {
+                    ui.add_sized(
+                        [text_width, 20.0],
+                        egui::Label::new(display_label).truncate(),
+                    );
+                },
+            );
+            child.allocate_ui_with_layout(
+                egui::vec2(action_width, 24.0),
+                egui::Layout::right_to_left(egui::Align::Center),
+                |ui| {
+                    let clear = ui.add_enabled(
+                        current_present,
+                        egui::Button::new(icon_text(icons::X, 14.0))
+                            .frame(false)
+                            .min_size(egui::vec2(20.0, 20.0)),
+                    );
+                    if clear.on_hover_text("Clear texture").clicked() {
+                        result.clear = true;
+                    }
+                    if candidates.is_empty() {
+                        ui.add_enabled(
+                            false,
+                            egui::Button::new(icon_text(icons::FOLDER_OPEN, 14.0))
+                                .frame(false)
+                                .min_size(egui::vec2(20.0, 20.0)),
+                        )
+                        .on_hover_text("No project textures available");
+                    } else {
+                        let menu = ui.menu_button(icon_text(icons::FOLDER_OPEN, 14.0), |ui| {
+                            ui.set_min_width(240.0);
+                            for candidate in candidates {
+                                let selected = selected_candidate.is_some_and(|selected| {
+                                    selected.reference.asset_id == candidate.reference.asset_id
+                                        && selected.reference.sub_asset_id
+                                            == candidate.reference.sub_asset_id
+                                });
+                                if ui
+                                    .selectable_label(selected, candidate.label.as_str())
+                                    .on_hover_text(candidate.detail.as_str())
+                                    .clicked()
+                                {
+                                    result.selected = Some(candidate.clone());
+                                    ui.close();
+                                }
+                            }
+                        });
+                        menu.response.on_hover_text("Select a project texture");
+                    }
+                },
+            );
+
+            if drop_hovered && ui.input(|input| input.pointer.any_released()) {
+                if let Some(candidate) = drop_candidate {
+                    result.selected = Some(candidate.clone());
+                    result.accepted_drop = true;
+                }
+            }
+        });
     });
+    result
 }
 
 fn default_value_for_shader_property(property_type: &ShaderPropertyType) -> MaterialParameterValue {
@@ -3119,11 +4040,11 @@ fn subasset_context_menu(
     }
     match embedded.kind {
         AssetSubAssetKind::Mesh => {
-            if embedded.requires_scene_instance {
-                ui.label(
-                    egui::RichText::new("Skinned mesh: place parent model or animation clip")
-                        .color(TEXT_DIM),
-                );
+            if embedded.requires_skinned_hierarchy {
+                if ui.button("Place Skinned Model at Origin").clicked() {
+                    place_subasset_operator(world, embedded.selection.clone(), Vec3::ZERO);
+                    ui.close();
+                }
             } else if ui.button("Place at Origin").clicked() {
                 place_subasset_operator(world, embedded.selection.clone(), Vec3::ZERO);
                 ui.close();
@@ -3150,7 +4071,7 @@ fn subasset_context_menu(
                 .as_slice()
                 .iter()
                 .copied()
-                .find(|entity| world.get::<shared::ModelRef>(*entity).is_some());
+                .find(|entity| world.get::<shared::SkinnedMeshRenderer>(*entity).is_some());
             let action = if animated_actor.is_some() {
                 "Assign To Selected Actor"
             } else {
@@ -3232,7 +4153,7 @@ fn regenerate_subasset_thumbnail(world: &mut World, embedded: &EmbeddedAsset) {
                         parent_path.clone(),
                         mesh_label,
                         embedded.material_label.clone(),
-                        embedded.requires_scene_instance,
+                        embedded.requires_skinned_hierarchy,
                         &mut studio,
                     );
                 });
@@ -3489,4 +4410,27 @@ mod tests {
         assert_eq!(audio_format_label("assets/audio/source.mp3"), "MP3");
         assert_eq!(audio_format_label("assets/audio/source.flac"), "FLAC");
     }
+
+    #[test]
+    fn material_instance_texture_override_stays_sparse() {
+        let first = EditorAssetRef::new("texture-a", "texture:source", "First")
+            .with_source_path("assets/textures/first.png");
+        let second = EditorAssetRef::new("texture-b", "texture:source", "Second")
+            .with_source_path("assets/textures/second.png");
+        let mut textures = Vec::new();
+
+        set_material_instance_texture_override(&mut textures, "base_color_texture", Some(first));
+        set_material_instance_texture_override(
+            &mut textures,
+            "base_color_texture",
+            Some(second.clone()),
+        );
+
+        assert_eq!(textures.len(), 1);
+        assert_eq!(textures[0].name, "base_color_texture");
+        assert_eq!(textures[0].texture.as_ref(), Some(&second));
+
+        set_material_instance_texture_override(&mut textures, "base_color_texture", None);
+        assert!(textures.is_empty());
+    }
 }
diff --git a/crates/editor/src/ui/asset_browser/state.rs b/crates/editor/src/ui/asset_browser/state.rs
index f0b2be4..2c7e197 100644
--- a/crates/editor/src/ui/asset_browser/state.rs
+++ b/crates/editor/src/ui/asset_browser/state.rs
@@ -3,7 +3,7 @@
 use std::collections::HashSet;
 
 use bevy::prelude::*;
-use shared::MaterialAsset;
+use shared::{MaterialAsset, MaterialInstanceAsset};
 
 use crate::asset_db::ImportSettings;
 use crate::assets::{AssetSelection, ASSETS_ROOT, BUILTINS_FOLDER};
@@ -48,6 +48,7 @@ pub struct AssetBrowserUiState {
     pub(crate) pending_delete: Option<AssetDeleteRequest>,
     pub(crate) import_draft: Option<ImportSettingsDraft>,
     pub(crate) material_draft: Option<MaterialAssetDraft>,
+    pub(crate) material_instance_draft: Option<MaterialInstanceAssetDraft>,
 }
 
 #[derive(Debug, Clone)]
@@ -71,6 +72,13 @@ pub(crate) struct MaterialAssetDraft {
     pub(crate) error: Option<String>,
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct MaterialInstanceAssetDraft {
+    pub(crate) path: String,
+    pub(crate) asset: MaterialInstanceAsset,
+    pub(crate) error: Option<String>,
+}
+
 impl Default for AssetBrowserUiState {
     fn default() -> Self {
         let mut expanded_folders = HashSet::new();
@@ -89,6 +97,7 @@ impl Default for AssetBrowserUiState {
             pending_delete: None,
             import_draft: None,
             material_draft: None,
+            material_instance_draft: None,
         }
     }
 }
diff --git a/crates/editor/src/ui/component_registry.rs b/crates/editor/src/ui/component_registry.rs
index 51087a1..e7ea2f9 100644
--- a/crates/editor/src/ui/component_registry.rs
+++ b/crates/editor/src/ui/component_registry.rs
@@ -1,6 +1,12 @@
 //! Editor-visible component registry for actor inspector palettes.
 
+use std::collections::{HashMap, HashSet};
+
+use bevy::ecs::reflect::ReflectComponent;
 use bevy::prelude::*;
+use bevy::reflect::std_traits::ReflectDefault;
+use bevy::reflect::GetTypeRegistration;
+use bevy_egui::egui;
 use egui_phosphor_icons::icons;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -9,6 +15,7 @@ pub enum EditorComponentCategory {
     Rendering,
     Animation,
     Audio,
+    Navigation,
     Physics,
     Gameplay,
     Volumes,
@@ -17,6 +24,8 @@ pub enum EditorComponentCategory {
 
 #[derive(Debug, Clone)]
 pub struct EditorComponentDescriptor {
+    /// Stable editor/protocol identity. This must not be a Rust type path.
+    pub id: &'static str,
     pub type_name: &'static str,
     pub display_name: &'static str,
     pub category: EditorComponentCategory,
@@ -35,6 +44,266 @@ pub struct EditorComponentDescriptor {
 #[derive(Resource, Debug, Clone)]
 pub struct EditorComponentRegistry {
     pub descriptors: Vec<EditorComponentDescriptor>,
+    inspectors: HashMap<&'static str, ComponentInspectorFn>,
+}
+
+pub type ComponentInspectorFn = fn(&mut World, &mut egui::Ui, Entity);
+
+impl EditorComponentRegistry {
+    /// Registers a statically linked component extension.
+    ///
+    /// Stable ids and reflected type paths are both unique. Returning an error
+    /// here prevents a game/editor extension from silently shadowing a built-in.
+    pub fn register(&mut self, descriptor: EditorComponentDescriptor) -> Result<(), String> {
+        if self
+            .descriptors
+            .iter()
+            .any(|existing| existing.id == descriptor.id)
+        {
+            return Err(format!(
+                "duplicate authoring component id `{}`",
+                descriptor.id
+            ));
+        }
+        if self
+            .descriptors
+            .iter()
+            .any(|existing| existing.type_name == descriptor.type_name)
+        {
+            return Err(format!(
+                "component type `{}` is already registered",
+                descriptor.type_name
+            ));
+        }
+        self.descriptors.push(descriptor);
+        Ok(())
+    }
+
+    pub fn register_with_inspector(
+        &mut self,
+        descriptor: EditorComponentDescriptor,
+        inspector: ComponentInspectorFn,
+    ) -> Result<(), String> {
+        let type_name = descriptor.type_name;
+        self.register(descriptor)?;
+        self.inspectors.insert(type_name, inspector);
+        Ok(())
+    }
+
+    pub fn inspector(&self, type_name: &str) -> Option<ComponentInspectorFn> {
+        self.inspectors.get(type_name).copied()
+    }
+
+    /// Hard lifecycle requirements keyed by stable component IDs. Keeping this
+    /// lookup in the registry removes requirement policy from inspector code.
+    pub fn required_component_ids(
+        &self,
+        descriptor: &EditorComponentDescriptor,
+    ) -> &'static [&'static str] {
+        match descriptor.id {
+            shared::AUTHORING_COMPONENT_ANIMATION_CONTROLLER => {
+                &[shared::AUTHORING_COMPONENT_SKINNED_MESH_RENDERER]
+            }
+            _ => &[],
+        }
+    }
+
+    pub fn present_dependents(
+        &self,
+        world: &World,
+        entity: Entity,
+        required_id: &str,
+    ) -> Vec<&EditorComponentDescriptor> {
+        self.descriptors
+            .iter()
+            .filter(|descriptor| {
+                self.required_component_ids(descriptor)
+                    .contains(&required_id)
+                    && self.component_present(world, entity, descriptor.type_name)
+            })
+            .collect()
+    }
+
+    pub fn by_id(&self, id: &str) -> Option<&EditorComponentDescriptor> {
+        self.descriptors
+            .iter()
+            .find(|descriptor| descriptor.id == id)
+    }
+
+    pub fn by_type_name(&self, type_name: &str) -> Option<&EditorComponentDescriptor> {
+        self.descriptors
+            .iter()
+            .find(|descriptor| descriptor.type_name == type_name)
+    }
+
+    pub fn stable_id_for_type<'a>(&self, type_name: &'a str) -> &'a str {
+        self.by_type_name(type_name)
+            .map(|descriptor| descriptor.id)
+            .unwrap_or(type_name)
+    }
+
+    pub fn ensure_component_order(&self, order: &mut shared::InspectorOrder, present: &[&str]) {
+        for type_name in present {
+            let component_id = self.stable_id_for_type(type_name);
+            if !order
+                .component_ids
+                .iter()
+                .any(|existing| existing == component_id)
+            {
+                order.component_ids.push(component_id.to_string());
+            }
+        }
+        order.component_type_names.clear();
+    }
+
+    pub fn ordered_components<'a>(
+        &self,
+        order: &shared::InspectorOrder,
+        present: &[&'a str],
+    ) -> Vec<&'a str> {
+        let mut ordered = Vec::new();
+        for component_id in &order.component_ids {
+            if let Some(type_name) = present
+                .iter()
+                .find(|type_name| self.stable_id_for_type(type_name) == component_id)
+            {
+                ordered.push(*type_name);
+            }
+        }
+        for legacy_type_name in &order.component_type_names {
+            if let Some(type_name) = present
+                .iter()
+                .find(|type_name| **type_name == legacy_type_name)
+            {
+                if !ordered.contains(type_name) {
+                    ordered.push(*type_name);
+                }
+            }
+        }
+        for type_name in present {
+            if !ordered.contains(type_name) {
+                ordered.push(*type_name);
+            }
+        }
+        ordered
+    }
+
+    pub fn move_component(
+        &self,
+        order: &mut shared::InspectorOrder,
+        type_name: &str,
+        offset: isize,
+        present: &[&str],
+    ) -> bool {
+        self.ensure_component_order(order, present);
+        let component_id = self.stable_id_for_type(type_name);
+        let Some(index) = order
+            .component_ids
+            .iter()
+            .position(|existing| existing == component_id)
+        else {
+            return false;
+        };
+        let target =
+            (index as isize + offset).clamp(0, order.component_ids.len() as isize - 1) as usize;
+        if index == target {
+            return false;
+        }
+        let item = order.component_ids.remove(index);
+        order.component_ids.insert(target, item);
+        true
+    }
+
+    pub fn component_present(&self, world: &World, entity: Entity, type_name: &str) -> bool {
+        let Ok(entity_ref) = world.get_entity(entity) else {
+            return false;
+        };
+        let Some(app_registry) = world.get_resource::<AppTypeRegistry>() else {
+            return false;
+        };
+        let type_registry = app_registry.read();
+        type_registry
+            .get_with_type_path(type_name)
+            .and_then(|registration| registration.data::<ReflectComponent>())
+            .is_some_and(|component| component.contains(entity_ref))
+    }
+
+    /// Validates registry metadata against Bevy reflection before the first
+    /// inspector frame. This is also the contract test used by extensions.
+    pub fn validate(&self, world: &World) -> Result<(), Vec<String>> {
+        let Some(app_registry) = world.get_resource::<AppTypeRegistry>() else {
+            return Err(vec!["AppTypeRegistry is unavailable".to_string()]);
+        };
+        let type_registry = app_registry.read();
+        let mut errors = Vec::new();
+        let mut ids = HashSet::new();
+        let mut type_names = HashSet::new();
+        for descriptor in &self.descriptors {
+            if descriptor.id.trim().is_empty() {
+                errors.push(format!(
+                    "{} has an empty stable id",
+                    descriptor.display_name
+                ));
+            } else if !ids.insert(descriptor.id) {
+                errors.push(format!("duplicate stable id `{}`", descriptor.id));
+            }
+            if !type_names.insert(descriptor.type_name) {
+                errors.push(format!(
+                    "duplicate reflected type `{}`",
+                    descriptor.type_name
+                ));
+            }
+            match type_registry.get_with_type_path(descriptor.type_name) {
+                Some(registration) if registration.data::<ReflectComponent>().is_none() => errors
+                    .push(format!(
+                        "`{}` is registered without ReflectComponent",
+                        descriptor.type_name
+                    )),
+                None => errors.push(format!(
+                    "reflected component `{}` is not registered",
+                    descriptor.type_name
+                )),
+                Some(registration)
+                    if descriptor.addable && registration.data::<ReflectDefault>().is_none() =>
+                {
+                    errors.push(format!(
+                        "addable component `{}` has no reflected Default",
+                        descriptor.type_name
+                    ));
+                }
+                Some(_) => {}
+            }
+            for relation in descriptor
+                .recommended
+                .iter()
+                .chain(descriptor.conflicts_with.iter())
+            {
+                if !self
+                    .descriptors
+                    .iter()
+                    .any(|candidate| candidate.type_name == *relation)
+                {
+                    errors.push(format!(
+                        "{} references unregistered component `{relation}`",
+                        descriptor.id
+                    ));
+                }
+            }
+            for required_id in self.required_component_ids(descriptor) {
+                if self.by_id(required_id).is_none() {
+                    errors.push(format!(
+                        "{} requires unknown stable component id `{required_id}`",
+                        descriptor.id
+                    ));
+                }
+            }
+        }
+        if errors.is_empty() {
+            Ok(())
+        } else {
+            Err(errors)
+        }
+    }
 }
 
 impl Default for EditorComponentRegistry {
@@ -42,6 +311,7 @@ impl Default for EditorComponentRegistry {
         Self {
             descriptors: vec![
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_STATIC_MESH_RENDERER,
                     type_name: "shared::components::StaticMeshRenderer",
                     display_name: "Static Mesh Renderer",
                     category: EditorComponentCategory::Rendering,
@@ -56,11 +326,35 @@ impl Default for EditorComponentRegistry {
                     conflicts_with: &[
                         "shared::components::Primitive",
                         "shared::components::BrushDesc",
+                        "shared::animation::SkinnedMeshRenderer",
                     ],
                     hydration_effect:
                         "Hydrates into generated mesh children and material bindings.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_SKINNED_MESH_RENDERER,
+                    type_name: "shared::animation::SkinnedMeshRenderer",
+                    display_name: "Skinned Mesh Renderer",
+                    category: EditorComponentCategory::Rendering,
+                    addable: false,
+                    removable: true,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::PERSON_SIMPLE_RUN.as_str(),
+                    description:
+                        "Renders rigged geometry while preserving its imported joints and skin bindings.",
+                    search_terms: &["mesh", "renderer", "skinned", "skeletal", "rigged", "joints"],
+                    recommended: &["shared::animation::AnimationControllerDesc"],
+                    conflicts_with: &[
+                        "shared::components::Primitive",
+                        "shared::components::BrushDesc",
+                        "shared::components::StaticMeshRenderer",
+                    ],
+                    hydration_effect:
+                        "Hydrates through a dedicated scene root containing Bevy skinned meshes and joints.",
+                },
+                EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_BRUSH,
                     type_name: "shared::components::BrushDesc",
                     display_name: "Brush",
                     category: EditorComponentCategory::Authoring,
@@ -75,10 +369,12 @@ impl Default for EditorComponentRegistry {
                     conflicts_with: &[
                         "shared::components::Primitive",
                         "shared::components::StaticMeshRenderer",
+                        "shared::animation::SkinnedMeshRenderer",
                     ],
                     hydration_effect: "Hydrates into generated brush mesh children.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_MATERIAL,
                     type_name: "shared::components::MaterialDesc",
                     display_name: "Authoring Material",
                     category: EditorComponentCategory::Rendering,
@@ -94,6 +390,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into Bevy material assets for renderable actors.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_RIGID_BODY,
                     type_name: "shared::components::RigidBodyDesc",
                     display_name: "Rigid Body",
                     category: EditorComponentCategory::Physics,
@@ -109,6 +406,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into runtime Avian rigid-body state.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_COLLIDER,
                     type_name: "shared::components::ColliderDesc",
                     display_name: "Collider",
                     category: EditorComponentCategory::Physics,
@@ -124,6 +422,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into runtime Avian collider state.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_LIGHT,
                     type_name: "shared::components::LightDesc",
                     display_name: "Light",
                     category: EditorComponentCategory::Rendering,
@@ -139,6 +438,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into runtime Bevy light components.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_ANIMATION_CONTROLLER,
                     type_name: "shared::animation::AnimationControllerDesc",
                     display_name: "Animation Controller",
                     category: EditorComponentCategory::Animation,
@@ -149,12 +449,13 @@ impl Default for EditorComponentRegistry {
                     icon: icons::FILM_SLATE.as_str(),
                     description: "Authors named animation states for an imported model rig.",
                     search_terms: &["animation", "controller", "state", "clip", "skeleton", "rig"],
-                    recommended: &[],
+                    recommended: &["shared::animation::SkinnedMeshRenderer"],
                     conflicts_with: &[],
                     hydration_effect:
                         "Hydrates into a Bevy animation graph and player bound to the imported model.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_AUDIO_SOURCE,
                     type_name: "shared::components::AudioSourceDesc",
                     display_name: "Audio Source",
                     category: EditorComponentCategory::Audio,
@@ -171,6 +472,7 @@ impl Default for EditorComponentRegistry {
                         "Hydrates into runtime Bevy audio voices with bus and attenuation control.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_AUDIO_LISTENER,
                     type_name: "shared::components::AudioListenerDesc",
                     display_name: "Audio Listener",
                     category: EditorComponentCategory::Audio,
@@ -187,6 +489,7 @@ impl Default for EditorComponentRegistry {
                         "The highest-priority enabled listener becomes the runtime listener.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_PRIMITIVE,
                     type_name: "shared::components::Primitive",
                     display_name: "Primitive",
                     category: EditorComponentCategory::Authoring,
@@ -201,11 +504,13 @@ impl Default for EditorComponentRegistry {
                     conflicts_with: &[
                         "shared::components::StaticMeshRenderer",
                         "shared::components::BrushDesc",
+                        "shared::animation::SkinnedMeshRenderer",
                     ],
                     hydration_effect:
                         "Hydrates into generated primitive render and collision data.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_PLAYER_SPAWN,
                     type_name: "shared::components::PlayerSpawn",
                     display_name: "Player Spawn",
                     category: EditorComponentCategory::Gameplay,
@@ -222,6 +527,7 @@ impl Default for EditorComponentRegistry {
                         "Used by PIE/session startup; no saved runtime player is created.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_WEAPON_SPAWN,
                     type_name: "shared::components::WeaponSpawn",
                     display_name: "Weapon Spawn",
                     category: EditorComponentCategory::Gameplay,
@@ -237,6 +543,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into gameplay spawn metadata.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_TRIGGER_VOLUME,
                     type_name: "shared::components::TriggerVolume",
                     display_name: "Trigger Volume",
                     category: EditorComponentCategory::Volumes,
@@ -252,6 +559,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into gameplay trigger queries and visualizers.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_TEAM_SPAWN,
                     type_name: "shared::components::TeamSpawn",
                     display_name: "Team Spawn",
                     category: EditorComponentCategory::Gameplay,
@@ -267,6 +575,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into gameplay spawn metadata.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_OBJECTIVE,
                     type_name: "shared::components::ObjectiveMarker",
                     display_name: "Objective Marker",
                     category: EditorComponentCategory::Gameplay,
@@ -282,6 +591,7 @@ impl Default for EditorComponentRegistry {
                     hydration_effect: "Hydrates into gameplay objective metadata.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_POST_PROCESS_VOLUME,
                     type_name: "shared::components::PostProcessVolumeDesc",
                     display_name: "Post-Process Volume",
                     category: EditorComponentCategory::Volumes,
@@ -298,6 +608,215 @@ impl Default for EditorComponentRegistry {
                         "Affects active camera rendering when the camera is inside the volume.",
                 },
                 EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_NAVIGATION_BOUNDS,
+                    type_name: "shared::navigation::NavigationBounds",
+                    display_name: "Navigation Bounds",
+                    category: EditorComponentCategory::Navigation,
+                    addable: true,
+                    removable: true,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::PATH.as_str(),
+                    description: "Defines the world region and agent profile for a navigation bake.",
+                    search_terms: &["navigation", "navmesh", "bounds", "agent", "bake"],
+                    recommended: &[],
+                    conflicts_with: &[
+                        "shared::navigation::NavigationObstacle",
+                        "shared::navigation::NavigationArea",
+                        "shared::navigation::NavigationLink",
+                    ],
+                    hydration_effect: "Feeds the generated navigation artifact; no render component is hydrated.",
+                },
+                EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_NAVIGATION_OBSTACLE,
+                    type_name: "shared::navigation::NavigationObstacle",
+                    display_name: "Navigation Obstacle",
+                    category: EditorComponentCategory::Navigation,
+                    addable: true,
+                    removable: true,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::SELECTION_SLASH.as_str(),
+                    description: "Carves an axis-aligned blocked volume from overlapping bakes.",
+                    search_terms: &["navigation", "navmesh", "obstacle", "block", "carve"],
+                    recommended: &[],
+                    conflicts_with: &[
+                        "shared::navigation::NavigationBounds",
+                        "shared::navigation::NavigationArea",
+                        "shared::navigation::NavigationLink",
+                    ],
+                    hydration_effect: "Contributes a deterministic unwalkable volume during bake.",
+                },
+                EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_NAVIGATION_AREA,
+                    type_name: "shared::navigation::NavigationArea",
+                    display_name: "Navigation Area",
+                    category: EditorComponentCategory::Navigation,
+                    addable: true,
+                    removable: true,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::POLYGON.as_str(),
+                    description: "Labels a walkable or blocked navigation area and traversal cost.",
+                    search_terms: &["navigation", "navmesh", "area", "cost", "walkable"],
+                    recommended: &[],
+                    conflicts_with: &[
+                        "shared::navigation::NavigationBounds",
+                        "shared::navigation::NavigationObstacle",
+                        "shared::navigation::NavigationLink",
+                    ],
+                    hydration_effect: "Stores area metadata and blocked-volume contribution in the bake artifact.",
+                },
+                EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_NAVIGATION_LINK,
+                    type_name: "shared::navigation::NavigationLink",
+                    display_name: "Navigation Link",
+                    category: EditorComponentCategory::Navigation,
+                    addable: true,
+                    removable: true,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::LINK.as_str(),
+                    description: "Connects otherwise isolated navigation regions with an explicit traversal.",
+                    search_terms: &["navigation", "navmesh", "link", "jump", "door", "ladder"],
+                    recommended: &[],
+                    conflicts_with: &[
+                        "shared::navigation::NavigationBounds",
+                        "shared::navigation::NavigationObstacle",
+                        "shared::navigation::NavigationArea",
+                    ],
+                    hydration_effect: "Adds a validated directed or bidirectional runtime path connection.",
+                },
+                EditorComponentDescriptor {
+                    id: shared::AUTHORING_COMPONENT_LEGACY_PHYSICS_BODY,
+                    type_name: "shared::components::PhysicsBody",
+                    display_name: "Legacy Physics Body",
+                    category: EditorComponentCategory::Physics,
+                    addable: false,
+                    removable: true,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::SPHERE.as_str(),
+                    description: "Legacy combined physics authoring retained for scene compatibility.",
+                    search_terms: &["legacy", "physics", "body"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Hydrates through the compatibility physics path.",
+                },
+                EditorComponentDescriptor {
+                    id: "prefab.instance",
+                    type_name: "shared::components::PrefabInstance",
+                    display_name: "Prefab Instance",
+                    category: EditorComponentCategory::Authoring,
+                    addable: false,
+                    removable: false,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::PACKAGE.as_str(),
+                    description: "Stores a linked prefab instance and its overrides.",
+                    search_terms: &["prefab", "instance", "link"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Hydrates linked prefab members beneath this anchor.",
+                },
+                EditorComponentDescriptor {
+                    id: "prefab.reference",
+                    type_name: "shared::components::PrefabRef",
+                    display_name: "Prefab Reference",
+                    category: EditorComponentCategory::Authoring,
+                    addable: false,
+                    removable: false,
+                    reorderable: false,
+                    hidden: true,
+                    icon: icons::PACKAGE.as_str(),
+                    description: "Stable source reference owned by a prefab anchor.",
+                    search_terms: &["prefab", "reference"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Resolves the prefab source asset.",
+                },
+                EditorComponentDescriptor {
+                    id: "render.imported_model",
+                    type_name: "shared::components::ModelRef",
+                    display_name: "Imported Model Reference",
+                    category: EditorComponentCategory::Rendering,
+                    addable: false,
+                    removable: false,
+                    reorderable: false,
+                    hidden: true,
+                    icon: icons::CUBE_TRANSPARENT.as_str(),
+                    description: "Legacy full-scene imported model reference.",
+                    search_terms: &["model", "imported", "scene"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Hydrates the referenced imported model scene.",
+                },
+                EditorComponentDescriptor {
+                    id: "render.material_override_legacy",
+                    type_name: "shared::components::MaterialOverride",
+                    display_name: "Legacy Material Override",
+                    category: EditorComponentCategory::Rendering,
+                    addable: false,
+                    removable: false,
+                    reorderable: false,
+                    hidden: true,
+                    icon: icons::PALETTE.as_str(),
+                    description: "Legacy renderer material slot overrides retained for migration.",
+                    search_terms: &["material", "override", "legacy"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Applies compatibility material overrides.",
+                },
+                EditorComponentDescriptor {
+                    id: "render.project_sun",
+                    type_name: "shared::components::ProjectSun",
+                    display_name: "Project Sun",
+                    category: EditorComponentCategory::Rendering,
+                    addable: false,
+                    removable: false,
+                    reorderable: true,
+                    hidden: false,
+                    icon: icons::SUN.as_str(),
+                    description: "Marks the scene light that overrides the project sun.",
+                    search_terms: &["sun", "directional", "project"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Selects the authored directional project light.",
+                },
+                EditorComponentDescriptor {
+                    id: "core.actor_kind",
+                    type_name: "shared::components::ActorKind",
+                    display_name: "Actor Kind Hint",
+                    category: EditorComponentCategory::Editor,
+                    addable: false,
+                    removable: false,
+                    reorderable: false,
+                    hidden: true,
+                    icon: icons::TAG.as_str(),
+                    description: "Compatibility and presentation hint derived from primary components.",
+                    search_terms: &["actor", "kind", "hint"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "No runtime effect; validation uses component composition.",
+                },
+                EditorComponentDescriptor {
+                    id: "editor.component_states",
+                    type_name: "shared::components::AuthoringComponentStates",
+                    display_name: "Authoring Component States",
+                    category: EditorComponentCategory::Editor,
+                    addable: false,
+                    removable: false,
+                    reorderable: false,
+                    hidden: true,
+                    icon: icons::TOGGLE_LEFT.as_str(),
+                    description: "Stores persisted component enable state independently of inspector layout.",
+                    search_terms: &["editor", "active", "enabled"],
+                    recommended: &[],
+                    conflicts_with: &[],
+                    hydration_effect: "Controls whether opted-in authoring components hydrate.",
+                },
+                EditorComponentDescriptor {
+                    id: "editor.inspector_order",
                     type_name: "shared::components::InspectorOrder",
                     display_name: "Inspector Order",
                     category: EditorComponentCategory::Editor,
@@ -306,14 +825,62 @@ impl Default for EditorComponentRegistry {
                     reorderable: false,
                     hidden: true,
                     icon: icons::LIST_BULLETS.as_str(),
-                    description: "Stores editor-only component ordering and active-state metadata.",
+                    description: "Stores editor-only component card ordering.",
                     search_terms: &["editor", "order"],
                     recommended: &[],
                     conflicts_with: &[],
-                    hydration_effect:
-                        "Controls editor presentation and authoring component active state.",
+                    hydration_effect: "Controls editor presentation only; runtime active state is stored separately.",
                 },
             ],
+            inspectors: HashMap::new(),
         }
     }
 }
+
+/// Registers one statically linked game/editor component with reflection,
+/// lifecycle metadata, and its editor inspector in a single call.
+pub fn register_authoring_component<T>(
+    app: &mut App,
+    descriptor: EditorComponentDescriptor,
+    inspector: ComponentInspectorFn,
+) -> Result<(), String>
+where
+    T: Component + Reflect + GetTypeRegistration,
+{
+    app.register_type::<T>();
+    if !app.world().contains_resource::<EditorComponentRegistry>() {
+        app.init_resource::<EditorComponentRegistry>();
+    }
+    app.world_mut()
+        .resource_mut::<EditorComponentRegistry>()
+        .register_with_inspector(descriptor, inspector)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn built_in_registry_is_unique_and_reflectable() {
+        let mut app = App::new();
+        app.add_plugins(shared::SharedTypesPlugin)
+            .init_resource::<EditorComponentRegistry>();
+
+        app.world()
+            .resource::<EditorComponentRegistry>()
+            .validate(app.world())
+            .unwrap();
+    }
+
+    #[test]
+    fn static_extensions_cannot_shadow_stable_ids_or_types() {
+        let mut registry = EditorComponentRegistry::default();
+        let mut duplicate = registry.descriptors[0].clone();
+        duplicate.type_name = "game::editor_ext::StaticFixture";
+        assert!(registry.register(duplicate).is_err());
+
+        let mut duplicate = registry.descriptors[0].clone();
+        duplicate.id = "game.static_fixture";
+        assert!(registry.register(duplicate).is_err());
+    }
+}
diff --git a/crates/editor/src/ui/helpers.rs b/crates/editor/src/ui/helpers.rs
index 3c7428e..a1fa265 100644
--- a/crates/editor/src/ui/helpers.rs
+++ b/crates/editor/src/ui/helpers.rs
@@ -91,6 +91,7 @@ pub fn light_snapshot(name: &str, translation: Vec3) -> EditorEntitySnapshot {
         primitive: None,
         brush: None,
         static_mesh_renderer: None,
+        skinned_mesh_renderer: None,
         material: None,
         material_override: None,
         rigid_body: None,
@@ -109,8 +110,18 @@ pub fn light_snapshot(name: &str, translation: Vec3) -> EditorEntitySnapshot {
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: 0,
         editor_visibility: shared::EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     }
 }
@@ -142,6 +153,7 @@ pub fn ensure_player_spawn_for_edit(world: &mut World) -> Entity {
             primitive: None,
             brush: None,
             static_mesh_renderer: None,
+            skinned_mesh_renderer: None,
             material: None,
             material_override: None,
             rigid_body: None,
@@ -160,8 +172,18 @@ pub fn ensure_player_spawn_for_edit(world: &mut World) -> Entity {
             post_process_volume: None,
             team_spawn: None,
             objective: None,
+
+            navigation_bounds: None,
+
+            navigation_obstacle: None,
+
+            navigation_area: None,
+
+            navigation_link: None,
             hierarchy_sibling_index: 0,
             editor_visibility: shared::EditorVisibility::default(),
+            inspector_order: None,
+            component_states: None,
             children: Vec::new(),
         },
     )
@@ -233,6 +255,7 @@ pub fn create_scene_sun_override_from_project_settings(world: &mut World) -> Ent
             primitive: None,
             brush: None,
             static_mesh_renderer: None,
+            skinned_mesh_renderer: None,
             material: None,
             material_override: None,
             rigid_body: None,
@@ -251,8 +274,18 @@ pub fn create_scene_sun_override_from_project_settings(world: &mut World) -> Ent
             post_process_volume: None,
             team_spawn: None,
             objective: None,
+
+            navigation_bounds: None,
+
+            navigation_obstacle: None,
+
+            navigation_area: None,
+
+            navigation_link: None,
             hierarchy_sibling_index: 0,
             editor_visibility: shared::EditorVisibility::default(),
+            inspector_order: None,
+            component_states: None,
             children: Vec::new(),
         },
     )
diff --git a/crates/editor/src/ui/hierarchy_ops.rs b/crates/editor/src/ui/hierarchy_ops.rs
index 3706160..3337b3c 100644
--- a/crates/editor/src/ui/hierarchy_ops.rs
+++ b/crates/editor/src/ui/hierarchy_ops.rs
@@ -4,6 +4,7 @@ use bevy::prelude::*;
 use shared::{
     ActorKind, AuthoringLightKind, EditorVisibility, HierarchySiblingIndex, HydratedPrefabMember,
     LevelObject, LightDesc, ModelRef, PhysicsBody, PlayerSpawn, PrefabInstance,
+    SkinnedMeshRenderer,
 };
 
 use super::helpers::{entity_name, is_level_object, HierarchyNodeKind};
@@ -203,7 +204,10 @@ fn actor_kind_sort_key(world: &World, entity: Entity) -> u8 {
         .copied()
         .map(|kind| match kind {
             ActorKind::Empty => 0,
-            ActorKind::Brush | ActorKind::StaticMesh | ActorKind::ImportedModel => 1,
+            ActorKind::Brush
+            | ActorKind::StaticMesh
+            | ActorKind::SkinnedMesh
+            | ActorKind::ImportedModel => 1,
             ActorKind::Light => 2,
             ActorKind::AudioSource | ActorKind::AudioListener => 3,
             ActorKind::PrefabAnchor => 3,
@@ -213,6 +217,7 @@ fn actor_kind_sort_key(world: &World, entity: Entity) -> u8 {
             ActorKind::PostProcessVolume => 6,
             ActorKind::TeamSpawn => 7,
             ActorKind::Objective => 8,
+            ActorKind::Navigation => 6,
         })
         .unwrap_or(9)
 }
@@ -464,6 +469,7 @@ pub fn actor_kind_icon(kind: ActorKind) -> &'static str {
         ActorKind::Empty => icons::FOLDER.as_str(),
         ActorKind::Brush => icons::CUBE.as_str(),
         ActorKind::StaticMesh => icons::CUBE.as_str(),
+        ActorKind::SkinnedMesh => icons::PERSON_SIMPLE_RUN.as_str(),
         ActorKind::ImportedModel => icons::CUBE_TRANSPARENT.as_str(),
         ActorKind::Light => icons::LIGHTBULB.as_str(),
         ActorKind::AudioSource => icons::SPEAKER_HIGH.as_str(),
@@ -475,6 +481,7 @@ pub fn actor_kind_icon(kind: ActorKind) -> &'static str {
         ActorKind::PostProcessVolume => icons::CAMERA.as_str(),
         ActorKind::TeamSpawn => icons::FLAG.as_str(),
         ActorKind::Objective => icons::TARGET.as_str(),
+        ActorKind::Navigation => icons::PATH.as_str(),
     }
 }
 
@@ -534,6 +541,10 @@ pub fn entity_matches_filter(world: &World, entity: Entity, filter_lower: &str)
             .is_some()
             .then_some("spawn"),
         world.get::<ModelRef>(entity).is_some().then_some("model"),
+        world
+            .get::<SkinnedMeshRenderer>(entity)
+            .is_some()
+            .then_some("skinned model"),
         world
             .get::<PhysicsBody>(entity)
             .is_some()
diff --git a/crates/editor/src/ui/inspector.rs b/crates/editor/src/ui/inspector.rs
index 9313c64..cee4923 100644
--- a/crates/editor/src/ui/inspector.rs
+++ b/crates/editor/src/ui/inspector.rs
@@ -7,30 +7,35 @@ use bevy::prelude::*;
 use bevy_egui::egui;
 use egui_phosphor_icons::{icons, Icon};
 use shared::{
+    authoring_component_active,
     brush_math::{validate_brush, BrushDiagnosticSeverity},
-    infer_actor_kind, inspector_component_active, ActorKind, AnimationControllerDesc,
-    AudioListenerDesc, AudioSourceDesc, AuthoringLightKind, AuthoringRigidBody, BrushDesc,
-    BrushKind, ColliderDesc, ColliderShapeDesc, ColorDesc, ComponentInstanceId, EditorAssetRef,
+    infer_actor_kind, ActorKind, AnimationControllerDesc, AudioListenerDesc, AudioSourceDesc,
+    AuthoringComponentStates, AuthoringLightKind, AuthoringRigidBody, BrushDesc, BrushKind,
+    ColliderDesc, ColliderShapeDesc, ColorDesc, ComponentInstanceId, EditorAssetRef,
     InspectorOrder, LevelObject, LightDesc, MaterialDesc, MaterialParameter,
-    MaterialParameterValue, MaterialShaderKind, ModelRef, ObjectiveMarker, PhysicsBody,
-    PlayerSpawn, PostProcessVolumeDesc, PrefabInstance, Primitive, PrimitiveShape, ProjectSun,
-    RigidBodyDesc, StaticMeshRenderer, StaticMeshRendererEntry, TeamSpawn, TriggerVolume,
+    MaterialParameterValue, MaterialRef, MaterialShaderKind, NavigationArea, NavigationBounds,
+    NavigationLink, NavigationObstacle, ObjectiveMarker, PhysicsBody, PlayerSpawn,
+    PostProcessVolumeDesc, PrefabInstance, Primitive, PrimitiveShape, ProjectSun, RigidBodyDesc,
+    SkinnedMeshRenderer, StaticMeshRenderer, StaticMeshRendererEntry, TeamSpawn, TriggerVolume,
     WeaponSpawn, AUTHORING_DIRECTIONAL_LUX_MAX, AUTHORING_POINT_SPOT_LUMENS_MAX,
     COMPONENT_ANIMATION_CONTROLLER_DESC, COMPONENT_AUDIO_LISTENER_DESC,
     COMPONENT_AUDIO_SOURCE_DESC, COMPONENT_BRUSH_DESC, COMPONENT_COLLIDER_DESC,
-    COMPONENT_LIGHT_DESC, COMPONENT_MATERIAL_DESC, COMPONENT_OBJECTIVE_MARKER,
-    COMPONENT_PHYSICS_BODY, COMPONENT_PLAYER_SPAWN, COMPONENT_POST_PROCESS_VOLUME,
-    COMPONENT_PREFAB_INSTANCE, COMPONENT_PRIMITIVE, COMPONENT_PROJECT_SUN,
-    COMPONENT_RIGID_BODY_DESC, COMPONENT_STATIC_MESH_RENDERER, COMPONENT_TEAM_SPAWN,
-    COMPONENT_TRIGGER_VOLUME, COMPONENT_WEAPON_SPAWN,
+    COMPONENT_LIGHT_DESC, COMPONENT_MATERIAL_DESC, COMPONENT_NAVIGATION_AREA,
+    COMPONENT_NAVIGATION_BOUNDS, COMPONENT_NAVIGATION_LINK, COMPONENT_NAVIGATION_OBSTACLE,
+    COMPONENT_OBJECTIVE_MARKER, COMPONENT_PHYSICS_BODY, COMPONENT_PLAYER_SPAWN,
+    COMPONENT_POST_PROCESS_VOLUME, COMPONENT_PREFAB_INSTANCE, COMPONENT_PRIMITIVE,
+    COMPONENT_PROJECT_SUN, COMPONENT_RIGID_BODY_DESC, COMPONENT_SKINNED_MESH_RENDERER,
+    COMPONENT_STATIC_MESH_RENDERER, COMPONENT_TEAM_SPAWN, COMPONENT_TRIGGER_VOLUME,
+    COMPONENT_WEAPON_SPAWN,
 };
 
 use crate::history::{
-    material_eq, set_animation_controller_with_history, set_audio_listener_with_history,
-    set_audio_source_with_history, set_brush_with_history, set_collider_with_history,
-    set_inspector_order_with_history, set_light_with_history, set_material_with_history,
-    set_physics_with_history, set_post_process_volume_with_history, set_primitive_with_history,
-    set_rigid_body_with_history, set_static_mesh_renderer_with_history, EditorEntitySnapshot,
+    material_eq, reflected_component_transaction, set_animation_controller_with_history,
+    set_audio_listener_with_history, set_audio_source_with_history, set_brush_with_history,
+    set_collider_with_history, set_inspector_order_with_history, set_light_with_history,
+    set_material_with_history, set_physics_with_history, set_post_process_volume_with_history,
+    set_primitive_with_history, set_rigid_body_with_history, set_static_mesh_renderer_with_history,
+    EditorEntitySnapshot,
 };
 use crate::selection::SelectedEntity;
 use crate::ui::theme::{
@@ -87,7 +92,6 @@ struct AssetRefCandidate {
     detail: String,
     selection: AssetSelection,
     folder_path: String,
-    source_material: Option<EditorAssetRef>,
     texture_id: Option<egui::TextureId>,
 }
 
@@ -138,6 +142,7 @@ enum AddComponentShelfDirection {
 
 #[derive(Debug, Clone)]
 enum CopiedComponent {
+    Reflected(crate::history::ReflectedComponentValue),
     AnimationControllerDesc(AnimationControllerDesc),
     Primitive(Primitive),
     BrushDesc(BrushDesc),
@@ -155,11 +160,16 @@ enum CopiedComponent {
     ObjectiveMarker(ObjectiveMarker),
     PostProcessVolume(PostProcessVolumeDesc),
     PrefabInstance(PrefabInstance),
+    NavigationBounds(NavigationBounds),
+    NavigationObstacle(NavigationObstacle),
+    NavigationArea(NavigationArea),
+    NavigationLink(NavigationLink),
 }
 
 impl CopiedComponent {
-    fn type_name(&self) -> &'static str {
+    fn type_name(&self) -> &str {
         match self {
+            Self::Reflected(value) => &value.type_path,
             Self::AnimationControllerDesc(_) => COMPONENT_ANIMATION_CONTROLLER_DESC,
             Self::Primitive(_) => COMPONENT_PRIMITIVE,
             Self::BrushDesc(_) => COMPONENT_BRUSH_DESC,
@@ -177,6 +187,10 @@ impl CopiedComponent {
             Self::ObjectiveMarker(_) => COMPONENT_OBJECTIVE_MARKER,
             Self::PostProcessVolume(_) => COMPONENT_POST_PROCESS_VOLUME,
             Self::PrefabInstance(_) => COMPONENT_PREFAB_INSTANCE,
+            Self::NavigationBounds(_) => COMPONENT_NAVIGATION_BOUNDS,
+            Self::NavigationObstacle(_) => COMPONENT_NAVIGATION_OBSTACLE,
+            Self::NavigationArea(_) => COMPONENT_NAVIGATION_AREA,
+            Self::NavigationLink(_) => COMPONENT_NAVIGATION_LINK,
         }
     }
 }
@@ -251,9 +265,13 @@ pub(crate) fn component_card_context(
 ) -> ComponentCardContext {
     let present = present_component_type_names(world, entity);
     let order = world.get::<InspectorOrder>(entity);
-    let active = order
-        .map(|order| order.is_component_active(options.type_name))
-        .unwrap_or(true);
+    let registry = world.resource::<EditorComponentRegistry>();
+    let state_key = registry.stable_id_for_type(options.type_name);
+    let active = authoring_component_active(
+        world.get::<AuthoringComponentStates>(entity),
+        order,
+        state_key,
+    );
     let collapsed = world
         .get_resource::<UiState>()
         .map(|state| {
@@ -268,7 +286,7 @@ pub(crate) fn component_card_context(
             .and_then(|clipboard| clipboard.component.as_ref())
             .is_some_and(|component| component.type_name() == options.type_name);
     let ordered = order
-        .map(|order| order.ordered_components(&present))
+        .map(|order| registry.ordered_components(order, &present))
         .unwrap_or_else(|| present.clone());
     let order_index = ordered
         .iter()
@@ -315,14 +333,30 @@ fn apply_component_card_response_for_type(
     }
 
     if let Some(active) = response.active {
-        let mut order = world
-            .get::<InspectorOrder>(entity)
+        let mut states = world
+            .get::<AuthoringComponentStates>(entity)
             .cloned()
-            .unwrap_or_default();
-        let present = present_component_type_names(world, entity);
-        order.ensure_component_order(&present);
-        order.set_component_active(type_name, active);
-        set_inspector_order_with_history(world, entity, order);
+            .unwrap_or_else(|| AuthoringComponentStates {
+                states: world
+                    .get::<InspectorOrder>(entity)
+                    .map(|order| order.component_states.clone())
+                    .unwrap_or_default(),
+            });
+        let component_id = world
+            .resource::<EditorComponentRegistry>()
+            .stable_id_for_type(type_name);
+        states.set_component_active(component_id, active);
+        let _ = crate::history::reflected_component_transaction(
+            world,
+            entity,
+            "Set Component Active",
+            "editor.component_states",
+            "shared::components::AuthoringComponentStates",
+            move |world, entity| {
+                world.entity_mut(entity).insert(states);
+                Ok(())
+            },
+        );
     }
 
     if response.move_up || response.move_down {
@@ -332,7 +366,10 @@ fn apply_component_card_response_for_type(
             .unwrap_or_default();
         let present = present_component_type_names(world, entity);
         let offset = if response.move_up { -1 } else { 1 };
-        if order.move_component(type_name, offset, &present) {
+        let moved = world
+            .resource::<EditorComponentRegistry>()
+            .move_component(&mut order, type_name, offset, &present);
+        if moved {
             set_inspector_order_with_history(world, entity, order);
         }
     }
@@ -366,6 +403,17 @@ fn component_card_key(world: &World, entity: Entity, type_name: &str) -> String
 }
 
 fn present_component_type_names(world: &World, entity: Entity) -> Vec<&'static str> {
+    if let Some(registry) = world.get_resource::<EditorComponentRegistry>() {
+        return registry
+            .descriptors
+            .iter()
+            .filter(|descriptor| {
+                !descriptor.hidden
+                    && registry.component_present(world, entity, descriptor.type_name)
+            })
+            .map(|descriptor| descriptor.type_name)
+            .collect();
+    }
     let mut present = Vec::new();
     if world.get::<AnimationControllerDesc>(entity).is_some() {
         present.push(COMPONENT_ANIMATION_CONTROLLER_DESC);
@@ -373,6 +421,9 @@ fn present_component_type_names(world: &World, entity: Entity) -> Vec<&'static s
     if world.get::<StaticMeshRenderer>(entity).is_some() {
         present.push(COMPONENT_STATIC_MESH_RENDERER);
     }
+    if world.get::<SkinnedMeshRenderer>(entity).is_some() {
+        present.push(COMPONENT_SKINNED_MESH_RENDERER);
+    }
     if world.get::<Primitive>(entity).is_some() {
         present.push(COMPONENT_PRIMITIVE);
     }
@@ -424,10 +475,38 @@ fn present_component_type_names(world: &World, entity: Entity) -> Vec<&'static s
     if world.get::<ProjectSun>(entity).is_some() {
         present.push(COMPONENT_PROJECT_SUN);
     }
+    if world.get::<NavigationBounds>(entity).is_some() {
+        present.push(COMPONENT_NAVIGATION_BOUNDS);
+    }
+    if world.get::<NavigationObstacle>(entity).is_some() {
+        present.push(COMPONENT_NAVIGATION_OBSTACLE);
+    }
+    if world.get::<NavigationArea>(entity).is_some() {
+        present.push(COMPONENT_NAVIGATION_AREA);
+    }
+    if world.get::<NavigationLink>(entity).is_some() {
+        present.push(COMPONENT_NAVIGATION_LINK);
+    }
     present
 }
 
 fn copy_component(world: &mut World, entity: Entity, type_name: &str) {
+    let descriptor = world
+        .resource::<EditorComponentRegistry>()
+        .by_type_name(type_name)
+        .cloned();
+    if let Some(descriptor) = descriptor {
+        if let Ok(Some(value)) = crate::history::capture_reflected_component(
+            world,
+            entity,
+            descriptor.id,
+            descriptor.type_name,
+        ) {
+            world.resource_mut::<InspectorClipboard>().component =
+                Some(CopiedComponent::Reflected(value));
+            return;
+        }
+    }
     let component = match type_name {
         COMPONENT_ANIMATION_CONTROLLER_DESC => world
             .get::<AnimationControllerDesc>(entity)
@@ -497,6 +576,22 @@ fn copy_component(world: &mut World, entity: Entity, type_name: &str) {
             .get::<PrefabInstance>(entity)
             .cloned()
             .map(CopiedComponent::PrefabInstance),
+        COMPONENT_NAVIGATION_BOUNDS => world
+            .get::<NavigationBounds>(entity)
+            .cloned()
+            .map(CopiedComponent::NavigationBounds),
+        COMPONENT_NAVIGATION_OBSTACLE => world
+            .get::<NavigationObstacle>(entity)
+            .cloned()
+            .map(CopiedComponent::NavigationObstacle),
+        COMPONENT_NAVIGATION_AREA => world
+            .get::<NavigationArea>(entity)
+            .cloned()
+            .map(CopiedComponent::NavigationArea),
+        COMPONENT_NAVIGATION_LINK => world
+            .get::<NavigationLink>(entity)
+            .cloned()
+            .map(CopiedComponent::NavigationLink),
         _ => None,
     };
     if let Some(component) = component {
@@ -508,7 +603,30 @@ fn paste_component(world: &mut World, entity: Entity, type_name: &str) {
     let component = world
         .get_resource::<InspectorClipboard>()
         .and_then(|clipboard| clipboard.component.clone());
+    if let Some(CopiedComponent::Reflected(value)) = component.as_ref() {
+        if value.type_path == type_name {
+            let value = value.clone();
+            let component_id = value.component_id.clone();
+            let _ = crate::history::reflected_component_transaction(
+                world,
+                entity,
+                "Paste Component",
+                &component_id,
+                type_name,
+                move |world, entity| {
+                    crate::history::apply_reflected_component(
+                        world,
+                        entity,
+                        type_name,
+                        Some(&value),
+                    )
+                },
+            );
+        }
+        return;
+    }
     match component {
+        Some(CopiedComponent::Reflected(_)) => {}
         Some(CopiedComponent::AnimationControllerDesc(value))
             if type_name == COMPONENT_ANIMATION_CONTROLLER_DESC =>
         {
@@ -572,11 +690,90 @@ fn paste_component(world: &mut World, entity: Entity, type_name: &str) {
         Some(CopiedComponent::PrefabInstance(value)) if type_name == COMPONENT_PREFAB_INSTANCE => {
             insert_direct_component(world, entity, value);
         }
+        Some(CopiedComponent::NavigationBounds(value))
+            if type_name == COMPONENT_NAVIGATION_BOUNDS =>
+        {
+            crate::history::set_navigation_with_history(
+                world,
+                entity,
+                crate::history::NavigationComponentState {
+                    bounds: Some(value),
+                    ..Default::default()
+                },
+            );
+        }
+        Some(CopiedComponent::NavigationObstacle(value))
+            if type_name == COMPONENT_NAVIGATION_OBSTACLE =>
+        {
+            crate::history::set_navigation_with_history(
+                world,
+                entity,
+                crate::history::NavigationComponentState {
+                    obstacle: Some(value),
+                    ..Default::default()
+                },
+            );
+        }
+        Some(CopiedComponent::NavigationArea(value)) if type_name == COMPONENT_NAVIGATION_AREA => {
+            crate::history::set_navigation_with_history(
+                world,
+                entity,
+                crate::history::NavigationComponentState {
+                    area: Some(value),
+                    ..Default::default()
+                },
+            );
+        }
+        Some(CopiedComponent::NavigationLink(value)) if type_name == COMPONENT_NAVIGATION_LINK => {
+            crate::history::set_navigation_with_history(
+                world,
+                entity,
+                crate::history::NavigationComponentState {
+                    link: Some(value),
+                    ..Default::default()
+                },
+            );
+        }
         _ => {}
     }
 }
 
 fn reset_component(world: &mut World, entity: Entity, type_name: &str) {
+    let descriptor = world
+        .resource::<EditorComponentRegistry>()
+        .by_type_name(type_name)
+        .cloned();
+    if let Some(descriptor) = descriptor {
+        let component_id = descriptor.id;
+        let type_path = descriptor.type_name;
+        if type_path == COMPONENT_ANIMATION_CONTROLLER_DESC {
+            let controller =
+                crate::ui::animation_inspector::default_controller_for_actor(world, entity);
+            let _ = crate::history::reflected_component_transaction(
+                world,
+                entity,
+                "Reset Component",
+                component_id,
+                type_path,
+                move |world, entity| {
+                    world.entity_mut(entity).insert(controller);
+                    Ok(())
+                },
+            );
+        } else {
+            let _ = crate::history::reflected_component_transaction(
+                world,
+                entity,
+                "Reset Component",
+                component_id,
+                type_path,
+                move |world, entity| {
+                    crate::history::apply_reflected_default(world, entity, type_path)
+                },
+            );
+        }
+        return;
+    }
     match type_name {
         COMPONENT_ANIMATION_CONTROLLER_DESC => {
             let controller =
@@ -608,6 +805,38 @@ fn reset_component(world: &mut World, entity: Entity, type_name: &str) {
         COMPONENT_POST_PROCESS_VOLUME => {
             set_post_process_volume_with_history(world, entity, PostProcessVolumeDesc::default());
         }
+        COMPONENT_NAVIGATION_BOUNDS => crate::history::set_navigation_with_history(
+            world,
+            entity,
+            crate::history::NavigationComponentState {
+                bounds: Some(NavigationBounds::default()),
+                ..Default::default()
+            },
+        ),
+        COMPONENT_NAVIGATION_OBSTACLE => crate::history::set_navigation_with_history(
+            world,
+            entity,
+            crate::history::NavigationComponentState {
+                obstacle: Some(NavigationObstacle::default()),
+                ..Default::default()
+            },
+        ),
+        COMPONENT_NAVIGATION_AREA => crate::history::set_navigation_with_history(
+            world,
+            entity,
+            crate::history::NavigationComponentState {
+                area: Some(NavigationArea::default()),
+                ..Default::default()
+            },
+        ),
+        COMPONENT_NAVIGATION_LINK => crate::history::set_navigation_with_history(
+            world,
+            entity,
+            crate::history::NavigationComponentState {
+                link: Some(NavigationLink::default()),
+                ..Default::default()
+            },
+        ),
         COMPONENT_WEAPON_SPAWN => insert_direct_component(
             world,
             entity,
@@ -640,6 +869,44 @@ fn insert_direct_component<T: Component>(world: &mut World, entity: Entity, comp
 }
 
 fn remove_registered_component(world: &mut World, entity: Entity, type_name: &str) {
+    let descriptor = world
+        .resource::<EditorComponentRegistry>()
+        .by_type_name(type_name)
+        .cloned();
+    if let Some(descriptor) = descriptor {
+        if !descriptor.removable {
+            return;
+        }
+        let dependents = world
+            .resource::<EditorComponentRegistry>()
+            .present_dependents(world, entity, descriptor.id)
+            .iter()
+            .map(|dependent| dependent.display_name)
+            .collect::<Vec<_>>();
+        if !dependents.is_empty() {
+            world
+                .resource_mut::<crate::scene_io::SceneIo>()
+                .set_status(format!(
+                    "Remove blocked: required by {}. Remove dependent components first.",
+                    dependents.join(", ")
+                ));
+            return;
+        }
+        let result = crate::history::reflected_component_transaction(
+            world,
+            entity,
+            "Remove Component",
+            descriptor.id,
+            descriptor.type_name,
+            |world, entity| {
+                crate::history::apply_reflected_component(world, entity, descriptor.type_name, None)
+            },
+        );
+        if result.is_ok() && type_name == COMPONENT_ANIMATION_CONTROLLER_DESC {
+            crate::ui::animation_inspector::stop_preview_if_actor(world, entity);
+        }
+        return;
+    }
     let Some(before) = crate::history::snapshot_entity(world, entity) else {
         return;
     };
@@ -648,6 +915,16 @@ fn remove_registered_component(world: &mut World, entity: Entity, type_name: &st
         (COMPONENT_AUDIO_SOURCE_DESC, ActorKind::AudioSource)
             | (COMPONENT_AUDIO_LISTENER_DESC, ActorKind::AudioListener)
     );
+    let removed_dedicated_navigation_kind = before.actor_kind == ActorKind::Navigation
+        && matches!(
+            type_name,
+            COMPONENT_NAVIGATION_BOUNDS
+                | COMPONENT_NAVIGATION_OBSTACLE
+                | COMPONENT_NAVIGATION_AREA
+                | COMPONENT_NAVIGATION_LINK
+        );
+    let removed_dedicated_skinned_kind =
+        type_name == COMPONENT_SKINNED_MESH_RENDERER && before.actor_kind == ActorKind::SkinnedMesh;
     let removed = if let Ok(mut entity_mut) = world.get_entity_mut(entity) {
         match type_name {
             COMPONENT_ANIMATION_CONTROLLER_DESC if before.animation_controller.is_some() => {
@@ -666,6 +943,10 @@ fn remove_registered_component(world: &mut World, entity: Entity, type_name: &st
                 entity_mut.remove::<StaticMeshRenderer>();
                 true
             }
+            COMPONENT_SKINNED_MESH_RENDERER if before.skinned_mesh_renderer.is_some() => {
+                entity_mut.remove::<SkinnedMeshRenderer>();
+                true
+            }
             COMPONENT_MATERIAL_DESC if before.material.is_some() => {
                 entity_mut.remove::<MaterialDesc>();
                 true
@@ -722,6 +1003,22 @@ fn remove_registered_component(world: &mut World, entity: Entity, type_name: &st
                 entity_mut.remove::<PostProcessVolumeDesc>();
                 true
             }
+            COMPONENT_NAVIGATION_BOUNDS if before.navigation_bounds.is_some() => {
+                entity_mut.remove::<NavigationBounds>();
+                true
+            }
+            COMPONENT_NAVIGATION_OBSTACLE if before.navigation_obstacle.is_some() => {
+                entity_mut.remove::<NavigationObstacle>();
+                true
+            }
+            COMPONENT_NAVIGATION_AREA if before.navigation_area.is_some() => {
+                entity_mut.remove::<NavigationArea>();
+                true
+            }
+            COMPONENT_NAVIGATION_LINK if before.navigation_link.is_some() => {
+                entity_mut.remove::<NavigationLink>();
+                true
+            }
             _ => false,
         }
     } else {
@@ -733,7 +1030,10 @@ fn remove_registered_component(world: &mut World, entity: Entity, type_name: &st
     if type_name == COMPONENT_ANIMATION_CONTROLLER_DESC {
         crate::ui::animation_inspector::stop_preview_if_actor(world, entity);
     }
-    if removed_dedicated_audio_kind {
+    if removed_dedicated_audio_kind
+        || removed_dedicated_navigation_kind
+        || removed_dedicated_skinned_kind
+    {
         let fallback = world
             .get_entity(entity)
             .ok()
@@ -761,10 +1061,13 @@ pub fn authoring_inspector_ui(world: &mut World, ui: &mut egui::Ui, entity: Enti
     }
 
     let present = present_component_type_names(world, entity);
-    let ordered = world
-        .get::<InspectorOrder>(entity)
-        .map(|order| order.ordered_components(&present))
-        .unwrap_or(present);
+    let ordered = if let Some(order) = world.get::<InspectorOrder>(entity) {
+        world
+            .resource::<EditorComponentRegistry>()
+            .ordered_components(order, &present)
+    } else {
+        present
+    };
     for type_name in ordered {
         draw_authoring_component_by_type(world, ui, entity, type_name);
     }
@@ -776,11 +1079,19 @@ fn draw_authoring_component_by_type(
     entity: Entity,
     type_name: &'static str,
 ) {
+    if let Some(inspector) = world
+        .resource::<EditorComponentRegistry>()
+        .inspector(type_name)
+    {
+        inspector(world, ui, entity);
+        return;
+    }
     match type_name {
         COMPONENT_ANIMATION_CONTROLLER_DESC => {
             crate::ui::animation_inspector::animation_controller_inspector_ui(world, ui, entity);
         }
         COMPONENT_STATIC_MESH_RENDERER => static_mesh_renderer_ui(world, ui, entity),
+        COMPONENT_SKINNED_MESH_RENDERER => skinned_mesh_renderer_ui(world, ui, entity),
         COMPONENT_BRUSH_DESC => brush_editor_ui(world, ui, entity),
         COMPONENT_PRIMITIVE => primitive_editor_ui(world, ui, entity),
         COMPONENT_MATERIAL_DESC => material_editor_ui(world, ui, entity),
@@ -804,6 +1115,18 @@ fn draw_authoring_component_by_type(
             crate::ui::post_process_volume_ui::post_process_volume_inspector_ui(world, ui, entity);
         }
         COMPONENT_PROJECT_SUN => project_sun_ui(world, ui, entity),
+        COMPONENT_NAVIGATION_BOUNDS => {
+            super::navigation_inspector::navigation_bounds_inspector_ui(world, ui, entity)
+        }
+        COMPONENT_NAVIGATION_OBSTACLE => {
+            super::navigation_inspector::navigation_obstacle_inspector_ui(world, ui, entity)
+        }
+        COMPONENT_NAVIGATION_AREA => {
+            super::navigation_inspector::navigation_area_inspector_ui(world, ui, entity)
+        }
+        COMPONENT_NAVIGATION_LINK => {
+            super::navigation_inspector::navigation_link_inspector_ui(world, ui, entity)
+        }
         _ => {}
     }
 }
@@ -1080,6 +1403,7 @@ fn filtered_component_descriptors<'a>(
         EditorComponentCategory::Rendering,
         EditorComponentCategory::Animation,
         EditorComponentCategory::Audio,
+        EditorComponentCategory::Navigation,
         EditorComponentCategory::Physics,
         EditorComponentCategory::Gameplay,
         EditorComponentCategory::Volumes,
@@ -1102,6 +1426,7 @@ fn component_category_label(category: EditorComponentCategory) -> &'static str {
         EditorComponentCategory::Rendering => "Rendering",
         EditorComponentCategory::Animation => "Animation",
         EditorComponentCategory::Audio => "Audio",
+        EditorComponentCategory::Navigation => "Navigation",
         EditorComponentCategory::Physics => "Physics",
         EditorComponentCategory::Gameplay => "Gameplay",
         EditorComponentCategory::Volumes => "Volumes",
@@ -1112,6 +1437,7 @@ fn component_category_label(category: EditorComponentCategory) -> &'static str {
 struct ComponentAddState {
     addable: bool,
     reason: Option<String>,
+    required: Vec<&'static str>,
     recommended: Vec<&'static str>,
     conflicts: Vec<&'static str>,
 }
@@ -1146,15 +1472,18 @@ fn component_add_state(
         .copied()
         .filter(|type_name| !component_present(world, entity, type_name))
         .collect::<Vec<_>>();
-    let animation_target_missing = descriptor.type_name == COMPONENT_ANIMATION_CONTROLLER_DESC
-        && (!world
-            .get::<ActorKind>(entity)
-            .is_some_and(|kind| *kind == ActorKind::ImportedModel)
-            || world.get::<ModelRef>(entity).is_none());
+    let registry = world.resource::<EditorComponentRegistry>();
+    let required = registry
+        .required_component_ids(descriptor)
+        .iter()
+        .filter_map(|id| registry.by_id(id))
+        .filter(|required| !registry.component_present(world, entity, required.type_name))
+        .map(|required| required.display_name)
+        .collect::<Vec<_>>();
     let reason = if duplicate {
         Some("Already present on this actor.".to_string())
-    } else if animation_target_missing {
-        Some("Animation Controller requires an ImportedModel actor with ModelRef.".to_string())
+    } else if !required.is_empty() {
+        Some(format!("Requires {}.", required.join(", ")))
     } else if !conflicts.is_empty() {
         Some(format!(
             "Conflicts with {}.",
@@ -1170,6 +1499,7 @@ fn component_add_state(
     ComponentAddState {
         addable: reason.is_none(),
         reason,
+        required,
         recommended,
         conflicts,
     }
@@ -1191,6 +1521,9 @@ fn component_hover_text(
     if let Some(reason) = &state.reason {
         lines.push(format!("Unavailable: {reason}"));
     }
+    if !state.required.is_empty() {
+        lines.push(format!("Requires: {}", state.required.join(", ")));
+    }
     if !state.recommended.is_empty() {
         lines.push(format!(
             "Recommended with: {}",
@@ -1216,6 +1549,11 @@ fn component_display_name(
 }
 
 fn component_present(world: &World, entity: Entity, type_name: &str) -> bool {
+    if let Some(registry) = world.get_resource::<EditorComponentRegistry>() {
+        if registry.by_type_name(type_name).is_some() {
+            return registry.component_present(world, entity, type_name);
+        }
+    }
     match type_name {
         COMPONENT_ANIMATION_CONTROLLER_DESC => {
             world.get::<AnimationControllerDesc>(entity).is_some()
@@ -1225,6 +1563,7 @@ fn component_present(world: &World, entity: Entity, type_name: &str) -> bool {
         "shared::components::StaticMeshRenderer" => {
             world.get::<StaticMeshRenderer>(entity).is_some()
         }
+        COMPONENT_SKINNED_MESH_RENDERER => world.get::<SkinnedMeshRenderer>(entity).is_some(),
         "shared::components::MaterialDesc" => world.get::<MaterialDesc>(entity).is_some(),
         "shared::components::LightDesc" => world.get::<LightDesc>(entity).is_some(),
         "shared::components::AudioSourceDesc" => world.get::<AudioSourceDesc>(entity).is_some(),
@@ -1239,11 +1578,51 @@ fn component_present(world: &World, entity: Entity, type_name: &str) -> bool {
         "shared::components::PostProcessVolumeDesc" => {
             world.get::<PostProcessVolumeDesc>(entity).is_some()
         }
+        COMPONENT_NAVIGATION_BOUNDS => world.get::<NavigationBounds>(entity).is_some(),
+        COMPONENT_NAVIGATION_OBSTACLE => world.get::<NavigationObstacle>(entity).is_some(),
+        COMPONENT_NAVIGATION_AREA => world.get::<NavigationArea>(entity).is_some(),
+        COMPONENT_NAVIGATION_LINK => world.get::<NavigationLink>(entity).is_some(),
         _ => false,
     }
 }
 
 fn insert_registered_component(world: &mut World, entity: Entity, type_name: &str) {
+    let descriptor = world
+        .resource::<EditorComponentRegistry>()
+        .by_type_name(type_name)
+        .cloned();
+    if let Some(descriptor) = descriptor {
+        if !descriptor.addable || component_present(world, entity, descriptor.type_name) {
+            return;
+        }
+        if descriptor.type_name == COMPONENT_ANIMATION_CONTROLLER_DESC {
+            let controller =
+                crate::ui::animation_inspector::default_controller_for_actor(world, entity);
+            let _ = crate::history::reflected_component_transaction(
+                world,
+                entity,
+                "Add Component",
+                descriptor.id,
+                descriptor.type_name,
+                move |world, entity| {
+                    world.entity_mut(entity).insert(controller);
+                    Ok(())
+                },
+            );
+        } else {
+            let _ = crate::history::reflected_component_transaction(
+                world,
+                entity,
+                "Add Component",
+                descriptor.id,
+                descriptor.type_name,
+                move |world, entity| {
+                    crate::history::apply_reflected_default(world, entity, descriptor.type_name)
+                },
+            );
+        }
+        return;
+    }
     match type_name {
         COMPONENT_ANIMATION_CONTROLLER_DESC => {
             let controller =
@@ -1309,6 +1688,26 @@ fn insert_registered_component(world: &mut World, entity: Entity, type_name: &st
                 objective_id: "objective".into(),
             });
         }),
+        COMPONENT_NAVIGATION_BOUNDS => insert_component(world, entity, |world, e| {
+            world
+                .entity_mut(e)
+                .insert((ActorKind::Navigation, NavigationBounds::default()));
+        }),
+        COMPONENT_NAVIGATION_OBSTACLE => insert_component(world, entity, |world, e| {
+            world
+                .entity_mut(e)
+                .insert((ActorKind::Navigation, NavigationObstacle::default()));
+        }),
+        COMPONENT_NAVIGATION_AREA => insert_component(world, entity, |world, e| {
+            world
+                .entity_mut(e)
+                .insert((ActorKind::Navigation, NavigationArea::default()));
+        }),
+        COMPONENT_NAVIGATION_LINK => insert_component(world, entity, |world, e| {
+            world
+                .entity_mut(e)
+                .insert((ActorKind::Navigation, NavigationLink::default()));
+        }),
         "shared::components::PostProcessVolumeDesc" => {
             insert_component(world, entity, |world, e| {
                 world.entity_mut(e).insert(PostProcessVolumeDesc::default());
@@ -1355,6 +1754,10 @@ fn diff_added(before: &EditorEntitySnapshot, after: &EditorEntitySnapshot) -> Ed
             .static_mesh_renderer
             .clone()
             .filter(|_| before.static_mesh_renderer.is_none()),
+        skinned_mesh_renderer: after
+            .skinned_mesh_renderer
+            .clone()
+            .filter(|_| before.skinned_mesh_renderer.is_none()),
         material: after.material.clone().filter(|_| before.material.is_none()),
         material_override: after
             .material_override
@@ -1402,8 +1805,26 @@ fn diff_added(before: &EditorEntitySnapshot, after: &EditorEntitySnapshot) -> Ed
             .objective
             .clone()
             .filter(|_| before.objective.is_none()),
+        navigation_bounds: after
+            .navigation_bounds
+            .clone()
+            .filter(|_| before.navigation_bounds.is_none()),
+        navigation_obstacle: after
+            .navigation_obstacle
+            .clone()
+            .filter(|_| before.navigation_obstacle.is_none()),
+        navigation_area: after
+            .navigation_area
+            .clone()
+            .filter(|_| before.navigation_area.is_none()),
+        navigation_link: after
+            .navigation_link
+            .clone()
+            .filter(|_| before.navigation_link.is_none()),
         hierarchy_sibling_index: after.hierarchy_sibling_index,
         editor_visibility: after.editor_visibility,
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     }
 }
@@ -1459,7 +1880,6 @@ fn static_mesh_asset_ref_candidates(
                         detail: format!("{} | {}", manifest.label, manifest.source.path),
                         selection: selection.clone(),
                         folder_path: folder_path.clone(),
-                        source_material: source_material_ref,
                         texture_id,
                     }
                 }
@@ -1473,7 +1893,6 @@ fn static_mesh_asset_ref_candidates(
                         detail: format!("{} | {}", manifest.label, manifest.source.path),
                         selection: selection.clone(),
                         folder_path: folder_path.clone(),
-                        source_material: None,
                         texture_id: None,
                     }
                 }
@@ -1551,7 +1970,6 @@ fn texture_asset_ref_candidates(world: &World) -> Vec<AssetRefCandidate> {
                 detail: path.to_string(),
                 selection: AssetSelection::File(path.to_string()),
                 folder_path: asset.folder_path.clone(),
-                source_material: None,
                 texture_id: snapshot
                     .as_ref()
                     .and_then(|snapshot| snapshot.texture_for(asset)),
@@ -1590,7 +2008,12 @@ fn brush_face_material_ref_candidates(world: &mut World) -> Vec<AssetRefCandidat
         let Some(record) = find_asset_by_path(registry, path) else {
             continue;
         };
-        let reference = EditorAssetRef::new(record.id.as_string(), "material:source", &asset.label)
+        let sub_asset_id = if shared::MaterialInstanceAsset::load_from_path(path).is_ok() {
+            "material:instance"
+        } else {
+            "material:source"
+        };
+        let reference = EditorAssetRef::new(record.id.as_string(), sub_asset_id, &asset.label)
             .with_source_path(path);
         let key = (reference.asset_id.clone(), reference.sub_asset_id.clone());
         if !seen.insert(key) {
@@ -1602,7 +2025,6 @@ fn brush_face_material_ref_candidates(world: &mut World) -> Vec<AssetRefCandidat
             detail: path.to_string(),
             selection: AssetSelection::File(path.to_string()),
             folder_path: asset.folder_path.clone(),
-            source_material: None,
             texture_id: None,
         });
     }
@@ -1627,10 +2049,15 @@ fn asset_ref_candidate_from_selection(
                         && asset.path.as_deref() == Some(path.as_str())
                 })?;
             let record = find_asset_by_path(registry, path)?;
+            let sub_asset_id = if shared::MaterialInstanceAsset::load_from_path(path).is_ok() {
+                "material:instance"
+            } else {
+                "material:source"
+            };
             Some(AssetRefCandidate {
                 reference: EditorAssetRef::new(
                     record.id.as_string(),
-                    "material:source",
+                    sub_asset_id,
                     asset.label.clone(),
                 )
                 .with_source_path(path),
@@ -1638,7 +2065,6 @@ fn asset_ref_candidate_from_selection(
                 detail: path.clone(),
                 selection: selection.clone(),
                 folder_path: asset.folder_path.clone(),
-                source_material: None,
                 texture_id: None,
             })
         }
@@ -1663,7 +2089,6 @@ fn asset_ref_candidate_from_selection(
                 detail: path.clone(),
                 selection: selection.clone(),
                 folder_path: asset.folder_path.clone(),
-                source_material: None,
                 texture_id: None,
             })
         }
@@ -1688,7 +2113,6 @@ fn asset_ref_candidate_from_selection(
                 detail: parent_path.clone(),
                 selection: selection.clone(),
                 folder_path: fallback_asset_folder(parent_path),
-                source_material: None,
                 texture_id: None,
             })
         }
@@ -1714,7 +2138,6 @@ fn asset_ref_candidate_from_selection(
                 detail: source_path.clone().unwrap_or_else(|| parent_path.clone()),
                 selection: selection.clone(),
                 folder_path: fallback_asset_folder(parent_path),
-                source_material: None,
                 texture_id: None,
             })
         }
@@ -1905,16 +2328,159 @@ fn locate_asset_ref(
     }
 }
 
+fn skinned_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
+    let material_candidates = brush_face_material_ref_candidates(world);
+    let Some(mut renderer) = world.get::<SkinnedMeshRenderer>(entity).cloned() else {
+        return;
+    };
+    let original = renderer.clone();
+    let mut changed = false;
+    let mut options = ComponentCardOptions::removable(
+        COMPONENT_SKINNED_MESH_RENDERER,
+        "Skinned Mesh Renderer",
+        icons::PERSON_SIMPLE_RUN,
+    );
+    options.active_toggle = false;
+    options.removable = world.get::<AnimationControllerDesc>(entity).is_none();
+    options.resettable = false;
+    options.copyable = false;
+    let context = component_card_context(world, entity, options);
+    let response = component_card(ui, &context, |ui| {
+        property_row(ui, "Source", |ui| {
+            ui.add(
+                egui::Label::new(if renderer.path.trim().is_empty() {
+                    "Unassigned"
+                } else {
+                    renderer.path.as_str()
+                })
+                .truncate(),
+            );
+        });
+        property_row(ui, "Scene", |ui| {
+            ui.label(renderer.scene_index.to_string());
+        });
+        property_row(ui, "Asset ID", |ui| {
+            ui.add(
+                egui::Label::new(if renderer.asset_id.trim().is_empty() {
+                    "Legacy/path-only"
+                } else {
+                    renderer.asset_id.as_str()
+                })
+                .truncate(),
+            );
+        });
+        ui.label(
+            egui::RichText::new(
+                "Preserves the imported skeleton hierarchy and Bevy skinned-mesh bindings.",
+            )
+            .small()
+            .color(TEXT_DIM),
+        );
+        ui.add_space(8.0);
+        ui.label(egui::RichText::new("Material slots").strong());
+        if renderer.materials.slots.is_empty() {
+            ui.label(
+                egui::RichText::new("No imported slots; reimport the source model")
+                    .small()
+                    .color(TEXT_DIM),
+            );
+        }
+        for slot in &mut renderer.materials.slots {
+            slot_card(ui, |ui| {
+                ui.label(egui::RichText::new(&slot.name).strong());
+                let response = asset_selector_row(
+                    ui,
+                    "Material",
+                    icons::PALETTE,
+                    slot.material.as_ref().map(|reference| &reference.0),
+                    slot.source_material.as_ref().map(|reference| &reference.0),
+                    true,
+                    &material_candidates,
+                    None,
+                );
+                if let Some(selected) = response.selected {
+                    slot.material = Some(MaterialRef::new(selected));
+                    changed = true;
+                }
+                if response.clear {
+                    slot.material = None;
+                    changed = true;
+                }
+                if response.locate {
+                    let reference = slot
+                        .material
+                        .as_ref()
+                        .or(slot.source_material.as_ref())
+                        .map(|reference| &reference.0);
+                    locate_asset_ref(world, reference, &material_candidates);
+                }
+                ui.label(
+                    egui::RichText::new(format!("ID: {}", slot.id.0))
+                        .small()
+                        .color(TEXT_DIM),
+                );
+            });
+        }
+        for orphan in &renderer.materials.orphaned_assignments {
+            ui.label(
+                egui::RichText::new(format!(
+                    "Orphaned: {} ({})",
+                    orphan.last_known_name, orphan.slot_id.0
+                ))
+                .small()
+                .color(egui::Color32::YELLOW),
+            );
+        }
+        if world.get::<AnimationControllerDesc>(entity).is_some() {
+            ui.label(
+                egui::RichText::new(
+                    "Remove the Animation Controller before removing its renderer.",
+                )
+                .small()
+                .color(TEXT_MUTED),
+            );
+        }
+    });
+    apply_component_card_response(world, entity, response);
+    if changed && renderer != original {
+        let result = reflected_component_transaction(
+            world,
+            entity,
+            "Assign Skinned Material Slot",
+            shared::AUTHORING_COMPONENT_SKINNED_MESH_RENDERER,
+            COMPONENT_SKINNED_MESH_RENDERER,
+            move |world, entity| {
+                world.entity_mut(entity).insert(renderer);
+                Ok(())
+            },
+        );
+        if let Err(error) = result {
+            world.resource_mut::<crate::scene_io::SceneIo>().status = error;
+        }
+    }
+}
+
 fn static_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
     let mesh_candidates = static_mesh_asset_ref_candidates(world, AssetRefCandidateKind::Mesh);
-    let material_candidates =
-        static_mesh_asset_ref_candidates(world, AssetRefCandidateKind::Material);
+    let material_candidates = brush_face_material_ref_candidates(world);
     let Some(mut renderer) = world.get::<StaticMeshRenderer>(entity).cloned() else {
         return;
     };
     let original = renderer.clone();
     let mut changed = false;
     let mut remove_entry = None;
+    for index in 0..renderer.slots.len() {
+        ensure_slot_id(&mut renderer.slots[index], index);
+        let part = &renderer.slots[index];
+        if renderer.materials.slot(&part.material_slot_id).is_none() {
+            renderer.materials.slots.push(shared::RendererMaterialSlot {
+                id: part.material_slot_id.clone(),
+                name: part.name.clone(),
+                source_material: part.material.clone().map(MaterialRef::new),
+                material: None,
+            });
+        }
+    }
 
     let card = component_card_context(
         world,
@@ -1932,11 +2498,11 @@ fn static_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity)
 
         for (index, entry) in renderer.slots.iter_mut().enumerate() {
             ensure_slot_id(entry, index);
-            let inherited_material = source_material_for_mesh(&entry.mesh, &mesh_candidates);
-            let material_for_locate = entry
-                .material
-                .clone()
-                .or_else(|| inherited_material.clone());
+            let material_slot_name = renderer
+                .materials
+                .slot(&entry.material_slot_id)
+                .map(|slot| slot.name.clone())
+                .unwrap_or_else(|| "Missing slot".into());
             let thumbnail = thumbnail_for_mesh(&entry.mesh, &mesh_candidates);
 
             slot_card(ui, |ui| {
@@ -1976,27 +2542,9 @@ fn static_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity)
                         locate_asset_ref(world, Some(&entry.mesh), &mesh_candidates);
                     }
 
-                    let material_response = asset_selector_row(
-                        ui,
-                        "Source material",
-                        icons::PALETTE,
-                        entry.material.as_ref(),
-                        inherited_material.as_ref(),
-                        true,
-                        &material_candidates,
-                        None,
-                    );
-                    if let Some(selected) = material_response.selected {
-                        entry.material = Some(selected);
-                        changed = true;
-                    }
-                    if material_response.clear {
-                        entry.material = None;
-                        changed = true;
-                    }
-                    if material_response.locate {
-                        locate_asset_ref(world, material_for_locate.as_ref(), &material_candidates);
-                    }
+                    property_row(ui, "Material slot", |ui| {
+                        ui.label(&material_slot_name);
+                    });
                     ui.horizontal_wrapped(|ui| {
                         changed |= ui.checkbox(&mut entry.visible, "Visible").changed();
                         changed |= ui
@@ -2025,6 +2573,45 @@ fn static_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity)
             });
         }
 
+        ui.add_space(8.0);
+        ui.label(egui::RichText::new("Material slots").strong());
+        for slot in &mut renderer.materials.slots {
+            slot_card(ui, |ui| {
+                ui.label(egui::RichText::new(&slot.name).strong());
+                let response = asset_selector_row(
+                    ui,
+                    "Material",
+                    icons::PALETTE,
+                    slot.material.as_ref().map(|reference| &reference.0),
+                    slot.source_material.as_ref().map(|reference| &reference.0),
+                    true,
+                    &material_candidates,
+                    None,
+                );
+                if let Some(selected) = response.selected {
+                    slot.material = Some(MaterialRef::new(selected));
+                    changed = true;
+                }
+                if response.clear {
+                    slot.material = None;
+                    changed = true;
+                }
+                if response.locate {
+                    let reference = slot
+                        .material
+                        .as_ref()
+                        .or(slot.source_material.as_ref())
+                        .map(|reference| &reference.0);
+                    locate_asset_ref(world, reference, &material_candidates);
+                }
+                ui.label(
+                    egui::RichText::new(format!("ID: {}", slot.id.0))
+                        .small()
+                        .color(TEXT_DIM),
+                );
+            });
+        }
+
         let add_slot = ui
             .add_sized(
                 [ui.available_width().max(1.0), 28.0],
@@ -2035,8 +2622,15 @@ fn static_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity)
             let index = renderer.slots.len();
             let entry = StaticMeshRendererEntry {
                 id: ComponentInstanceId::new(format!("slot:{index}")),
+                material_slot_id: ComponentInstanceId::new(format!("slot:manual:{index}")),
                 ..Default::default()
             };
+            renderer.materials.slots.push(shared::RendererMaterialSlot {
+                id: entry.material_slot_id.clone(),
+                name: format!("Material {index}"),
+                source_material: None,
+                material: None,
+            });
             renderer.slots.push(entry);
             changed = true;
         }
@@ -2044,7 +2638,25 @@ fn static_mesh_renderer_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity)
     apply_component_card_response(world, entity, card_response);
 
     if let Some(index) = remove_entry {
-        renderer.slots.remove(index);
+        let removed = renderer.slots.remove(index);
+        if let Some(slot_index) = renderer
+            .materials
+            .slots
+            .iter()
+            .position(|slot| slot.id == removed.material_slot_id)
+        {
+            let slot = renderer.materials.slots.remove(slot_index);
+            if let Some(material) = slot.material {
+                renderer
+                    .materials
+                    .orphaned_assignments
+                    .push(shared::OrphanedMaterialAssignment {
+                        slot_id: slot.id,
+                        last_known_name: slot.name,
+                        material,
+                    });
+            }
+        }
         changed = true;
     }
     if changed && renderer != original {
@@ -2056,6 +2668,9 @@ fn ensure_slot_id(entry: &mut StaticMeshRendererEntry, index: usize) {
     if entry.id.is_empty() {
         entry.id = ComponentInstanceId::new(format!("slot:{index}"));
     }
+    if entry.material_slot_id.is_empty() {
+        entry.material_slot_id = ComponentInstanceId::new(format!("slot:{}", entry.id.0));
+    }
 }
 
 fn slot_card(ui: &mut egui::Ui, add_contents: impl FnOnce(&mut egui::Ui)) {
@@ -2142,19 +2757,6 @@ fn slot_thumbnail(ui: &mut egui::Ui, texture_id: Option<egui::TextureId>) {
     }
 }
 
-fn source_material_for_mesh(
-    mesh: &EditorAssetRef,
-    candidates: &[AssetRefCandidate],
-) -> Option<EditorAssetRef> {
-    candidates
-        .iter()
-        .find(|candidate| {
-            candidate.reference.asset_id == mesh.asset_id
-                && candidate.reference.sub_asset_id == mesh.sub_asset_id
-        })
-        .and_then(|candidate| candidate.source_material.clone())
-}
-
 fn thumbnail_for_mesh(
     mesh: &EditorAssetRef,
     candidates: &[AssetRefCandidate],
@@ -3588,10 +4190,14 @@ pub fn project_sun_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
 
 fn has_scene_sun_override(world: &mut World) -> bool {
     world
-        .query_filtered::<(&shared::LightDesc, Option<&InspectorOrder>), With<LevelObject>>()
+        .query_filtered::<(
+            &shared::LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ), With<LevelObject>>()
         .iter(world)
-        .any(|(light, order)| {
-            inspector_component_active(order, COMPONENT_LIGHT_DESC)
+        .any(|(light, states, legacy_order)| {
+            authoring_component_active(states, legacy_order, COMPONENT_LIGHT_DESC)
                 && matches!(light.kind, shared::AuthoringLightKind::Directional)
         })
 }
diff --git a/crates/editor/src/ui/menu.rs b/crates/editor/src/ui/menu.rs
index 8619c93..822f039 100644
--- a/crates/editor/src/ui/menu.rs
+++ b/crates/editor/src/ui/menu.rs
@@ -158,6 +158,44 @@ pub fn top_menu_bar(
                     crate::rendering_diagnostics::spawn_post_process_volume_at_camera(world);
                     ui.close();
                 }
+                ui.separator();
+                ui.menu_button("Navigation", |ui| {
+                    use super::navigation_inspector::{
+                        spawn_navigation_actor, NavigationActorType,
+                    };
+                    for (label, actor_type) in [
+                        ("Create Bounds", NavigationActorType::Bounds),
+                        ("Create Obstacle", NavigationActorType::Obstacle),
+                        ("Create Area", NavigationActorType::Area),
+                        ("Create Link", NavigationActorType::Link),
+                    ] {
+                        if menu_item(ui, label, None, true).clicked() {
+                            spawn_navigation_actor(world, actor_type);
+                            ui.close();
+                        }
+                    }
+                    ui.separator();
+                    let selected_bounds =
+                        selected.as_slice().iter().copied().find(|entity| {
+                            world.get::<shared::NavigationBounds>(*entity).is_some()
+                        });
+                    if menu_item(ui, "Bake Selected Bounds", None, selected_bounds.is_some())
+                        .clicked()
+                    {
+                        if let Some(entity) = selected_bounds {
+                            super::navigation_inspector::bake_bounds(world, entity);
+                        }
+                        ui.close();
+                    }
+                    if menu_item(ui, "Test Selected Path", None, selected_bounds.is_some())
+                        .clicked()
+                    {
+                        if let Some(entity) = selected_bounds {
+                            super::navigation_inspector::query_preview(world, entity);
+                        }
+                        ui.close();
+                    }
+                });
             });
 
             ui.menu_button("Build", |ui| {
diff --git a/crates/editor/src/ui/mod.rs b/crates/editor/src/ui/mod.rs
index 290e48a..422fb3d 100644
--- a/crates/editor/src/ui/mod.rs
+++ b/crates/editor/src/ui/mod.rs
@@ -3,7 +3,7 @@ mod animation_inspector;
 mod asset_browser;
 mod audio_inspector;
 mod build;
-mod component_registry;
+pub mod component_registry;
 mod diagnostics;
 mod dock_tabs;
 mod fonts;
@@ -14,6 +14,7 @@ pub mod hierarchy_state;
 pub(crate) mod inspector;
 mod layout;
 mod menu;
+pub(crate) mod navigation_inspector;
 mod play_controls;
 mod post_process_volume_ui;
 mod scene_tabs;
@@ -294,6 +295,7 @@ impl Plugin for EditorUiPlugin {
             .init_resource::<inspector::InspectorClipboard>()
             .init_resource::<inspector::InspectorPanelState>()
             .init_resource::<animation_inspector::AnimationInspectorState>()
+            .init_resource::<navigation_inspector::NavigationEditorState>()
             .init_resource::<ViewportUiState>()
             .init_resource::<LayoutSaveTimer>()
             .add_systems(
@@ -301,6 +303,7 @@ impl Plugin for EditorUiPlugin {
                 init_hierarchy_panel_from_prefs
                     .after(crate::project_io::load_user_preferences_on_startup),
             )
+            .add_systems(Startup, validate_editor_component_registry)
             .add_systems(
                 Startup,
                 apply_ui_state_from_prefs
@@ -312,11 +315,25 @@ impl Plugin for EditorUiPlugin {
                 (
                     hierarchy_state::tick_hierarchy_prefs_save,
                     build::tick_build_job,
+                    navigation_inspector::sync_navigation_state,
                 ),
             );
     }
 }
 
+fn validate_editor_component_registry(world: &mut World) {
+    let errors = world
+        .resource::<component_registry::EditorComponentRegistry>()
+        .validate(world)
+        .err();
+    if let Some(errors) = errors {
+        panic!(
+            "invalid authoring component registry:\n{}",
+            errors.join("\n")
+        );
+    }
+}
+
 fn apply_ui_state_from_prefs(mut ui_state: ResMut<UiState>, prefs: Res<UserPreferences>) {
     *ui_state = UiState::from_prefs(&prefs);
 }
diff --git a/crates/editor/src/ui/navigation_inspector.rs b/crates/editor/src/ui/navigation_inspector.rs
new file mode 100644
index 0000000..c675def
--- /dev/null
+++ b/crates/editor/src/ui/navigation_inspector.rs
@@ -0,0 +1,765 @@
+use std::collections::HashSet;
+use std::path::{Path, PathBuf};
+
+use bevy::prelude::*;
+use bevy_egui::egui;
+use egui_phosphor_icons::icons;
+use scene::navigation::{
+    aabb_overlaps, bake_navigation, geometry_overlaps_bounds, navigation_geometry_from_parts,
+    navigation_source_fingerprint, point_in_aabb, read_navigation_artifact,
+    write_navigation_artifact, NavigationAreaInput, NavigationBakeArtifact, NavigationBakeInput,
+    NavigationLinkInput, NavigationVolumeInput,
+};
+use shared::{
+    ActorId, BrushDesc, NavigationArea, NavigationBounds, NavigationLink, NavigationObstacle,
+    Primitive, COMPONENT_NAVIGATION_AREA, COMPONENT_NAVIGATION_BOUNDS, COMPONENT_NAVIGATION_LINK,
+    COMPONENT_NAVIGATION_OBSTACLE,
+};
+
+use crate::history::{set_navigation_with_history, NavigationComponentState};
+use crate::project_io::ProjectWorkspace;
+use crate::scene_io::SceneIo;
+use crate::ui::inspector::{
+    apply_component_card_response, component_card, component_card_context, property_row,
+    ComponentCardOptions,
+};
+use crate::ui::theme::{ERROR, SUCCESS, TEXT_DIM, WARNING};
+use crate::viewport::{editor_spawn_ground_position, snap_translation, ViewportSettings};
+
+#[derive(Resource, Debug, Clone)]
+pub struct NavigationEditorState {
+    pub bounds_entity: Option<Entity>,
+    pub artifact: Option<NavigationBakeArtifact>,
+    pub preview_start: Vec3,
+    pub preview_end: Vec3,
+    pub preview_path: Vec<Vec3>,
+    pub status: String,
+    pub error: bool,
+    pub show_mesh: bool,
+    observed_fingerprint: Option<String>,
+    auto_bake_attempt: Option<String>,
+    debounce_elapsed: f32,
+}
+
+impl Default for NavigationEditorState {
+    fn default() -> Self {
+        Self {
+            bounds_entity: None,
+            artifact: None,
+            preview_start: Vec3::new(-4.0, 0.0, 0.0),
+            preview_end: Vec3::new(4.0, 0.0, 0.0),
+            preview_path: Vec::new(),
+            status: "Not baked".into(),
+            error: false,
+            show_mesh: true,
+            observed_fingerprint: None,
+            auto_bake_attempt: None,
+            debounce_elapsed: 0.0,
+        }
+    }
+}
+
+pub fn navigation_bounds_inspector_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
+    let Some(mut bounds) = world.get::<NavigationBounds>(entity).cloned() else {
+        return;
+    };
+    let original = bounds.clone();
+    let mut preview_start = world.resource::<NavigationEditorState>().preview_start;
+    let mut preview_end = world.resource::<NavigationEditorState>().preview_end;
+    let mut show_mesh = world.resource::<NavigationEditorState>().show_mesh;
+    let status = world.resource::<NavigationEditorState>().status.clone();
+    let status_error = world.resource::<NavigationEditorState>().error;
+    let current = build_input(world, entity, &bounds).ok();
+    let stale = current.as_ref().is_some_and(|input| {
+        world
+            .resource::<NavigationEditorState>()
+            .artifact
+            .as_ref()
+            .is_none_or(|artifact| artifact.is_stale_for(input))
+    });
+    let mut bake = false;
+    let mut preview = false;
+
+    let card = component_card_context(
+        world,
+        entity,
+        ComponentCardOptions::removable(
+            COMPONENT_NAVIGATION_BOUNDS,
+            "Navigation Bounds",
+            icons::PATH,
+        ),
+    );
+    let response = component_card(ui, &card, |ui| {
+        property_row(ui, "Half extents", |ui| {
+            vec3_editor(ui, &mut bounds.half_extents, 0.1)
+        });
+        property_row(ui, "Agent ID", |ui| {
+            ui.text_edit_singleline(&mut bounds.agent.id)
+        });
+        property_row(ui, "Radius / height", |ui| {
+            ui.horizontal(|ui| {
+                ui.add(egui::DragValue::new(&mut bounds.agent.radius).speed(0.01));
+                ui.add(egui::DragValue::new(&mut bounds.agent.height).speed(0.01))
+            })
+            .response
+        });
+        property_row(ui, "Climb / slope", |ui| {
+            ui.horizontal(|ui| {
+                ui.add(egui::DragValue::new(&mut bounds.agent.max_climb).speed(0.01));
+                ui.add(
+                    egui::DragValue::new(&mut bounds.agent.max_slope_deg)
+                        .speed(0.25)
+                        .suffix(" deg"),
+                )
+            })
+            .response
+        });
+        property_row(ui, "Voxel detail", |ui| {
+            ui.horizontal(|ui| {
+                ui.add(
+                    egui::DragValue::new(&mut bounds.agent.cell_size_fraction)
+                        .speed(0.1)
+                        .range(1.0..=12.0),
+                );
+                ui.add(
+                    egui::DragValue::new(&mut bounds.agent.cell_height_fraction)
+                        .speed(0.1)
+                        .range(1.0..=24.0),
+                )
+            })
+            .response
+        });
+        property_row(ui, "Artifact", |ui| {
+            ui.text_edit_singleline(&mut bounds.artifact_path)
+        });
+        property_row(ui, "Auto bake", |ui| {
+            ui.checkbox(&mut bounds.auto_bake, "Debounced")
+        });
+
+        ui.separator();
+        ui.horizontal(|ui| {
+            bake = ui
+                .button(format!("{} Bake", icons::HAMMER.as_str()))
+                .on_hover_text("Bake deterministic navigation artifact")
+                .clicked();
+            preview = ui
+                .add_enabled(
+                    !stale,
+                    egui::Button::new(format!("{} Test Path", icons::PATH.as_str())),
+                )
+                .on_hover_text("Query the baked artifact using the game runtime API")
+                .clicked();
+            ui.checkbox(&mut show_mesh, "Overlay");
+        });
+        let status_color = if status_error {
+            ERROR
+        } else if stale {
+            WARNING
+        } else {
+            SUCCESS
+        };
+        ui.colored_label(
+            status_color,
+            if stale {
+                format!("Stale: {status}")
+            } else {
+                status.clone()
+            },
+        );
+
+        property_row(ui, "Path start", |ui| {
+            vec3_editor(ui, &mut preview_start, 0.1)
+        });
+        property_row(ui, "Path end", |ui| vec3_editor(ui, &mut preview_end, 0.1));
+        if let Some(input) = current.as_ref() {
+            ui.label(
+                egui::RichText::new(format!(
+                    "{} obstacles  {} areas  {} links",
+                    input.obstacles.len(),
+                    input.areas.len(),
+                    input.links.len()
+                ))
+                .small()
+                .color(TEXT_DIM),
+            );
+        }
+    });
+    apply_component_card_response(world, entity, response);
+
+    if bounds != original {
+        set_navigation_with_history(
+            world,
+            entity,
+            NavigationComponentState {
+                bounds: Some(bounds.clone()),
+                ..Default::default()
+            },
+        );
+    }
+    {
+        let mut state = world.resource_mut::<NavigationEditorState>();
+        state.preview_start = preview_start;
+        state.preview_end = preview_end;
+        state.show_mesh = show_mesh;
+    }
+    if bake {
+        bake_bounds(world, entity);
+    }
+    if preview {
+        query_preview(world, entity);
+    }
+}
+
+pub fn navigation_obstacle_inspector_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
+    let Some(mut value) = world.get::<NavigationObstacle>(entity).cloned() else {
+        return;
+    };
+    let original = value.clone();
+    let card = component_card_context(
+        world,
+        entity,
+        ComponentCardOptions::removable(
+            COMPONENT_NAVIGATION_OBSTACLE,
+            "Navigation Obstacle",
+            icons::SELECTION_SLASH,
+        ),
+    );
+    let response = component_card(ui, &card, |ui| {
+        property_row(ui, "Half extents", |ui| {
+            vec3_editor(ui, &mut value.half_extents, 0.05)
+        });
+        property_row(ui, "Runtime", |ui| {
+            ui.checkbox(&mut value.dynamic, "Dynamic obstacle")
+        });
+        if value.dynamic {
+            ui.colored_label(
+                WARNING,
+                "Dynamic carving is not baked in navigation v1; this volume remains a static bake input.",
+            );
+        }
+    });
+    apply_component_card_response(world, entity, response);
+    if value != original {
+        set_navigation_with_history(
+            world,
+            entity,
+            NavigationComponentState {
+                obstacle: Some(value),
+                ..Default::default()
+            },
+        );
+    }
+}
+
+pub fn navigation_area_inspector_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
+    let Some(mut value) = world.get::<NavigationArea>(entity).cloned() else {
+        return;
+    };
+    let original = value.clone();
+    let card = component_card_context(
+        world,
+        entity,
+        ComponentCardOptions::removable(
+            COMPONENT_NAVIGATION_AREA,
+            "Navigation Area",
+            icons::POLYGON,
+        ),
+    );
+    let response = component_card(ui, &card, |ui| {
+        property_row(ui, "Area ID", |ui| ui.text_edit_singleline(&mut value.id));
+        property_row(ui, "Half extents", |ui| {
+            vec3_editor(ui, &mut value.half_extents, 0.05)
+        });
+        property_row(ui, "Cost", |ui| {
+            ui.add(
+                egui::DragValue::new(&mut value.cost)
+                    .speed(0.05)
+                    .range(0.05..=100.0),
+            )
+        });
+        property_row(ui, "Walkable", |ui| {
+            ui.checkbox(&mut value.walkable, "Enabled")
+        });
+    });
+    apply_component_card_response(world, entity, response);
+    if value != original {
+        set_navigation_with_history(
+            world,
+            entity,
+            NavigationComponentState {
+                area: Some(value),
+                ..Default::default()
+            },
+        );
+    }
+}
+
+pub fn navigation_link_inspector_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
+    let Some(mut value) = world.get::<NavigationLink>(entity).cloned() else {
+        return;
+    };
+    let original = value.clone();
+    let card = component_card_context(
+        world,
+        entity,
+        ComponentCardOptions::removable(COMPONENT_NAVIGATION_LINK, "Navigation Link", icons::LINK),
+    );
+    let response = component_card(ui, &card, |ui| {
+        property_row(ui, "Start", |ui| vec3_editor(ui, &mut value.start, 0.05));
+        property_row(ui, "End", |ui| vec3_editor(ui, &mut value.end, 0.05));
+        property_row(ui, "Direction", |ui| {
+            ui.checkbox(&mut value.bidirectional, "Bidirectional")
+        });
+        property_row(ui, "Cost", |ui| {
+            ui.add(
+                egui::DragValue::new(&mut value.cost)
+                    .speed(0.05)
+                    .range(0.05..=100.0),
+            )
+        });
+        property_row(ui, "Enabled", |ui| {
+            ui.checkbox(&mut value.enabled, "Active")
+        });
+    });
+    apply_component_card_response(world, entity, response);
+    if value != original {
+        set_navigation_with_history(
+            world,
+            entity,
+            NavigationComponentState {
+                link: Some(value),
+                ..Default::default()
+            },
+        );
+    }
+}
+
+pub fn bake_bounds(world: &mut World, entity: Entity) {
+    let Some(bounds) = world.get::<NavigationBounds>(entity).cloned() else {
+        set_status(
+            world,
+            "Bake failed: selected actor has no Navigation Bounds",
+            true,
+        );
+        return;
+    };
+    let input = match build_input(world, entity, &bounds) {
+        Ok(input) => input,
+        Err(error) => {
+            set_status(world, format!("Bake failed: {error}"), true);
+            return;
+        }
+    };
+    let artifact = match bake_navigation(&input) {
+        Ok(artifact) => artifact,
+        Err(error) => {
+            set_status(world, format!("Bake failed: {error}"), true);
+            return;
+        }
+    };
+    let path = match artifact_path(world, &bounds.artifact_path) {
+        Ok(path) => path,
+        Err(error) => {
+            set_status(world, format!("Bake failed: {error}"), true);
+            return;
+        }
+    };
+    if let Err(error) = write_navigation_artifact(&path, &artifact) {
+        set_status(world, format!("Bake failed: {error}"), true);
+        return;
+    }
+    let polygon_count: usize = artifact
+        .mesh
+        .layers
+        .iter()
+        .map(|layer| layer.polygons.len())
+        .sum();
+    let mut state = world.resource_mut::<NavigationEditorState>();
+    state.bounds_entity = Some(entity);
+    state.artifact = Some(artifact);
+    state.preview_path.clear();
+    state.error = false;
+    state.status = format!("Baked {polygon_count} polygons to {}", bounds.artifact_path);
+}
+
+pub fn query_preview(world: &mut World, entity: Entity) {
+    let (artifact, start, end) = {
+        let state = world.resource::<NavigationEditorState>();
+        (
+            state.artifact.clone(),
+            state.preview_start,
+            state.preview_end,
+        )
+    };
+    let Some(artifact) = artifact else {
+        set_status(world, "Path test failed: bake navigation first", true);
+        return;
+    };
+    let runtime = match game::navigation::NavigationRuntime::from_artifact(artifact) {
+        Ok(runtime) => runtime,
+        Err(error) => {
+            set_status(world, format!("Path test failed: {error}"), true);
+            return;
+        }
+    };
+    match runtime.query(start, end) {
+        Ok(path) => {
+            let mut state = world.resource_mut::<NavigationEditorState>();
+            state.bounds_entity = Some(entity);
+            state.preview_path = path.points;
+            state.error = false;
+            state.status = format!(
+                "Path {:.2} m, {} waypoints{}",
+                path.length,
+                state.preview_path.len(),
+                path.used_link_actor_id
+                    .as_deref()
+                    .map(|id| format!(", link {id}"))
+                    .unwrap_or_default()
+            );
+        }
+        Err(error) => set_status(world, format!("Path test failed: {error}"), true),
+    }
+}
+
+fn build_input(
+    world: &mut World,
+    bounds_entity: Entity,
+    bounds: &NavigationBounds,
+) -> Result<NavigationBakeInput, String> {
+    let active_path = world
+        .resource::<SceneIo>()
+        .active_path
+        .as_ref()
+        .cloned()
+        .ok_or_else(|| "save the scene before baking navigation".to_string())?;
+    let project_root = Path::new(&world.resource::<ProjectWorkspace>().root);
+    let source_scene = active_path
+        .strip_prefix(project_root)
+        .unwrap_or(&active_path)
+        .to_string_lossy()
+        .replace('\\', "/");
+    let bounds_actor_id = actor_id(world, bounds_entity)?;
+    let bounds_transform = world_transform(world, bounds_entity);
+    let center = bounds_transform.translation.to_array();
+    let half_extents = world_aabb_half_extents(bounds_transform, bounds.half_extents).to_array();
+
+    let mut obstacles = Vec::new();
+    let mut obstacle_query = world.query::<(Entity, &NavigationObstacle)>();
+    for (entity, obstacle) in obstacle_query.iter(world) {
+        let value = NavigationVolumeInput {
+            actor_id: actor_id(world, entity)?,
+            center: world_position(world, entity).to_array(),
+            half_extents: world_aabb_half_extents(
+                world_transform(world, entity),
+                obstacle.half_extents,
+            )
+            .to_array(),
+        };
+        if aabb_overlaps(center, half_extents, value.center, value.half_extents) {
+            obstacles.push(value);
+        }
+    }
+    obstacles.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+
+    let mut areas = Vec::new();
+    let mut area_query = world.query::<(Entity, &NavigationArea)>();
+    for (entity, area) in area_query.iter(world) {
+        let value = NavigationAreaInput {
+            actor_id: actor_id(world, entity)?,
+            id: area.id.clone(),
+            center: world_position(world, entity).to_array(),
+            half_extents: world_aabb_half_extents(
+                world_transform(world, entity),
+                area.half_extents,
+            )
+            .to_array(),
+            cost: area.cost,
+            walkable: area.walkable,
+        };
+        if aabb_overlaps(center, half_extents, value.center, value.half_extents) {
+            areas.push(value);
+        }
+    }
+    areas.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+
+    let mut links = Vec::new();
+    let mut link_query = world.query::<(Entity, &NavigationLink)>();
+    for (entity, link) in link_query.iter(world) {
+        let transform = world_transform(world, entity);
+        let value = NavigationLinkInput {
+            actor_id: actor_id(world, entity)?,
+            start: transform.transform_point(link.start).to_array(),
+            end: transform.transform_point(link.end).to_array(),
+            bidirectional: link.bidirectional,
+            cost: link.cost,
+            enabled: link.enabled,
+        };
+        if point_in_aabb(value.start, center, half_extents)
+            || point_in_aabb(value.end, center, half_extents)
+        {
+            links.push(value);
+        }
+    }
+    links.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+
+    let mut geometry = Vec::new();
+    let mut geometry_query = world.query::<(Entity, Option<&Primitive>, Option<&BrushDesc>)>();
+    for (entity, primitive, brush) in geometry_query.iter(world) {
+        if primitive.is_none() && brush.is_none() {
+            continue;
+        }
+        let transform = world_transform(world, entity);
+        let Some(value) = navigation_geometry_from_parts(
+            actor_id(world, entity)?,
+            transform.translation.to_array(),
+            transform.rotation.to_array(),
+            transform.scale.to_array(),
+            primitive,
+            brush,
+        ) else {
+            continue;
+        };
+        if geometry_overlaps_bounds(&value, center, half_extents) {
+            geometry.push(value);
+        }
+    }
+    geometry.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+
+    Ok(NavigationBakeInput {
+        source_scene,
+        bounds_actor_id,
+        center,
+        half_extents,
+        agent: bounds.agent.clone(),
+        geometry,
+        obstacles,
+        areas,
+        links,
+    })
+}
+
+fn actor_id(world: &World, entity: Entity) -> Result<String, String> {
+    world
+        .get::<ActorId>(entity)
+        .map(|id| id.0.clone())
+        .filter(|id| !id.trim().is_empty())
+        .ok_or_else(|| format!("navigation actor {entity:?} requires a stable ActorId"))
+}
+
+fn world_transform(world: &World, entity: Entity) -> Transform {
+    let mut chain = Vec::new();
+    let mut current = entity;
+    let mut visited = HashSet::new();
+    while visited.insert(current) {
+        chain.push(world.get::<Transform>(current).copied().unwrap_or_default());
+        let Some(parent) = world.get::<ChildOf>(current).map(ChildOf::parent) else {
+            break;
+        };
+        current = parent;
+    }
+    if world.get::<ChildOf>(current).is_some() {
+        return Transform::default();
+    }
+    let mut chain = chain.into_iter().rev();
+    let root = chain.next().unwrap_or_default();
+    chain
+        .fold(GlobalTransform::from(root), |global, local| {
+            global.mul_transform(local)
+        })
+        .compute_transform()
+}
+
+fn world_position(world: &World, entity: Entity) -> Vec3 {
+    world_transform(world, entity).translation
+}
+
+fn world_aabb_half_extents(transform: Transform, local_half_extents: Vec3) -> Vec3 {
+    let half = transform.scale.abs() * local_half_extents;
+    let x = transform.rotation * Vec3::X;
+    let y = transform.rotation * Vec3::Y;
+    let z = transform.rotation * Vec3::Z;
+    x.abs() * half.x + y.abs() * half.y + z.abs() * half.z
+}
+
+fn artifact_path(world: &World, authored: &str) -> Result<PathBuf, String> {
+    let relative = Path::new(authored);
+    if relative.is_absolute()
+        || relative
+            .components()
+            .any(|component| matches!(component, std::path::Component::ParentDir))
+    {
+        return Err("navigation artifact path must stay inside the project".into());
+    }
+    if !authored
+        .replace('\\', "/")
+        .starts_with("assets/navigation/generated/")
+    {
+        return Err("navigation artifacts must be under assets/navigation/generated/".into());
+    }
+    Ok(Path::new(&world.resource::<ProjectWorkspace>().root).join(relative))
+}
+
+fn set_status(world: &mut World, message: impl Into<String>, error: bool) {
+    let message = message.into();
+    let mut state = world.resource_mut::<NavigationEditorState>();
+    state.status.clone_from(&message);
+    state.error = error;
+    if error {
+        state.preview_path.clear();
+    }
+    world.resource_mut::<SceneIo>().set_status(message);
+}
+
+fn vec3_editor(ui: &mut egui::Ui, value: &mut Vec3, speed: f64) -> egui::Response {
+    ui.horizontal(|ui| {
+        ui.add(egui::DragValue::new(&mut value.x).speed(speed));
+        ui.add(egui::DragValue::new(&mut value.y).speed(speed));
+        ui.add(egui::DragValue::new(&mut value.z).speed(speed))
+    })
+    .response
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum NavigationActorType {
+    Bounds,
+    Obstacle,
+    Area,
+    Link,
+}
+
+pub fn spawn_navigation_actor(world: &mut World, actor_type: NavigationActorType) -> Entity {
+    let rect = world.resource::<crate::ui::UiState>().viewport_rect;
+    let settings = world.resource::<ViewportSettings>().clone();
+    let translation = snap_translation(editor_spawn_ground_position(world, rect), &settings);
+    let (name, bounds, obstacle, area, link) = match actor_type {
+        NavigationActorType::Bounds => (
+            "Navigation Bounds",
+            Some(NavigationBounds::default()),
+            None,
+            None,
+            None,
+        ),
+        NavigationActorType::Obstacle => (
+            "Navigation Obstacle",
+            None,
+            Some(NavigationObstacle::default()),
+            None,
+            None,
+        ),
+        NavigationActorType::Area => (
+            "Navigation Area",
+            None,
+            None,
+            Some(NavigationArea::default()),
+            None,
+        ),
+        NavigationActorType::Link => (
+            "Navigation Link",
+            None,
+            None,
+            None,
+            Some(NavigationLink::default()),
+        ),
+    };
+    let mut snapshot =
+        super::helpers::primitive_snapshot(name, shared::PrimitiveShape::Box, translation);
+    snapshot.actor_kind = shared::ActorKind::Navigation;
+    snapshot.primitive = None;
+    snapshot.material = None;
+    snapshot.physics = None;
+    snapshot.collider = None;
+    snapshot.rigid_body = None;
+    snapshot.navigation_bounds = bounds;
+    snapshot.navigation_obstacle = obstacle;
+    snapshot.navigation_area = area;
+    snapshot.navigation_link = link;
+    crate::history::spawn_with_history(world, snapshot)
+}
+
+pub fn sync_navigation_state(world: &mut World) {
+    let selected = world.resource::<crate::selection::SelectedEntity>().0;
+    let Some(entity) = selected.filter(|entity| world.get::<NavigationBounds>(*entity).is_some())
+    else {
+        return;
+    };
+    let Some(bounds) = world.get::<NavigationBounds>(entity).cloned() else {
+        return;
+    };
+    let input = match build_input(world, entity, &bounds) {
+        Ok(input) => input,
+        Err(_) => return,
+    };
+    let fingerprint = navigation_source_fingerprint(&input);
+    let changed_bounds = world.resource::<NavigationEditorState>().bounds_entity != Some(entity);
+    if changed_bounds {
+        let loaded = artifact_path(world, &bounds.artifact_path)
+            .ok()
+            .and_then(|path| read_navigation_artifact(&path).ok());
+        let mut state = world.resource_mut::<NavigationEditorState>();
+        state.bounds_entity = Some(entity);
+        state.artifact = loaded;
+        state.preview_path.clear();
+        state.observed_fingerprint = None;
+        state.auto_bake_attempt = None;
+        state.debounce_elapsed = 0.0;
+    }
+
+    let delta = world.resource::<Time>().delta_secs();
+    let mut should_bake = false;
+    {
+        let mut state = world.resource_mut::<NavigationEditorState>();
+        if state.observed_fingerprint.as_deref() != Some(&fingerprint) {
+            state.observed_fingerprint = Some(fingerprint.clone());
+            state.auto_bake_attempt = None;
+            state.debounce_elapsed = 0.0;
+        }
+        let stale = state
+            .artifact
+            .as_ref()
+            .is_none_or(|artifact| artifact.source_fingerprint != fingerprint);
+        if stale {
+            state.debounce_elapsed += delta;
+            if !state.error {
+                state.status = "Authored navigation changed; rebake required".into();
+            }
+            should_bake = bounds.auto_bake
+                && state.debounce_elapsed >= 0.75
+                && state.auto_bake_attempt.as_deref() != Some(&fingerprint);
+            if should_bake {
+                state.auto_bake_attempt = Some(fingerprint.clone());
+            }
+        } else if state.status == "Not baked"
+            || state.status == "Authored navigation changed; rebake required"
+        {
+            state.status = format!("Current: {}", bounds.artifact_path);
+            state.error = false;
+        }
+    }
+    if should_bake {
+        bake_bounds(world, entity);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn world_transform_uses_current_authored_parent_chain() {
+        let mut world = World::new();
+        let parent = world.spawn(Transform::from_xyz(4.0, 0.0, 0.0)).id();
+        let child = world
+            .spawn((Transform::from_xyz(0.0, 0.0, 2.0), ChildOf(parent)))
+            .id();
+
+        world
+            .entity_mut(child)
+            .insert(Transform::from_xyz(0.0, 0.0, 3.0));
+
+        assert_eq!(
+            world_transform(&world, child).translation,
+            Vec3::new(4.0, 0.0, 3.0)
+        );
+    }
+}
diff --git a/crates/editor/src/ui/toolbar.rs b/crates/editor/src/ui/toolbar.rs
index 5b530c3..80a9358 100644
--- a/crates/editor/src/ui/toolbar.rs
+++ b/crates/editor/src/ui/toolbar.rs
@@ -141,6 +141,25 @@ fn left_toolbar(world: &mut World, ui: &mut egui::Ui) {
             if icon_button(ui, icons::PENCIL_SIMPLE_LINE, "Draw brush (B)").clicked() {
                 start_draw_brush_tool(world);
             }
+            let selected_navigation_bounds = world
+                .resource::<crate::selection::SelectedEntity>()
+                .0
+                .filter(|entity| world.get::<shared::NavigationBounds>(*entity).is_some());
+            let navigation_tip = if selected_navigation_bounds.is_some() {
+                "Bake selected navigation bounds"
+            } else {
+                "Create navigation bounds"
+            };
+            if icon_button(ui, icons::PATH, navigation_tip).clicked() {
+                if let Some(entity) = selected_navigation_bounds {
+                    super::navigation_inspector::bake_bounds(world, entity);
+                } else {
+                    super::navigation_inspector::spawn_navigation_actor(
+                        world,
+                        super::navigation_inspector::NavigationActorType::Bounds,
+                    );
+                }
+            }
 
             toolbar_separator(ui);
 
diff --git a/crates/editor/src/ui/viewport_chrome.rs b/crates/editor/src/ui/viewport_chrome.rs
index cab22fc..4c913a0 100644
--- a/crates/editor/src/ui/viewport_chrome.rs
+++ b/crates/editor/src/ui/viewport_chrome.rs
@@ -875,7 +875,7 @@ fn viewport_asset_drop_ui(
             .as_slice()
             .iter()
             .copied()
-            .find(|entity| world.get::<shared::ModelRef>(*entity).is_some())
+            .find(|entity| world.get::<shared::SkinnedMeshRenderer>(*entity).is_some())
         {
             assign_animation_clip_operator(world, selection, entity);
         } else {
@@ -1011,7 +1011,7 @@ fn asset_drag_descriptor(
         } if selected
             .as_slice()
             .iter()
-            .any(|entity| world.get::<shared::ModelRef>(*entity).is_some()) =>
+            .any(|entity| world.get::<shared::SkinnedMeshRenderer>(*entity).is_some()) =>
         {
             "Assign clip to animated actor"
         }
diff --git a/crates/editor/src/viewport/actor_icons.rs b/crates/editor/src/viewport/actor_icons.rs
index 9d0a6f8..610a250 100644
--- a/crates/editor/src/viewport/actor_icons.rs
+++ b/crates/editor/src/viewport/actor_icons.rs
@@ -16,8 +16,8 @@ use bevy::shader::ShaderRef;
 use shared::{
     ActorKind, AudioListenerDesc, AudioSourceDesc, AuthoringLightKind, ColliderDesc, LevelObject,
     LightDesc, ModelRef, ObjectiveMarker, PhysicsBody, PlayerSpawn, PostProcessVolumeDesc,
-    PrefabInstance, PrefabRef, Primitive, RaytracingExcluded, StaticMeshRenderer, TeamSpawn,
-    TriggerVolume, WeaponSpawn,
+    PrefabInstance, PrefabRef, Primitive, RaytracingExcluded, SkinnedMeshRenderer,
+    StaticMeshRenderer, TeamSpawn, TriggerVolume, WeaponSpawn,
 };
 
 use crate::camera::EditorCamera;
@@ -203,6 +203,7 @@ struct ActorIconComponents {
     light_kind: Option<AuthoringLightKind>,
     has_primitive: bool,
     has_static_mesh_renderer: bool,
+    has_skinned_mesh_renderer: bool,
     has_model_ref: bool,
     has_prefab_ref: bool,
     has_prefab_instance: bool,
@@ -386,6 +387,7 @@ fn sync_actor_icons(
         ),
         (With<LevelObject>, Without<EditorOnly>),
     >,
+    skinned_meshes: Query<(), With<SkinnedMeshRenderer>>,
     audio: Query<(Has<AudioSourceDesc>, Has<AudioListenerDesc>)>,
     physics: Query<(), Or<(With<PhysicsBody>, With<ColliderDesc>)>>,
 ) {
@@ -419,6 +421,7 @@ fn sync_actor_icons(
                 has_primitive,
                 has_static_mesh_renderer: static_mesh_renderer
                     .is_some_and(has_resolved_static_mesh_slot),
+                has_skinned_mesh_renderer: skinned_meshes.contains(target),
                 has_model_ref,
                 has_prefab_ref,
                 has_prefab_instance,
@@ -489,6 +492,7 @@ fn sync_actor_icons(
             has_primitive,
             has_static_mesh_renderer: static_mesh_renderer
                 .is_some_and(has_resolved_static_mesh_slot),
+            has_skinned_mesh_renderer: skinned_meshes.contains(target),
             has_model_ref,
             has_prefab_ref,
             has_prefab_instance,
@@ -637,6 +641,16 @@ fn icon_for_actor_components(components: ActorIconComponents) -> ActorIconSpec {
                 warning
             }
         }
+        ActorKind::SkinnedMesh => {
+            if components.has_skinned_mesh_renderer {
+                ActorIconSpec {
+                    image: ActorIconImage::Mesh,
+                    category: ActorIconCategory::Mesh,
+                }
+            } else {
+                warning
+            }
+        }
         ActorKind::ImportedModel => {
             if components.has_model_ref {
                 ActorIconSpec {
@@ -752,6 +766,10 @@ fn icon_for_actor_components(components: ActorIconComponents) -> ActorIconSpec {
                 warning
             }
         }
+        ActorKind::Navigation => ActorIconSpec {
+            image: ActorIconImage::GameMarker,
+            category: ActorIconCategory::Volume,
+        },
         ActorKind::Empty => {
             if components.has_physics {
                 ActorIconSpec {
diff --git a/crates/editor/src/viewport/brush_tool.rs b/crates/editor/src/viewport/brush_tool.rs
index 18a02db..ff25946 100644
--- a/crates/editor/src/viewport/brush_tool.rs
+++ b/crates/editor/src/viewport/brush_tool.rs
@@ -374,6 +374,7 @@ fn brush_snapshot_from_convex_points(
         primitive: None,
         brush: Some(brush),
         static_mesh_renderer: None,
+        skinned_mesh_renderer: None,
         material: Some(MaterialDesc::default()),
         material_override: None,
         rigid_body: None,
@@ -392,8 +393,18 @@ fn brush_snapshot_from_convex_points(
         post_process_volume: None,
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: 0,
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     })
 }
diff --git a/crates/editor/src/viewport/rendering_diagnostics.rs b/crates/editor/src/viewport/rendering_diagnostics.rs
index 9a17c55..f72393c 100644
--- a/crates/editor/src/viewport/rendering_diagnostics.rs
+++ b/crates/editor/src/viewport/rendering_diagnostics.rs
@@ -290,14 +290,33 @@ fn solari_geometry_summary(world: &World, ui: &mut egui::Ui) {
     ui.separator();
     ui.heading("Solari raytracing scene");
     ui.label(format!(
-        "Project meshes: {} tagged, {} eligible, {} Solari-compatible assets, {} unsupported, {} excluded helpers, {} outside level roots",
+        "Project meshes: {} tagged, {} eligible, {} Solari-compatible assets, {} unsupported, {} deformed safely omitted, {} excluded helpers, {} outside level roots",
         stats.tagged_meshes,
         stats.project_meshes,
         stats.compatible_mesh_assets,
         stats.unsupported_meshes,
+        stats.deformed_meshes_excluded,
         stats.excluded_meshes,
         stats.missing_level_root_meshes
     ));
+    if stats.surface_material_meshes > 0 {
+        ui.label(format!(
+            "Surface ABI materials: {} meshes, {} missing an active evaluator generation",
+            stats.surface_material_meshes, stats.surface_materials_missing_evaluator
+        ));
+    }
+    if stats.deformed_meshes_excluded > 0 {
+        ui.colored_label(
+            egui::Color32::from_rgb(255, 180, 100),
+            "Skinned/morphed meshes are omitted from Solari until dynamic deformed BLAS is available; no bind-pose proxy is traced.",
+        );
+    }
+    if stats.surface_materials_missing_evaluator > 0 {
+        ui.colored_label(
+            egui::Color32::from_rgb(255, 140, 140),
+            "Surface meshes without a validated evaluator are omitted instead of using an approximate ray-tracing material.",
+        );
+    }
     if stats.incompatible_mesh_assets > 0 {
         ui.colored_label(
             egui::Color32::from_rgb(255, 180, 100),
@@ -457,6 +476,7 @@ pub fn spawn_post_process_volume_at_camera(world: &mut World) {
         primitive: None,
         brush: None,
         static_mesh_renderer: None,
+        skinned_mesh_renderer: None,
         material: None,
         material_override: None,
         rigid_body: None,
@@ -475,8 +495,18 @@ pub fn spawn_post_process_volume_at_camera(world: &mut World) {
         post_process_volume: Some(PostProcessVolumeDesc::default()),
         team_spawn: None,
         objective: None,
+
+        navigation_bounds: None,
+
+        navigation_obstacle: None,
+
+        navigation_area: None,
+
+        navigation_link: None,
         hierarchy_sibling_index: 0,
         editor_visibility: EditorVisibility::default(),
+        inspector_order: None,
+        component_states: None,
         children: Vec::new(),
     };
     spawn_with_history(world, snapshot);
diff --git a/crates/editor/src/viewport/visualizers.rs b/crates/editor/src/viewport/visualizers.rs
index 754ac01..9f7ee4c 100644
--- a/crates/editor/src/viewport/visualizers.rs
+++ b/crates/editor/src/viewport/visualizers.rs
@@ -5,8 +5,9 @@ use bevy::ecs::system::SystemParam;
 use bevy::prelude::*;
 use shared::{
     AudioListenerDesc, AudioSourceDesc, AuthoringLightKind, ColliderDesc, ColliderShapeDesc,
-    LevelObject, LightDesc, ModelRef, ObjectiveMarker, PhysicsBody, PlayerSpawn,
-    PostProcessVolumeDesc, PrefabRef, ProjectSun, RaytracingExcluded, TeamSpawn, TriggerVolume,
+    LevelObject, LightDesc, ModelRef, NavigationArea, NavigationBounds, NavigationLink,
+    NavigationObstacle, ObjectiveMarker, PhysicsBody, PlayerSpawn, PostProcessVolumeDesc,
+    PrefabRef, ProjectSun, RaytracingExcluded, SkinnedMeshRenderer, TeamSpawn, TriggerVolume,
     WeaponSpawn,
 };
 use sim::tuning::{EYE_OFFSET_STAND, PLAYER_LENGTH, PLAYER_RADIUS};
@@ -107,7 +108,15 @@ struct VisualizerTargetQueries<'w, 's> {
     lights: Query<'w, 's, Entity, (With<LevelObject>, With<LightDesc>)>,
     spawns: Query<'w, 's, Entity, (With<LevelObject>, With<PlayerSpawn>)>,
     prefabs: Query<'w, 's, Entity, (With<LevelObject>, With<PrefabRef>)>,
-    models: Query<'w, 's, Entity, (With<LevelObject>, With<ModelRef>)>,
+    models: Query<
+        'w,
+        's,
+        Entity,
+        (
+            With<LevelObject>,
+            Or<(With<ModelRef>, With<SkinnedMeshRenderer>)>,
+        ),
+    >,
     players: Query<'w, 's, Entity, With<Player>>,
     cameras: Query<'w, 's, Entity, With<PlayerCamera>>,
     project_suns: Query<'w, 's, Entity, With<ProjectSun>>,
@@ -127,6 +136,7 @@ impl Plugin for EditorVisualizersPlugin {
                     draw_audio_visualizers,
                     draw_split_collider_visualizers,
                     draw_post_process_volume_gizmos,
+                    draw_navigation_visualizers,
                 )
                     .chain()
                     .run_if(scene_tools_active)
@@ -135,6 +145,119 @@ impl Plugin for EditorVisualizersPlugin {
     }
 }
 
+fn draw_navigation_visualizers(
+    state: Res<crate::ui::navigation_inspector::NavigationEditorState>,
+    mut gizmos: Gizmos,
+    bounds: Query<(&NavigationBounds, &GlobalTransform), With<LevelObject>>,
+    obstacles: Query<(&NavigationObstacle, &GlobalTransform), With<LevelObject>>,
+    areas: Query<(&NavigationArea, &GlobalTransform), With<LevelObject>>,
+    links: Query<(&NavigationLink, &GlobalTransform), With<LevelObject>>,
+) {
+    for (value, global) in &bounds {
+        let (_, rotation, center) = global.to_scale_rotation_translation();
+        draw_box(
+            &mut gizmos,
+            center,
+            rotation,
+            value.half_extents,
+            Color::srgba(0.12, 0.82, 0.78, 0.72),
+        );
+    }
+    for (value, global) in &obstacles {
+        let (_, rotation, center) = global.to_scale_rotation_translation();
+        draw_box(
+            &mut gizmos,
+            center,
+            rotation,
+            value.half_extents,
+            Color::srgba(1.0, 0.28, 0.22, 0.78),
+        );
+    }
+    for (value, global) in &areas {
+        let (_, rotation, center) = global.to_scale_rotation_translation();
+        let color = if value.walkable {
+            Color::srgba(0.32, 0.72, 1.0, 0.62)
+        } else {
+            Color::srgba(1.0, 0.55, 0.18, 0.72)
+        };
+        draw_box(&mut gizmos, center, rotation, value.half_extents, color);
+    }
+    for (value, global) in &links {
+        let start = global.transform_point(value.start);
+        let end = global.transform_point(value.end);
+        let color = if value.enabled {
+            Color::srgba(0.95, 0.78, 0.22, 0.95)
+        } else {
+            Color::srgba(0.48, 0.48, 0.5, 0.55)
+        };
+        gizmos.line(start, end, color);
+        gizmos
+            .sphere(Isometry3d::from_translation(start), 0.11, color)
+            .resolution(12);
+        gizmos
+            .sphere(Isometry3d::from_translation(end), 0.11, color)
+            .resolution(12);
+    }
+
+    if state.show_mesh {
+        if let Some(artifact) = &state.artifact {
+            for layer in &artifact.mesh.layers {
+                for polygon in &layer.polygons {
+                    for index in 0..polygon.vertices.len() {
+                        let a_index = polygon.vertices[index] as usize;
+                        let b_index =
+                            polygon.vertices[(index + 1) % polygon.vertices.len()] as usize;
+                        let Some(a) = navigation_vertex(layer, a_index) else {
+                            continue;
+                        };
+                        let Some(b) = navigation_vertex(layer, b_index) else {
+                            continue;
+                        };
+                        gizmos.line(
+                            a + Vec3::Y * 0.025,
+                            b + Vec3::Y * 0.025,
+                            Color::srgba(0.08, 0.9, 0.72, 0.7),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    for edge in state.preview_path.windows(2) {
+        gizmos.line(
+            edge[0] + Vec3::Y * 0.08,
+            edge[1] + Vec3::Y * 0.08,
+            Color::srgba(0.98, 0.88, 0.2, 1.0),
+        );
+    }
+    if let Some(start) = state.preview_path.first().copied() {
+        gizmos
+            .sphere(
+                Isometry3d::from_translation(start + Vec3::Y * 0.08),
+                0.16,
+                Color::srgba(0.2, 1.0, 0.55, 1.0),
+            )
+            .resolution(14);
+    }
+    if let Some(end) = state.preview_path.last().copied() {
+        gizmos
+            .sphere(
+                Isometry3d::from_translation(end + Vec3::Y * 0.08),
+                0.16,
+                Color::srgba(1.0, 0.28, 0.22, 1.0),
+            )
+            .resolution(14);
+    }
+}
+
+fn navigation_vertex(layer: &polyanya::Layer, index: usize) -> Option<Vec3> {
+    let vertex = layer.vertices.get(index)?;
+    let height = layer.height.get(index).copied().unwrap_or_default();
+    let coords = vertex.coords + layer.offset;
+    Some(Vec3::new(coords.x, height, coords.y))
+}
+
 fn draw_audio_visualizers(
     viewport_mode: Res<EditorViewportMode>,
     settings: Res<EditorVisualizationSettings>,
@@ -399,7 +522,13 @@ fn draw_visualizers(
     lights: Query<(Entity, &LightDesc, &GlobalTransform), With<LevelObject>>,
     spawns: Query<(Entity, &GlobalTransform), (With<LevelObject>, With<PlayerSpawn>)>,
     prefabs: Query<(Entity, &GlobalTransform), (With<LevelObject>, With<PrefabRef>)>,
-    models: Query<(Entity, &GlobalTransform), (With<LevelObject>, With<ModelRef>)>,
+    models: Query<
+        (Entity, &GlobalTransform),
+        (
+            With<LevelObject>,
+            Or<(With<ModelRef>, With<SkinnedMeshRenderer>)>,
+        ),
+    >,
     players: Query<(Entity, &GlobalTransform), With<Player>>,
     cameras: Query<(Entity, &GlobalTransform), With<PlayerCamera>>,
     project_suns: Query<(Entity, &GlobalTransform), With<ProjectSun>>,
diff --git a/crates/game/Cargo.toml b/crates/game/Cargo.toml
index 48354ca..8753329 100644
--- a/crates/game/Cargo.toml
+++ b/crates/game/Cargo.toml
@@ -18,6 +18,8 @@ bevy_ufbx.workspace = true
 cpal = "0.17.3"
 game_hot = { path = "../game_hot" }
 hot-lib-reloader = { version = "0.8.2", optional = true }
+nav_glam.workspace = true
+polyanya.workspace = true
 protocol.workspace = true
 ron = "0.12"
 scene.workspace = true
diff --git a/crates/game/src/animation.rs b/crates/game/src/animation.rs
index 32c103a..5ae3d2c 100644
--- a/crates/game/src/animation.rs
+++ b/crates/game/src/animation.rs
@@ -1,6 +1,6 @@
 //! Runtime adapter for scene-authored animation controllers.
 
-use std::collections::{HashMap, VecDeque};
+use std::collections::{HashMap, HashSet, VecDeque};
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 
@@ -12,11 +12,14 @@ use bevy::animation::{
     RepeatAnimation,
 };
 use bevy::gltf::GltfAssetLabel;
+use bevy::mesh::morph::MorphWeights;
+use bevy::mesh::skinning::{SkinnedMesh, SkinnedMeshInverseBindposes};
 use bevy::prelude::*;
 use bevy::world_serialization::WorldInstanceReady;
 use shared::{
     animation_clip_source_index, asset_server_path, AnimationControllerDesc, AnimationEventDesc,
-    AnimationManifest, AnimationStateDesc, HydratedModelRoot, ANIMATION_ARTIFACT_DIR,
+    AnimationManifest, AnimationStateDesc, HydratedSkinnedMeshRoot, ANIMATION_ARTIFACT_DIR,
+    ANIMATION_MANIFEST_SCHEMA_VERSION,
 };
 use sim::SimEnabled;
 
@@ -114,6 +117,29 @@ pub struct AuthoredAnimationRuntime {
     last_event_time: Option<f32>,
 }
 
+#[derive(Debug, Clone)]
+struct SkinnedPoseBaselineEntry {
+    entity: Entity,
+    transform: Option<Transform>,
+    morph_weights: Option<MorphWeights>,
+}
+
+/// Imported rest-pose state captured before Blacksite starts authored animation playback.
+///
+/// This component is runtime-only. It is replaced whenever a new hydrated hierarchy becomes
+/// ready, so renderer reloads cannot restore values onto an older scene generation.
+#[derive(Component, Debug, Clone)]
+pub struct SkinnedPoseBaseline {
+    pub root: Entity,
+    entries: Vec<SkinnedPoseBaselineEntry>,
+}
+
+impl SkinnedPoseBaseline {
+    pub fn entry_count(&self) -> usize {
+        self.entries.len()
+    }
+}
+
 /// Editor-only transient preview request consumed by the shared runtime adapter.
 #[derive(Debug, Clone, PartialEq)]
 pub struct AnimationPreviewRequest {
@@ -163,10 +189,14 @@ impl Plugin for GameAnimationPlugin {
 fn attach_controller_when_model_ready(
     ready: On<WorldInstanceReady>,
     mut commands: Commands,
-    roots: Query<&HydratedModelRoot>,
+    roots: Query<&HydratedSkinnedMeshRoot>,
     controllers: Query<&AnimationControllerDesc>,
     children: Query<&Children>,
     players: Query<Entity, With<AnimationPlayer>>,
+    transforms: Query<&Transform>,
+    morph_weights: Query<&MorphWeights>,
+    skinned_meshes: Query<(Entity, &SkinnedMesh)>,
+    inverse_bindposes: Option<Res<Assets<SkinnedMeshInverseBindposes>>>,
     asset_server: Res<AssetServer>,
     mut graphs: ResMut<Assets<AnimationGraph>>,
     mut diagnostics: ResMut<AnimationRuntimeDiagnostics>,
@@ -175,6 +205,18 @@ fn attach_controller_when_model_ready(
     let Ok(root) = roots.get(ready.entity) else {
         return;
     };
+    let subtree = std::iter::once(ready.entity)
+        .chain(children.iter_descendants(ready.entity))
+        .collect::<HashSet<_>>();
+    let baseline = capture_pose_baseline(ready.entity, &subtree, &transforms, &morph_weights);
+    commands.entity(root.owner).insert(baseline);
+    validate_skinned_bindings(
+        root.owner,
+        &subtree,
+        &skinned_meshes,
+        inverse_bindposes.as_deref(),
+        &mut diagnostics,
+    );
     let Ok(controller) = controllers.get(root.owner) else {
         return;
     };
@@ -182,7 +224,7 @@ fn attach_controller_when_model_ready(
         diagnostics.push(
             Some(root.owner),
             "animation.player_missing",
-            "The hydrated model contains no AnimationPlayer. Verify that the selected glTF scene contains an animated hierarchy.",
+            "The hydrated skinned mesh contains no AnimationPlayer. Verify that the selected glTF scene contains an animated hierarchy.",
         );
         return;
     };
@@ -199,6 +241,75 @@ fn attach_controller_when_model_ready(
     );
 }
 
+fn capture_pose_baseline(
+    root: Entity,
+    subtree: &HashSet<Entity>,
+    transforms: &Query<&Transform>,
+    morph_weights: &Query<&MorphWeights>,
+) -> SkinnedPoseBaseline {
+    let mut entities = subtree.iter().copied().collect::<Vec<_>>();
+    entities.sort_by_key(|entity| entity.to_bits());
+    let entries = entities
+        .into_iter()
+        .filter_map(|entity| {
+            let transform = transforms.get(entity).ok().copied();
+            let morph_weights = morph_weights.get(entity).ok().cloned();
+            (transform.is_some() || morph_weights.is_some()).then_some(SkinnedPoseBaselineEntry {
+                entity,
+                transform,
+                morph_weights,
+            })
+        })
+        .collect();
+    SkinnedPoseBaseline { root, entries }
+}
+
+fn validate_skinned_bindings(
+    actor: Entity,
+    subtree: &HashSet<Entity>,
+    skinned_meshes: &Query<(Entity, &SkinnedMesh)>,
+    inverse_bindposes: Option<&Assets<SkinnedMeshInverseBindposes>>,
+    diagnostics: &mut AnimationRuntimeDiagnostics,
+) {
+    for (mesh_entity, skin) in skinned_meshes.iter() {
+        if !subtree.contains(&mesh_entity) {
+            continue;
+        }
+        if let Some(inverse_bindposes) = inverse_bindposes {
+            let Some(bindposes) = inverse_bindposes.get(&skin.inverse_bindposes) else {
+                diagnostics.push(
+                    Some(actor),
+                    "animation.inverse_bindposes_missing",
+                    format!(
+                        "Skinned mesh {mesh_entity} has no loaded inverse-bind-pose asset; the imported hierarchy was preserved but cannot be validated."
+                    ),
+                );
+                continue;
+            };
+            if skin.joints.len() != bindposes.len() {
+                diagnostics.push(
+                    Some(actor),
+                    "animation.skin_binding_count_mismatch",
+                    format!(
+                        "Skinned mesh {mesh_entity} has {} joints but {} inverse bind poses. Re-export the rig and reimport the model.",
+                        skin.joints.len(),
+                        bindposes.len()
+                    ),
+                );
+            }
+        }
+        if let Some(joint) = skin.joints.iter().find(|joint| !subtree.contains(joint)) {
+            diagnostics.push(
+                Some(actor),
+                "animation.skin_joint_outside_hierarchy",
+                format!(
+                    "Skinned mesh {mesh_entity} references joint {joint} outside its hydrated hierarchy. Re-export the rig as one scene hierarchy."
+                ),
+            );
+        }
+    }
+}
+
 #[allow(clippy::too_many_arguments)]
 fn reconcile_changed_controllers(
     mut commands: Commands,
@@ -209,7 +320,7 @@ fn reconcile_changed_controllers(
             Changed<AnimationControllerDesc>,
         )>,
     >,
-    roots: Query<(Entity, &HydratedModelRoot)>,
+    roots: Query<(Entity, &HydratedSkinnedMeshRoot)>,
     children: Query<&Children>,
     players: Query<Entity, With<AnimationPlayer>>,
     asset_server: Res<AssetServer>,
@@ -266,6 +377,9 @@ fn configure_runtime(
                     Some(controller.default_crossfade_seconds),
                 )
             });
+            commands.queue(move |world: &mut World| {
+                restore_pose_baseline(world, actor);
+            });
             commands.entity(player).insert((
                 AnimationGraphHandle(graph.clone()),
                 AnimationTransitions::new(),
@@ -298,6 +412,7 @@ fn clear_failed_runtime_configuration(commands: &mut Commands, actor: Entity, pl
         if let Some(mut animation_player) = world.get_mut::<AnimationPlayer>(player) {
             animation_player.stop_all();
         }
+        restore_pose_baseline(world, actor);
         if let Ok(mut player_entity) = world.get_entity_mut(player) {
             player_entity
                 .remove::<AnimationGraphHandle>()
@@ -468,7 +583,17 @@ fn load_runtime_animation_manifest(
     let path = runtime_animation_manifest_path(assets_root, asset_id);
     let text = std::fs::read_to_string(&path)
         .map_err(|error| format!("could not read {}: {error}", path.display()))?;
-    ron::from_str(&text).map_err(|error| format!("could not parse {}: {error}", path.display()))
+    let manifest: AnimationManifest = ron::from_str(&text)
+        .map_err(|error| format!("could not parse {}: {error}", path.display()))?;
+    if manifest.schema_version != ANIMATION_MANIFEST_SCHEMA_VERSION {
+        return Err(format!(
+            "animation manifest {} uses schema {} but runtime requires {}; reimport the source model",
+            path.display(),
+            manifest.schema_version,
+            ANIMATION_MANIFEST_SCHEMA_VERSION
+        ));
+    }
+    Ok(manifest)
 }
 
 fn process_animation_state_requests(
@@ -550,8 +675,18 @@ fn sync_authored_animation_playback(
             .request
             .as_ref()
             .filter(|request| request.actor == actor);
-        let should_run = sim_enabled.0 || preview_request.is_some();
-        if !should_run {
+        let desired_state = preview_request
+            .map(|request| request.state_id.as_str())
+            .or(runtime.desired_state.as_deref())
+            .or((!controller.default_state.trim().is_empty())
+                .then_some(controller.default_state.as_str()))
+            .map(str::to_owned);
+        let sampling_edit_rest = !sim_enabled.0
+            && preview_request.is_none()
+            && runtime.active_state.is_none()
+            && desired_state.is_some();
+        let should_evaluate = sim_enabled.0 || preview_request.is_some() || sampling_edit_rest;
+        if !should_evaluate {
             if runtime.active_state.is_some() {
                 player.pause_all();
                 runtime.paused_by_sim = true;
@@ -572,12 +707,6 @@ fn sync_authored_animation_playback(
                 .unwrap_or_default()
         });
 
-        let desired_state = preview_request
-            .map(|request| request.state_id.as_str())
-            .or(runtime.desired_state.as_deref())
-            .or((!controller.default_state.trim().is_empty())
-                .then_some(controller.default_state.as_str()))
-            .map(str::to_owned);
         let Some(desired_state) = desired_state else {
             continue;
         };
@@ -600,7 +729,7 @@ fn sync_authored_animation_playback(
         };
 
         if runtime.active_state.as_deref() != Some(desired_state.as_str()) {
-            let crossfade = if preview_request.is_some() {
+            let crossfade = if preview_request.is_some() || sampling_edit_rest {
                 0.0
             } else {
                 runtime
@@ -830,23 +959,49 @@ fn crossed_animation_events<'a>(
     crossed
 }
 
-fn cleanup_stale_animation_runtimes(
-    mut commands: Commands,
-    controllers: Query<(), With<AnimationControllerDesc>>,
-    runtimes: Query<(Entity, &AuthoredAnimationRuntime)>,
-    mut players: Query<&mut AnimationPlayer>,
-) {
-    for (actor, runtime) in &runtimes {
-        if controllers.get(actor).is_ok() && players.get(runtime.player).is_ok() {
-            continue;
+fn cleanup_stale_animation_runtimes(world: &mut World) {
+    let runtimes = world
+        .query::<(Entity, &AuthoredAnimationRuntime)>()
+        .iter(world)
+        .map(|(actor, runtime)| (actor, runtime.player))
+        .collect::<Vec<_>>();
+    let stale = runtimes
+        .into_iter()
+        .filter(|(actor, player)| {
+            let controller_exists = world.get::<AnimationControllerDesc>(*actor).is_some();
+            let player_exists = world.get::<AnimationPlayer>(*player).is_some();
+            !controller_exists || !player_exists
+        })
+        .collect::<Vec<_>>();
+    for (actor, player) in stale {
+        if let Some(mut animation_player) = world.get_mut::<AnimationPlayer>(player) {
+            animation_player.stop_all();
         }
-        if let Ok(mut player) = players.get_mut(runtime.player) {
-            player.stop_all();
-            commands
-                .entity(runtime.player)
-                .remove::<SuspendedAnimationTransitions>();
+        if let Ok(mut player_entity) = world.get_entity_mut(player) {
+            player_entity.remove::<SuspendedAnimationTransitions>();
+        }
+        restore_pose_baseline(world, actor);
+        if let Ok(mut actor_entity) = world.get_entity_mut(actor) {
+            actor_entity.remove::<AuthoredAnimationRuntime>();
+        }
+    }
+}
+
+fn restore_pose_baseline(world: &mut World, actor: Entity) {
+    let Some(baseline) = world.get::<SkinnedPoseBaseline>(actor).cloned() else {
+        return;
+    };
+    for entry in baseline.entries {
+        if let Some(transform) = entry.transform {
+            if let Some(mut current) = world.get_mut::<Transform>(entry.entity) {
+                *current = transform;
+            }
+        }
+        if let Some(morph_weights) = entry.morph_weights {
+            if let Some(mut current) = world.get_mut::<MorphWeights>(entry.entity) {
+                *current = morph_weights;
+            }
         }
-        commands.entity(actor).remove::<AuthoredAnimationRuntime>();
     }
 }
 
@@ -919,8 +1074,15 @@ pub fn stop_animation_preview(world: &mut World) {
             animation_player.stop_all();
         }
     }
+    restore_pose_baseline(world, actor);
+    let edit_rest_state = world
+        .get::<AnimationControllerDesc>(actor)
+        .map(|controller| controller.default_state.clone())
+        .filter(|state| !state.trim().is_empty());
     if let Some(mut runtime) = world.get_mut::<AuthoredAnimationRuntime>(actor) {
         runtime.active_state = None;
+        runtime.desired_state = edit_rest_state;
+        runtime.requested_crossfade_seconds = Some(0.0);
         runtime.paused_by_sim = false;
         runtime.applied_preview_revision = None;
         runtime.last_event_time = None;
@@ -943,10 +1105,15 @@ pub fn reset_authored_animation_runtime(world: &mut World) {
         if let Some(mut animation_player) = world.get_mut::<AnimationPlayer>(player) {
             animation_player.stop_all();
         }
+        restore_pose_baseline(world, actor);
+        let edit_rest_state = world
+            .get::<AnimationControllerDesc>(actor)
+            .map(|controller| controller.default_state.clone())
+            .filter(|state| !state.trim().is_empty());
         if let Some(mut runtime) = world.get_mut::<AuthoredAnimationRuntime>(actor) {
             runtime.active_state = None;
-            runtime.desired_state = None;
-            runtime.requested_crossfade_seconds = None;
+            runtime.desired_state = edit_rest_state;
+            runtime.requested_crossfade_seconds = Some(0.0);
             runtime.paused_by_sim = false;
             runtime.applied_preview_revision = None;
             runtime.last_event_time = None;
@@ -960,7 +1127,7 @@ mod tests {
     use bevy::asset::{AssetApp, AssetPlugin};
     use shared::{
         AnimationClipRecord, AnimationManifestSource, AnimationPlaybackRange,
-        AnimationSourceFingerprint, EditorAssetRef, ANIMATION_MANIFEST_SCHEMA_VERSION,
+        AnimationSourceFingerprint, EditorAssetRef,
     };
 
     fn state(id: &str, index: usize) -> AnimationStateDesc {
@@ -1094,6 +1261,7 @@ mod tests {
             schema_version: ANIMATION_MANIFEST_SCHEMA_VERSION,
             asset_id: state.clip.asset_id.clone(),
             label: "Moved Model".into(),
+            default_animation_clip_id: None,
             source: AnimationManifestSource {
                 path: "assets/models/relocated.glb".into(),
                 format: "glb".into(),
@@ -1144,7 +1312,7 @@ mod tests {
         let actor = app.world_mut().spawn_empty().id();
         let root = app
             .world_mut()
-            .spawn((HydratedModelRoot { owner: actor }, ChildOf(actor)))
+            .spawn((HydratedSkinnedMeshRoot { owner: actor }, ChildOf(actor)))
             .id();
         let stale_node = AnimationNodeIndex::new(0);
         let mut animation_player = AnimationPlayer::default();
@@ -1362,6 +1530,202 @@ mod tests {
             .all_paused());
     }
 
+    #[test]
+    fn edit_mode_samples_and_pauses_the_explicit_default_state() {
+        let (mut app, actor, player, _) = runtime_test_app(false);
+
+        app.update();
+
+        assert_eq!(
+            app.world()
+                .get::<AuthoredAnimationRuntime>(actor)
+                .and_then(|runtime| runtime.active_state.as_deref()),
+            Some("idle")
+        );
+        assert!(app
+            .world()
+            .get::<AnimationPlayer>(player)
+            .is_some_and(AnimationPlayer::all_paused));
+    }
+
+    #[test]
+    fn stopping_preview_restores_transform_and_morph_baseline_before_resampling() {
+        let mut app = App::new();
+        app.init_resource::<AnimationPreviewRuntime>();
+        let baseline_transform = Transform::from_xyz(1.0, 2.0, 3.0);
+        let baseline_morph = MorphWeights::new(vec![0.1, 0.9], None).unwrap();
+        let target = app
+            .world_mut()
+            .spawn((
+                Transform::from_xyz(9.0, 8.0, 7.0),
+                MorphWeights::new(vec![0.8, 0.2], None).unwrap(),
+            ))
+            .id();
+        let node = AnimationNodeIndex::new(0);
+        let mut animation_player = AnimationPlayer::default();
+        animation_player.start(node);
+        let player = app.world_mut().spawn(animation_player).id();
+        let actor = app
+            .world_mut()
+            .spawn(AnimationControllerDesc {
+                states: vec![state("idle", 0)],
+                default_state: "idle".into(),
+                ..Default::default()
+            })
+            .id();
+        app.world_mut().entity_mut(actor).insert((
+            SkinnedPoseBaseline {
+                root: target,
+                entries: vec![SkinnedPoseBaselineEntry {
+                    entity: target,
+                    transform: Some(baseline_transform),
+                    morph_weights: Some(baseline_morph),
+                }],
+            },
+            AuthoredAnimationRuntime {
+                player,
+                graph: Handle::default(),
+                state_nodes: HashMap::from([("idle".into(), node)]),
+                active_state: Some("idle".into()),
+                desired_state: Some("idle".into()),
+                requested_crossfade_seconds: None,
+                paused_by_sim: false,
+                applied_preview_revision: None,
+                metadata_by_state: HashMap::new(),
+                last_event_time: None,
+            },
+        ));
+        set_animation_preview(
+            app.world_mut(),
+            AnimationPreviewRequest {
+                actor,
+                state_id: "idle".into(),
+                seek_seconds: Some(0.7),
+                playing: true,
+            },
+        )
+        .unwrap();
+
+        stop_animation_preview(app.world_mut());
+
+        assert_eq!(
+            app.world().get::<Transform>(target),
+            Some(&baseline_transform)
+        );
+        assert_eq!(
+            app.world().get::<MorphWeights>(target).unwrap().weights(),
+            &[0.1, 0.9]
+        );
+        assert!(app
+            .world()
+            .get::<AnimationPlayer>(player)
+            .unwrap()
+            .playing_animations()
+            .next()
+            .is_none());
+        let runtime = app.world().get::<AuthoredAnimationRuntime>(actor).unwrap();
+        assert!(runtime.active_state.is_none());
+        assert_eq!(runtime.desired_state.as_deref(), Some("idle"));
+        assert_eq!(runtime.requested_crossfade_seconds, Some(0.0));
+    }
+
+    #[test]
+    fn removing_controller_restores_baseline_and_clears_runtime() {
+        let mut world = World::new();
+        let target = world.spawn(Transform::from_xyz(9.0, 0.0, 0.0)).id();
+        let player = world.spawn(AnimationPlayer::default()).id();
+        let actor = world
+            .spawn((
+                SkinnedPoseBaseline {
+                    root: target,
+                    entries: vec![SkinnedPoseBaselineEntry {
+                        entity: target,
+                        transform: Some(Transform::from_xyz(1.0, 0.0, 0.0)),
+                        morph_weights: None,
+                    }],
+                },
+                AuthoredAnimationRuntime {
+                    player,
+                    graph: Handle::default(),
+                    state_nodes: HashMap::new(),
+                    active_state: Some("idle".into()),
+                    desired_state: Some("idle".into()),
+                    requested_crossfade_seconds: None,
+                    paused_by_sim: false,
+                    applied_preview_revision: None,
+                    metadata_by_state: HashMap::new(),
+                    last_event_time: None,
+                },
+            ))
+            .id();
+
+        cleanup_stale_animation_runtimes(&mut world);
+
+        assert_eq!(world.get::<Transform>(target).unwrap().translation, Vec3::X);
+        assert!(world.get::<AuthoredAnimationRuntime>(actor).is_none());
+    }
+
+    #[test]
+    fn duplicate_skin_records_are_validated_independently_against_shared_joints() {
+        let mut world = World::new();
+        let actor = world.spawn_empty().id();
+        let root = world.spawn_empty().id();
+        let joint = world.spawn_empty().id();
+        let mut inverse_bindposes = Assets::<SkinnedMeshInverseBindposes>::default();
+        let first_bindposes =
+            inverse_bindposes.add(SkinnedMeshInverseBindposes::from(vec![Mat4::IDENTITY]));
+        let second_bindposes =
+            inverse_bindposes.add(SkinnedMeshInverseBindposes::from(vec![Mat4::IDENTITY]));
+        let first_mesh = world
+            .spawn(SkinnedMesh {
+                inverse_bindposes: first_bindposes,
+                joints: vec![joint],
+            })
+            .id();
+        let second_mesh = world
+            .spawn(SkinnedMesh {
+                inverse_bindposes: second_bindposes,
+                joints: vec![joint],
+            })
+            .id();
+        let subtree = HashSet::from([root, joint, first_mesh, second_mesh]);
+        let mut diagnostics = AnimationRuntimeDiagnostics::default();
+        let mut query_state =
+            bevy::ecs::system::SystemState::<Query<(Entity, &SkinnedMesh)>>::new(&mut world);
+
+        {
+            let skins = query_state.get(&world).unwrap();
+            validate_skinned_bindings(
+                actor,
+                &subtree,
+                &skins,
+                Some(&inverse_bindposes),
+                &mut diagnostics,
+            );
+        }
+        assert!(diagnostics.entries().next().is_none());
+
+        world
+            .get_mut::<SkinnedMesh>(second_mesh)
+            .unwrap()
+            .joints
+            .push(joint);
+        {
+            let skins = query_state.get(&world).unwrap();
+            validate_skinned_bindings(
+                actor,
+                &subtree,
+                &skins,
+                Some(&inverse_bindposes),
+                &mut diagnostics,
+            );
+        }
+        assert_eq!(
+            diagnostics.latest().map(|diagnostic| diagnostic.code),
+            Some("animation.skin_binding_count_mismatch")
+        );
+    }
+
     #[test]
     fn invalid_state_request_is_rejected_without_message_side_effect() {
         let mut app = App::new();
diff --git a/crates/game/src/audio.rs b/crates/game/src/audio.rs
index cadfab8..f4c51df 100644
--- a/crates/game/src/audio.rs
+++ b/crates/game/src/audio.rs
@@ -12,9 +12,9 @@ use settings::{
     AudioSettings, ProjectSettings, AUDIO_BUS_MASTER_ID, AUDIO_GAIN_DB_MAX, AUDIO_GAIN_DB_MIN,
 };
 use shared::{
-    asset_server_path, inspector_component_active, ActorId, AudioAttenuationDesc,
-    AudioListenerDesc, AudioRolloff, AudioSourceDesc, InspectorOrder, LevelObject,
-    COMPONENT_AUDIO_LISTENER_DESC, COMPONENT_AUDIO_SOURCE_DESC,
+    asset_server_path, authoring_component_active, ActorId, AudioAttenuationDesc,
+    AudioListenerDesc, AudioRolloff, AudioSourceDesc, AuthoringComponentStates, InspectorOrder,
+    LevelObject, COMPONENT_AUDIO_LISTENER_DESC, COMPONENT_AUDIO_SOURCE_DESC,
 };
 use sim::{PlayerCamera, SimEnabled};
 
@@ -265,10 +265,13 @@ fn reconcile_audio_listener(world: &mut World) {
             Entity,
             &AudioListenerDesc,
             Option<&ActorId>,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ), With<LevelObject>>();
-        for (entity, desc, actor_id, order) in query.iter(world) {
-            if desc.enabled && inspector_component_active(order, COMPONENT_AUDIO_LISTENER_DESC) {
+        for (entity, desc, actor_id, states, legacy_order) in query.iter(world) {
+            if desc.enabled
+                && authoring_component_active(states, legacy_order, COMPONENT_AUDIO_LISTENER_DESC)
+            {
                 candidates.push((
                     entity,
                     *desc,
@@ -343,10 +346,11 @@ fn reconcile_audio_sources(world: &mut World) {
         let mut query = world.query_filtered::<(
             Entity,
             &AudioSourceDesc,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ), With<LevelObject>>();
-        for (entity, desc, order) in query.iter(world) {
-            if inspector_component_active(order, COMPONENT_AUDIO_SOURCE_DESC) {
+        for (entity, desc, states, legacy_order) in query.iter(world) {
+            if authoring_component_active(states, legacy_order, COMPONENT_AUDIO_SOURCE_DESC) {
                 sources.push((entity, desc.clone()));
             }
         }
diff --git a/crates/game/src/lib.rs b/crates/game/src/lib.rs
index dc94c3d..7e000bd 100644
--- a/crates/game/src/lib.rs
+++ b/crates/game/src/lib.rs
@@ -12,6 +12,7 @@ pub mod animation;
 pub mod audio;
 pub mod editor_ext;
 pub mod launch;
+pub mod navigation;
 mod scene_bootstrap;
 mod schema_world_loader;
 
diff --git a/crates/game/src/navigation.rs b/crates/game/src/navigation.rs
new file mode 100644
index 0000000..5d9c562
--- /dev/null
+++ b/crates/game/src/navigation.rs
@@ -0,0 +1,257 @@
+use std::path::Path;
+
+use bevy::prelude::Vec3;
+use nav_glam::{Vec2 as NavVec2, Vec3 as NavVec3};
+use polyanya::Mesh;
+use scene::navigation::{read_navigation_artifact, NavigationBakeArtifact, NavigationLinkInput};
+
+/// Loaded navigation artifact and its baked Polyanya acceleration data.
+#[derive(Debug, Clone)]
+pub struct NavigationRuntime {
+    artifact: NavigationBakeArtifact,
+    mesh: Mesh,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct NavigationPath {
+    pub points: Vec<Vec3>,
+    pub length: f32,
+    pub used_link_actor_id: Option<String>,
+}
+
+impl NavigationRuntime {
+    pub fn from_artifact(artifact: NavigationBakeArtifact) -> Result<Self, String> {
+        if artifact.mesh.layers.is_empty()
+            || artifact
+                .mesh
+                .layers
+                .iter()
+                .all(|layer| layer.polygons.is_empty())
+        {
+            return Err("navigation artifact contains no walkable polygons; rebake it".into());
+        }
+        let mesh = artifact.runtime_mesh();
+        Ok(Self { artifact, mesh })
+    }
+
+    pub fn load(path: &Path) -> Result<Self, String> {
+        Self::from_artifact(read_navigation_artifact(path)?)
+    }
+
+    pub fn artifact(&self) -> &NavigationBakeArtifact {
+        &self.artifact
+    }
+
+    pub fn query(&self, start: Vec3, end: Vec3) -> Result<NavigationPath, String> {
+        if !start.is_finite() || !end.is_finite() {
+            return Err("navigation query endpoints must be finite".into());
+        }
+
+        let mut best = self.direct_path(start, end).ok().map(|path| Candidate {
+            path,
+            weighted_cost: 0.0,
+        });
+        if let Some(candidate) = best.as_mut() {
+            candidate.weighted_cost = candidate.path.length;
+        }
+
+        for link in self.artifact.links.iter().filter(|link| link.enabled) {
+            self.consider_link(start, end, link, false, &mut best);
+            if link.bidirectional {
+                self.consider_link(start, end, link, true, &mut best);
+            }
+        }
+
+        best.map(|candidate| candidate.path).ok_or_else(|| {
+            "no navigation path connects the requested endpoints; inspect islands or add a link"
+                .into()
+        })
+    }
+
+    pub fn validate_links(&self) -> Vec<String> {
+        let mut findings = Vec::new();
+        for link in self.artifact.links.iter().filter(|link| link.enabled) {
+            for (label, endpoint) in [("start", link.start), ("end", link.end)] {
+                let point = NavVec2::new(endpoint[0], endpoint[2]);
+                let Some(closest) = self.mesh.get_closest_point(point) else {
+                    findings.push(format!(
+                        "navigation link {} {label} endpoint is not near a walkable polygon",
+                        link.actor_id
+                    ));
+                    continue;
+                };
+                if closest.position().distance(point) > self.artifact.agent.radius * 2.0 {
+                    findings.push(format!(
+                        "navigation link {} {label} endpoint is farther than two agent radii from the mesh",
+                        link.actor_id
+                    ));
+                }
+            }
+        }
+        findings
+    }
+
+    fn consider_link(
+        &self,
+        start: Vec3,
+        end: Vec3,
+        link: &NavigationLinkInput,
+        reverse: bool,
+        best: &mut Option<Candidate>,
+    ) {
+        let (entry, exit) = if reverse {
+            (vec3(link.end), vec3(link.start))
+        } else {
+            (vec3(link.start), vec3(link.end))
+        };
+        let (Ok(mut first), Ok(second)) =
+            (self.direct_path(start, entry), self.direct_path(exit, end))
+        else {
+            return;
+        };
+        append_distinct(&mut first.points, entry);
+        append_distinct(&mut first.points, exit);
+        for point in second.points.into_iter().skip(1) {
+            append_distinct(&mut first.points, point);
+        }
+        let link_length = entry.distance(exit);
+        first.length += link_length + second.length;
+        first.used_link_actor_id = Some(link.actor_id.clone());
+        let weighted_cost = first.length + link_length * (link.cost - 1.0);
+        if best
+            .as_ref()
+            .is_none_or(|candidate| weighted_cost < candidate.weighted_cost)
+        {
+            *best = Some(Candidate {
+                path: first,
+                weighted_cost,
+            });
+        }
+    }
+
+    fn direct_path(&self, start: Vec3, end: Vec3) -> Result<NavigationPath, String> {
+        let start2 = NavVec2::new(start.x, start.z);
+        let end2 = NavVec2::new(end.x, end.z);
+        let path = self.mesh.path(start2, end2).ok_or_else(|| {
+            "navigation endpoints are outside the same reachable mesh island".to_string()
+        })?;
+        let length = path.length;
+        let nav_start = NavVec3::new(start.x, start.y, start.z);
+        let nav_end = NavVec3::new(end.x, end.y, end.z);
+        let mut points = vec![start];
+        for point in path.path_with_height(nav_start, nav_end, &self.mesh) {
+            append_distinct(&mut points, Vec3::new(point.x, point.y, point.z));
+        }
+        append_distinct(&mut points, end);
+        Ok(NavigationPath {
+            points,
+            length,
+            used_link_actor_id: None,
+        })
+    }
+}
+
+struct Candidate {
+    path: NavigationPath,
+    weighted_cost: f32,
+}
+
+fn append_distinct(points: &mut Vec<Vec3>, point: Vec3) {
+    if points
+        .last()
+        .is_none_or(|last| last.distance_squared(point) > 1.0e-8)
+    {
+        points.push(point);
+    }
+}
+
+fn vec3(value: [f32; 3]) -> Vec3 {
+    Vec3::from_array(value)
+}
+
+pub fn query_navigation_path(
+    artifact_path: &Path,
+    start: Vec3,
+    end: Vec3,
+) -> Result<NavigationPath, String> {
+    NavigationRuntime::load(artifact_path)?.query(start, end)
+}
+
+#[cfg(test)]
+mod tests {
+    use scene::navigation::{
+        bake_navigation, NavigationBakeInput, NavigationLinkInput, NavigationVolumeInput,
+    };
+    use shared::NavigationAgentProfile;
+
+    use super::*;
+
+    fn input() -> NavigationBakeInput {
+        NavigationBakeInput {
+            source_scene: "assets/levels/navigation_showcase.scn.ron".into(),
+            bounds_actor_id: "bounds".into(),
+            center: [0.0, 0.0, 0.0],
+            half_extents: [6.0, 2.0, 6.0],
+            agent: NavigationAgentProfile {
+                min_region_size: 1,
+                merge_region_size: 2,
+                ..Default::default()
+            },
+            geometry: Vec::new(),
+            obstacles: vec![NavigationVolumeInput {
+                actor_id: "wall".into(),
+                center: [0.0, 0.5, 0.0],
+                half_extents: [0.5, 1.0, 4.5],
+            }],
+            areas: Vec::new(),
+            links: Vec::new(),
+        }
+    }
+
+    #[test]
+    fn runtime_query_routes_on_the_baked_mesh() {
+        let runtime = NavigationRuntime::from_artifact(bake_navigation(&input()).unwrap()).unwrap();
+        let path = runtime
+            .query(Vec3::new(-4.0, 0.0, -5.0), Vec3::new(4.0, 0.0, -5.0))
+            .unwrap();
+        assert!(path.length >= 8.0);
+        assert!(path.points.len() >= 2);
+    }
+
+    #[test]
+    fn explicit_link_can_connect_isolated_regions() {
+        let mut input = input();
+        input.obstacles[0].half_extents[2] = 6.0;
+        input.links.push(NavigationLinkInput {
+            actor_id: "door-link".into(),
+            start: [-1.0, 0.0, 0.0],
+            end: [1.0, 0.0, 0.0],
+            bidirectional: true,
+            cost: 1.0,
+            enabled: true,
+        });
+        let runtime = NavigationRuntime::from_artifact(bake_navigation(&input).unwrap()).unwrap();
+        let path = runtime
+            .query(Vec3::new(-4.0, 0.0, 0.0), Vec3::new(4.0, 0.0, 0.0))
+            .unwrap();
+        assert_eq!(path.used_link_actor_id.as_deref(), Some("door-link"));
+    }
+
+    #[test]
+    fn invalid_link_endpoint_is_reported_with_actor_identity() {
+        let mut input = input();
+        input.links.push(NavigationLinkInput {
+            actor_id: "bad-link".into(),
+            start: [100.0, 0.0, 100.0],
+            end: [0.0, 0.0, 0.0],
+            bidirectional: false,
+            cost: 1.0,
+            enabled: true,
+        });
+        let runtime = NavigationRuntime::from_artifact(bake_navigation(&input).unwrap()).unwrap();
+        assert!(runtime
+            .validate_links()
+            .iter()
+            .any(|finding| finding.contains("bad-link start")));
+    }
+}
diff --git a/crates/game_hot/Cargo.toml b/crates/game_hot/Cargo.toml
index 7fe3ce6..8967beb 100644
--- a/crates/game_hot/Cargo.toml
+++ b/crates/game_hot/Cargo.toml
@@ -18,6 +18,7 @@ avian3d.workspace = true
 bevy.workspace = true
 bevy_core_pipeline.workspace = true
 bevy_solari.workspace = true
+blacksite_surface.workspace = true
 protocol.workspace = true
 shared.workspace = true
 sim.workspace = true
diff --git a/crates/game_hot/src/rendering/solari.rs b/crates/game_hot/src/rendering/solari.rs
index 563bb71..d21b3fa 100644
--- a/crates/game_hot/src/rendering/solari.rs
+++ b/crates/game_hot/src/rendering/solari.rs
@@ -5,7 +5,7 @@ use bevy::core_pipeline::prepass::{
     DeferredPrepass, DeferredPrepassDoubleBuffer, DepthPrepass, DepthPrepassDoubleBuffer,
     MotionVectorPrepass,
 };
-use bevy::mesh::{Indices, PrimitiveTopology};
+use bevy::mesh::{morph::MeshMorphWeights, skinning::SkinnedMesh, Indices, PrimitiveTopology};
 use bevy::pbr::{DefaultOpaqueRendererMethod, ExtractedDirectionalLight};
 use bevy::prelude::*;
 use bevy::render::render_resource::TextureUsages;
@@ -14,6 +14,7 @@ use bevy::render::{Render, RenderApp, RenderSystems};
 use bevy_solari::prelude::{RaytracingMesh3d, SolariLighting};
 use bevy_solari::scene::RaytracingSceneBindings;
 use bevy_solari::SolariPlugins;
+use blacksite_surface::{SurfaceEvaluatorRegistry, SurfaceMaterial};
 use settings::{GiPath, ProjectSettings, RenderingCapabilities};
 use shared::{LevelObject, RaytracingExcluded};
 use std::sync::{Arc, Mutex};
@@ -24,6 +25,10 @@ pub struct SolariRaytracingSceneStats {
     pub tagged_meshes: usize,
     pub excluded_meshes: usize,
     pub unsupported_meshes: usize,
+    /// Skinned or morphed meshes deliberately omitted until Solari consumes deformed vertices.
+    pub deformed_meshes_excluded: usize,
+    pub surface_material_meshes: usize,
+    pub surface_materials_missing_evaluator: usize,
     pub missing_level_root_meshes: usize,
     pub emissive_meshes: usize,
     pub compatible_mesh_assets: usize,
@@ -61,7 +66,8 @@ pub struct SolariRenderingPlugin;
 
 impl Plugin for SolariRenderingPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(SolariPlugins)
+        app.add_plugins(blacksite_surface::SurfaceMaterialPlugin)
+            .add_plugins(SolariPlugins)
             .init_resource::<RenderingCapabilities>()
             .init_resource::<settings::EffectiveRenderStack>()
             .init_resource::<SolariRaytracingSceneStats>()
@@ -213,11 +219,16 @@ fn sync_hydrated_raytracing_meshes(
     mut commands: Commands,
     mut stats: ResMut<SolariRaytracingSceneStats>,
     materials: Res<Assets<StandardMaterial>>,
+    surface_materials: Res<Assets<SurfaceMaterial>>,
+    surface_evaluators: Res<SurfaceEvaluatorRegistry>,
     mesh_assets: Res<Assets<Mesh>>,
     meshes: Query<(
         Entity,
         &Mesh3d,
         Option<&MeshMaterial3d<StandardMaterial>>,
+        Option<&MeshMaterial3d<SurfaceMaterial>>,
+        Option<&SkinnedMesh>,
+        Option<&MeshMorphWeights>,
         Option<&RaytracingMesh3d>,
         Option<&RaytracingExcluded>,
     )>,
@@ -230,6 +241,9 @@ fn sync_hydrated_raytracing_meshes(
     next_stats.tagged_meshes = 0;
     next_stats.excluded_meshes = 0;
     next_stats.unsupported_meshes = 0;
+    next_stats.deformed_meshes_excluded = 0;
+    next_stats.surface_material_meshes = 0;
+    next_stats.surface_materials_missing_evaluator = 0;
     next_stats.missing_level_root_meshes = 0;
     next_stats.emissive_meshes = 0;
     next_stats.compatible_mesh_assets = 0;
@@ -255,7 +269,9 @@ fn sync_hydrated_raytracing_meshes(
         return;
     }
 
-    for (entity, mesh, material, rt_mesh, excluded) in &meshes {
+    for (entity, mesh, standard_material, surface_material, skin, morph, rt_mesh, excluded) in
+        &meshes
+    {
         if excluded.is_some() {
             next_stats.excluded_meshes += 1;
             if rt_mesh.is_some() {
@@ -271,19 +287,79 @@ fn sync_hydrated_raytracing_meshes(
 
         next_stats.project_meshes += 1;
 
-        let Some(material) = material else {
+        // Bevy 0.19's mesh allocator exposes the source vertex slab to Solari, not the
+        // morph-then-skin output consumed by raster rendering. Tagging this mesh would trace the
+        // bind pose, so omit it until the fork owns an instance-keyed deformed vertex/BLAS path.
+        let mesh_has_morph_targets = mesh_assets
+            .get(&mesh.0)
+            .and_then(Mesh::get_morph_targets)
+            .is_some();
+        if !solari_deformation_is_supported(skin.is_some(), morph.is_some(), mesh_has_morph_targets)
+        {
+            next_stats.deformed_meshes_excluded += 1;
+            if rt_mesh.is_some() {
+                commands.entity(entity).remove::<RaytracingMesh3d>();
+            }
+            continue;
+        }
+
+        if standard_material.is_none() && surface_material.is_none() {
             next_stats.unsupported_meshes += 1;
             if rt_mesh.is_some() {
                 commands.entity(entity).remove::<RaytracingMesh3d>();
             }
             continue;
-        };
+        }
 
-        if materials
-            .get(&material.0)
-            .is_some_and(|material| material.emissive.to_vec3() != Vec3::ZERO)
-        {
+        if let Some(surface_handle) = surface_material {
+            next_stats.surface_material_meshes += 1;
+            let Some(material) = surface_materials.get(&surface_handle.0) else {
+                next_stats.unsupported_meshes += 1;
+                if rt_mesh.is_some() {
+                    commands.entity(entity).remove::<RaytracingMesh3d>();
+                }
+                continue;
+            };
+            if !solari_alpha_mode_is_supported(material.base.alpha_mode) {
+                next_stats.unsupported_meshes += 1;
+                if rt_mesh.is_some() {
+                    commands.entity(entity).remove::<RaytracingMesh3d>();
+                }
+                continue;
+            }
+            if !surface_evaluators
+                .evaluators
+                .contains_key(&material.extension.uniform.shader_id)
+            {
+                next_stats.surface_materials_missing_evaluator += 1;
+                next_stats.unsupported_meshes += 1;
+                if rt_mesh.is_some() {
+                    commands.entity(entity).remove::<RaytracingMesh3d>();
+                }
+                continue;
+            }
+            // A custom evaluator may emit light as a function of parameters, textures, or world
+            // position. Conservatively register Surface instances as potential emissive sources;
+            // zero-emission samples contribute no energy.
             next_stats.emissive_meshes += 1;
+        } else if let Some(standard_handle) = standard_material {
+            let Some(material) = materials.get(&standard_handle.0) else {
+                next_stats.unsupported_meshes += 1;
+                if rt_mesh.is_some() {
+                    commands.entity(entity).remove::<RaytracingMesh3d>();
+                }
+                continue;
+            };
+            if !solari_alpha_mode_is_supported(material.alpha_mode) {
+                next_stats.unsupported_meshes += 1;
+                if rt_mesh.is_some() {
+                    commands.entity(entity).remove::<RaytracingMesh3d>();
+                }
+                continue;
+            }
+            if material.emissive.to_vec3() != Vec3::ZERO {
+                next_stats.emissive_meshes += 1;
+            }
         }
 
         match mesh_assets
@@ -323,7 +399,7 @@ fn sync_hydrated_raytracing_meshes(
 
     if *stats != next_stats {
         info!(
-            "Solari mesh eligibility: requested={:?} eligible={} tagged={} compatible_assets={} incompatible_assets={} missing_tangents={} missing_u32_indices={} unsupported={} excluded={} outside_level_roots={} emissive={}",
+            "Solari mesh eligibility: requested={:?} eligible={} tagged={} compatible_assets={} incompatible_assets={} missing_tangents={} missing_u32_indices={} unsupported={} deformed_excluded={} surface_materials={} surface_missing_evaluator={} excluded={} outside_level_roots={} emissive_candidates={}",
             caps.requested_gi_path,
             next_stats.project_meshes,
             next_stats.tagged_meshes,
@@ -332,6 +408,9 @@ fn sync_hydrated_raytracing_meshes(
             next_stats.mesh_assets_missing_tangents,
             next_stats.mesh_assets_missing_u32_indices,
             next_stats.unsupported_meshes,
+            next_stats.deformed_meshes_excluded,
+            next_stats.surface_material_meshes,
+            next_stats.surface_materials_missing_evaluator,
             next_stats.excluded_meshes,
             next_stats.missing_level_root_meshes,
             next_stats.emissive_meshes,
@@ -340,6 +419,21 @@ fn sync_hydrated_raytracing_meshes(
     }
 }
 
+fn solari_deformation_is_supported(
+    has_skin: bool,
+    has_morph_weights: bool,
+    mesh_has_morph_targets: bool,
+) -> bool {
+    !has_skin && !has_morph_weights && !mesh_has_morph_targets
+}
+
+fn solari_alpha_mode_is_supported(alpha_mode: AlphaMode) -> bool {
+    matches!(
+        alpha_mode,
+        AlphaMode::Opaque | AlphaMode::Mask(_) | AlphaMode::AlphaToCoverage
+    )
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum SolariMeshCompatibility {
     Compatible,
@@ -380,17 +474,24 @@ fn mesh_is_solari_project_geometry(
         Entity,
         &Mesh3d,
         Option<&MeshMaterial3d<StandardMaterial>>,
+        Option<&MeshMaterial3d<SurfaceMaterial>>,
+        Option<&SkinnedMesh>,
+        Option<&MeshMorphWeights>,
         Option<&RaytracingMesh3d>,
         Option<&RaytracingExcluded>,
     )>,
     parents: &Query<&ChildOf>,
     level_roots: &Query<(), With<LevelObject>>,
 ) -> bool {
-    let Ok((_, _, material, _, excluded)) = meshes.get(entity) else {
+    let Ok((_, _, standard_material, surface_material, skin, morph, _, excluded)) =
+        meshes.get(entity)
+    else {
         return false;
     };
     excluded.is_none()
-        && material.is_some()
+        && skin.is_none()
+        && morph.is_none()
+        && (standard_material.is_some() || surface_material.is_some())
         && has_level_object_ancestor(entity, parents, level_roots)
 }
 
@@ -569,4 +670,22 @@ mod tests {
             GiPath::SolariDeferred
         );
     }
+
+    #[test]
+    fn deformation_is_excluded_instead_of_tracing_the_bind_pose() {
+        assert!(solari_deformation_is_supported(false, false, false));
+        assert!(!solari_deformation_is_supported(true, false, false));
+        assert!(!solari_deformation_is_supported(false, true, false));
+        assert!(!solari_deformation_is_supported(false, false, true));
+        assert!(!solari_deformation_is_supported(true, true, true));
+    }
+
+    #[test]
+    fn solari_accepts_only_opaque_and_cutout_materials() {
+        assert!(solari_alpha_mode_is_supported(AlphaMode::Opaque));
+        assert!(solari_alpha_mode_is_supported(AlphaMode::Mask(0.5)));
+        assert!(solari_alpha_mode_is_supported(AlphaMode::AlphaToCoverage));
+        assert!(!solari_alpha_mode_is_supported(AlphaMode::Blend));
+        assert!(!solari_alpha_mode_is_supported(AlphaMode::Premultiplied));
+    }
 }
diff --git a/crates/game_hot/src/rendering/volumes.rs b/crates/game_hot/src/rendering/volumes.rs
index 4b4f717..871126b 100644
--- a/crates/game_hot/src/rendering/volumes.rs
+++ b/crates/game_hot/src/rendering/volumes.rs
@@ -7,8 +7,8 @@ use settings::{
     ProjectSettings, RenderingCapabilities, RenderingSettings, VolumeContribution,
 };
 use shared::{
-    inspector_component_active, InspectorOrder, LevelObject, PostProcessVolumeDesc,
-    PostProcessVolumeOverrides, COMPONENT_POST_PROCESS_VOLUME,
+    authoring_component_active, AuthoringComponentStates, InspectorOrder, LevelObject,
+    PostProcessVolumeDesc, PostProcessVolumeOverrides, COMPONENT_POST_PROCESS_VOLUME,
 };
 
 use super::solari::SolariRaytracingSceneStats;
@@ -264,6 +264,7 @@ pub fn sync_active_camera_render_profile(
             Entity,
             &PostProcessVolumeDesc,
             &GlobalTransform,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ),
         With<LevelObject>,
@@ -305,10 +306,10 @@ pub fn sync_active_camera_render_profile(
 
     let volume_list: Vec<_> = volumes
         .iter()
-        .filter(|(_, _, _, order)| {
-            inspector_component_active(*order, COMPONENT_POST_PROCESS_VOLUME)
+        .filter(|(_, _, _, states, legacy_order)| {
+            authoring_component_active(*states, *legacy_order, COMPONENT_POST_PROCESS_VOLUME)
         })
-        .map(|(entity, desc, transform, _)| (entity, desc, transform))
+        .map(|(entity, desc, transform, _, _)| (entity, desc, transform))
         .collect();
     let (resolved, entries) = resolve_active_camera_render_profile(
         camera_tf.translation(),
diff --git a/crates/game_hot/src/world/lighting.rs b/crates/game_hot/src/world/lighting.rs
index b9c335f..17139a1 100644
--- a/crates/game_hot/src/world/lighting.rs
+++ b/crates/game_hot/src/world/lighting.rs
@@ -4,8 +4,8 @@ use bevy::light::CascadeShadowConfig;
 use bevy::prelude::*;
 use settings::ProjectSettings;
 use shared::{
-    cascade_config_from_rendering, inspector_component_active, AuthoringLightKind, InspectorOrder,
-    LevelObject, LightDesc, ProjectSun, COMPONENT_LIGHT_DESC,
+    authoring_component_active, cascade_config_from_rendering, AuthoringComponentStates,
+    AuthoringLightKind, InspectorOrder, LevelObject, LightDesc, ProjectSun, COMPONENT_LIGHT_DESC,
 };
 
 /// Spawns the directional "sun" from project rendering settings.
@@ -14,7 +14,14 @@ pub fn spawn_sun(
     mut commands: Commands,
     settings: Res<ProjectSettings>,
     existing: Query<(), With<DirectionalLight>>,
-    scene_suns: Query<(&LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
+    scene_suns: Query<
+        (
+            &LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
+        With<LevelObject>,
+    >,
 ) {
     if !existing.is_empty() {
         return;
@@ -39,7 +46,14 @@ pub fn spawn_sun(
 
 #[unsafe(no_mangle)]
 pub fn sync_project_sun_visibility(
-    scene_suns: Query<(&LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
+    scene_suns: Query<
+        (
+            &LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
+        With<LevelObject>,
+    >,
     mut project_suns: Query<(&mut DirectionalLight, &mut Visibility), With<ProjectSun>>,
 ) {
     let scene_override = has_scene_sun_override(&scene_suns);
@@ -54,10 +68,17 @@ pub fn sync_project_sun_visibility(
 }
 
 fn has_scene_sun_override(
-    scene_suns: &Query<(&LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
+    scene_suns: &Query<
+        (
+            &LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
+        With<LevelObject>,
+    >,
 ) -> bool {
-    scene_suns.iter().any(|(light, order)| {
-        inspector_component_active(order, COMPONENT_LIGHT_DESC)
+    scene_suns.iter().any(|(light, states, legacy_order)| {
+        authoring_component_active(states, legacy_order, COMPONENT_LIGHT_DESC)
             && matches!(light.kind, AuthoringLightKind::Directional)
     })
 }
@@ -99,7 +120,14 @@ pub fn sync_scene_directional_shadow_cascades(
 #[unsafe(no_mangle)]
 pub fn sync_project_sun_from_settings(
     settings: Res<ProjectSettings>,
-    scene_suns: Query<(&LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
+    scene_suns: Query<
+        (
+            &LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
+        With<LevelObject>,
+    >,
     mut project_suns: Query<(&mut DirectionalLight, &mut Visibility), With<ProjectSun>>,
 ) {
     let scene_override = has_scene_sun_override(&scene_suns);
diff --git a/crates/scene/Cargo.toml b/crates/scene/Cargo.toml
index 5a2486b..0214a98 100644
--- a/crates/scene/Cargo.toml
+++ b/crates/scene/Cargo.toml
@@ -10,5 +10,8 @@ blake3 = "1"
 serde = { workspace = true }
 ron = "0.8"
 ron-edit = "=0.2.0"
+nav_glam.workspace = true
+polyanya.workspace = true
+rerecast.workspace = true
 shared.workspace = true
 settings.workspace = true
diff --git a/crates/scene/src/document.rs b/crates/scene/src/document.rs
index ef96eee..5b35357 100644
--- a/crates/scene/src/document.rs
+++ b/crates/scene/src/document.rs
@@ -743,7 +743,7 @@ mod tests {
         let body = "(resources: {}, entities: {})";
         let document = SceneDocument::from_ron_text(body).unwrap();
         let text = document.to_ron_text().unwrap();
-        assert!(text.starts_with("(schema_version: 2,"));
+        assert!(text.starts_with("(schema_version: 4,"));
         assert!(SceneDocument::from_ron_text(&text)
             .unwrap()
             .entities
diff --git a/crates/scene/src/lib.rs b/crates/scene/src/lib.rs
index 4fdd4f8..c19850f 100644
--- a/crates/scene/src/lib.rs
+++ b/crates/scene/src/lib.rs
@@ -6,15 +6,19 @@
 mod composition;
 pub mod document;
 mod migrate;
+pub mod navigation;
 mod prefab;
 mod project_validation;
+mod upgrade;
 
 use std::path::Path;
 
 use serde::{Deserialize, Serialize};
 
 pub use composition::{validate_composition_graph, validate_scene_composition};
-pub use migrate::{migrate_v1_to_v2, DEFAULT_SUN_ILLUMINANCE_LUX};
+pub use migrate::{
+    migrate_v1_to_v2, migrate_v2_to_v3, migrate_v3_to_v4, DEFAULT_SUN_ILLUMINANCE_LUX,
+};
 pub use prefab::{
     prefab_graph_revision, validate_prefab_graph, validate_prefab_graph_text,
     validate_prefab_references, validate_prefab_references_text,
@@ -23,8 +27,9 @@ pub use project_validation::{
     validate_project, ProjectDependency, ProjectValidationFinding, ProjectValidationReport,
     ValidationSeverity,
 };
+pub use upgrade::{upgrade_project, ProjectUpgradeChange, ProjectUpgradeReport};
 
-pub const CURRENT_SCENE_SCHEMA_VERSION: u32 = 2;
+pub const CURRENT_SCENE_SCHEMA_VERSION: u32 = 4;
 
 /// Whether an asset-relative path names a tree excluded from runtime packages.
 pub fn is_runtime_package_excluded_tree(relative: &Path) -> bool {
@@ -129,8 +134,10 @@ pub fn migrate_scene_text(text: &str) -> Result<String, String> {
     };
 
     let migrated_body = match version {
-        0 | 1 => migrate_v1_to_v2(&body),
-        2 => body,
+        0 | 1 => migrate_v3_to_v4(&migrate_v2_to_v3(&migrate_v1_to_v2(&body))),
+        2 => migrate_v3_to_v4(&migrate_v2_to_v3(&body)),
+        3 => migrate_v3_to_v4(&body),
+        4 => body,
         _ => {
             return Err(format!(
                 "scene schema version {version} is newer than supported version {CURRENT_SCENE_SCHEMA_VERSION}"
@@ -220,16 +227,16 @@ mod tests {
     fn stamp_and_strip_round_trip() {
         let body = "(resources: {}, entities: {})";
         let stamped = stamp_schema_version(body).unwrap();
-        assert!(stamped.starts_with("(schema_version: 2,"));
+        assert!(stamped.starts_with("(schema_version: 4,"));
         let stripped = strip_schema_version(&stamped).unwrap();
         assert_eq!(stripped, body);
     }
 
     #[test]
-    fn legacy_scene_migrates_to_v2() {
+    fn legacy_scene_migrates_to_current_schema() {
         let legacy = "(resources: {}, entities: {4294967133: ()})";
         let migrated = migrate_scene_text(legacy).unwrap();
-        assert!(migrated.contains("schema_version: 2"));
+        assert!(migrated.contains("schema_version: 4"));
     }
 
     #[test]
diff --git a/crates/scene/src/migrate.rs b/crates/scene/src/migrate.rs
index b2ec340..df04651 100644
--- a/crates/scene/src/migrate.rs
+++ b/crates/scene/src/migrate.rs
@@ -12,6 +12,57 @@ pub fn migrate_v1_to_v2(body: &str) -> String {
     out
 }
 
+/// Migrates v2 animated imported-model actors to the dedicated skinned renderer contract.
+///
+/// `ModelRef` and `SkinnedMeshRenderer` intentionally share the same serialized source fields, so
+/// the migration can preserve stable asset IDs and cached paths without lossy reconstruction.
+pub fn migrate_v2_to_v3(body: &str) -> String {
+    let mut result = String::with_capacity(body.len() + 256);
+    let mut rest = body;
+    while let Some(index) = rest.find("components: {") {
+        result.push_str(&rest[..index]);
+        let after = &rest[index..];
+        let Some(close) = find_components_close(after) else {
+            result.push_str(after);
+            return result;
+        };
+        let block = &after[..close];
+        if block.contains("\"shared::animation::AnimationControllerDesc\"")
+            && block.contains("\"shared::components::ModelRef\"")
+        {
+            result.push_str(
+                &block
+                    .replace(
+                        "\"shared::components::ModelRef\"",
+                        "\"shared::animation::SkinnedMeshRenderer\"",
+                    )
+                    .replace(
+                        "\"shared::components::ActorKind\": ImportedModel",
+                        "\"shared::components::ActorKind\": SkinnedMesh",
+                    )
+                    .replace(
+                        "\"shared::components::ActorKind\":ImportedModel",
+                        "\"shared::components::ActorKind\":SkinnedMesh",
+                    ),
+            );
+        } else {
+            result.push_str(block);
+        }
+        rest = &after[close..];
+    }
+    result.push_str(rest);
+    result
+}
+
+/// Migrates schema-v3 documents into the registry-driven renderer/component foundation.
+///
+/// The v4 authoring types deliberately use serde defaults for material-slot sets and component
+/// enable state, so normal loading can remain read-only. The explicit project upgrader later
+/// materializes shared Material assets and canonical slot IDs on disk.
+pub fn migrate_v3_to_v4(body: &str) -> String {
+    body.to_string()
+}
+
 fn backfill_actor_kinds(text: &str) -> String {
     let mut result = String::with_capacity(text.len() + 1024);
     let mut rest = text;
@@ -89,6 +140,9 @@ fn infer_kind_from_block(block: &str) -> &'static str {
     if block.contains("\"shared::components::LightDesc\"") {
         return actor_kind_ron(ActorKind::Light);
     }
+    if block.contains("\"shared::animation::SkinnedMeshRenderer\"") {
+        return actor_kind_ron(ActorKind::SkinnedMesh);
+    }
     if block.contains("\"shared::components::ModelRef\"") {
         return actor_kind_ron(ActorKind::ImportedModel);
     }
@@ -111,6 +165,9 @@ fn infer_kind_from_block(block: &str) -> &'static str {
     if block.contains("\"shared::components::AudioListenerDesc\"") {
         return actor_kind_ron(ActorKind::AudioListener);
     }
+    if block.contains("\"shared::navigation::Navigation") {
+        return actor_kind_ron(ActorKind::Navigation);
+    }
     actor_kind_ron(ActorKind::Empty)
 }
 
@@ -119,6 +176,7 @@ fn actor_kind_ron(kind: ActorKind) -> &'static str {
         ActorKind::Empty => "Empty",
         ActorKind::Brush => "Brush",
         ActorKind::StaticMesh => "StaticMesh",
+        ActorKind::SkinnedMesh => "SkinnedMesh",
         ActorKind::ImportedModel => "ImportedModel",
         ActorKind::Light => "Light",
         ActorKind::PrefabAnchor => "PrefabAnchor",
@@ -130,6 +188,7 @@ fn actor_kind_ron(kind: ActorKind) -> &'static str {
         ActorKind::Objective => "Objective",
         ActorKind::AudioSource => "AudioSource",
         ActorKind::AudioListener => "AudioListener",
+        ActorKind::Navigation => "Navigation",
     }
 }
 
@@ -241,6 +300,35 @@ mod tests {
         assert!(migrated.contains("Brush"));
     }
 
+    #[test]
+    fn v2_animation_actor_moves_to_dedicated_skinned_renderer() {
+        let body = r#"(
+  resources: {},
+  entities: {
+    1: (components: {
+      "shared::components::LevelObject": (),
+      "shared::components::ActorKind": ImportedModel,
+      "shared::components::ModelRef": (asset_id: "hero", path: "models/hero.glb", scene_index: 0),
+      "shared::animation::AnimationControllerDesc": (skeleton: None, states: [], default_state: "", default_crossfade_seconds: 0.2),
+    }),
+    2: (components: {
+      "shared::components::ActorKind": ImportedModel,
+      "shared::components::ModelRef": (asset_id: "prop", path: "models/prop.glb", scene_index: 0),
+    }),
+  },
+)"#;
+
+        let migrated = migrate_v2_to_v3(body);
+
+        assert!(migrated.contains("\"shared::animation::SkinnedMeshRenderer\""));
+        assert!(migrated.contains("\"shared::components::ActorKind\": SkinnedMesh"));
+        assert_eq!(
+            migrated.matches("\"shared::components::ModelRef\"").count(),
+            1,
+            "generic scene instance must remain a ModelRef"
+        );
+    }
+
     #[test]
     fn backfills_actor_kind_for_audio_source_entity() {
         let body = r#"(
diff --git a/crates/scene/src/navigation.rs b/crates/scene/src/navigation.rs
new file mode 100644
index 0000000..e8e4d2b
--- /dev/null
+++ b/crates/scene/src/navigation.rs
@@ -0,0 +1,899 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use nav_glam::{UVec3, Vec2, Vec3, Vec3A};
+use polyanya::{Mesh, RecastFullMesh};
+use rerecast::{
+    Aabb3d, AreaType, ConfigBuilder, ConvexVolume, DetailNavmesh, HeightfieldBuilder, TriMesh,
+};
+use serde::{Deserialize, Serialize};
+use shared::{
+    BrushDesc, BrushKind, NavigationAgentProfile, NavigationArea, NavigationBounds, NavigationLink,
+    NavigationObstacle, Primitive, PrimitiveShape, COMPONENT_BRUSH_DESC, COMPONENT_NAVIGATION_AREA,
+    COMPONENT_NAVIGATION_BOUNDS, COMPONENT_NAVIGATION_LINK, COMPONENT_NAVIGATION_OBSTACLE,
+    COMPONENT_PRIMITIVE,
+};
+
+use crate::document::{SceneDocument, SceneEntity};
+
+pub const NAVIGATION_ARTIFACT_SCHEMA_VERSION: u32 = 1;
+pub const NAVIGATION_GENERATOR_ID: &str = "rerecast-0.3/polyanya-0.16";
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct NavigationVolumeInput {
+    pub actor_id: String,
+    pub center: [f32; 3],
+    pub half_extents: [f32; 3],
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct NavigationAreaInput {
+    pub actor_id: String,
+    pub id: String,
+    pub center: [f32; 3],
+    pub half_extents: [f32; 3],
+    pub cost: f32,
+    pub walkable: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct NavigationLinkInput {
+    pub actor_id: String,
+    pub start: [f32; 3],
+    pub end: [f32; 3],
+    pub bidirectional: bool,
+    pub cost: f32,
+    pub enabled: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct NavigationGeometryInput {
+    pub actor_id: String,
+    pub triangles: Vec<[[f32; 3]; 3]>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct NavigationBakeInput {
+    pub source_scene: String,
+    pub bounds_actor_id: String,
+    pub center: [f32; 3],
+    pub half_extents: [f32; 3],
+    pub agent: NavigationAgentProfile,
+    #[serde(default)]
+    pub geometry: Vec<NavigationGeometryInput>,
+    #[serde(default)]
+    pub obstacles: Vec<NavigationVolumeInput>,
+    #[serde(default)]
+    pub areas: Vec<NavigationAreaInput>,
+    #[serde(default)]
+    pub links: Vec<NavigationLinkInput>,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct NavigationBakeJob {
+    pub artifact_path: String,
+    pub input: NavigationBakeInput,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct NavigationBakeArtifact {
+    pub schema_version: u32,
+    pub generator: String,
+    pub source_scene: String,
+    pub source_fingerprint: String,
+    pub bounds_actor_id: String,
+    pub center: [f32; 3],
+    pub half_extents: [f32; 3],
+    pub agent: NavigationAgentProfile,
+    pub mesh: Mesh,
+    pub links: Vec<NavigationLinkInput>,
+    pub areas: Vec<NavigationAreaInput>,
+}
+
+impl NavigationBakeArtifact {
+    pub fn runtime_mesh(&self) -> Mesh {
+        let mut mesh = self.mesh.clone();
+        mesh.bake();
+        mesh
+    }
+
+    pub fn is_stale_for(&self, input: &NavigationBakeInput) -> bool {
+        self.schema_version != NAVIGATION_ARTIFACT_SCHEMA_VERSION
+            || self.generator != NAVIGATION_GENERATOR_ID
+            || self.source_fingerprint != navigation_source_fingerprint(input)
+    }
+}
+
+pub fn navigation_source_fingerprint(input: &NavigationBakeInput) -> String {
+    let bytes = ron::ser::to_string(input)
+        .expect("navigation bake input contains only serializable authoring data");
+    blake3::hash(bytes.as_bytes()).to_hex().to_string()
+}
+
+pub fn bake_navigation(input: &NavigationBakeInput) -> Result<NavigationBakeArtifact, String> {
+    validate_navigation_input(input)?;
+
+    let center = vec3(input.center);
+    let half_extents = vec3(input.half_extents);
+    let min = center - half_extents;
+    let max = center + half_extents;
+    let mut trimesh = floor_trimesh(min, max, center.y);
+    append_geometry(&mut trimesh, &input.geometry);
+    let config = ConfigBuilder {
+        cell_size_fraction: input.agent.cell_size_fraction,
+        cell_height_fraction: input.agent.cell_height_fraction,
+        agent_height: input.agent.height,
+        agent_radius: input.agent.radius,
+        walkable_climb: input.agent.max_climb,
+        walkable_slope_angle: input.agent.max_slope_deg.to_radians(),
+        min_region_size: input.agent.min_region_size,
+        merge_region_size: input.agent.merge_region_size,
+        aabb: Aabb3d { min, max },
+        ..Default::default()
+    }
+    .build();
+
+    trimesh.mark_walkable_triangles(config.walkable_slope_angle);
+    let mut heightfield = HeightfieldBuilder {
+        aabb: config.aabb,
+        cell_size: config.cell_size,
+        cell_height: config.cell_height,
+    }
+    .build()
+    .map_err(|error| format!("failed to allocate navigation heightfield: {error}"))?;
+    heightfield
+        .rasterize_triangles(&trimesh, config.walkable_climb)
+        .map_err(|error| format!("failed to rasterize navigation geometry: {error}"))?;
+    heightfield.filter_low_hanging_walkable_obstacles(config.walkable_climb);
+    heightfield.filter_ledge_spans(config.walkable_height, config.walkable_climb);
+    heightfield.filter_walkable_low_height_spans(config.walkable_height);
+
+    let mut compact = heightfield
+        .into_compact(config.walkable_height, config.walkable_climb)
+        .map_err(|error| format!("failed to compact navigation heightfield: {error}"))?;
+    compact.erode_walkable_area(config.walkable_radius);
+    for obstacle in &input.obstacles {
+        compact.mark_convex_poly_area(&unwalkable_volume(obstacle.center, obstacle.half_extents));
+    }
+    for area in input.areas.iter().filter(|area| !area.walkable) {
+        compact.mark_convex_poly_area(&unwalkable_volume(area.center, area.half_extents));
+    }
+
+    compact.build_distance_field();
+    compact
+        .build_regions(
+            config.border_size,
+            config.min_region_area,
+            config.merge_region_area,
+        )
+        .map_err(|error| format!("failed to partition navigation regions: {error}"))?;
+    let contours = compact.build_contours(
+        config.max_simplification_error,
+        config.max_edge_len,
+        config.contour_flags,
+    );
+    let polygon = contours
+        .into_polygon_mesh(config.max_vertices_per_polygon)
+        .map_err(|error| format!("failed to build navigation polygons: {error}"))?;
+    if polygon.polygon_count() == 0 {
+        return Err(
+            "navigation bake produced no walkable polygons; enlarge bounds or repair obstacles"
+                .into(),
+        );
+    }
+    let detail = DetailNavmesh::new(
+        &polygon,
+        &compact,
+        config.detail_sample_dist,
+        config.detail_sample_max_error,
+    )
+    .map_err(|error| format!("failed to build navigation detail mesh: {error}"))?;
+
+    let mut mesh: Mesh = RecastFullMesh::new(polygon, detail).into();
+    mesh.unbake();
+    Ok(NavigationBakeArtifact {
+        schema_version: NAVIGATION_ARTIFACT_SCHEMA_VERSION,
+        generator: NAVIGATION_GENERATOR_ID.into(),
+        source_scene: input.source_scene.clone(),
+        source_fingerprint: navigation_source_fingerprint(input),
+        bounds_actor_id: input.bounds_actor_id.clone(),
+        center: input.center,
+        half_extents: input.half_extents,
+        agent: input.agent.clone(),
+        mesh,
+        links: input.links.clone(),
+        areas: input.areas.clone(),
+    })
+}
+
+pub fn write_navigation_artifact(
+    path: &Path,
+    artifact: &NavigationBakeArtifact,
+) -> Result<(), String> {
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent).map_err(|error| {
+            format!("failed to create navigation artifact directory {parent:?}: {error}")
+        })?;
+    }
+    let text = ron::ser::to_string_pretty(artifact, ron::ser::PrettyConfig::default())
+        .map_err(|error| format!("failed to serialize navigation artifact: {error}"))?;
+    let temporary = temporary_path(path);
+    fs::write(&temporary, text)
+        .map_err(|error| format!("failed to write navigation artifact {temporary:?}: {error}"))?;
+    fs::rename(&temporary, path)
+        .map_err(|error| format!("failed to replace navigation artifact {path:?}: {error}"))
+}
+
+pub fn read_navigation_artifact(path: &Path) -> Result<NavigationBakeArtifact, String> {
+    let text = fs::read_to_string(path)
+        .map_err(|error| format!("failed to read navigation artifact {path:?}: {error}"))?;
+    let artifact: NavigationBakeArtifact = ron::from_str(&text)
+        .map_err(|error| format!("failed to parse navigation artifact {path:?}: {error}"))?;
+    if artifact.schema_version != NAVIGATION_ARTIFACT_SCHEMA_VERSION {
+        return Err(format!(
+            "navigation artifact schema {} is unsupported; rebake with schema {}",
+            artifact.schema_version, NAVIGATION_ARTIFACT_SCHEMA_VERSION
+        ));
+    }
+    Ok(artifact)
+}
+
+pub fn navigation_bake_jobs_from_document(
+    document: &SceneDocument,
+    source_scene: &str,
+) -> Result<Vec<NavigationBakeJob>, String> {
+    if !document.entities.iter().any(|entity| {
+        entity
+            .components
+            .iter()
+            .any(|component| component.type_name == COMPONENT_NAVIGATION_BOUNDS)
+    }) {
+        return Ok(Vec::new());
+    }
+    let poses = document_world_poses(document)?;
+    let mut obstacles = Vec::new();
+    let mut areas = Vec::new();
+    let mut links = Vec::new();
+    let mut bounds = Vec::new();
+    let mut geometry = Vec::new();
+
+    for entity in &document.entities {
+        let bounds_value = component::<NavigationBounds>(entity, COMPONENT_NAVIGATION_BOUNDS)?;
+        let obstacle_value =
+            component::<NavigationObstacle>(entity, COMPONENT_NAVIGATION_OBSTACLE)?;
+        let area_value = component::<NavigationArea>(entity, COMPONENT_NAVIGATION_AREA)?;
+        let link_value = component::<NavigationLink>(entity, COMPONENT_NAVIGATION_LINK)?;
+        let primitive = component::<Primitive>(entity, COMPONENT_PRIMITIVE)?;
+        let brush = component::<BrushDesc>(entity, COMPONENT_BRUSH_DESC)?;
+        if bounds_value.is_none()
+            && obstacle_value.is_none()
+            && area_value.is_none()
+            && link_value.is_none()
+            && primitive.is_none()
+            && brush.is_none()
+        {
+            continue;
+        }
+        let actor_id = entity
+            .actor_id
+            .clone()
+            .ok_or_else(|| format!("navigation entity {} requires ActorId", entity.document_id))?;
+        let pose = poses
+            .get(&actor_id)
+            .copied()
+            .unwrap_or_else(WorldPose::identity);
+        if let Some(value) = bounds_value {
+            bounds.push((actor_id.clone(), pose, value));
+        }
+        if let Some(value) = obstacle_value {
+            obstacles.push(NavigationVolumeInput {
+                actor_id: actor_id.clone(),
+                center: pose.translation.to_array(),
+                half_extents: rotated_aabb_half_extents(pose, value.half_extents.to_array()),
+            });
+        }
+        if let Some(value) = area_value {
+            areas.push(NavigationAreaInput {
+                actor_id: actor_id.clone(),
+                id: value.id,
+                center: pose.translation.to_array(),
+                half_extents: rotated_aabb_half_extents(pose, value.half_extents.to_array()),
+                cost: value.cost,
+                walkable: value.walkable,
+            });
+        }
+        if let Some(value) = link_value {
+            links.push(NavigationLinkInput {
+                actor_id: actor_id.clone(),
+                start: pose.transform_point(value.start.to_array()).to_array(),
+                end: pose.transform_point(value.end.to_array()).to_array(),
+                bidirectional: value.bidirectional,
+                cost: value.cost,
+                enabled: value.enabled,
+            });
+        }
+        if let Some(value) = navigation_geometry_from_parts(
+            actor_id,
+            pose.translation.to_array(),
+            pose.rotation.to_array(),
+            pose.scale.to_array(),
+            primitive.as_ref(),
+            brush.as_ref(),
+        ) {
+            geometry.push(value);
+        }
+    }
+    obstacles.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+    areas.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+    links.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+    geometry.sort_by(|a, b| a.actor_id.cmp(&b.actor_id));
+    bounds.sort_by(|a, b| a.0.cmp(&b.0));
+
+    Ok(bounds
+        .into_iter()
+        .map(|(actor_id, pose, bounds)| {
+            let center = pose.translation.to_array();
+            let half_extents = rotated_aabb_half_extents(pose, bounds.half_extents.to_array());
+            NavigationBakeJob {
+                artifact_path: bounds.artifact_path,
+                input: NavigationBakeInput {
+                    source_scene: source_scene.to_string(),
+                    bounds_actor_id: actor_id,
+                    center,
+                    half_extents,
+                    agent: bounds.agent,
+                    geometry: geometry
+                        .iter()
+                        .filter(|value| geometry_overlaps_bounds(value, center, half_extents))
+                        .cloned()
+                        .collect(),
+                    obstacles: obstacles
+                        .iter()
+                        .filter(|value| {
+                            aabb_overlaps(center, half_extents, value.center, value.half_extents)
+                        })
+                        .cloned()
+                        .collect(),
+                    areas: areas
+                        .iter()
+                        .filter(|value| {
+                            aabb_overlaps(center, half_extents, value.center, value.half_extents)
+                        })
+                        .cloned()
+                        .collect(),
+                    links: links
+                        .iter()
+                        .filter(|value| {
+                            point_in_aabb(value.start, center, half_extents)
+                                || point_in_aabb(value.end, center, half_extents)
+                        })
+                        .cloned()
+                        .collect(),
+                },
+            }
+        })
+        .collect())
+}
+
+fn validate_navigation_input(input: &NavigationBakeInput) -> Result<(), String> {
+    input
+        .agent
+        .validate()
+        .map_err(|error| format!("invalid navigation agent profile: {error}"))?;
+    if input.source_scene.trim().is_empty() {
+        return Err("navigation bake requires a source scene path".into());
+    }
+    if input.bounds_actor_id.trim().is_empty() {
+        return Err("navigation bounds actor requires a stable ActorId".into());
+    }
+    validate_half_extents(input.half_extents, "navigation bounds")?;
+    for geometry in &input.geometry {
+        if geometry.actor_id.trim().is_empty() {
+            return Err("navigation geometry requires a stable actor ID".into());
+        }
+        for triangle in &geometry.triangles {
+            if !triangle.iter().copied().all(finite3) {
+                return Err(format!(
+                    "navigation geometry {} contains a non-finite triangle",
+                    geometry.actor_id
+                ));
+            }
+        }
+    }
+    for obstacle in &input.obstacles {
+        validate_half_extents(obstacle.half_extents, "navigation obstacle")?;
+    }
+    for area in &input.areas {
+        validate_half_extents(area.half_extents, "navigation area")?;
+        if area.id.trim().is_empty() {
+            return Err(format!("navigation area {} has an empty ID", area.actor_id));
+        }
+        if !area.cost.is_finite() || area.cost <= 0.0 {
+            return Err(format!(
+                "navigation area {} cost must be finite and greater than zero",
+                area.actor_id
+            ));
+        }
+    }
+    for link in &input.links {
+        if link.enabled && (!finite3(link.start) || !finite3(link.end)) {
+            return Err(format!(
+                "navigation link {} endpoints must be finite",
+                link.actor_id
+            ));
+        }
+        if link.enabled && squared_distance(link.start, link.end) <= f32::EPSILON {
+            return Err(format!(
+                "navigation link {} endpoints must be distinct",
+                link.actor_id
+            ));
+        }
+        if !link.cost.is_finite() || link.cost <= 0.0 {
+            return Err(format!(
+                "navigation link {} cost must be finite and greater than zero",
+                link.actor_id
+            ));
+        }
+    }
+    Ok(())
+}
+
+fn floor_trimesh(min: Vec3, max: Vec3, y: f32) -> TriMesh {
+    TriMesh {
+        vertices: vec![
+            Vec3A::new(min.x, y, min.z),
+            Vec3A::new(max.x, y, min.z),
+            Vec3A::new(max.x, y, max.z),
+            Vec3A::new(min.x, y, max.z),
+        ],
+        indices: vec![UVec3::new(0, 2, 1), UVec3::new(0, 3, 2)],
+        area_types: vec![AreaType::DEFAULT_WALKABLE; 2],
+    }
+}
+
+fn append_geometry(trimesh: &mut TriMesh, geometry: &[NavigationGeometryInput]) {
+    for source in geometry {
+        for triangle in &source.triangles {
+            let base = trimesh.vertices.len() as u32;
+            trimesh
+                .vertices
+                .extend(triangle.iter().map(|vertex| Vec3A::from_array(*vertex)));
+            trimesh.indices.push(UVec3::new(base, base + 1, base + 2));
+            trimesh.area_types.push(AreaType::DEFAULT_WALKABLE);
+        }
+    }
+}
+
+pub fn navigation_geometry_from_parts(
+    actor_id: String,
+    translation: [f32; 3],
+    rotation: [f32; 4],
+    scale: [f32; 3],
+    primitive: Option<&Primitive>,
+    brush: Option<&BrushDesc>,
+) -> Option<NavigationGeometryInput> {
+    let pose = WorldPose {
+        translation: Vec3::from_array(translation),
+        rotation: nav_glam::Quat::from_array(rotation).normalize(),
+        scale: Vec3::from_array(scale),
+    };
+    let local_triangles =
+        if let Some(brush) = brush.filter(|brush| brush.kind == BrushKind::Additive) {
+            brush_triangles(brush)
+        } else if let Some(primitive) = primitive {
+            primitive_triangles(primitive)
+        } else {
+            Vec::new()
+        };
+    (!local_triangles.is_empty()).then(|| NavigationGeometryInput {
+        actor_id,
+        triangles: local_triangles
+            .into_iter()
+            .map(|triangle| triangle.map(|point| pose.transform_point(point).to_array()))
+            .collect(),
+    })
+}
+
+fn brush_triangles(brush: &BrushDesc) -> Vec<[[f32; 3]; 3]> {
+    let mut triangles = Vec::new();
+    for face in &brush.faces {
+        let Some(first) = face.vertices.first() else {
+            continue;
+        };
+        for edge in face.vertices[1..].windows(2) {
+            triangles.push([first.to_array(), edge[0].to_array(), edge[1].to_array()]);
+        }
+    }
+    triangles
+}
+
+fn primitive_triangles(primitive: &Primitive) -> Vec<[[f32; 3]; 3]> {
+    let half = primitive.size.abs() * 0.5;
+    let vertices = match primitive.shape {
+        PrimitiveShape::Box => vec![
+            [-half.x, -half.y, -half.z],
+            [half.x, -half.y, -half.z],
+            [half.x, half.y, -half.z],
+            [-half.x, half.y, -half.z],
+            [-half.x, -half.y, half.z],
+            [half.x, -half.y, half.z],
+            [half.x, half.y, half.z],
+            [-half.x, half.y, half.z],
+        ],
+        PrimitiveShape::Ramp => vec![
+            [-half.x, -half.y, -half.z],
+            [half.x, -half.y, -half.z],
+            [half.x, half.y, -half.z],
+            [-half.x, half.y, -half.z],
+            [-half.x, -half.y, half.z],
+            [half.x, -half.y, half.z],
+        ],
+        PrimitiveShape::Sphere => vec![
+            [0.0, half.y, 0.0],
+            [half.x, 0.0, 0.0],
+            [0.0, 0.0, half.z],
+            [-half.x, 0.0, 0.0],
+            [0.0, 0.0, -half.z],
+            [0.0, -half.y, 0.0],
+        ],
+    };
+    let indices: &[[usize; 3]] = match primitive.shape {
+        PrimitiveShape::Box => &[
+            [0, 2, 1],
+            [0, 3, 2],
+            [4, 5, 6],
+            [4, 6, 7],
+            [0, 1, 5],
+            [0, 5, 4],
+            [3, 7, 6],
+            [3, 6, 2],
+            [0, 4, 7],
+            [0, 7, 3],
+            [1, 2, 6],
+            [1, 6, 5],
+        ],
+        PrimitiveShape::Ramp => &[
+            [0, 2, 1],
+            [0, 3, 2],
+            [0, 1, 5],
+            [0, 5, 4],
+            [0, 4, 3],
+            [1, 2, 5],
+            [3, 4, 5],
+            [3, 5, 2],
+        ],
+        PrimitiveShape::Sphere => &[
+            [0, 2, 1],
+            [0, 3, 2],
+            [0, 4, 3],
+            [0, 1, 4],
+            [5, 1, 2],
+            [5, 2, 3],
+            [5, 3, 4],
+            [5, 4, 1],
+        ],
+    };
+    indices
+        .iter()
+        .map(|[a, b, c]| [vertices[*a], vertices[*b], vertices[*c]])
+        .collect()
+}
+
+pub fn aabb_overlaps(
+    a_center: [f32; 3],
+    a_half: [f32; 3],
+    b_center: [f32; 3],
+    b_half: [f32; 3],
+) -> bool {
+    (0..3).all(|axis| (a_center[axis] - b_center[axis]).abs() <= a_half[axis] + b_half[axis])
+}
+
+pub fn point_in_aabb(point: [f32; 3], center: [f32; 3], half_extents: [f32; 3]) -> bool {
+    (0..3).all(|axis| (point[axis] - center[axis]).abs() <= half_extents[axis])
+}
+
+pub fn geometry_overlaps_bounds(
+    geometry: &NavigationGeometryInput,
+    center: [f32; 3],
+    half_extents: [f32; 3],
+) -> bool {
+    geometry.triangles.iter().any(|triangle| {
+        let mut min = triangle[0];
+        let mut max = triangle[0];
+        for vertex in &triangle[1..] {
+            for axis in 0..3 {
+                min[axis] = min[axis].min(vertex[axis]);
+                max[axis] = max[axis].max(vertex[axis]);
+            }
+        }
+        let geometry_center = std::array::from_fn(|axis| (min[axis] + max[axis]) * 0.5);
+        let geometry_half = std::array::from_fn(|axis| (max[axis] - min[axis]) * 0.5);
+        aabb_overlaps(center, half_extents, geometry_center, geometry_half)
+    })
+}
+
+fn unwalkable_volume(center: [f32; 3], half_extents: [f32; 3]) -> ConvexVolume {
+    let center = vec3(center);
+    let half = vec3(half_extents);
+    ConvexVolume {
+        vertices: vec![
+            Vec2::new(center.x - half.x, center.z - half.z),
+            Vec2::new(center.x + half.x, center.z - half.z),
+            Vec2::new(center.x + half.x, center.z + half.z),
+            Vec2::new(center.x - half.x, center.z + half.z),
+        ],
+        min_y: center.y - half.y,
+        max_y: center.y + half.y,
+        area: AreaType::NOT_WALKABLE,
+    }
+}
+
+fn vec3(value: [f32; 3]) -> Vec3 {
+    Vec3::from_array(value)
+}
+
+fn finite3(value: [f32; 3]) -> bool {
+    value.into_iter().all(f32::is_finite)
+}
+
+fn validate_half_extents(value: [f32; 3], label: &str) -> Result<(), String> {
+    if !finite3(value) || value.into_iter().any(|axis| axis <= 0.0) {
+        return Err(format!(
+            "{label} half extents must be finite and greater than zero"
+        ));
+    }
+    Ok(())
+}
+
+fn squared_distance(a: [f32; 3], b: [f32; 3]) -> f32 {
+    a.into_iter().zip(b).map(|(a, b)| (a - b) * (a - b)).sum()
+}
+
+fn temporary_path(path: &Path) -> PathBuf {
+    let mut temporary = path.as_os_str().to_os_string();
+    temporary.push(".tmp");
+    PathBuf::from(temporary)
+}
+
+const TRANSFORM_COMPONENT: &str = "bevy_transform::components::transform::Transform";
+
+#[derive(Debug, Clone, Copy, Deserialize)]
+struct SerializedTransform {
+    translation: [f32; 3],
+    rotation: [f32; 4],
+    scale: [f32; 3],
+}
+
+impl Default for SerializedTransform {
+    fn default() -> Self {
+        Self {
+            translation: [0.0; 3],
+            rotation: [0.0, 0.0, 0.0, 1.0],
+            scale: [1.0; 3],
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+struct WorldPose {
+    translation: Vec3,
+    rotation: nav_glam::Quat,
+    scale: Vec3,
+}
+
+impl WorldPose {
+    fn identity() -> Self {
+        Self {
+            translation: Vec3::ZERO,
+            rotation: nav_glam::Quat::IDENTITY,
+            scale: Vec3::ONE,
+        }
+    }
+
+    fn from_serialized(value: SerializedTransform) -> Self {
+        Self {
+            translation: Vec3::from_array(value.translation),
+            rotation: nav_glam::Quat::from_array(value.rotation).normalize(),
+            scale: Vec3::from_array(value.scale),
+        }
+    }
+
+    fn compose(self, local: Self) -> Self {
+        Self {
+            translation: self.translation + self.rotation * (self.scale * local.translation),
+            rotation: (self.rotation * local.rotation).normalize(),
+            scale: self.scale * local.scale,
+        }
+    }
+
+    fn transform_point(self, point: [f32; 3]) -> Vec3 {
+        self.translation + self.rotation * (self.scale * Vec3::from_array(point))
+    }
+}
+
+fn document_world_poses(
+    document: &SceneDocument,
+) -> Result<std::collections::BTreeMap<String, WorldPose>, String> {
+    let entities: std::collections::BTreeMap<&str, &SceneEntity> = document
+        .entities
+        .iter()
+        .filter_map(|entity| Some((entity.actor_id.as_deref()?, entity)))
+        .collect();
+    let mut poses = std::collections::BTreeMap::new();
+    let mut visiting = std::collections::BTreeSet::new();
+    for actor_id in entities.keys().copied() {
+        resolve_document_pose(actor_id, &entities, &mut poses, &mut visiting)?;
+    }
+    Ok(poses)
+}
+
+fn resolve_document_pose(
+    actor_id: &str,
+    entities: &std::collections::BTreeMap<&str, &SceneEntity>,
+    poses: &mut std::collections::BTreeMap<String, WorldPose>,
+    visiting: &mut std::collections::BTreeSet<String>,
+) -> Result<WorldPose, String> {
+    if let Some(pose) = poses.get(actor_id).copied() {
+        return Ok(pose);
+    }
+    if !visiting.insert(actor_id.to_string()) {
+        return Err(format!(
+            "navigation hierarchy contains a cycle at actor {actor_id}"
+        ));
+    }
+    let entity = entities
+        .get(actor_id)
+        .ok_or_else(|| format!("navigation actor {actor_id} is missing from the scene document"))?;
+    let local = component::<SerializedTransform>(entity, TRANSFORM_COMPONENT)?
+        .map(WorldPose::from_serialized)
+        .unwrap_or_else(WorldPose::identity);
+    let world = match entity.parent_actor_id.as_deref() {
+        Some(parent) => resolve_document_pose(parent, entities, poses, visiting)?.compose(local),
+        None => local,
+    };
+    visiting.remove(actor_id);
+    poses.insert(actor_id.to_string(), world);
+    Ok(world)
+}
+
+fn component<T: for<'de> Deserialize<'de>>(
+    entity: &SceneEntity,
+    type_name: &str,
+) -> Result<Option<T>, String> {
+    entity
+        .components
+        .iter()
+        .find(|component| component.type_name == type_name)
+        .map(|component| {
+            ron::from_str(&component.ron).map_err(|error| {
+                format!(
+                    "actor {} has invalid {type_name}: {error}",
+                    entity.document_id
+                )
+            })
+        })
+        .transpose()
+}
+
+fn rotated_aabb_half_extents(pose: WorldPose, local_half: [f32; 3]) -> [f32; 3] {
+    let half = pose.scale.abs() * Vec3::from_array(local_half);
+    let x = pose.rotation * Vec3::X;
+    let y = pose.rotation * Vec3::Y;
+    let z = pose.rotation * Vec3::Z;
+    (x.abs() * half.x + y.abs() * half.y + z.abs() * half.z).to_array()
+}
+
+#[cfg(test)]
+mod tests {
+    use nav_glam::Vec2;
+
+    use super::*;
+
+    fn fixture() -> NavigationBakeInput {
+        NavigationBakeInput {
+            source_scene: "assets/levels/navigation_showcase.scn.ron".into(),
+            bounds_actor_id: "bounds".into(),
+            center: [0.0, 0.0, 0.0],
+            half_extents: [5.0, 2.0, 5.0],
+            agent: NavigationAgentProfile {
+                min_region_size: 1,
+                merge_region_size: 2,
+                ..Default::default()
+            },
+            geometry: Vec::new(),
+            obstacles: vec![NavigationVolumeInput {
+                actor_id: "center-obstacle".into(),
+                center: [0.0, 0.5, 0.0],
+                half_extents: [0.75, 1.0, 0.75],
+            }],
+            areas: Vec::new(),
+            links: Vec::new(),
+        }
+    }
+
+    #[test]
+    fn deterministic_bake_routes_around_an_obstacle() {
+        let input = fixture();
+        let artifact = bake_navigation(&input).unwrap();
+        assert_eq!(
+            artifact.source_fingerprint,
+            navigation_source_fingerprint(&input)
+        );
+        let mesh = artifact.runtime_mesh();
+        let path = mesh.path(Vec2::new(-3.0, 0.0), Vec2::new(3.0, 0.0));
+        assert!(path.is_some());
+        assert!(path.unwrap().length > 6.0);
+    }
+
+    #[test]
+    fn artifact_round_trip_preserves_query_mesh() {
+        let artifact = bake_navigation(&fixture()).unwrap();
+        let text = ron::ser::to_string(&artifact).unwrap();
+        let restored: NavigationBakeArtifact = ron::from_str(&text).unwrap();
+        assert!(restored
+            .runtime_mesh()
+            .path(Vec2::new(-3.0, -3.0), Vec2::new(3.0, 3.0))
+            .is_some());
+    }
+
+    #[test]
+    fn agent_change_marks_artifact_stale() {
+        let input = fixture();
+        let artifact = bake_navigation(&input).unwrap();
+        let mut changed = input;
+        changed.agent.radius += 0.1;
+        assert!(artifact.is_stale_for(&changed));
+    }
+
+    #[test]
+    fn authored_geometry_change_marks_artifact_stale() {
+        let mut input = fixture();
+        input.geometry.push(NavigationGeometryInput {
+            actor_id: "walkable-floor".into(),
+            triangles: vec![[[-2.0, 0.0, -2.0], [2.0, 0.0, 2.0], [2.0, 0.0, -2.0]]],
+        });
+        let artifact = bake_navigation(&input).unwrap();
+        input.geometry[0].triangles[0][0][0] -= 0.25;
+        assert!(artifact.is_stale_for(&input));
+    }
+
+    #[test]
+    fn bounds_filter_excludes_distant_authoring() {
+        assert!(aabb_overlaps(
+            [0.0, 0.0, 0.0],
+            [2.0, 2.0, 2.0],
+            [3.0, 0.0, 0.0],
+            [1.0, 1.0, 1.0]
+        ));
+        assert!(!aabb_overlaps(
+            [0.0, 0.0, 0.0],
+            [2.0, 2.0, 2.0],
+            [3.01, 0.0, 0.0],
+            [1.0, 1.0, 1.0]
+        ));
+    }
+
+    #[test]
+    fn committed_navigation_fixture_matches_its_bake_artifact() {
+        let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("../..");
+        let scene_path = root.join("assets/levels/navigation_authoring_showcase.scn.ron");
+        let text = std::fs::read_to_string(scene_path).unwrap();
+        let document = SceneDocument::from_ron_text(&text).unwrap();
+        let job = navigation_bake_jobs_from_document(
+            &document,
+            "assets/levels/navigation_authoring_showcase.scn.ron",
+        )
+        .unwrap()
+        .pop()
+        .unwrap();
+        let committed = read_navigation_artifact(&root.join(&job.artifact_path)).unwrap();
+        assert!(!committed.is_stale_for(&job.input));
+        assert_eq!(committed.bounds_actor_id, "navigation-bounds-main");
+        assert_eq!(job.input.geometry.len(), 1);
+        assert_eq!(job.input.geometry[0].actor_id, "navigation-floor-geometry");
+        assert!(committed
+            .runtime_mesh()
+            .path(Vec2::new(-6.0, 0.0), Vec2::new(6.0, 0.0))
+            .is_some());
+    }
+}
diff --git a/crates/scene/src/project_validation.rs b/crates/scene/src/project_validation.rs
index d66b6ef..51542b3 100644
--- a/crates/scene/src/project_validation.rs
+++ b/crates/scene/src/project_validation.rs
@@ -11,10 +11,10 @@ use shared::{
     brush_math::{validate_brush, BrushDiagnosticSeverity},
     AnimationControllerDesc, AnimationDiagnosticSeverity, AnimationManifest, AudioListenerDesc,
     AudioSourceDesc, BrushDesc, ColliderDesc, ColliderShapeDesc, EditorAssetRef, MaterialAsset,
-    MaterialDesc, MaterialOverride, ModelRef, PostProcessEffectAsset, PostProcessVolumeDesc,
-    PrefabInstance, PrefabRef, ShaderSchemaAsset, StaticMeshRenderer,
-    ANIMATION_MANIFEST_SCHEMA_VERSION, AUDIO_CLIP_SUB_ASSET_ID,
-    COMPONENT_ANIMATION_CONTROLLER_DESC,
+    MaterialDesc, MaterialInstanceAsset, MaterialOverride, ModelRef, PostProcessEffectAsset,
+    PostProcessVolumeDesc, PrefabInstance, PrefabRef, RendererMaterialSet, ShaderSchemaAsset,
+    SkinnedMeshRenderer, StaticMeshRenderer, ANIMATION_MANIFEST_SCHEMA_VERSION,
+    AUDIO_CLIP_SUB_ASSET_ID, COMPONENT_ANIMATION_CONTROLLER_DESC, COMPONENT_SKINNED_MESH_RENDERER,
 };
 
 use crate::document::{SceneComponentBlob, SceneDocument};
@@ -308,6 +308,8 @@ struct RegistryImportSettings {
     static_mesh_manifest_path: Option<String>,
     #[serde(default)]
     animation_manifest_path: Option<String>,
+    #[serde(default)]
+    default_animation_clip_id: Option<String>,
 }
 
 #[derive(Deserialize)]
@@ -325,6 +327,7 @@ struct RegistryAssetRecord {
 struct AnimationRegistryRecord {
     source_path: String,
     manifest_path: Option<String>,
+    default_animation_clip_id: Option<String>,
 }
 
 #[derive(Debug, Clone)]
@@ -438,6 +441,10 @@ fn validate_asset_registry(
                 .or_insert(AnimationRegistryRecord {
                     source_path: record.path.clone(),
                     manifest_path: record.import_settings.animation_manifest_path.clone(),
+                    default_animation_clip_id: record
+                        .import_settings
+                        .default_animation_clip_id
+                        .clone(),
                 });
         }
         if record.kind_tag == "Model"
@@ -499,21 +506,103 @@ fn validate_material_assets(project_root: &Path, report: &mut ProjectValidationR
         report,
     ) {
         let source = display_project_path(project_root, &path);
-        let Some(asset) = parse_document::<MaterialAsset>(&path, &source, "material", report)
-        else {
+        let Ok(text) = std::fs::read_to_string(&path) else {
             continue;
         };
-        if let Some(shader) = asset.shader {
-            add_reference(
+        if let Ok(asset) = ron::from_str::<MaterialAsset>(&text) {
+            if asset.schema_version != shared::MATERIAL_ASSET_SCHEMA_VERSION {
+                report.findings.push(ProjectValidationFinding {
+                    severity: ValidationSeverity::Error,
+                    code: "material.incompatible_schema".into(),
+                    source_path: source.clone(),
+                    owner_actor_id: None,
+                    reference: Some(asset.schema_version.to_string()),
+                    message: "material asset schema is not supported by this build".into(),
+                    repair: "Run `cargo upgrade-project --apply` and review the upgrade report."
+                        .into(),
+                });
+            }
+            if let Some(shader) = asset.shader {
+                add_reference(
+                    project_root,
+                    report,
+                    &source,
+                    None,
+                    "shader_schema",
+                    &shader,
+                );
+            }
+            if let Some(shader) = asset.shader_ref {
+                collect_asset_ref(
+                    project_root,
+                    report,
+                    &source,
+                    None,
+                    "shader_schema",
+                    &shader,
+                );
+            }
+            collect_material(project_root, report, &source, None, &asset.material);
+            continue;
+        }
+        if let Ok(instance) = ron::from_str::<MaterialInstanceAsset>(&text) {
+            if instance.schema_version != shared::MATERIAL_INSTANCE_SCHEMA_VERSION {
+                report.findings.push(ProjectValidationFinding {
+                    severity: ValidationSeverity::Error,
+                    code: "material_instance.incompatible_schema".into(),
+                    source_path: source.clone(),
+                    owner_actor_id: None,
+                    reference: Some(instance.schema_version.to_string()),
+                    message: "material-instance schema is not supported by this build".into(),
+                    repair: "Run `cargo upgrade-project --apply` and review the upgrade report."
+                        .into(),
+                });
+            }
+            let nested_base = instance.base.0.sub_asset_id == "material:instance"
+                || instance.base.0.source_path.as_deref().is_some_and(|path| {
+                    let path = Path::new(path);
+                    let path = if path.is_absolute() {
+                        path.to_path_buf()
+                    } else {
+                        project_root.join(path)
+                    };
+                    MaterialInstanceAsset::load_from_path(&path.to_string_lossy()).is_ok()
+                });
+            if nested_base {
+                report.findings.push(ProjectValidationFinding {
+                    severity: ValidationSeverity::Error,
+                    code: "material_instance.nested_base".into(),
+                    source_path: source.clone(),
+                    owner_actor_id: None,
+                    reference: Some(instance.base.0.label.clone()),
+                    message: "material instances must directly inherit a Material asset".into(),
+                    repair: "Choose a Material asset as the instance base.".into(),
+                });
+            }
+            collect_asset_ref(
                 project_root,
                 report,
                 &source,
                 None,
-                "shader_schema",
-                &shader,
+                "material",
+                &instance.base.0,
             );
+            for texture in instance.textures {
+                if let Some(reference) = texture.texture {
+                    collect_asset_ref(project_root, report, &source, None, "texture", &reference);
+                }
+            }
+            continue;
         }
-        collect_material(project_root, report, &source, None, &asset.material);
+        report.findings.push(ProjectValidationFinding {
+            severity: ValidationSeverity::Error,
+            code: "material.invalid".into(),
+            source_path: source,
+            owner_actor_id: None,
+            reference: None,
+            message: "could not parse file as a Material or Material Instance asset".into(),
+            repair: "Repair the document or restore it from the project-upgrade backup.".into(),
+        });
     }
 }
 
@@ -530,8 +619,53 @@ fn validate_shader_assets(project_root: &Path, report: &mut ProjectValidationRep
         else {
             continue;
         };
+        if asset.schema_version != shared::SURFACE_SHADER_SCHEMA_VERSION {
+            report.findings.push(ProjectValidationFinding {
+                severity: ValidationSeverity::Error,
+                code: "surface_shader.incompatible_schema".into(),
+                source_path: source.clone(),
+                owner_actor_id: None,
+                reference: Some(asset.schema_version.to_string()),
+                message: "surface shader schema is not supported by this build".into(),
+                repair: "Run `cargo upgrade-project --apply` and review the upgrade report.".into(),
+            });
+        }
         if let Some(wgsl) = asset.wgsl_path {
             add_reference(project_root, report, &source, None, "shader", &wgsl);
+            if let Ok(code) = std::fs::read_to_string(project_root.join(&wgsl)) {
+                if !code.contains("fn evaluate(")
+                    || [
+                        "@group",
+                        "@binding",
+                        "@vertex",
+                        "@fragment",
+                        "@compute",
+                        "var<",
+                        "rayQuery",
+                        "dpdx",
+                        "dpdy",
+                        "fwidth",
+                        "discard",
+                        "Barrier",
+                        "subgroup",
+                        "textureStore",
+                        "atomic",
+                    ]
+                    .iter()
+                    .any(|forbidden| code.contains(forbidden))
+                {
+                    report.findings.push(ProjectValidationFinding {
+                        severity: ValidationSeverity::Error,
+                        code: "surface_shader.invalid_contract".into(),
+                        source_path: source.clone(),
+                        owner_actor_id: None,
+                        reference: Some(wgsl.clone()),
+                        message: "WGSL does not satisfy the Surface ABI evaluator contract".into(),
+                        repair: "Define only `fn evaluate(...) -> Surface` and remove resource bindings/entry points."
+                            .into(),
+                    });
+                }
+            }
         }
         for texture in asset.default_textures {
             if let Some(reference) = texture.texture {
@@ -574,6 +708,8 @@ struct StaticMeshSourceView {
     dependencies: Vec<String>,
 }
 
+const STATIC_MESH_MANIFEST_SCHEMA_VERSION: u32 = 3;
+
 fn validate_static_mesh_manifests(project_root: &Path, report: &mut ProjectValidationReport) {
     for path in ron_files(
         project_root,
@@ -590,7 +726,9 @@ fn validate_static_mesh_manifests(project_root: &Path, report: &mut ProjectValid
         ) else {
             continue;
         };
-        if manifest.schema_version != 1 || manifest.asset_id.trim().is_empty() {
+        if manifest.schema_version != STATIC_MESH_MANIFEST_SCHEMA_VERSION
+            || manifest.asset_id.trim().is_empty()
+        {
             report.findings.push(ProjectValidationFinding {
                 severity: ValidationSeverity::Error,
                 code: "manifest.incompatible_schema".into(),
@@ -732,6 +870,17 @@ fn validate_animation_manifests(
                 repair: "Reimport the model so its UUID-keyed animation manifest matches the asset registry.".into(),
             });
         }
+        if manifest.default_animation_clip_id != record.default_animation_clip_id {
+            report.findings.push(ProjectValidationFinding {
+                severity: ValidationSeverity::Error,
+                code: "animation.default_clip_manifest_mismatch".into(),
+                source_path: normalized.clone(),
+                owner_actor_id: None,
+                reference: record.default_animation_clip_id.clone(),
+                message: "model import settings and generated animation manifest disagree on the default clip".into(),
+                repair: "Reimport the model so its generated manifest records the current Default animation setting.".into(),
+            });
+        }
         if manifest.source.path != record.source_path {
             report.findings.push(ProjectValidationFinding {
                 severity: ValidationSeverity::Error,
@@ -1001,6 +1150,26 @@ fn validate_animation_manifest_contract(
         }
     }
 
+    if let Some(default_clip_id) = manifest.default_animation_clip_id.as_deref() {
+        if (default_clip_id.trim().is_empty() || !clip_ids.contains(default_clip_id))
+            && !manifest
+                .diagnostics
+                .iter()
+                .any(|diagnostic| diagnostic.code == "animation.default_clip_missing")
+        {
+            report.findings.push(ProjectValidationFinding {
+                severity: ValidationSeverity::Error,
+                code: "animation.default_clip_missing".into(),
+                source_path: source_path.into(),
+                owner_actor_id: None,
+                reference: Some(default_clip_id.to_string()),
+                message: "animation manifest default clip does not resolve to an imported clip"
+                    .into(),
+                repair: "Choose an existing Default animation in Model Import Settings, or select Imported rest pose, then reimport.".into(),
+            });
+        }
+    }
+
     match source_format.as_str() {
         "gltf" | "glb" if !manifest.runtime_supported => {
             report.findings.push(ProjectValidationFinding {
@@ -1219,6 +1388,8 @@ fn validate_document(
         return;
     };
 
+    validate_navigation_document(project_root, &source_path, &document, report);
+
     if let Some(composition) = &document.composition {
         for subscene in &composition.subscenes {
             add_reference(
@@ -1279,6 +1450,131 @@ fn validate_document(
     }
 }
 
+fn validate_navigation_document(
+    project_root: &Path,
+    source_path: &str,
+    document: &SceneDocument,
+    report: &mut ProjectValidationReport,
+) {
+    let jobs = match crate::navigation::navigation_bake_jobs_from_document(document, source_path) {
+        Ok(jobs) => jobs,
+        Err(error) => {
+            report.findings.push(ProjectValidationFinding {
+                severity: ValidationSeverity::Error,
+                code: "navigation.authoring_invalid".into(),
+                source_path: source_path.to_string(),
+                owner_actor_id: None,
+                reference: None,
+                message: error,
+                repair: "Repair the named navigation actor and rebake the scene.".into(),
+            });
+            return;
+        }
+    };
+
+    for job in jobs {
+        report.dependencies.push(ProjectDependency {
+            owner_path: source_path.to_string(),
+            owner_actor_id: Some(job.input.bounds_actor_id.clone()),
+            kind: "navigation_artifact".into(),
+            reference: job.artifact_path.clone(),
+        });
+        let Some(path) = resolve_reference(project_root, &job.artifact_path) else {
+            push_navigation_finding(
+                report,
+                source_path,
+                &job.input.bounds_actor_id,
+                "navigation.artifact_unsafe_path",
+                &job.artifact_path,
+                "navigation artifact path escapes the project",
+                "Choose an artifact path under assets/navigation/generated/.",
+            );
+            continue;
+        };
+        if !path.is_file() {
+            push_navigation_finding(
+                report,
+                source_path,
+                &job.input.bounds_actor_id,
+                "navigation.artifact_missing",
+                &job.artifact_path,
+                "navigation bounds has no baked artifact",
+                "Select the bounds actor and run Scene > Navigation > Bake Selected Bounds.",
+            );
+            continue;
+        }
+        let artifact = match crate::navigation::read_navigation_artifact(&path) {
+            Ok(artifact) => artifact,
+            Err(error) => {
+                push_navigation_finding(
+                    report,
+                    source_path,
+                    &job.input.bounds_actor_id,
+                    "navigation.artifact_invalid",
+                    &job.artifact_path,
+                    &error,
+                    "Delete the invalid generated artifact and rebake the bounds actor.",
+                );
+                continue;
+            }
+        };
+        if artifact.is_stale_for(&job.input) {
+            push_navigation_finding(
+                report,
+                source_path,
+                &job.input.bounds_actor_id,
+                "navigation.artifact_stale",
+                &job.artifact_path,
+                "navigation artifact fingerprint does not match authored navigation data",
+                "Rebake navigation after the authored geometry or agent-profile change.",
+            );
+        }
+
+        let mesh = artifact.runtime_mesh();
+        for link in artifact.links.iter().filter(|link| link.enabled) {
+            for (label, endpoint) in [("start", link.start), ("end", link.end)] {
+                let point = nav_glam::Vec2::new(endpoint[0], endpoint[2]);
+                let valid = mesh.get_closest_point(point).is_some_and(|closest| {
+                    closest.position().distance(point) <= artifact.agent.radius * 2.0
+                });
+                if !valid {
+                    push_navigation_finding(
+                        report,
+                        source_path,
+                        &link.actor_id,
+                        "navigation.link_unreachable",
+                        &job.artifact_path,
+                        &format!(
+                            "navigation link {label} endpoint is farther than two agent radii from the baked mesh"
+                        ),
+                        "Move the endpoint onto a visible navigation polygon and rebake.",
+                    );
+                }
+            }
+        }
+    }
+}
+
+fn push_navigation_finding(
+    report: &mut ProjectValidationReport,
+    source_path: &str,
+    actor_id: &str,
+    code: &str,
+    reference: &str,
+    message: &str,
+    repair: &str,
+) {
+    report.findings.push(ProjectValidationFinding {
+        severity: ValidationSeverity::Error,
+        code: code.into(),
+        source_path: source_path.into(),
+        owner_actor_id: Some(actor_id.into()),
+        reference: Some(reference.into()),
+        message: message.into(),
+        repair: repair.into(),
+    });
+}
+
 fn collect_component_references(
     project_root: &Path,
     report: &mut ProjectValidationReport,
@@ -1321,51 +1617,36 @@ fn collect_component_references(
         }
         MODEL_REF => {
             let model = parse!(ModelRef);
-            if model.asset_id.trim().is_empty() {
-                add_reference(
-                    project_root,
-                    report,
-                    source_path,
-                    actor_id,
-                    "model",
-                    &model.path,
-                );
-            } else if let Some(record) = animation_catalog.registry_by_id.get(&model.asset_id) {
-                add_reference(
-                    project_root,
-                    report,
-                    source_path,
-                    actor_id,
-                    "model",
-                    &record.source_path,
-                );
-                if normalized_project_reference(&model.path)
-                    != normalized_project_reference(&record.source_path)
-                {
-                    report.findings.push(ProjectValidationFinding {
-                        severity: ValidationSeverity::Warning,
-                        code: "model.cached_path_stale".into(),
-                        source_path: source_path.to_string(),
-                        owner_actor_id: actor_id.map(str::to_string),
-                        reference: Some(model.asset_id),
-                        message: format!(
-                            "ModelRef cached path `{}` differs from registered path `{}`",
-                            model.path, record.source_path
-                        ),
-                        repair: "Open and save the scene to refresh the cached path hint; runtime resolution already uses the stable asset ID.".into(),
-                    });
-                }
-            } else {
-                report.findings.push(ProjectValidationFinding {
-                    severity: ValidationSeverity::Error,
-                    code: "model.asset_unresolved".into(),
-                    source_path: source_path.to_string(),
-                    owner_actor_id: actor_id.map(str::to_string),
-                    reference: Some(model.asset_id),
-                    message: "ModelRef asset ID is absent from the project registry".into(),
-                    repair: "Restore/reimport the owning model or reassign the model reference in the editor.".into(),
-                });
-            }
+            collect_model_source_reference(
+                project_root,
+                report,
+                source_path,
+                actor_id,
+                &model.asset_id,
+                &model.path,
+                "ModelRef",
+                animation_catalog,
+            );
+        }
+        COMPONENT_SKINNED_MESH_RENDERER => {
+            let renderer = parse!(SkinnedMeshRenderer);
+            collect_model_source_reference(
+                project_root,
+                report,
+                source_path,
+                actor_id,
+                &renderer.asset_id,
+                &renderer.path,
+                "SkinnedMeshRenderer",
+                animation_catalog,
+            );
+            collect_renderer_material_references(
+                project_root,
+                report,
+                source_path,
+                actor_id,
+                &renderer.materials,
+            );
         }
         MATERIAL_DESC => collect_material(
             project_root,
@@ -1390,7 +1671,33 @@ fn collect_component_references(
             }
         }
         STATIC_MESH_RENDERER => {
-            for slot in parse!(StaticMeshRenderer).slots {
+            let renderer = parse!(StaticMeshRenderer);
+            collect_renderer_material_references(
+                project_root,
+                report,
+                source_path,
+                actor_id,
+                &renderer.materials,
+            );
+            if let Some(slot) = renderer.slots.iter().find(|slot| {
+                animation_asset_requires_skinned_renderer(&slot.mesh.asset_id, animation_catalog)
+            }) {
+                report.findings.push(ProjectValidationFinding {
+                    severity: ValidationSeverity::Error,
+                    code: "static_mesh.hierarchy_bound_geometry".into(),
+                    source_path: source_path.to_string(),
+                    owner_actor_id: actor_id.map(str::to_string),
+                    reference: Some(format!(
+                        "{}#{}",
+                        slot.mesh.asset_id, slot.mesh.sub_asset_id
+                    )),
+                    message:
+                        "StaticMeshRenderer references geometry from a skinned or animated model"
+                            .into(),
+                    repair: "Replace this actor by placing the source model through SkinnedMeshRenderer; static slots cannot retain its imported hierarchy.".into(),
+                });
+            }
+            for slot in renderer.slots {
                 collect_asset_ref(
                     project_root,
                     report,
@@ -1510,6 +1817,119 @@ fn collect_component_references(
     }
 }
 
+fn collect_renderer_material_references(
+    project_root: &Path,
+    report: &mut ProjectValidationReport,
+    source_path: &str,
+    actor_id: Option<&str>,
+    materials: &RendererMaterialSet,
+) {
+    for slot in &materials.slots {
+        for reference in [slot.source_material.as_ref(), slot.material.as_ref()]
+            .into_iter()
+            .flatten()
+        {
+            collect_asset_ref(
+                project_root,
+                report,
+                source_path,
+                actor_id,
+                "material",
+                &reference.0,
+            );
+        }
+    }
+    for orphan in &materials.orphaned_assignments {
+        collect_asset_ref(
+            project_root,
+            report,
+            source_path,
+            actor_id,
+            "material",
+            &orphan.material.0,
+        );
+    }
+}
+
+fn animation_asset_requires_skinned_renderer(
+    asset_id: &str,
+    catalog: &AnimationValidationCatalog,
+) -> bool {
+    let Some(record) = catalog.registry_by_id.get(asset_id) else {
+        return false;
+    };
+    let Some(manifest_path) = record.manifest_path.as_deref() else {
+        return false;
+    };
+    matches!(
+        catalog
+            .manifests_by_path
+            .get(&normalized_project_reference(manifest_path)),
+        Some(AnimationManifestLoad::Valid(manifest))
+            if !manifest.skeletons.is_empty() || !manifest.clips.is_empty()
+    )
+}
+
+#[allow(clippy::too_many_arguments)]
+fn collect_model_source_reference(
+    project_root: &Path,
+    report: &mut ProjectValidationReport,
+    source_path: &str,
+    actor_id: Option<&str>,
+    asset_id: &str,
+    cached_path: &str,
+    component_name: &str,
+    animation_catalog: &AnimationValidationCatalog,
+) {
+    if asset_id.trim().is_empty() {
+        add_reference(
+            project_root,
+            report,
+            source_path,
+            actor_id,
+            "model",
+            cached_path,
+        );
+    } else if let Some(record) = animation_catalog.registry_by_id.get(asset_id) {
+        add_reference(
+            project_root,
+            report,
+            source_path,
+            actor_id,
+            "model",
+            &record.source_path,
+        );
+        if normalized_project_reference(cached_path)
+            != normalized_project_reference(&record.source_path)
+        {
+            report.findings.push(ProjectValidationFinding {
+                severity: ValidationSeverity::Warning,
+                code: "model.cached_path_stale".into(),
+                source_path: source_path.to_string(),
+                owner_actor_id: actor_id.map(str::to_string),
+                reference: Some(asset_id.to_string()),
+                message: format!(
+                    "{component_name} cached path `{cached_path}` differs from registered path `{}`",
+                    record.source_path
+                ),
+                repair: "Open and save the scene to refresh the cached path hint; runtime resolution already uses the stable asset ID.".into(),
+            });
+        }
+    } else {
+        report.findings.push(ProjectValidationFinding {
+            severity: ValidationSeverity::Error,
+            code: "model.asset_unresolved".into(),
+            source_path: source_path.to_string(),
+            owner_actor_id: actor_id.map(str::to_string),
+            reference: Some(asset_id.to_string()),
+            message: format!("{component_name} asset ID is absent from the project registry"),
+            repair:
+                "Restore/reimport the owning model or reassign the model reference in the editor."
+                    .into(),
+        });
+    }
+}
+
 fn validate_animation_controller(
     project_root: &Path,
     report: &mut ProjectValidationReport,
@@ -2396,6 +2816,31 @@ mod tests {
         root
     }
 
+    #[test]
+    fn static_mesh_manifest_schema_v3_is_current() {
+        let root = fixture_root();
+        let source_path = "assets/models/static.glb";
+        std::fs::create_dir_all(root.join("assets/models")).unwrap();
+        std::fs::write(root.join(source_path), b"model").unwrap();
+        let artifact_dir = root.join("assets/meshes/generated");
+        std::fs::create_dir_all(&artifact_dir).unwrap();
+        std::fs::write(
+            artifact_dir.join("static-id.static_mesh.ron"),
+            format!(
+                "(schema_version:{STATIC_MESH_MANIFEST_SCHEMA_VERSION},asset_id:\"static-id\",source:(path:\"{source_path}\",dependencies:[]),warnings:[])"
+            ),
+        )
+        .unwrap();
+
+        let report = validate_project(&root);
+
+        assert!(!report.findings.iter().any(|finding| {
+            finding.code == "manifest.incompatible_schema"
+                && finding.source_path.ends_with("static-id.static_mesh.ron")
+        }));
+        std::fs::remove_dir_all(root).unwrap();
+    }
+
     fn write_manifest(root: &Path, version: u32) {
         std::fs::write(
             root.join("assets/project.ron"),
@@ -2423,6 +2868,7 @@ mod tests {
             schema_version: ANIMATION_MANIFEST_SCHEMA_VERSION,
             asset_id: ANIMATION_ASSET_ID.into(),
             label: "Hero".into(),
+            default_animation_clip_id: None,
             source: AnimationManifestSource {
                 path: source_path.into(),
                 format: source_format.into(),
@@ -2497,6 +2943,23 @@ mod tests {
         .unwrap();
     }
 
+    fn write_animation_source_and_registry_default(
+        root: &Path,
+        source_path: &str,
+        default_clip_id: &str,
+    ) {
+        let source = root.join(source_path);
+        std::fs::create_dir_all(source.parent().unwrap()).unwrap();
+        std::fs::write(source, b"model").unwrap();
+        std::fs::write(
+            root.join("assets/.index/registry.ron"),
+            format!(
+                "[(id:(\"{ANIMATION_ASSET_ID}\"),path:\"{source_path}\",kind_tag:\"Model\",import_settings:(static_mesh_manifest_path:None,animation_manifest_path:Some(\"{ANIMATION_MANIFEST_PATH}\"),default_animation_clip_id:Some(\"{default_clip_id}\")),dependencies:[])]"
+            ),
+        )
+        .unwrap();
+    }
+
     fn write_animation_manifest(root: &Path, manifest: &AnimationManifest) {
         let path = root.join(ANIMATION_MANIFEST_PATH);
         std::fs::create_dir_all(path.parent().unwrap()).unwrap();
@@ -2539,6 +3002,61 @@ mod tests {
         std::fs::remove_dir_all(root).unwrap();
     }
 
+    fn write_navigation_scene(root: &Path, radius: f32, write_artifact: bool) {
+        let mut bounds = shared::NavigationBounds::default();
+        bounds.agent.radius = radius;
+        bounds.agent.min_region_size = 1;
+        bounds.agent.merge_region_size = 2;
+        bounds.artifact_path = "assets/navigation/generated/main_humanoid.nav.ron".to_string();
+        let bounds_ron = ron::to_string(&bounds).unwrap();
+        let scene = format!(
+            "(schema_version:2,resources:{{}},entities:{{1:(components:{{\"shared::components::ActorId\":(\"nav-bounds\"),\"shared::navigation::NavigationBounds\":{bounds_ron},}})}})"
+        );
+        std::fs::write(root.join("assets/levels/main.scn.ron"), &scene).unwrap();
+        if write_artifact {
+            let document = SceneDocument::from_ron_text(&scene).unwrap();
+            let job = crate::navigation::navigation_bake_jobs_from_document(
+                &document,
+                "assets/levels/main.scn.ron",
+            )
+            .unwrap()
+            .pop()
+            .unwrap();
+            let artifact = crate::navigation::bake_navigation(&job.input).unwrap();
+            crate::navigation::write_navigation_artifact(&root.join(&job.artifact_path), &artifact)
+                .unwrap();
+        }
+    }
+
+    #[test]
+    fn missing_navigation_artifact_blocks_release_with_bounds_owner() {
+        let root = fixture_root();
+        write_navigation_scene(&root, 0.35, false);
+
+        let report = validate_project(&root);
+        let finding = report
+            .findings
+            .iter()
+            .find(|finding| finding.code == "navigation.artifact_missing")
+            .expect("missing artifact should be reported");
+        assert_eq!(finding.owner_actor_id.as_deref(), Some("nav-bounds"));
+        assert!(finding.repair.contains("Bake Selected Bounds"));
+    }
+
+    #[test]
+    fn navigation_agent_change_marks_bake_stale() {
+        let root = fixture_root();
+        write_navigation_scene(&root, 0.35, true);
+        assert!(validate_project(&root).is_release_ready());
+
+        write_navigation_scene(&root, 0.5, false);
+        let report = validate_project(&root);
+        assert!(report
+            .findings
+            .iter()
+            .any(|finding| finding.code == "navigation.artifact_stale"));
+    }
+
     #[test]
     fn valid_animation_controller_collects_stable_artifact_dependencies() {
         let root = fixture_root();
@@ -2565,6 +3083,39 @@ mod tests {
         std::fs::remove_dir_all(root).unwrap();
     }
 
+    #[test]
+    fn static_renderer_cannot_reference_skinned_or_animated_model_geometry() {
+        let root = fixture_root();
+        let source_path = "assets/models/hero.glb";
+        let manifest = animation_fixture_manifest(source_path, "glb", "rig-signature", true);
+        write_animation_source_and_registry(&root, source_path, Some(ANIMATION_MANIFEST_PATH));
+        write_animation_manifest(&root, &manifest);
+        let renderer = StaticMeshRenderer::single(shared::StaticMeshRendererEntry {
+            mesh: EditorAssetRef::new(ANIMATION_ASSET_ID, "mesh:hero", "Hero"),
+            ..Default::default()
+        });
+        let renderer = ron::to_string(&renderer).unwrap();
+        std::fs::write(
+            root.join("assets/levels/main.scn.ron"),
+            format!(
+                "(schema_version:3,resources:{{}},entities:{{1:(components:{{\"shared::components::ActorId\":(\"static-hero\"),\"shared::components::StaticMeshRenderer\":{renderer},}})}})"
+            ),
+        )
+        .unwrap();
+
+        let report = validate_project(&root);
+
+        let finding = report
+            .findings
+            .iter()
+            .find(|finding| finding.code == "static_mesh.hierarchy_bound_geometry")
+            .expect("static use of hierarchy-bound geometry should be blocking");
+        assert_eq!(finding.owner_actor_id.as_deref(), Some("static-hero"));
+        assert_eq!(finding.severity, ValidationSeverity::Error);
+        assert!(finding.repair.contains("SkinnedMeshRenderer"));
+        std::fs::remove_dir_all(root).unwrap();
+    }
+
     #[test]
     fn same_size_animation_source_change_invalidates_manifest_content_hash() {
         let root = fixture_root();
@@ -2669,13 +3220,37 @@ mod tests {
                     && finding.owner_actor_id.as_deref() == Some("animated-actor")
             })
             .expect("missing clip must identify the owning actor state");
-        assert!(finding.reference.as_deref().is_some_and(
-            |reference| reference.contains("AnimationControllerDesc.states[idle].clip")
-        ));
+        assert!(finding.reference.as_deref().is_some_and(|reference| {
+            reference.contains("AnimationControllerDesc.states[idle].clip")
+        }));
         assert!(!finding.repair.trim().is_empty());
         std::fs::remove_dir_all(root).unwrap();
     }
 
+    #[test]
+    fn missing_import_default_clip_blocks_the_generated_manifest() {
+        let root = fixture_root();
+        let source_path = "assets/models/hero.glb";
+        let missing = animation_clip_sub_asset_id(9, "Removed");
+        let mut manifest = animation_fixture_manifest(source_path, "glb", "rig-signature", true);
+        manifest.default_animation_clip_id = Some(missing.clone());
+        write_animation_source_and_registry_default(&root, source_path, &missing);
+        write_animation_manifest(&root, &manifest);
+
+        let report = validate_project(&root);
+
+        let finding = report
+            .findings
+            .iter()
+            .find(|finding| finding.code == "animation.default_clip_missing")
+            .expect("a stale import default must be a blocking project diagnostic");
+        assert_eq!(finding.severity, ValidationSeverity::Error);
+        assert_eq!(finding.reference.as_deref(), Some(missing.as_str()));
+        assert!(finding.repair.contains("Default animation"));
+        assert!(!report.is_release_ready());
+        std::fs::remove_dir_all(root).unwrap();
+    }
+
     #[test]
     fn invalid_animation_state_contract_reports_each_actor_property() {
         let root = fixture_root();
@@ -2757,9 +3332,9 @@ mod tests {
                     && finding.owner_actor_id.as_deref() == Some("animated-actor")
             })
             .expect("signature mismatch must identify the owning actor state");
-        assert!(finding.reference.as_deref().is_some_and(
-            |reference| reference.contains("AnimationControllerDesc.states[idle].clip")
-        ));
+        assert!(finding.reference.as_deref().is_some_and(|reference| {
+            reference.contains("AnimationControllerDesc.states[idle].clip")
+        }));
         assert!(finding.repair.contains("does not retarget"));
         assert!(!report.is_release_ready());
         std::fs::remove_dir_all(root).unwrap();
diff --git a/crates/scene/src/upgrade.rs b/crates/scene/src/upgrade.rs
new file mode 100644
index 0000000..761a46f
--- /dev/null
+++ b/crates/scene/src/upgrade.rs
@@ -0,0 +1,450 @@
+//! Explicit, transactional project content upgrade support.
+
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use serde::Serialize;
+use shared::{
+    AuthoringComponentStates, ComponentInstanceId, InspectorOrder, MaterialAsset,
+    MaterialInstanceAsset, MaterialRef, RendererMaterialSlot, ShaderSchemaAsset,
+    StaticMeshRenderer, COMPONENT_STATIC_MESH_RENDERER,
+};
+
+use crate::document::{SceneComponentBlob, SceneDocument};
+
+const INSPECTOR_ORDER_COMPONENT: &str = "shared::components::InspectorOrder";
+const AUTHORING_COMPONENT_STATES_COMPONENT: &str = "shared::components::AuthoringComponentStates";
+
+#[derive(Debug, Clone, Serialize)]
+pub struct ProjectUpgradeChange {
+    pub path: String,
+    pub kind: String,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct ProjectUpgradeReport {
+    pub applied: bool,
+    pub backup_path: Option<String>,
+    pub changes: Vec<ProjectUpgradeChange>,
+    pub warnings: Vec<String>,
+}
+
+struct PendingWrite {
+    path: PathBuf,
+    contents: String,
+    kind: &'static str,
+}
+
+pub fn upgrade_project(root: &Path, apply: bool) -> Result<ProjectUpgradeReport, String> {
+    let assets = root.join("assets");
+    let mut files = Vec::new();
+    collect_files(&assets, &mut files)?;
+    files.sort();
+
+    let mut pending = Vec::new();
+    let mut warnings = Vec::new();
+    for path in files {
+        if path
+            .file_name()
+            .and_then(|name| name.to_str())
+            .is_some_and(|name| name.starts_with('.'))
+        {
+            continue;
+        }
+        let relative = path.strip_prefix(root).unwrap_or(&path);
+        let normalized = relative.to_string_lossy().replace('\\', "/");
+        let Some(original) = fs::read_to_string(&path).ok() else {
+            continue;
+        };
+        let upgraded = if normalized.ends_with(".scn.ron") || normalized.ends_with(".prefab.ron") {
+            match canonical_scene_document(&original) {
+                Ok(value) => Some((value, "scene-schema")),
+                Err(error) => {
+                    warnings.push(format!("{normalized}: {error}"));
+                    None
+                }
+            }
+        } else if normalized.contains("/materials/") && normalized.ends_with(".ron") {
+            canonical_material_document(&path, &original)
+        } else if normalized.contains("/shaders/") && normalized.ends_with(".shader.ron") {
+            canonical_shader_document(&original)
+        } else {
+            None
+        };
+        let Some((contents, kind)) = upgraded else {
+            continue;
+        };
+        if normalize_text(&contents) != normalize_text(&original) {
+            pending.push(PendingWrite {
+                path,
+                contents,
+                kind,
+            });
+        }
+    }
+
+    let changes = pending
+        .iter()
+        .map(|write| ProjectUpgradeChange {
+            path: write
+                .path
+                .strip_prefix(root)
+                .unwrap_or(&write.path)
+                .to_string_lossy()
+                .replace('\\', "/"),
+            kind: write.kind.to_string(),
+        })
+        .collect::<Vec<_>>();
+    if !apply || pending.is_empty() {
+        return Ok(ProjectUpgradeReport {
+            applied: false,
+            backup_path: None,
+            changes,
+            warnings,
+        });
+    }
+
+    let timestamp = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map_err(|error| error.to_string())?
+        .as_secs();
+    let backup_root = root
+        .join(".blacksite")
+        .join("backups")
+        .join(format!("material-component-v4-{timestamp}"));
+    for write in &pending {
+        let relative = write
+            .path
+            .strip_prefix(root)
+            .map_err(|error| error.to_string())?;
+        let backup = backup_root.join(relative);
+        if let Some(parent) = backup.parent() {
+            fs::create_dir_all(parent).map_err(|error| error.to_string())?;
+        }
+        fs::copy(&write.path, &backup).map_err(|error| {
+            format!(
+                "could not back up {} to {}: {error}",
+                write.path.display(),
+                backup.display()
+            )
+        })?;
+    }
+
+    let mut staged = Vec::new();
+    for (index, write) in pending.iter().enumerate() {
+        let temporary = write
+            .path
+            .with_extension(format!("blacksite-upgrade-{index}.tmp"));
+        fs::write(&temporary, &write.contents)
+            .map_err(|error| format!("could not stage {}: {error}", write.path.display()))?;
+        staged.push((temporary, write.path.clone()));
+    }
+    for (temporary, destination) in &staged {
+        if let Err(error) = fs::rename(temporary, destination) {
+            for change in &changes {
+                let backup = backup_root.join(&change.path);
+                let destination = root.join(&change.path);
+                let _ = fs::copy(backup, destination);
+            }
+            return Err(format!(
+                "project upgrade failed while replacing {} and was rolled back: {error}",
+                destination.display()
+            ));
+        }
+    }
+
+    Ok(ProjectUpgradeReport {
+        applied: true,
+        backup_path: Some(
+            backup_root
+                .strip_prefix(root)
+                .unwrap_or(&backup_root)
+                .to_string_lossy()
+                .replace('\\', "/"),
+        ),
+        changes,
+        warnings,
+    })
+}
+
+fn canonical_scene_document(text: &str) -> Result<String, String> {
+    let mut document = SceneDocument::from_ron_text(text)?;
+    for entity in &mut document.entities {
+        let present_types = entity
+            .components
+            .iter()
+            .filter(|component| shared::authoring_component_id(&component.type_name).is_some())
+            .map(|component| component.type_name.clone())
+            .collect::<Vec<_>>();
+
+        if let Some(component) = entity
+            .components
+            .iter_mut()
+            .find(|component| component.type_name == COMPONENT_STATIC_MESH_RENDERER)
+        {
+            let mut renderer: StaticMeshRenderer =
+                ron::from_str(&component.ron).map_err(|error| {
+                    format!("could not upgrade StaticMeshRenderer component: {error}")
+                })?;
+            normalize_static_renderer(&mut renderer);
+            *component =
+                SceneComponentBlob::from_serializable(COMPONENT_STATIC_MESH_RENDERER, &renderer)?;
+        }
+
+        let states_index = entity
+            .components
+            .iter()
+            .position(|component| component.type_name == AUTHORING_COMPONENT_STATES_COMPONENT);
+        let mut states = states_index
+            .and_then(|index| {
+                ron::from_str::<AuthoringComponentStates>(&entity.components[index].ron).ok()
+            })
+            .unwrap_or_default();
+        normalize_component_states(&mut states);
+
+        let mut migrated_legacy_state = false;
+        if let Some(order_index) = entity
+            .components
+            .iter()
+            .position(|component| component.type_name == INSPECTOR_ORDER_COMPONENT)
+        {
+            let mut order: InspectorOrder = ron::from_str(&entity.components[order_index].ron)
+                .map_err(|error| format!("could not upgrade InspectorOrder component: {error}"))?;
+            for legacy in std::mem::take(&mut order.component_states) {
+                let key = if legacy.component_id.trim().is_empty() {
+                    legacy.type_name
+                } else {
+                    legacy.component_id
+                };
+                if !key.trim().is_empty() {
+                    states.set_component_active(key, legacy.active);
+                    migrated_legacy_state = true;
+                }
+            }
+            let present = present_types.iter().map(String::as_str).collect::<Vec<_>>();
+            order.ensure_component_order(&present);
+            entity.components[order_index] =
+                SceneComponentBlob::from_serializable(INSPECTOR_ORDER_COMPONENT, &order)?;
+        }
+        if states_index.is_some() || migrated_legacy_state {
+            let component = SceneComponentBlob::from_serializable(
+                AUTHORING_COMPONENT_STATES_COMPONENT,
+                &states,
+            )?;
+            if let Some(index) = states_index {
+                entity.components[index] = component;
+            } else {
+                entity.components.push(component);
+            }
+        }
+    }
+    document.to_ron_text()
+}
+
+fn normalize_static_renderer(renderer: &mut StaticMeshRenderer) {
+    for (index, part) in renderer.slots.iter_mut().enumerate() {
+        if part.id.is_empty() {
+            let id = if part.mesh.sub_asset_id.trim().is_empty() {
+                format!("draw:legacy:{index}")
+            } else {
+                part.mesh.sub_asset_id.clone()
+            };
+            part.id = ComponentInstanceId::new(id);
+        }
+        if part.material_slot_id.is_empty() {
+            part.material_slot_id = ComponentInstanceId::new(format!("slot:{}", part.id.0));
+        }
+        let legacy_material = part.material.take().map(MaterialRef::new);
+        if let Some(slot) = renderer.materials.slot_mut(&part.material_slot_id) {
+            if slot.source_material.is_none() {
+                slot.source_material = legacy_material;
+            }
+            if slot.name.trim().is_empty() {
+                slot.name = part.name.clone();
+            }
+        } else {
+            renderer.materials.slots.push(RendererMaterialSlot {
+                id: part.material_slot_id.clone(),
+                name: part.name.clone(),
+                source_material: legacy_material,
+                material: None,
+            });
+        }
+    }
+}
+
+fn normalize_component_states(states: &mut AuthoringComponentStates) {
+    let old = std::mem::take(&mut states.states);
+    for state in old {
+        let key = if state.component_id.trim().is_empty() {
+            state.type_name
+        } else {
+            state.component_id
+        };
+        if !key.trim().is_empty() {
+            states.set_component_active(key, state.active);
+        }
+    }
+}
+
+fn canonical_material_document(path: &Path, text: &str) -> Option<(String, &'static str)> {
+    if let Ok(asset) = ron::from_str::<MaterialAsset>(text) {
+        return ron::ser::to_string_pretty(&asset, ron::ser::PrettyConfig::default())
+            .ok()
+            .map(|text| (text, "material-schema"));
+    }
+    if let Ok(instance) = ron::from_str::<MaterialInstanceAsset>(text) {
+        return ron::ser::to_string_pretty(&instance, ron::ser::PrettyConfig::default())
+            .ok()
+            .map(|text| (text, "material-instance-schema"));
+    }
+    let _ = path;
+    None
+}
+
+fn canonical_shader_document(text: &str) -> Option<(String, &'static str)> {
+    let schema = ron::from_str::<ShaderSchemaAsset>(text).ok()?;
+    ron::ser::to_string_pretty(&schema, ron::ser::PrettyConfig::default())
+        .ok()
+        .map(|text| (text, "surface-shader-schema"))
+}
+
+fn collect_files(path: &Path, output: &mut Vec<PathBuf>) -> Result<(), String> {
+    if !path.exists() {
+        return Ok(());
+    }
+    for entry in fs::read_dir(path).map_err(|error| error.to_string())? {
+        let entry = entry.map_err(|error| error.to_string())?;
+        let path = entry.path();
+        if entry
+            .file_type()
+            .map_err(|error| error.to_string())?
+            .is_dir()
+        {
+            collect_files(&path, output)?;
+        } else {
+            output.push(path);
+        }
+    }
+    Ok(())
+}
+
+fn normalize_text(text: &str) -> String {
+    text.trim().replace("\r\n", "\n")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use shared::{
+        EditorAssetRef, InspectorComponentState, MeshRenderSlot,
+        AUTHORING_COMPONENT_STATIC_MESH_RENDERER,
+    };
+
+    #[test]
+    fn dry_run_does_not_write_and_apply_creates_backup() {
+        let root = std::env::temp_dir().join(format!(
+            "blacksite-upgrader-{}",
+            SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        let level = root.join("assets/levels/main.scn.ron");
+        fs::create_dir_all(level.parent().unwrap()).unwrap();
+        fs::write(&level, "(schema_version: 3, resources: {}, entities: {})").unwrap();
+
+        let dry_run = upgrade_project(&root, false).unwrap();
+        assert!(!dry_run.applied);
+        assert_eq!(dry_run.changes.len(), 1);
+        assert!(fs::read_to_string(&level)
+            .unwrap()
+            .contains("schema_version: 3"));
+
+        let applied = upgrade_project(&root, true).unwrap();
+        assert!(applied.applied);
+        assert!(fs::read_to_string(&level)
+            .unwrap()
+            .contains("schema_version: 4"));
+        assert!(root.join(applied.backup_path.unwrap()).exists());
+        fs::remove_dir_all(root).unwrap();
+    }
+
+    #[test]
+    fn canonical_upgrade_materializes_slots_and_separates_active_state() {
+        let renderer = StaticMeshRenderer {
+            slots: vec![MeshRenderSlot {
+                id: ComponentInstanceId::new("draw:body"),
+                name: "Body".into(),
+                mesh: EditorAssetRef::new("model", "mesh:body", "Body"),
+                material: Some(EditorAssetRef::new(
+                    "model",
+                    "material:body",
+                    "Body Material",
+                )),
+                ..Default::default()
+            }],
+            ..Default::default()
+        };
+        let order = InspectorOrder {
+            component_type_names: vec![COMPONENT_STATIC_MESH_RENDERER.into()],
+            component_states: vec![InspectorComponentState {
+                type_name: COMPONENT_STATIC_MESH_RENDERER.into(),
+                active: false,
+                ..Default::default()
+            }],
+            ..Default::default()
+        };
+        let text = format!(
+            "(schema_version: 3, resources: {{}}, entities: {{1: (components: {{\"{COMPONENT_STATIC_MESH_RENDERER}\": {}, \"{INSPECTOR_ORDER_COMPONENT}\": {}}})}})",
+            ron::to_string(&renderer).unwrap(),
+            ron::to_string(&order).unwrap(),
+        );
+
+        let upgraded = canonical_scene_document(&text).unwrap();
+        let document = SceneDocument::from_ron_text(&upgraded).unwrap();
+        let components = &document.entities[0].components;
+        let renderer: StaticMeshRenderer = ron::from_str(
+            &components
+                .iter()
+                .find(|component| component.type_name == COMPONENT_STATIC_MESH_RENDERER)
+                .unwrap()
+                .ron,
+        )
+        .unwrap();
+        assert!(renderer.slots[0].material.is_none());
+        assert_eq!(renderer.materials.slots.len(), 1);
+        assert_eq!(
+            renderer.materials.slots[0]
+                .source_material
+                .as_ref()
+                .unwrap()
+                .0
+                .sub_asset_id,
+            "material:body"
+        );
+        let order: InspectorOrder = ron::from_str(
+            &components
+                .iter()
+                .find(|component| component.type_name == INSPECTOR_ORDER_COMPONENT)
+                .unwrap()
+                .ron,
+        )
+        .unwrap();
+        assert!(order.component_states.is_empty());
+        assert_eq!(
+            order.component_ids,
+            vec![AUTHORING_COMPONENT_STATIC_MESH_RENDERER]
+        );
+        let states: AuthoringComponentStates = ron::from_str(
+            &components
+                .iter()
+                .find(|component| component.type_name == AUTHORING_COMPONENT_STATES_COMPONENT)
+                .unwrap()
+                .ron,
+        )
+        .unwrap();
+        assert!(!states.is_component_active(COMPONENT_STATIC_MESH_RENDERER));
+    }
+}
diff --git a/crates/shared/src/actor.rs b/crates/shared/src/actor.rs
index 3bd8b2e..36bdeca 100644
--- a/crates/shared/src/actor.rs
+++ b/crates/shared/src/actor.rs
@@ -9,14 +9,37 @@ use bevy::prelude::*;
 use crate::{
     animation_clip_source_index, animation_skeleton_source_index, brush_math::validate_brush,
     ActorKind, AnimationControllerDesc, AudioListenerDesc, AudioSourceDesc, BrushDesc, LevelObject,
-    LightDesc, ModelRef, ObjectiveMarker, PlayerSpawn, PostProcessVolumeDesc, PrefabInstance,
-    PrefabRef, Primitive, StaticMeshRenderer, TeamSpawn, TriggerVolume, WeaponSpawn,
+    LightDesc, ModelRef, NavigationArea, NavigationBounds, NavigationLink, NavigationObstacle,
+    ObjectiveMarker, PlayerSpawn, PostProcessVolumeDesc, PrefabInstance, PrefabRef, Primitive,
+    SkinnedMeshRenderer, StaticMeshRenderer, TeamSpawn, TriggerVolume, WeaponSpawn,
     AUDIO_CLIP_SUB_ASSET_ID,
 };
 
-/// One-shot deterministic kind from authoring components (scene migration only).
+/// Deterministic presentation/compatibility hint derived from authoring components.
+///
+/// Validation is component-driven; this priority only chooses an icon/default
+/// label when an actor composes several compatible behaviors (for example a
+/// rendered mesh with a light).
 pub fn infer_actor_kind(entity: EntityRef<'_>) -> Option<ActorKind> {
     entity.get::<LevelObject>()?;
+    if entity.get::<PrefabRef>().is_some() || entity.get::<PrefabInstance>().is_some() {
+        return Some(ActorKind::PrefabAnchor);
+    }
+    if entity.get::<SkinnedMeshRenderer>().is_some() {
+        return Some(ActorKind::SkinnedMesh);
+    }
+    if entity.get::<BrushDesc>().is_some() {
+        return Some(ActorKind::Brush);
+    }
+    if entity.get::<Primitive>().is_some() || entity.get::<StaticMeshRenderer>().is_some() {
+        return Some(ActorKind::StaticMesh);
+    }
+    if entity.get::<ModelRef>().is_some() {
+        return Some(ActorKind::ImportedModel);
+    }
+    if entity.get::<LightDesc>().is_some() {
+        return Some(ActorKind::Light);
+    }
     if entity.get::<PlayerSpawn>().is_some() {
         return Some(ActorKind::PlayerSpawn);
     }
@@ -35,27 +58,19 @@ pub fn infer_actor_kind(entity: EntityRef<'_>) -> Option<ActorKind> {
     if entity.get::<ObjectiveMarker>().is_some() {
         return Some(ActorKind::Objective);
     }
-    if entity.get::<LightDesc>().is_some() {
-        return Some(ActorKind::Light);
-    }
-    if entity.get::<BrushDesc>().is_some() {
-        return Some(ActorKind::Brush);
-    }
-    if entity.get::<Primitive>().is_some() || entity.get::<StaticMeshRenderer>().is_some() {
-        return Some(ActorKind::StaticMesh);
-    }
-    if entity.get::<ModelRef>().is_some() {
-        return Some(ActorKind::ImportedModel);
-    }
-    if entity.get::<PrefabRef>().is_some() || entity.get::<PrefabInstance>().is_some() {
-        return Some(ActorKind::PrefabAnchor);
-    }
     if entity.get::<AudioSourceDesc>().is_some() {
         return Some(ActorKind::AudioSource);
     }
     if entity.get::<AudioListenerDesc>().is_some() {
         return Some(ActorKind::AudioListener);
     }
+    if entity.get::<NavigationBounds>().is_some()
+        || entity.get::<NavigationObstacle>().is_some()
+        || entity.get::<NavigationArea>().is_some()
+        || entity.get::<NavigationLink>().is_some()
+    {
+        return Some(ActorKind::Navigation);
+    }
     Some(ActorKind::Empty)
 }
 
@@ -75,6 +90,13 @@ pub enum ActorValidationError {
     ImportedModelMissingModelRef,
     ImportedModelHasPrimitive,
     ImportedModelHasStaticMeshRenderer,
+    SkinnedMeshMissingRenderer,
+    SkinnedMeshInvalidRenderer,
+    SkinnedMeshHasPrimitive,
+    SkinnedMeshHasStaticMeshRenderer,
+    SkinnedMeshHasModelRef,
+    SkinnedMeshRendererActorKindMismatch,
+    ConflictingGeometrySources,
     LightMissingLightDesc,
     LightHasPrimitive,
     LightHasModelRef,
@@ -93,7 +115,7 @@ pub enum ActorValidationError {
     AudioSourceMissingBus,
     AudioListenerMissingDesc,
     AudioListenerInvalidEarGap,
-    AnimationControllerMissingModelRef,
+    AnimationControllerMissingSkinnedMeshRenderer,
     AnimationControllerMissingSkeleton,
     AnimationControllerInvalidSkeletonReference,
     AnimationControllerEmptyStateId,
@@ -104,6 +126,7 @@ pub enum ActorValidationError {
     AnimationControllerInvalidCrossfade,
     AnimationControllerMissingDefaultState,
     AnimationControllerUnknownDefaultState,
+    InvalidNavigation(String),
 }
 
 fn is_finite_positive(v: f32) -> bool {
@@ -120,9 +143,10 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
         return Ok(());
     }
 
-    let Some(kind) = entity.get::<ActorKind>() else {
+    let Some(_stored_kind) = entity.get::<ActorKind>() else {
         return Err(ActorValidationError::MissingActorKind);
     };
+    let kind = infer_actor_kind(entity).unwrap_or(ActorKind::Empty);
 
     if entity.get::<Transform>().is_none() {
         return Err(ActorValidationError::MissingTransform);
@@ -135,13 +159,50 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
         validate_audio_listener(listener)?;
     }
     if let Some(controller) = entity.get::<AnimationControllerDesc>() {
-        if entity.get::<ModelRef>().is_none() {
-            return Err(ActorValidationError::AnimationControllerMissingModelRef);
+        if entity.get::<SkinnedMeshRenderer>().is_none() {
+            return Err(ActorValidationError::AnimationControllerMissingSkinnedMeshRenderer);
         }
         validate_animation_controller(controller)?;
     }
+    let geometry_source_count = usize::from(entity.get::<Primitive>().is_some())
+        + usize::from(entity.get::<BrushDesc>().is_some())
+        + usize::from(entity.get::<StaticMeshRenderer>().is_some())
+        + usize::from(entity.get::<SkinnedMeshRenderer>().is_some())
+        + usize::from(entity.get::<ModelRef>().is_some());
+    if geometry_source_count > 1 {
+        return Err(ActorValidationError::ConflictingGeometrySources);
+    }
+    if let Some(brush) = entity.get::<BrushDesc>() {
+        let report = validate_brush(brush);
+        if !report.is_valid() {
+            let message = report
+                .diagnostics
+                .into_iter()
+                .find(|diagnostic| {
+                    diagnostic.severity == crate::brush_math::BrushDiagnosticSeverity::Error
+                })
+                .map(|diagnostic| diagnostic.message)
+                .unwrap_or_else(|| "Brush geometry is invalid.".to_string());
+            return Err(ActorValidationError::InvalidBrushGeometry(message));
+        }
+    }
+    if let Some(renderer) = entity.get::<SkinnedMeshRenderer>() {
+        if renderer.path.trim().is_empty() {
+            return Err(ActorValidationError::SkinnedMeshInvalidRenderer);
+        }
+    }
+    if let Some(desc) = entity.get::<PostProcessVolumeDesc>() {
+        validate_post_process_volume(desc)?;
+    }
+    if entity.get::<NavigationBounds>().is_some()
+        || entity.get::<NavigationObstacle>().is_some()
+        || entity.get::<NavigationArea>().is_some()
+        || entity.get::<NavigationLink>().is_some()
+    {
+        validate_navigation_actor(entity)?;
+    }
 
-    match kind {
+    match &kind {
         ActorKind::Brush => {
             let Some(brush) = entity.get::<BrushDesc>() else {
                 return Err(ActorValidationError::BrushMissingDesc);
@@ -152,24 +213,10 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
             if entity.get::<StaticMeshRenderer>().is_some() {
                 return Err(ActorValidationError::BrushHasStaticMeshRenderer);
             }
-            if entity.get::<LightDesc>().is_some() {
-                return Err(ActorValidationError::BrushHasLight);
-            }
             if entity.get::<ModelRef>().is_some() {
                 return Err(ActorValidationError::BrushHasModelRef);
             }
-            let report = validate_brush(brush);
-            if !report.is_valid() {
-                let message = report
-                    .diagnostics
-                    .into_iter()
-                    .find(|diagnostic| {
-                        diagnostic.severity == crate::brush_math::BrushDiagnosticSeverity::Error
-                    })
-                    .map(|diagnostic| diagnostic.message)
-                    .unwrap_or_else(|| "Brush geometry is invalid.".to_string());
-                return Err(ActorValidationError::InvalidBrushGeometry(message));
-            }
+            let _ = brush;
         }
         ActorKind::StaticMesh => {
             let has_static_mesh_renderer = entity
@@ -178,13 +225,24 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
             if entity.get::<Primitive>().is_none() && !has_static_mesh_renderer {
                 return Err(ActorValidationError::StaticMeshMissingPrimitive);
             }
-            if entity.get::<LightDesc>().is_some() {
-                return Err(ActorValidationError::StaticMeshHasLight);
-            }
             if entity.get::<ModelRef>().is_some() {
                 return Err(ActorValidationError::StaticMeshHasModelRef);
             }
         }
+        ActorKind::SkinnedMesh => {
+            let Some(_renderer) = entity.get::<SkinnedMeshRenderer>() else {
+                return Err(ActorValidationError::SkinnedMeshMissingRenderer);
+            };
+            if entity.get::<Primitive>().is_some() {
+                return Err(ActorValidationError::SkinnedMeshHasPrimitive);
+            }
+            if entity.get::<StaticMeshRenderer>().is_some() {
+                return Err(ActorValidationError::SkinnedMeshHasStaticMeshRenderer);
+            }
+            if entity.get::<ModelRef>().is_some() {
+                return Err(ActorValidationError::SkinnedMeshHasModelRef);
+            }
+        }
         ActorKind::ImportedModel => {
             if entity.get::<ModelRef>().is_none() {
                 return Err(ActorValidationError::ImportedModelMissingModelRef);
@@ -200,40 +258,13 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
             if entity.get::<LightDesc>().is_none() {
                 return Err(ActorValidationError::LightMissingLightDesc);
             }
-            if entity.get::<Primitive>().is_some() {
-                return Err(ActorValidationError::LightHasPrimitive);
-            }
-            if entity.get::<ModelRef>().is_some() {
-                return Err(ActorValidationError::LightHasModelRef);
-            }
-            if entity.get::<StaticMeshRenderer>().is_some() {
-                return Err(ActorValidationError::LightHasStaticMeshRenderer);
-            }
+            // Other compatible authoring components may be composed with a light.
         }
         ActorKind::PostProcessVolume => {
             let Some(desc) = entity.get::<PostProcessVolumeDesc>() else {
                 return Err(ActorValidationError::PostProcessVolumeMissingDesc);
             };
-            if !is_finite_positive(desc.half_extents.x)
-                || !is_finite_positive(desc.half_extents.y)
-                || !is_finite_positive(desc.half_extents.z)
-            {
-                return Err(ActorValidationError::PostProcessVolumeInvalidHalfExtents);
-            }
-            if !is_finite_non_negative(desc.blend_distance) {
-                return Err(ActorValidationError::PostProcessVolumeInvalidBlendDistance);
-            }
-            let o = &desc.overrides;
-            if let Some(v) = o.exposure_ev100 {
-                if !v.is_finite() {
-                    return Err(ActorValidationError::PostProcessVolumeInvalidOverrideScalar);
-                }
-            }
-            if let Some(v) = o.fog_density {
-                if !v.is_finite() || v < 0.0 {
-                    return Err(ActorValidationError::PostProcessVolumeInvalidOverrideScalar);
-                }
-            }
+            let _ = desc;
         }
         ActorKind::AudioSource => {
             if entity.get::<AudioSourceDesc>().is_none() {
@@ -245,6 +276,7 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
                 return Err(ActorValidationError::AudioListenerMissingDesc);
             }
         }
+        ActorKind::Navigation => {}
         ActorKind::Empty
         | ActorKind::PrefabAnchor
         | ActorKind::PlayerSpawn
@@ -257,6 +289,93 @@ pub fn validate_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError>
     Ok(())
 }
 
+fn validate_post_process_volume(desc: &PostProcessVolumeDesc) -> Result<(), ActorValidationError> {
+    if !is_finite_positive(desc.half_extents.x)
+        || !is_finite_positive(desc.half_extents.y)
+        || !is_finite_positive(desc.half_extents.z)
+    {
+        return Err(ActorValidationError::PostProcessVolumeInvalidHalfExtents);
+    }
+    if !is_finite_non_negative(desc.blend_distance) {
+        return Err(ActorValidationError::PostProcessVolumeInvalidBlendDistance);
+    }
+    let overrides = &desc.overrides;
+    if overrides
+        .exposure_ev100
+        .is_some_and(|value| !value.is_finite())
+        || overrides
+            .fog_density
+            .is_some_and(|value| !value.is_finite() || value < 0.0)
+    {
+        return Err(ActorValidationError::PostProcessVolumeInvalidOverrideScalar);
+    }
+    Ok(())
+}
+
+fn validate_navigation_actor(entity: EntityRef<'_>) -> Result<(), ActorValidationError> {
+    let mut component_count = 0;
+    if let Some(bounds) = entity.get::<NavigationBounds>() {
+        component_count += 1;
+        validate_vec3_positive(bounds.half_extents, "navigation bounds")?;
+        bounds
+            .agent
+            .validate()
+            .map_err(|error| ActorValidationError::InvalidNavigation(error.into()))?;
+        if bounds.artifact_path.trim().is_empty() {
+            return Err(ActorValidationError::InvalidNavigation(
+                "navigation artifact path must not be empty".into(),
+            ));
+        }
+    }
+    if let Some(obstacle) = entity.get::<NavigationObstacle>() {
+        component_count += 1;
+        validate_vec3_positive(obstacle.half_extents, "navigation obstacle")?;
+    }
+    if let Some(area) = entity.get::<NavigationArea>() {
+        component_count += 1;
+        validate_vec3_positive(area.half_extents, "navigation area")?;
+        if area.id.trim().is_empty() {
+            return Err(ActorValidationError::InvalidNavigation(
+                "navigation area ID must not be empty".into(),
+            ));
+        }
+        if !is_finite_positive(area.cost) {
+            return Err(ActorValidationError::InvalidNavigation(
+                "navigation area cost must be finite and greater than zero".into(),
+            ));
+        }
+    }
+    if let Some(link) = entity.get::<NavigationLink>() {
+        component_count += 1;
+        if !link.start.is_finite() || !link.end.is_finite() || link.start == link.end {
+            return Err(ActorValidationError::InvalidNavigation(
+                "navigation link endpoints must be finite and distinct".into(),
+            ));
+        }
+        if !is_finite_positive(link.cost) {
+            return Err(ActorValidationError::InvalidNavigation(
+                "navigation link cost must be finite and greater than zero".into(),
+            ));
+        }
+    }
+    if component_count != 1 {
+        return Err(ActorValidationError::InvalidNavigation(
+            "navigation actors must own exactly one bounds, obstacle, area, or link component"
+                .into(),
+        ));
+    }
+    Ok(())
+}
+
+fn validate_vec3_positive(value: Vec3, label: &str) -> Result<(), ActorValidationError> {
+    if !value.is_finite() || value.min_element() <= 0.0 {
+        return Err(ActorValidationError::InvalidNavigation(format!(
+            "{label} half extents must be finite and greater than zero"
+        )));
+    }
+    Ok(())
+}
+
 fn validate_audio_source(source: &AudioSourceDesc) -> Result<(), ActorValidationError> {
     let Some(clip) = source.clip.as_ref() else {
         return Err(ActorValidationError::AudioSourceMissingClip);
@@ -423,7 +542,7 @@ mod tests {
     }
 
     #[test]
-    fn validate_static_mesh_rejects_light() {
+    fn validate_static_mesh_composes_with_light_and_uses_derived_hint() {
         let mut world = World::new();
         let e = level_entity(
             &mut world,
@@ -433,9 +552,10 @@ mod tests {
                 LightDesc::default(),
             ),
         );
+        assert!(validate_actor(world.entity(e)).is_ok());
         assert_eq!(
-            validate_actor(world.entity(e)),
-            Err(ActorValidationError::StaticMeshHasLight)
+            infer_actor_kind(world.entity(e)),
+            Some(ActorKind::StaticMesh)
         );
     }
 
@@ -459,7 +579,7 @@ mod tests {
         );
         assert_eq!(
             validate_actor(world.entity(e)),
-            Err(ActorValidationError::BrushHasStaticMeshRenderer)
+            Err(ActorValidationError::ConflictingGeometrySources)
         );
     }
 
@@ -587,20 +707,17 @@ mod tests {
     }
 
     #[test]
-    fn animation_controller_requires_model_and_resolved_skeleton() {
+    fn animation_controller_requires_skinned_renderer_and_resolved_skeleton() {
         let mut world = World::new();
-        let entity = level_entity(
-            &mut world,
-            (ActorKind::ImportedModel, animation_controller()),
-        );
+        let entity = level_entity(&mut world, (ActorKind::SkinnedMesh, animation_controller()));
         assert_eq!(
             validate_actor(world.entity(entity)),
-            Err(ActorValidationError::AnimationControllerMissingModelRef)
+            Err(ActorValidationError::AnimationControllerMissingSkinnedMeshRenderer)
         );
 
         world
             .entity_mut(entity)
-            .insert(ModelRef::new("assets/models/animated.glb"));
+            .insert(SkinnedMeshRenderer::new("assets/models/animated.glb"));
         let mut controller = animation_controller();
         controller.skeleton = None;
         world.entity_mut(entity).insert(controller);
@@ -627,8 +744,8 @@ mod tests {
         let entity = level_entity(
             &mut world,
             (
-                ActorKind::ImportedModel,
-                ModelRef::new("assets/models/animated.glb"),
+                ActorKind::SkinnedMesh,
+                SkinnedMeshRenderer::new("assets/models/animated.glb"),
                 animation_controller(),
             ),
         );
@@ -666,8 +783,8 @@ mod tests {
         let entity = level_entity(
             &mut world,
             (
-                ActorKind::ImportedModel,
-                ModelRef::new("assets/models/animated.glb"),
+                ActorKind::SkinnedMesh,
+                SkinnedMeshRenderer::new("assets/models/animated.glb"),
                 animation_controller(),
             ),
         );
diff --git a/crates/shared/src/animation.rs b/crates/shared/src/animation.rs
index d8d4a6b..2e8b5d5 100644
--- a/crates/shared/src/animation.rs
+++ b/crates/shared/src/animation.rs
@@ -5,10 +5,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::EditorAssetRef;
 
-pub const ANIMATION_MANIFEST_SCHEMA_VERSION: u32 = 2;
+pub const ANIMATION_MANIFEST_SCHEMA_VERSION: u32 = 3;
 pub const ANIMATION_ARTIFACT_DIR: &str = "assets/animations/generated";
 pub const ANIMATION_CLIP_SUB_ASSET_PREFIX: &str = "animation:clip:";
 pub const ANIMATION_SKELETON_SUB_ASSET_PREFIX: &str = "animation:skeleton:";
+pub const COMPONENT_SKINNED_MESH_RENDERER: &str = "shared::animation::SkinnedMeshRenderer";
 pub const COMPONENT_ANIMATION_CONTROLLER_DESC: &str = "shared::animation::AnimationControllerDesc";
 
 const DEFAULT_CROSSFADE_SECONDS: f32 = 0.2;
@@ -75,6 +76,54 @@ impl AnimationSkeletonSignature {
     }
 }
 
+/// Authoring renderer for rigged geometry that must retain its imported joint hierarchy.
+///
+/// Unlike [`crate::StaticMeshRenderer`], this component never flattens source primitives into
+/// independent mesh slots. Hydration instantiates the selected model scene so Bevy can preserve
+/// its `SkinnedMesh`, joint entities, inverse bind poses, and animation player bindings.
+#[derive(Component, Reflect, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct SkinnedMeshRenderer {
+    /// Stable asset-registry UUID. Empty only for legacy or unresolved references.
+    #[serde(default)]
+    pub asset_id: String,
+    /// Asset path relative to `assets/`, e.g. `models/character.glb`.
+    pub path: String,
+    /// Scene index whose hierarchy owns the skinned primitives and joints.
+    #[serde(default)]
+    pub scene_index: usize,
+    /// Stable material slots for every draw binding in the imported animated hierarchy.
+    #[serde(default)]
+    pub materials: crate::RendererMaterialSet,
+}
+
+impl SkinnedMeshRenderer {
+    pub fn new(path: impl Into<String>) -> Self {
+        Self {
+            asset_id: String::new(),
+            path: path.into(),
+            scene_index: 0,
+            materials: crate::RendererMaterialSet::default(),
+        }
+    }
+
+    pub fn with_asset_id(mut self, asset_id: impl Into<String>) -> Self {
+        self.asset_id = asset_id.into();
+        self
+    }
+
+    /// Asset-server path for FBX `#SceneN` labels (see `bevy_ufbx`).
+    pub fn fbx_scene_asset_path(path: &str, scene_index: usize) -> String {
+        format!("{path}#Scene{scene_index}")
+    }
+}
+
+impl Default for SkinnedMeshRenderer {
+    fn default() -> Self {
+        Self::new(String::new())
+    }
+}
+
 /// Authored playback window inside an imported clip.
 #[derive(Reflect, Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 #[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
@@ -135,7 +184,7 @@ impl Default for AnimationStateDesc {
     }
 }
 
-/// Scene-authored single-layer animation controller.
+/// Scene-authored single-layer animation controller for a sibling [`SkinnedMeshRenderer`].
 ///
 /// Bevy graph, player, transition, and instantiated-world state are derived at runtime.
 #[derive(Component, Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -191,6 +240,12 @@ pub struct AnimationManifest {
     pub schema_version: u32,
     pub asset_id: String,
     pub label: String,
+    /// Explicit imported clip shown as the asset's edit-mode rest presentation.
+    ///
+    /// This is a stable clip sub-asset ID. `None` deliberately preserves the imported node pose;
+    /// importers and placement code must never guess the first clip.
+    #[serde(default)]
+    pub default_animation_clip_id: Option<String>,
     pub source: AnimationManifestSource,
     /// Whether this source format can hydrate the extracted animation data at runtime.
     pub runtime_supported: bool,
@@ -315,4 +370,26 @@ mod tests {
         assert_eq!(animation_skeleton_source_index(&skeleton), Some(3));
         assert_eq!(animation_clip_source_index(&skeleton), None);
     }
+
+    #[test]
+    fn schema_v2_manifest_defaults_to_imported_rest_pose() {
+        let legacy = r#"(
+            schema_version: 2,
+            asset_id: "model-id",
+            label: "Legacy",
+            source: (
+                path: "assets/models/legacy.glb",
+                format: "glb",
+                fingerprint: (byte_len: 1, modified_unix_secs: 0, content_hash: "hash"),
+                dependencies: [],
+            ),
+            runtime_supported: true,
+            skeletons: [],
+            clips: [],
+            diagnostics: [],
+        )"#;
+
+        let manifest: AnimationManifest = ron::from_str(legacy).unwrap();
+        assert!(manifest.default_animation_clip_id.is_none());
+    }
 }
diff --git a/crates/shared/src/components.rs b/crates/shared/src/components.rs
index 1b06190..362a525 100644
--- a/crates/shared/src/components.rs
+++ b/crates/shared/src/components.rs
@@ -80,16 +80,39 @@ impl ComponentInstanceId {
 #[derive(Component, Reflect, Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct InspectorOrder {
+    /// Stable component IDs used by current scenes.
+    #[serde(default)]
+    pub component_ids: Vec<String>,
+    /// Legacy reflected type paths used by schema-v3 scenes.
     #[serde(default)]
     pub component_type_names: Vec<String>,
+    /// Legacy schema-v3 storage. New authoring writes active state to
+    /// [`AuthoringComponentStates`]; this field remains readable so old scenes can
+    /// be upgraded without losing disabled components.
     #[serde(default)]
     pub component_states: Vec<InspectorComponentState>,
 }
 
+/// Persisted active state for authoring components.
+///
+/// This is intentionally separate from [`InspectorOrder`]: hydration and runtime
+/// behavior must not depend on how the editor happens to arrange component cards.
+#[derive(Component, Reflect, Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct AuthoringComponentStates {
+    #[serde(default)]
+    pub states: Vec<InspectorComponentState>,
+}
+
 /// Per-component inspector metadata that must survive scene save/load.
 #[derive(Reflect, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct InspectorComponentState {
+    /// Stable authoring component identity used by current scenes.
+    #[serde(default)]
+    pub component_id: String,
+    /// Legacy schema-v3 reflected type path.
+    #[serde(default)]
     pub type_name: String,
     #[serde(default = "default_true")]
     pub active: bool,
@@ -98,6 +121,7 @@ pub struct InspectorComponentState {
 impl Default for InspectorComponentState {
     fn default() -> Self {
         Self {
+            component_id: String::new(),
             type_name: String::new(),
             active: true,
         }
@@ -106,41 +130,64 @@ impl Default for InspectorComponentState {
 
 impl InspectorOrder {
     pub fn is_component_active(&self, type_name: &str) -> bool {
+        let component_id = authoring_component_key(type_name);
         self.component_states
             .iter()
-            .find(|state| state.type_name == type_name)
+            .find(|state| {
+                state.component_id == component_id
+                    || state.type_name == type_name
+                    || state.type_name == component_id
+            })
             .map(|state| state.active)
             .unwrap_or(true)
     }
 
     pub fn set_component_active(&mut self, type_name: impl Into<String>, active: bool) {
         let type_name = type_name.into();
-        if let Some(state) = self
-            .component_states
-            .iter_mut()
-            .find(|state| state.type_name == type_name)
-        {
+        let component_id = authoring_component_key(&type_name).to_string();
+        if let Some(state) = self.component_states.iter_mut().find(|state| {
+            state.component_id == component_id
+                || state.type_name == type_name
+                || state.type_name == component_id
+        }) {
+            state.component_id = component_id;
+            state.type_name.clear();
             state.active = active;
         } else {
-            self.component_states
-                .push(InspectorComponentState { type_name, active });
+            self.component_states.push(InspectorComponentState {
+                component_id,
+                type_name: String::new(),
+                active,
+            });
         }
     }
 
     pub fn ensure_component_order(&mut self, present: &[&str]) {
         for type_name in present {
+            let component_id = authoring_component_key(type_name);
             if !self
-                .component_type_names
+                .component_ids
                 .iter()
-                .any(|existing| existing == type_name)
+                .any(|existing| existing == component_id)
             {
-                self.component_type_names.push((*type_name).to_string());
+                self.component_ids.push(component_id.to_string());
             }
         }
+        // Once the editor touches order, the stable-ID representation is
+        // authoritative and legacy paths no longer need to be re-saved.
+        self.component_type_names.clear();
     }
 
     pub fn ordered_components<'a>(&self, present: &[&'a str]) -> Vec<&'a str> {
         let mut ordered = Vec::new();
+        for component_id in &self.component_ids {
+            if let Some(present_type) = present
+                .iter()
+                .find(|present| authoring_component_key(present) == component_id)
+            {
+                ordered.push(*present_type);
+            }
+        }
         for type_name in &self.component_type_names {
             if let Some(present_type) = present.iter().find(|present| **present == type_name) {
                 ordered.push(*present_type);
@@ -157,29 +204,186 @@ impl InspectorOrder {
     pub fn move_component(&mut self, type_name: &str, offset: isize, present: &[&str]) -> bool {
         self.ensure_component_order(present);
         let Some(index) = self
-            .component_type_names
+            .component_ids
             .iter()
-            .position(|existing| existing == type_name)
+            .position(|existing| existing == authoring_component_key(type_name))
         else {
             return false;
         };
-        let target = (index as isize + offset)
-            .clamp(0, self.component_type_names.len() as isize - 1) as usize;
+        let target =
+            (index as isize + offset).clamp(0, self.component_ids.len() as isize - 1) as usize;
         if target == index {
             return false;
         }
-        let item = self.component_type_names.remove(index);
-        self.component_type_names.insert(target, item);
+        let item = self.component_ids.remove(index);
+        self.component_ids.insert(target, item);
         true
     }
 }
 
+impl AuthoringComponentStates {
+    pub fn is_component_active(&self, type_name: &str) -> bool {
+        let component_id = authoring_component_key(type_name);
+        self.states
+            .iter()
+            .find(|state| {
+                state.component_id == component_id
+                    || state.type_name == type_name
+                    || state.type_name == component_id
+            })
+            .map(|state| state.active)
+            .unwrap_or(true)
+    }
+
+    pub fn set_component_active(&mut self, type_name: impl Into<String>, active: bool) {
+        let type_name = type_name.into();
+        let component_id = authoring_component_key(&type_name).to_string();
+        if let Some(state) = self.states.iter_mut().find(|state| {
+            state.component_id == component_id
+                || state.type_name == type_name
+                || state.type_name == component_id
+        }) {
+            state.component_id = component_id;
+            state.type_name.clear();
+            state.active = active;
+        } else {
+            self.states.push(InspectorComponentState {
+                component_id,
+                type_name: String::new(),
+                active,
+            });
+        }
+    }
+
+    pub fn remove_component(&mut self, type_name: &str) {
+        let component_id = authoring_component_key(type_name);
+        self.states.retain(|state| {
+            state.component_id != component_id
+                && state.type_name != type_name
+                && state.type_name != component_id
+        });
+    }
+}
+
+/// Returns whether a persisted authoring component is enabled.
+///
+/// `legacy_order` is consulted only when an older scene has not yet been migrated
+/// to [`AuthoringComponentStates`].
+pub fn authoring_component_active(
+    states: Option<&AuthoringComponentStates>,
+    legacy_order: Option<&InspectorOrder>,
+    type_name: &str,
+) -> bool {
+    states
+        .map(|states| states.is_component_active(type_name))
+        .or_else(|| legacy_order.map(|order| order.is_component_active(type_name)))
+        .unwrap_or(true)
+}
+
 pub fn inspector_component_active(order: Option<&InspectorOrder>, type_name: &str) -> bool {
     order
         .map(|order| order.is_component_active(type_name))
         .unwrap_or(true)
 }
 
+// Stable authoring component identities. These are editor/protocol keys; reflected
+// Rust type paths remain serialization details and may change during refactors.
+pub const AUTHORING_COMPONENT_PRIMITIVE: &str = "render.primitive";
+pub const AUTHORING_COMPONENT_BRUSH: &str = "render.brush";
+pub const AUTHORING_COMPONENT_STATIC_MESH_RENDERER: &str = "render.static_mesh_renderer";
+pub const AUTHORING_COMPONENT_SKINNED_MESH_RENDERER: &str = "render.skinned_mesh_renderer";
+pub const AUTHORING_COMPONENT_MATERIAL: &str = "render.material";
+pub const AUTHORING_COMPONENT_LIGHT: &str = "render.light";
+pub const AUTHORING_COMPONENT_ANIMATION_CONTROLLER: &str = "animation.controller";
+pub const AUTHORING_COMPONENT_AUDIO_SOURCE: &str = "audio.source";
+pub const AUTHORING_COMPONENT_AUDIO_LISTENER: &str = "audio.listener";
+pub const AUTHORING_COMPONENT_RIGID_BODY: &str = "physics.rigid_body";
+pub const AUTHORING_COMPONENT_COLLIDER: &str = "physics.collider";
+pub const AUTHORING_COMPONENT_LEGACY_PHYSICS_BODY: &str = "physics.legacy_body";
+pub const AUTHORING_COMPONENT_PLAYER_SPAWN: &str = "gameplay.player_spawn";
+pub const AUTHORING_COMPONENT_WEAPON_SPAWN: &str = "gameplay.weapon_spawn";
+pub const AUTHORING_COMPONENT_TRIGGER_VOLUME: &str = "gameplay.trigger_volume";
+pub const AUTHORING_COMPONENT_TEAM_SPAWN: &str = "gameplay.team_spawn";
+pub const AUTHORING_COMPONENT_OBJECTIVE: &str = "gameplay.objective";
+pub const AUTHORING_COMPONENT_POST_PROCESS_VOLUME: &str = "render.post_process_volume";
+pub const AUTHORING_COMPONENT_NAVIGATION_BOUNDS: &str = "navigation.bounds";
+pub const AUTHORING_COMPONENT_NAVIGATION_OBSTACLE: &str = "navigation.obstacle";
+pub const AUTHORING_COMPONENT_NAVIGATION_AREA: &str = "navigation.area";
+pub const AUTHORING_COMPONENT_NAVIGATION_LINK: &str = "navigation.link";
+
+/// Resolves either a stable authoring ID or a reflected Rust type path to its
+/// stable editor/protocol identity. Unknown extension keys are returned as
+/// `None` and remain usable as-is by generic state/order storage.
+pub fn authoring_component_id(key: &str) -> Option<&'static str> {
+    match key {
+        AUTHORING_COMPONENT_PRIMITIVE | COMPONENT_PRIMITIVE => Some(AUTHORING_COMPONENT_PRIMITIVE),
+        AUTHORING_COMPONENT_BRUSH | COMPONENT_BRUSH_DESC => Some(AUTHORING_COMPONENT_BRUSH),
+        AUTHORING_COMPONENT_STATIC_MESH_RENDERER | COMPONENT_STATIC_MESH_RENDERER => {
+            Some(AUTHORING_COMPONENT_STATIC_MESH_RENDERER)
+        }
+        AUTHORING_COMPONENT_SKINNED_MESH_RENDERER | "shared::animation::SkinnedMeshRenderer" => {
+            Some(AUTHORING_COMPONENT_SKINNED_MESH_RENDERER)
+        }
+        AUTHORING_COMPONENT_MATERIAL | COMPONENT_MATERIAL_DESC => {
+            Some(AUTHORING_COMPONENT_MATERIAL)
+        }
+        AUTHORING_COMPONENT_LIGHT | COMPONENT_LIGHT_DESC => Some(AUTHORING_COMPONENT_LIGHT),
+        AUTHORING_COMPONENT_ANIMATION_CONTROLLER | "shared::animation::AnimationControllerDesc" => {
+            Some(AUTHORING_COMPONENT_ANIMATION_CONTROLLER)
+        }
+        AUTHORING_COMPONENT_AUDIO_SOURCE | COMPONENT_AUDIO_SOURCE_DESC => {
+            Some(AUTHORING_COMPONENT_AUDIO_SOURCE)
+        }
+        AUTHORING_COMPONENT_AUDIO_LISTENER | COMPONENT_AUDIO_LISTENER_DESC => {
+            Some(AUTHORING_COMPONENT_AUDIO_LISTENER)
+        }
+        AUTHORING_COMPONENT_RIGID_BODY | COMPONENT_RIGID_BODY_DESC => {
+            Some(AUTHORING_COMPONENT_RIGID_BODY)
+        }
+        AUTHORING_COMPONENT_COLLIDER | COMPONENT_COLLIDER_DESC => {
+            Some(AUTHORING_COMPONENT_COLLIDER)
+        }
+        AUTHORING_COMPONENT_LEGACY_PHYSICS_BODY | COMPONENT_PHYSICS_BODY => {
+            Some(AUTHORING_COMPONENT_LEGACY_PHYSICS_BODY)
+        }
+        AUTHORING_COMPONENT_PLAYER_SPAWN | COMPONENT_PLAYER_SPAWN => {
+            Some(AUTHORING_COMPONENT_PLAYER_SPAWN)
+        }
+        AUTHORING_COMPONENT_WEAPON_SPAWN | COMPONENT_WEAPON_SPAWN => {
+            Some(AUTHORING_COMPONENT_WEAPON_SPAWN)
+        }
+        AUTHORING_COMPONENT_TRIGGER_VOLUME | COMPONENT_TRIGGER_VOLUME => {
+            Some(AUTHORING_COMPONENT_TRIGGER_VOLUME)
+        }
+        AUTHORING_COMPONENT_TEAM_SPAWN | COMPONENT_TEAM_SPAWN => {
+            Some(AUTHORING_COMPONENT_TEAM_SPAWN)
+        }
+        AUTHORING_COMPONENT_OBJECTIVE | COMPONENT_OBJECTIVE_MARKER => {
+            Some(AUTHORING_COMPONENT_OBJECTIVE)
+        }
+        AUTHORING_COMPONENT_POST_PROCESS_VOLUME | COMPONENT_POST_PROCESS_VOLUME => {
+            Some(AUTHORING_COMPONENT_POST_PROCESS_VOLUME)
+        }
+        AUTHORING_COMPONENT_NAVIGATION_BOUNDS | "shared::navigation::NavigationBounds" => {
+            Some(AUTHORING_COMPONENT_NAVIGATION_BOUNDS)
+        }
+        AUTHORING_COMPONENT_NAVIGATION_OBSTACLE | "shared::navigation::NavigationObstacle" => {
+            Some(AUTHORING_COMPONENT_NAVIGATION_OBSTACLE)
+        }
+        AUTHORING_COMPONENT_NAVIGATION_AREA | "shared::navigation::NavigationArea" => {
+            Some(AUTHORING_COMPONENT_NAVIGATION_AREA)
+        }
+        AUTHORING_COMPONENT_NAVIGATION_LINK | "shared::navigation::NavigationLink" => {
+            Some(AUTHORING_COMPONENT_NAVIGATION_LINK)
+        }
+        _ => None,
+    }
+}
+
+pub fn authoring_component_key(key: &str) -> &str {
+    authoring_component_id(key).unwrap_or(key)
+}
+
 pub const COMPONENT_PRIMITIVE: &str = "shared::components::Primitive";
 pub const COMPONENT_BRUSH_DESC: &str = "shared::components::BrushDesc";
 pub const COMPONENT_STATIC_MESH_RENDERER: &str = "shared::components::StaticMeshRenderer";
@@ -700,6 +904,11 @@ pub struct MeshRenderSlot {
     pub id: ComponentInstanceId,
     pub name: String,
     pub mesh: EditorAssetRef,
+    /// Stable renderer material slot used by this draw part.
+    #[serde(default)]
+    pub material_slot_id: ComponentInstanceId,
+    /// Legacy inline imported-material reference. Schema-v4 migration moves this into the
+    /// renderer's shared `RendererMaterialSet`.
     #[serde(default)]
     pub material: Option<EditorAssetRef>,
     #[serde(default)]
@@ -718,6 +927,7 @@ impl Default for MeshRenderSlot {
             id: ComponentInstanceId::default(),
             name: "Mesh".into(),
             mesh: EditorAssetRef::default(),
+            material_slot_id: ComponentInstanceId::default(),
             material: None,
             local_transform: Transform::default(),
             visible: true,
@@ -730,6 +940,9 @@ impl Default for MeshRenderSlot {
 /// Backward-compatible alias for old code paths while scenes migrate to slots.
 pub type StaticMeshRendererEntry = MeshRenderSlot;
 
+/// Public renderer-foundation name for one static draw part.
+pub type StaticMeshPart = MeshRenderSlot;
+
 /// Reflectable static mesh renderer. Hydration turns entries into child `Mesh3d`
 /// entities and source/default materials.
 #[derive(Component, Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -737,15 +950,48 @@ pub type StaticMeshRendererEntry = MeshRenderSlot;
 pub struct StaticMeshRenderer {
     #[serde(default, alias = "entries")]
     pub slots: Vec<MeshRenderSlot>,
+    #[serde(default)]
+    pub materials: crate::RendererMaterialSet,
 }
 
 impl StaticMeshRenderer {
     pub fn empty() -> Self {
-        Self { slots: Vec::new() }
+        Self {
+            slots: Vec::new(),
+            materials: crate::RendererMaterialSet::default(),
+        }
     }
 
-    pub fn single(slot: MeshRenderSlot) -> Self {
-        Self { slots: vec![slot] }
+    pub fn single(mut slot: MeshRenderSlot) -> Self {
+        if slot.material_slot_id.0.trim().is_empty() {
+            slot.material_slot_id = ComponentInstanceId::new(format!("slot:{}", slot.id.0));
+        }
+        let source_material = slot.material.clone().map(crate::MaterialRef::new);
+        let materials = crate::RendererMaterialSet {
+            slots: vec![crate::RendererMaterialSlot {
+                id: slot.material_slot_id.clone(),
+                name: slot.name.clone(),
+                source_material,
+                material: None,
+            }],
+            orphaned_assignments: Vec::new(),
+        };
+        Self {
+            slots: vec![slot],
+            materials,
+        }
+    }
+
+    pub fn material_slot_for_part(
+        &self,
+        part: &MeshRenderSlot,
+    ) -> Option<&crate::RendererMaterialSlot> {
+        let slot_id = if part.material_slot_id.0.trim().is_empty() {
+            &part.id
+        } else {
+            &part.material_slot_id
+        };
+        self.materials.slot(slot_id)
     }
 }
 
@@ -1147,6 +1393,7 @@ pub enum ActorKind {
     Empty,
     Brush,
     StaticMesh,
+    SkinnedMesh,
     ImportedModel,
     Light,
     PrefabAnchor,
@@ -1158,6 +1405,7 @@ pub enum ActorKind {
     Objective,
     AudioSource,
     AudioListener,
+    Navigation,
 }
 
 /// Inspector upper bound for point/spot [`LightDesc::intensity`] (lumens).
diff --git a/crates/shared/src/hydration/brushes.rs b/crates/shared/src/hydration/brushes.rs
index 8571b38..5f80e27 100644
--- a/crates/shared/src/hydration/brushes.rs
+++ b/crates/shared/src/hydration/brushes.rs
@@ -9,9 +9,10 @@ use bevy::mesh::{Indices, PrimitiveTopology};
 use bevy::prelude::*;
 
 use crate::{
-    asset_server_path, brush_math::validate_brush, inspector_component_active, BrushDesc,
-    BrushFaceDesc, ColliderDesc, InspectorOrder, LevelObject, MaterialAsset, MaterialDesc,
-    COMPONENT_BRUSH_DESC, COMPONENT_COLLIDER_DESC, COMPONENT_MATERIAL_DESC,
+    asset_server_path, authoring_component_active, brush_math::validate_brush,
+    AuthoringComponentStates, BrushDesc, BrushFaceDesc, ColliderDesc, InspectorOrder, LevelObject,
+    MaterialAsset, MaterialDesc, COMPONENT_BRUSH_DESC, COMPONENT_COLLIDER_DESC,
+    COMPONENT_MATERIAL_DESC,
 };
 
 use super::materials::material_from_desc;
@@ -33,6 +34,7 @@ pub fn hydrate_brushes(
             &BrushDesc,
             Option<&MaterialDesc>,
             Option<&ColliderDesc>,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ),
         (
@@ -42,6 +44,7 @@ pub fn hydrate_brushes(
                 Changed<BrushDesc>,
                 Changed<MaterialDesc>,
                 Changed<ColliderDesc>,
+                Changed<AuthoringComponentStates>,
                 Changed<InspectorOrder>,
             )>,
         ),
@@ -49,9 +52,9 @@ pub fn hydrate_brushes(
     children: Query<&Children>,
     generated_brushes: Query<(), With<HydratedBrushMesh>>,
 ) {
-    for (entity, brush, material, collider, order) in &brushes {
+    for (entity, brush, material, collider, states, legacy_order) in &brushes {
         despawn_brush_mesh(&mut commands, entity, &children, &generated_brushes);
-        if !inspector_component_active(order, COMPONENT_BRUSH_DESC) {
+        if !authoring_component_active(states, legacy_order, COMPONENT_BRUSH_DESC) {
             continue;
         }
         spawn_brush_mesh(
@@ -61,8 +64,12 @@ pub fn hydrate_brushes(
             &mut materials,
             entity,
             brush,
-            material.filter(|_| inspector_component_active(order, COMPONENT_MATERIAL_DESC)),
-            collider.filter(|_| inspector_component_active(order, COMPONENT_COLLIDER_DESC)),
+            material.filter(|_| {
+                authoring_component_active(states, legacy_order, COMPONENT_MATERIAL_DESC)
+            }),
+            collider.filter(|_| {
+                authoring_component_active(states, legacy_order, COMPONENT_COLLIDER_DESC)
+            }),
         );
     }
 }
diff --git a/crates/shared/src/hydration/lights.rs b/crates/shared/src/hydration/lights.rs
index a6eab96..a090dd4 100644
--- a/crates/shared/src/hydration/lights.rs
+++ b/crates/shared/src/hydration/lights.rs
@@ -5,8 +5,8 @@ use bevy::prelude::*;
 use settings::{ActiveCameraRenderProfile, GiPath, RenderingCapabilities, RenderingSettings};
 
 use crate::{
-    inspector_component_active, AuthoringLightKind, InspectorOrder, LevelObject, LightDesc,
-    COMPONENT_LIGHT_DESC,
+    authoring_component_active, AuthoringComponentStates, AuthoringLightKind, InspectorOrder,
+    LevelObject, LightDesc, COMPONENT_LIGHT_DESC,
 };
 
 /// Legacy directional lux below this is treated as invalid (see ADR 0011).
@@ -31,21 +31,36 @@ pub fn hydrate_lights(
     settings: Res<settings::ProjectSettings>,
     profile: Option<Res<ActiveCameraRenderProfile>>,
     caps: Option<Res<RenderingCapabilities>>,
-    lights: Query<(Entity, Ref<LightDesc>, Option<Ref<InspectorOrder>>), With<LevelObject>>,
+    lights: Query<
+        (
+            Entity,
+            Ref<LightDesc>,
+            Option<Ref<AuthoringComponentStates>>,
+            Option<Ref<InspectorOrder>>,
+        ),
+        With<LevelObject>,
+    >,
 ) {
     let rendering = &settings.rendering;
     let render_stack_changed = profile.as_ref().is_some_and(|profile| profile.is_changed())
         || caps.as_ref().is_some_and(|caps| caps.is_changed());
     let profile = profile.as_deref();
     let caps = caps.as_deref();
-    for (entity, light, order) in &lights {
-        let order_changed = order.as_ref().is_some_and(|order| order.is_changed());
-        if !light.is_changed() && !order_changed && !render_stack_changed {
+    for (entity, light, states, legacy_order) in &lights {
+        let state_changed = states.as_ref().is_some_and(|states| states.is_changed());
+        let legacy_changed = legacy_order
+            .as_ref()
+            .is_some_and(|order| order.is_changed());
+        if !light.is_changed() && !state_changed && !legacy_changed && !render_stack_changed {
             continue;
         }
         let mut entity_commands = commands.entity(entity);
         strip_light_components(&mut entity_commands);
-        if !inspector_component_active(order.as_deref(), COMPONENT_LIGHT_DESC) {
+        if !authoring_component_active(
+            states.as_deref(),
+            legacy_order.as_deref(),
+            COMPONENT_LIGHT_DESC,
+        ) {
             continue;
         }
         if local_light_disabled_in_solari(&light, profile, caps) {
@@ -86,7 +101,15 @@ pub fn reconcile_missing_runtime_lights(
     settings: Res<settings::ProjectSettings>,
     profile: Option<Res<ActiveCameraRenderProfile>>,
     caps: Option<Res<RenderingCapabilities>>,
-    lights: Query<(Entity, &LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
+    lights: Query<
+        (
+            Entity,
+            &LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
+        With<LevelObject>,
+    >,
     points: Query<(), With<PointLight>>,
     spots: Query<(), With<SpotLight>>,
     directionals: Query<(), With<DirectionalLight>>,
@@ -94,8 +117,8 @@ pub fn reconcile_missing_runtime_lights(
     let rendering = &settings.rendering;
     let profile = profile.as_deref();
     let caps = caps.as_deref();
-    for (entity, light, order) in &lights {
-        if !inspector_component_active(order, COMPONENT_LIGHT_DESC) {
+    for (entity, light, states, legacy_order) in &lights {
+        if !authoring_component_active(states, legacy_order, COMPONENT_LIGHT_DESC) {
             continue;
         }
         if local_light_disabled_in_solari(light, profile, caps) {
diff --git a/crates/shared/src/hydration/materials.rs b/crates/shared/src/hydration/materials.rs
index 6885c41..d76626e 100644
--- a/crates/shared/src/hydration/materials.rs
+++ b/crates/shared/src/hydration/materials.rs
@@ -3,8 +3,8 @@
 use bevy::prelude::*;
 
 use crate::{
-    asset_server_path, inspector_component_active, InspectorOrder, LevelObject, MaterialDesc,
-    MaterialShaderKind, Primitive, COMPONENT_MATERIAL_DESC,
+    asset_server_path, authoring_component_active, AuthoringComponentStates, InspectorOrder,
+    LevelObject, MaterialDesc, MaterialShaderKind, Primitive, COMPONENT_MATERIAL_DESC,
 };
 
 #[allow(clippy::type_complexity)]
@@ -13,7 +13,12 @@ pub fn hydrate_materials(
     asset_server: Res<AssetServer>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     targets: Query<
-        (Entity, &MaterialDesc, Option<&InspectorOrder>),
+        (
+            Entity,
+            &MaterialDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
         (
             With<LevelObject>,
             With<Mesh3d>,
@@ -21,13 +26,14 @@ pub fn hydrate_materials(
                 Changed<MaterialDesc>,
                 Added<Mesh3d>,
                 Changed<Primitive>,
+                Changed<AuthoringComponentStates>,
                 Changed<InspectorOrder>,
             )>,
         ),
     >,
 ) {
-    for (entity, desc, order) in &targets {
-        if !inspector_component_active(order, COMPONENT_MATERIAL_DESC) {
+    for (entity, desc, states, legacy_order) in &targets {
+        if !authoring_component_active(states, legacy_order, COMPONENT_MATERIAL_DESC) {
             commands
                 .entity(entity)
                 .remove::<MeshMaterial3d<StandardMaterial>>();
diff --git a/crates/shared/src/hydration/mod.rs b/crates/shared/src/hydration/mod.rs
index 7c26c3d..74e79b2 100644
--- a/crates/shared/src/hydration/mod.rs
+++ b/crates/shared/src/hydration/mod.rs
@@ -7,6 +7,7 @@ mod models;
 mod physics;
 mod prefabs;
 mod primitives;
+mod skinned_meshes;
 mod static_meshes;
 pub mod strip;
 mod visibility;
@@ -27,6 +28,11 @@ use physics::hydrate_physics;
 use prefabs::{hydrate_prefabs, tag_hydrated_prefab_members};
 pub use prefabs::{HydratedPrefabMember, HydratedPrefabReady, PrefabHydrationBlocked};
 use primitives::{hydrate_primitives, primitive_mesh};
+pub use skinned_meshes::HydratedSkinnedMeshRoot;
+use skinned_meshes::{
+    apply_skinned_renderer_material_changes, cleanup_removed_skinned_mesh_renderers,
+    hydrate_skinned_mesh_renderers, mark_skinned_materials_ready,
+};
 use static_meshes::{
     hydrate_static_mesh_renderers, spawn_static_mesh_parts, HydratedStaticMeshPart,
     StaticMeshArtifactCache,
@@ -37,10 +43,10 @@ use visibility::{
 };
 
 use crate::{
-    inspector_component_active, BrushDesc, ColliderDesc, EditorVisibility, InspectorOrder,
-    LevelObject, MaterialDesc, MaterialOverride, Primitive, StaticMeshRenderer,
-    COMPONENT_BRUSH_DESC, COMPONENT_COLLIDER_DESC, COMPONENT_LIGHT_DESC, COMPONENT_MATERIAL_DESC,
-    COMPONENT_PRIMITIVE, COMPONENT_STATIC_MESH_RENDERER,
+    authoring_component_active, AuthoringComponentStates, BrushDesc, ColliderDesc,
+    EditorVisibility, InspectorOrder, LevelObject, MaterialDesc, MaterialOverride, Primitive,
+    StaticMeshRenderer, COMPONENT_BRUSH_DESC, COMPONENT_COLLIDER_DESC, COMPONENT_LIGHT_DESC,
+    COMPONENT_MATERIAL_DESC, COMPONENT_PRIMITIVE, COMPONENT_STATIC_MESH_RENDERER,
 };
 
 /// Registers hydration systems in deterministic order.
@@ -50,6 +56,7 @@ impl Plugin for HydrationPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<StaticMeshArtifactCache>()
             .add_observer(tag_hydrated_prefab_members)
+            .add_observer(mark_skinned_materials_ready)
             .add_observer(crate::prefab_overrides::apply_prefab_overrides_on_ready)
             .add_systems(
                 Update,
@@ -60,6 +67,9 @@ impl Plugin for HydrationPlugin {
                     hydrate_lights,
                     reconcile_missing_runtime_lights,
                     hydrate_static_mesh_renderers,
+                    hydrate_skinned_mesh_renderers,
+                    apply_skinned_renderer_material_changes,
+                    cleanup_removed_skinned_mesh_renderers,
                     hydrate_models,
                     hydrate_prefabs,
                     hydrate_physics,
@@ -89,17 +99,31 @@ pub fn flush_level_object_hydration(world: &mut World) {
     }
 
     let primitives: Vec<(Entity, Primitive)> = world
-        .query_filtered::<(Entity, &Primitive, Option<&InspectorOrder>), With<LevelObject>>()
+        .query_filtered::<(
+            Entity,
+            &Primitive,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ), With<LevelObject>>()
         .iter(world)
-        .filter(|(_, _, order)| inspector_component_active(*order, COMPONENT_PRIMITIVE))
-        .map(|(entity, primitive, _)| (entity, primitive.clone()))
+        .filter(|(_, _, states, order)| {
+            authoring_component_active(*states, *order, COMPONENT_PRIMITIVE)
+        })
+        .map(|(entity, primitive, _, _)| (entity, primitive.clone()))
         .collect();
 
     let material_targets: Vec<(Entity, MaterialDesc)> = world
-        .query_filtered::<(Entity, &MaterialDesc, Option<&InspectorOrder>), With<LevelObject>>()
+        .query_filtered::<(
+            Entity,
+            &MaterialDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ), With<LevelObject>>()
         .iter(world)
-        .filter(|(_, _, order)| inspector_component_active(*order, COMPONENT_MATERIAL_DESC))
-        .map(|(entity, desc, _)| (entity, desc.clone()))
+        .filter(|(_, _, states, order)| {
+            authoring_component_active(*states, *order, COMPONENT_MATERIAL_DESC)
+        })
+        .map(|(entity, desc, _, _)| (entity, desc.clone()))
         .collect();
 
     let brush_entities_for_cleanup: Vec<Entity> = world
@@ -113,31 +137,33 @@ pub fn flush_level_object_hydration(world: &mut World) {
         BrushDesc,
         Option<MaterialDesc>,
         Option<ColliderDesc>,
-        Option<InspectorOrder>,
     )> = world
         .query_filtered::<(
             Entity,
             &BrushDesc,
             Option<&MaterialDesc>,
             Option<&ColliderDesc>,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ), With<LevelObject>>()
         .iter(world)
-        .map(|(entity, brush, material, collider, order)| {
-            (
-                entity,
-                brush.clone(),
-                material
-                    .filter(|_| inspector_component_active(order, COMPONENT_MATERIAL_DESC))
-                    .cloned(),
-                collider
-                    .filter(|_| inspector_component_active(order, COMPONENT_COLLIDER_DESC))
-                    .cloned(),
-                order.cloned(),
-            )
-        })
-        .filter(|(_, _, _, _, order)| {
-            inspector_component_active(order.as_ref(), COMPONENT_BRUSH_DESC)
+        .filter_map(|(entity, brush, material, collider, states, order)| {
+            authoring_component_active(states, order, COMPONENT_BRUSH_DESC).then(|| {
+                (
+                    entity,
+                    brush.clone(),
+                    material
+                        .filter(|_| {
+                            authoring_component_active(states, order, COMPONENT_MATERIAL_DESC)
+                        })
+                        .cloned(),
+                    collider
+                        .filter(|_| {
+                            authoring_component_active(states, order, COMPONENT_COLLIDER_DESC)
+                        })
+                        .cloned(),
+                )
+            })
         })
         .collect();
 
@@ -153,7 +179,6 @@ pub fn flush_level_object_hydration(world: &mut World) {
         Option<MaterialDesc>,
         Option<MaterialOverride>,
         Option<ColliderDesc>,
-        Option<InspectorOrder>,
     )> = world
         .query_filtered::<(
             Entity,
@@ -161,28 +186,41 @@ pub fn flush_level_object_hydration(world: &mut World) {
             Option<&MaterialDesc>,
             Option<&MaterialOverride>,
             Option<&ColliderDesc>,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ), With<LevelObject>>()
         .iter(world)
-        .map(
-            |(entity, renderer, material, material_override, collider, order)| {
-                (
-                    entity,
-                    renderer.clone(),
-                    material
-                        .filter(|_| inspector_component_active(order, COMPONENT_MATERIAL_DESC))
-                        .cloned(),
-                    material_override.cloned(),
-                    collider
-                        .filter(|_| inspector_component_active(order, COMPONENT_COLLIDER_DESC))
-                        .cloned(),
-                    order.cloned(),
+        .filter_map(
+            |(entity, renderer, material, material_override, collider, states, order)| {
+                authoring_component_active(states, order, COMPONENT_STATIC_MESH_RENDERER).then(
+                    || {
+                        (
+                            entity,
+                            renderer.clone(),
+                            material
+                                .filter(|_| {
+                                    authoring_component_active(
+                                        states,
+                                        order,
+                                        COMPONENT_MATERIAL_DESC,
+                                    )
+                                })
+                                .cloned(),
+                            material_override.cloned(),
+                            collider
+                                .filter(|_| {
+                                    authoring_component_active(
+                                        states,
+                                        order,
+                                        COMPONENT_COLLIDER_DESC,
+                                    )
+                                })
+                                .cloned(),
+                        )
+                    },
                 )
             },
         )
-        .filter(|(_, _, _, _, _, order)| {
-            inspector_component_active(order.as_ref(), COMPONENT_STATIC_MESH_RENDERER)
-        })
         .collect();
 
     let mut generated_static_mesh_parts = Vec::new();
@@ -225,13 +263,18 @@ pub fn flush_level_object_hydration(world: &mut World) {
         .cloned();
 
     let lights: Vec<(Entity, crate::LightDesc)> = world
-        .query_filtered::<(Entity, &crate::LightDesc, Option<&InspectorOrder>), With<LevelObject>>()
+        .query_filtered::<(
+            Entity,
+            &crate::LightDesc,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ), With<LevelObject>>()
         .iter(world)
-        .filter(|(_, light, order)| {
-            inspector_component_active(*order, COMPONENT_LIGHT_DESC)
+        .filter(|(_, light, states, order)| {
+            authoring_component_active(*states, *order, COMPONENT_LIGHT_DESC)
                 && !lights::local_light_disabled_in_solari(light, profile.as_ref(), caps.as_ref())
         })
-        .map(|(entity, light, _)| (entity, light.clone()))
+        .map(|(entity, light, _, _)| (entity, light.clone()))
         .collect();
 
     let mut state: SystemState<(
@@ -261,7 +304,7 @@ pub fn flush_level_object_hydration(world: &mut World) {
             commands.entity(child).despawn();
         }
 
-        for (entity, brush, material, collider, _) in &brush_targets {
+        for (entity, brush, material, collider) in &brush_targets {
             spawn_brush_mesh(
                 &mut commands,
                 &asset_server,
@@ -278,7 +321,7 @@ pub fn flush_level_object_hydration(world: &mut World) {
             commands.entity(child).despawn();
         }
 
-        for (entity, renderer, material, material_override, collider, _) in &static_mesh_renderers {
+        for (entity, renderer, material, material_override, collider) in &static_mesh_renderers {
             spawn_static_mesh_parts(
                 &mut commands,
                 &asset_server,
diff --git a/crates/shared/src/hydration/physics.rs b/crates/shared/src/hydration/physics.rs
index 68af5d5..b495341 100644
--- a/crates/shared/src/hydration/physics.rs
+++ b/crates/shared/src/hydration/physics.rs
@@ -4,23 +4,37 @@ use avian3d::prelude::*;
 use bevy::prelude::*;
 
 use crate::{
-    inspector_component_active, AuthoringRigidBody, ColliderDesc, ColliderShapeDesc,
-    InspectorOrder, LevelObject, PhysicsBody, RigidBodyDesc, COMPONENT_COLLIDER_DESC,
-    COMPONENT_PHYSICS_BODY, COMPONENT_RIGID_BODY_DESC,
+    authoring_component_active, AuthoringComponentStates, AuthoringRigidBody, ColliderDesc,
+    ColliderShapeDesc, InspectorOrder, LevelObject, PhysicsBody, RigidBodyDesc,
+    COMPONENT_COLLIDER_DESC, COMPONENT_PHYSICS_BODY, COMPONENT_RIGID_BODY_DESC,
 };
 
 #[allow(clippy::type_complexity)]
 pub fn hydrate_physics(
     mut commands: Commands,
     physics: Query<
-        (Entity, &PhysicsBody, Option<&InspectorOrder>),
+        (
+            Entity,
+            &PhysicsBody,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
         (
             With<LevelObject>,
-            Or<(Changed<PhysicsBody>, Changed<InspectorOrder>)>,
+            Or<(
+                Changed<PhysicsBody>,
+                Changed<AuthoringComponentStates>,
+                Changed<InspectorOrder>,
+            )>,
         ),
     >,
     new_physics: Query<
-        (Entity, &PhysicsBody, Option<&InspectorOrder>),
+        (
+            Entity,
+            &PhysicsBody,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
         (With<LevelObject>, Added<PhysicsBody>),
     >,
     split_physics: Query<
@@ -28,6 +42,7 @@ pub fn hydrate_physics(
             Entity,
             Option<&RigidBodyDesc>,
             Option<&ColliderDesc>,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ),
         (
@@ -37,13 +52,14 @@ pub fn hydrate_physics(
                 Added<RigidBodyDesc>,
                 Changed<ColliderDesc>,
                 Added<ColliderDesc>,
+                Changed<AuthoringComponentStates>,
                 Changed<InspectorOrder>,
             )>,
         ),
     >,
 ) {
-    for (entity, body, order) in new_physics.iter().chain(physics.iter()) {
-        if !inspector_component_active(order, COMPONENT_PHYSICS_BODY) {
+    for (entity, body, states, legacy_order) in new_physics.iter().chain(physics.iter()) {
+        if !authoring_component_active(states, legacy_order, COMPONENT_PHYSICS_BODY) {
             commands
                 .entity(entity)
                 .remove::<RigidBody>()
@@ -63,12 +79,12 @@ pub fn hydrate_physics(
             .insert((rigid_body, body.collider.clone()));
     }
 
-    for (entity, rigid_body, collider, order) in &split_physics {
+    for (entity, rigid_body, collider, states, legacy_order) in &split_physics {
         let mut entity_commands = commands.entity(entity);
         entity_commands.remove::<RigidBody>().remove::<Collider>();
 
-        if let Some(rigid_body) =
-            rigid_body.filter(|_| inspector_component_active(order, COMPONENT_RIGID_BODY_DESC))
+        if let Some(rigid_body) = rigid_body
+            .filter(|_| authoring_component_active(states, legacy_order, COMPONENT_RIGID_BODY_DESC))
         {
             entity_commands.insert(rigid_body_from_desc(rigid_body.body));
         }
@@ -76,7 +92,7 @@ pub fn hydrate_physics(
         let Some(collider) = collider else {
             continue;
         };
-        if !inspector_component_active(order, COMPONENT_COLLIDER_DESC) {
+        if !authoring_component_active(states, legacy_order, COMPONENT_COLLIDER_DESC) {
             continue;
         }
         if !collider.enabled || matches!(collider.shape, ColliderShapeDesc::StaticMesh { .. }) {
diff --git a/crates/shared/src/hydration/primitives.rs b/crates/shared/src/hydration/primitives.rs
index cf71f99..982a23c 100644
--- a/crates/shared/src/hydration/primitives.rs
+++ b/crates/shared/src/hydration/primitives.rs
@@ -3,8 +3,8 @@
 use bevy::prelude::*;
 
 use crate::{
-    inspector_component_active, InspectorOrder, LevelObject, Primitive, PrimitiveShape,
-    COMPONENT_PRIMITIVE,
+    authoring_component_active, AuthoringComponentStates, InspectorOrder, LevelObject, Primitive,
+    PrimitiveShape, COMPONENT_PRIMITIVE,
 };
 
 pub(crate) fn primitive_mesh(primitive: &Primitive) -> Mesh {
@@ -32,20 +32,26 @@ pub(crate) fn primitive_mesh(primitive: &Primitive) -> Mesh {
 pub fn hydrate_primitives(
     mut commands: Commands,
     primitives: Query<
-        (Entity, &Primitive, Option<&InspectorOrder>),
+        (
+            Entity,
+            &Primitive,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
         (
             With<LevelObject>,
             Or<(
                 Added<Primitive>,
                 Changed<Primitive>,
+                Changed<AuthoringComponentStates>,
                 Changed<InspectorOrder>,
             )>,
         ),
     >,
     mut meshes: ResMut<Assets<Mesh>>,
 ) {
-    for (entity, primitive, order) in &primitives {
-        if !inspector_component_active(order, COMPONENT_PRIMITIVE) {
+    for (entity, primitive, states, legacy_order) in &primitives {
+        if !authoring_component_active(states, legacy_order, COMPONENT_PRIMITIVE) {
             commands
                 .entity(entity)
                 .remove::<Mesh3d>()
diff --git a/crates/shared/src/hydration/skinned_meshes.rs b/crates/shared/src/hydration/skinned_meshes.rs
new file mode 100644
index 0000000..749dd7f
--- /dev/null
+++ b/crates/shared/src/hydration/skinned_meshes.rs
@@ -0,0 +1,473 @@
+//! Dedicated scene hydration for rigged and skinned model geometry.
+
+use std::fs;
+
+use bevy::gltf::GltfAssetLabel;
+use bevy::prelude::WorldAssetRoot;
+use bevy::prelude::*;
+use bevy::world_serialization::WorldInstanceReady;
+use serde::Deserialize;
+
+use crate::{
+    asset_server_path, authoring_component_active, AuthoringComponentStates,
+    HydratedRendererMaterialBinding, InspectorOrder, LevelObject, SkinnedMeshRenderer,
+    ANIMATION_ARTIFACT_DIR, COMPONENT_SKINNED_MESH_RENDERER,
+};
+
+use super::static_meshes::{
+    renderer_error_material, resolve_renderer_material_handle, StaticMeshArtifactCache,
+};
+
+/// Runtime hierarchy root generated for one authored [`SkinnedMeshRenderer`].
+///
+/// The loaded world contains Bevy's actual skinned-mesh bindings and joints. Keeping this marker
+/// distinct from `HydratedModelRoot` prevents animation systems from binding to generic imported
+/// scene instances.
+#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
+pub struct HydratedSkinnedMeshRoot {
+    pub owner: Entity,
+}
+
+#[derive(Component, Debug, Clone, PartialEq, Eq)]
+pub(super) struct HydratedSkinnedMeshSource {
+    asset_id: String,
+    path: String,
+    scene_index: usize,
+}
+
+impl From<&SkinnedMeshRenderer> for HydratedSkinnedMeshSource {
+    fn from(renderer: &SkinnedMeshRenderer) -> Self {
+        Self {
+            asset_id: renderer.asset_id.clone(),
+            path: renderer.path.clone(),
+            scene_index: renderer.scene_index,
+        }
+    }
+}
+
+#[derive(Component, Default)]
+pub(super) struct SkinnedMaterialsDirty;
+
+#[derive(Deserialize)]
+struct AnimationArtifactLookup {
+    source: AnimationSourceLookup,
+}
+
+#[derive(Deserialize)]
+struct AnimationSourceLookup {
+    path: String,
+}
+
+pub fn skinned_mesh_manifest_path(asset_id: &str) -> String {
+    format!("{ANIMATION_ARTIFACT_DIR}/{asset_id}.animation.ron")
+}
+
+/// Resolves the current model source from the animation artifact rather than the static-mesh
+/// artifact. The authored cached path remains the fallback when a legacy/unindexed asset has no
+/// generated animation metadata.
+pub fn skinned_mesh_source_path(asset_id: &str) -> Result<String, String> {
+    let path = skinned_mesh_manifest_path(asset_id);
+    let text = fs::read_to_string(&path)
+        .map_err(|error| format!("could not read skinned mesh artifact {path}: {error}"))?;
+    let artifact: AnimationArtifactLookup = ron::from_str(&text)
+        .map_err(|error| format!("could not parse skinned mesh artifact {path}: {error}"))?;
+    Ok(artifact.source.path)
+}
+
+#[allow(clippy::type_complexity)]
+pub(super) fn hydrate_skinned_mesh_renderers(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    renderers: Query<
+        (
+            Entity,
+            &SkinnedMeshRenderer,
+            Option<&AuthoringComponentStates>,
+            Option<&InspectorOrder>,
+        ),
+        (
+            With<LevelObject>,
+            Or<(
+                Added<SkinnedMeshRenderer>,
+                Changed<SkinnedMeshRenderer>,
+                Changed<AuthoringComponentStates>,
+                Changed<InspectorOrder>,
+            )>,
+        ),
+    >,
+    generated_roots: Query<(
+        Entity,
+        &HydratedSkinnedMeshRoot,
+        Option<&HydratedSkinnedMeshSource>,
+    )>,
+) {
+    for (entity, renderer, states, legacy_order) in &renderers {
+        if !authoring_component_active(states, legacy_order, COMPONENT_SKINNED_MESH_RENDERER) {
+            for (root, generated, _) in &generated_roots {
+                if generated.owner == entity {
+                    commands.entity(root).despawn();
+                }
+            }
+            continue;
+        }
+        let requested_source = HydratedSkinnedMeshSource::from(renderer);
+        let mut matching_root = None;
+        for (root, generated, source) in &generated_roots {
+            if generated.owner == entity {
+                if source == Some(&requested_source) {
+                    matching_root = Some(root);
+                } else {
+                    commands.entity(root).despawn();
+                }
+            }
+        }
+        if let Some(root) = matching_root {
+            commands.entity(root).insert(SkinnedMaterialsDirty);
+            continue;
+        }
+
+        let resolved_path = if renderer.asset_id.trim().is_empty() {
+            renderer.path.clone()
+        } else {
+            match skinned_mesh_source_path(&renderer.asset_id) {
+                Ok(path) => path,
+                Err(error) => {
+                    warn!(
+                        "SkinnedMeshRenderer {entity} could not resolve stable asset {}: {error}; falling back to cached path {}",
+                        renderer.asset_id, renderer.path
+                    );
+                    renderer.path.clone()
+                }
+            }
+        };
+        let path = asset_server_path(&resolved_path);
+        let handle = if path.to_ascii_lowercase().ends_with(".fbx") {
+            asset_server.load(SkinnedMeshRenderer::fbx_scene_asset_path(
+                &path,
+                renderer.scene_index,
+            ))
+        } else {
+            asset_server.load(GltfAssetLabel::Scene(renderer.scene_index).from_asset(path))
+        };
+        commands.spawn((
+            Name::new("Hydrated Skinned Mesh Root"),
+            HydratedSkinnedMeshRoot { owner: entity },
+            requested_source,
+            WorldAssetRoot(handle),
+            ChildOf(entity),
+        ));
+    }
+}
+
+/// Defers material application until the imported world has produced its actual draw entities.
+pub(super) fn mark_skinned_materials_ready(
+    ready: On<WorldInstanceReady>,
+    roots: Query<(), With<HydratedSkinnedMeshRoot>>,
+    mut commands: Commands,
+) {
+    if roots.get(ready.entity).is_ok() {
+        commands.entity(ready.entity).insert(SkinnedMaterialsDirty);
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+pub(super) fn apply_skinned_renderer_material_changes(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    mut artifact_cache: ResMut<StaticMeshArtifactCache>,
+    dirty_roots: Query<(Entity, &HydratedSkinnedMeshRoot), With<SkinnedMaterialsDirty>>,
+    renderers: Query<&SkinnedMeshRenderer>,
+    children: Query<&Children>,
+    parents: Query<&ChildOf>,
+    names: Query<&Name>,
+    meshes: Query<(Entity, &Mesh3d)>,
+) {
+    for (root_entity, root) in &dirty_roots {
+        let Ok(renderer) = renderers.get(root.owner) else {
+            commands
+                .entity(root_entity)
+                .remove::<SkinnedMaterialsDirty>();
+            continue;
+        };
+        let descendants = collect_descendants(root_entity, &children);
+        let mut candidates = Vec::new();
+        for entity in descendants {
+            let Ok((_, mesh)) = meshes.get(entity) else {
+                continue;
+            };
+            let label = asset_server
+                .get_path(mesh.id())
+                .and_then(|path| path.label().map(str::to_string));
+            let hierarchy_path = hierarchy_path(entity, root_entity, &parents, &names);
+            candidates.push((entity, label, hierarchy_path));
+        }
+
+        let mut used = std::collections::HashSet::new();
+        for slot in &renderer.materials.slots {
+            let Some(binding) = artifact_cache.resolve_draw_binding(&renderer.asset_id, &slot.id)
+            else {
+                warn!(
+                    "Skinned material slot '{}' has no generated draw binding for asset {}",
+                    slot.id.0, renderer.asset_id
+                );
+                continue;
+            };
+            let matched = candidates
+                .iter()
+                .filter(|(entity, label, _)| {
+                    !used.contains(entity) && label.as_deref() == Some(binding.mesh_label.as_str())
+                })
+                .find(|(_, _, path)| {
+                    binding
+                        .source_node
+                        .as_deref()
+                        .is_none_or(|source| path.ends_with(source))
+                })
+                .or_else(|| {
+                    candidates.iter().find(|(entity, label, _)| {
+                        !used.contains(entity)
+                            && label.as_deref() == Some(binding.mesh_label.as_str())
+                    })
+                });
+            let Some((entity, _, _)) = matched else {
+                warn!(
+                    "Skinned material slot '{}' could not find hydrated mesh {} ({:?})",
+                    slot.id.0, binding.mesh_label, binding.source_node
+                );
+                continue;
+            };
+            used.insert(*entity);
+            let effective = slot.effective_material().cloned();
+            let Some(reference) = effective.as_ref() else {
+                commands
+                    .entity(*entity)
+                    .insert(HydratedRendererMaterialBinding {
+                        owner: root.owner,
+                        slot_id: slot.id.clone(),
+                        effective_material: None,
+                    });
+                continue;
+            };
+            let handle = resolve_renderer_material_handle(
+                &asset_server,
+                &mut materials,
+                &mut artifact_cache,
+                reference,
+            )
+            .unwrap_or_else(|| renderer_error_material(&mut materials));
+            commands.entity(*entity).insert((
+                MeshMaterial3d(handle),
+                HydratedRendererMaterialBinding {
+                    owner: root.owner,
+                    slot_id: slot.id.clone(),
+                    effective_material: effective,
+                },
+            ));
+        }
+        commands
+            .entity(root_entity)
+            .remove::<SkinnedMaterialsDirty>();
+    }
+}
+
+fn collect_descendants(root: Entity, children: &Query<&Children>) -> Vec<Entity> {
+    let mut result = Vec::new();
+    let mut pending = vec![root];
+    while let Some(entity) = pending.pop() {
+        if entity != root {
+            result.push(entity);
+        }
+        if let Ok(entity_children) = children.get(entity) {
+            pending.extend(entity_children.iter());
+        }
+    }
+    result
+}
+
+fn hierarchy_path(
+    mut entity: Entity,
+    root: Entity,
+    parents: &Query<&ChildOf>,
+    names: &Query<&Name>,
+) -> String {
+    let mut segments = Vec::new();
+    while entity != root {
+        if let Ok(name) = names.get(entity) {
+            segments.push(name.as_str().to_string());
+        }
+        let Ok(parent) = parents.get(entity) else {
+            break;
+        };
+        entity = parent.parent();
+    }
+    segments.reverse();
+    segments.join("/")
+}
+
+/// Removes generated roots if the authoring renderer is removed without another renderer change.
+pub(super) fn cleanup_removed_skinned_mesh_renderers(
+    mut commands: Commands,
+    renderers: Query<
+        (Option<&AuthoringComponentStates>, Option<&InspectorOrder>),
+        With<SkinnedMeshRenderer>,
+    >,
+    roots: Query<(Entity, &HydratedSkinnedMeshRoot)>,
+) {
+    for (root_entity, root) in &roots {
+        let active = renderers
+            .get(root.owner)
+            .is_ok_and(|(states, legacy_order)| {
+                authoring_component_active(states, legacy_order, COMPONENT_SKINNED_MESH_RENDERER)
+            });
+        if !active {
+            commands.entity(root_entity).despawn();
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use bevy::asset::{AssetApp, AssetPlugin};
+    use bevy::prelude::WorldAsset;
+    use std::path::{Path, PathBuf};
+
+    struct TestManifest(PathBuf);
+
+    impl Drop for TestManifest {
+        fn drop(&mut self) {
+            let _ = std::fs::remove_file(&self.0);
+        }
+    }
+
+    fn write_test_manifest(asset_id: &str, source_path: &str) -> TestManifest {
+        let path = PathBuf::from(skinned_mesh_manifest_path(asset_id));
+        std::fs::create_dir_all(path.parent().expect("manifest has a parent directory"))
+            .expect("generated animation directory should be writable");
+        std::fs::write(&path, format!(r#"(source: (path: "{source_path}"))"#))
+            .expect("test animation manifest should be writable");
+        TestManifest(path)
+    }
+
+    fn hydration_app() -> App {
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, AssetPlugin::default()))
+            .init_asset::<WorldAsset>()
+            .add_systems(
+                Update,
+                (
+                    hydrate_skinned_mesh_renderers,
+                    cleanup_removed_skinned_mesh_renderers,
+                )
+                    .chain(),
+            );
+        app
+    }
+
+    fn generated_roots(world: &mut World, owner: Entity) -> Vec<Entity> {
+        world
+            .query::<(Entity, &HydratedSkinnedMeshRoot)>()
+            .iter(world)
+            .filter_map(|(entity, root)| (root.owner == owner).then_some(entity))
+            .collect()
+    }
+
+    #[test]
+    fn renderer_hydrates_a_dedicated_root_and_preserves_authored_children() {
+        let mut app = hydration_app();
+        let owner = app
+            .world_mut()
+            .spawn((
+                LevelObject,
+                SkinnedMeshRenderer::new("assets/models/character.glb"),
+            ))
+            .id();
+        let authored_child = app
+            .world_mut()
+            .spawn((Name::new("Socket"), ChildOf(owner)))
+            .id();
+
+        app.update();
+
+        assert_eq!(generated_roots(app.world_mut(), owner).len(), 1);
+        assert!(app.world().get_entity(authored_child).is_ok());
+    }
+
+    #[test]
+    fn stable_asset_id_uses_animation_artifact_source() {
+        const ASSET_ID: &str = "fe1ea62f-9ca8-40c6-a747-a1f40567b8c6";
+        let _manifest = write_test_manifest(ASSET_ID, "assets/models/relocated/hero.glb");
+        let mut app = hydration_app();
+        let owner = app
+            .world_mut()
+            .spawn((
+                LevelObject,
+                SkinnedMeshRenderer::new("assets/models/stale.glb").with_asset_id(ASSET_ID),
+            ))
+            .id();
+
+        app.update();
+
+        let root_entity = generated_roots(app.world_mut(), owner)[0];
+        let root = app.world().get::<WorldAssetRoot>(root_entity).unwrap();
+        let loaded_path = app
+            .world()
+            .resource::<AssetServer>()
+            .get_path(root.0.id())
+            .unwrap();
+        assert_eq!(loaded_path.path(), Path::new("models/relocated/hero.glb"));
+        assert_eq!(loaded_path.label(), Some("Scene0"));
+    }
+
+    #[test]
+    fn removing_renderer_despawns_only_its_generated_root() {
+        let mut app = hydration_app();
+        let owner = app
+            .world_mut()
+            .spawn((
+                LevelObject,
+                SkinnedMeshRenderer::new("assets/models/character.glb"),
+            ))
+            .id();
+        app.update();
+        let root = generated_roots(app.world_mut(), owner)[0];
+
+        app.world_mut()
+            .entity_mut(owner)
+            .remove::<SkinnedMeshRenderer>();
+        app.update();
+
+        assert!(app.world().get_entity(root).is_err());
+        assert!(app.world().get_entity(owner).is_ok());
+    }
+
+    #[test]
+    fn disabling_renderer_removes_hydrated_root_and_reenable_restores_it() {
+        let mut app = hydration_app();
+        let owner = app
+            .world_mut()
+            .spawn((
+                LevelObject,
+                SkinnedMeshRenderer::new("assets/models/character.glb"),
+                AuthoringComponentStates::default(),
+            ))
+            .id();
+        app.update();
+        assert_eq!(generated_roots(app.world_mut(), owner).len(), 1);
+
+        app.world_mut()
+            .get_mut::<AuthoringComponentStates>(owner)
+            .unwrap()
+            .set_component_active(COMPONENT_SKINNED_MESH_RENDERER, false);
+        app.update();
+        assert!(generated_roots(app.world_mut(), owner).is_empty());
+
+        app.world_mut()
+            .get_mut::<AuthoringComponentStates>(owner)
+            .unwrap()
+            .set_component_active(COMPONENT_SKINNED_MESH_RENDERER, true);
+        app.update();
+        assert_eq!(generated_roots(app.world_mut(), owner).len(), 1);
+    }
+}
diff --git a/crates/shared/src/hydration/static_meshes.rs b/crates/shared/src/hydration/static_meshes.rs
index 65b5c2e..5202401 100644
--- a/crates/shared/src/hydration/static_meshes.rs
+++ b/crates/shared/src/hydration/static_meshes.rs
@@ -3,13 +3,16 @@
 use avian3d::prelude::ColliderConstructor;
 use bevy::light::{NotShadowCaster, NotShadowReceiver};
 use bevy::prelude::*;
+use bevy::render::render_resource::Face;
 use serde::Deserialize;
 use std::collections::{HashMap, HashSet};
 
 use crate::{
-    asset_server_path, inspector_component_active, standard_material_asset_path, ColliderDesc,
-    ColliderShapeDesc, EditorAssetRef, InspectorOrder, LevelObject, MaterialDesc, MaterialOverride,
-    StaticMeshRenderer, StaticMeshRendererEntry, COMPONENT_COLLIDER_DESC, COMPONENT_MATERIAL_DESC,
+    asset_server_path, authoring_component_active, standard_material_asset_path,
+    AuthoringComponentStates, ColliderDesc, ColliderShapeDesc, EditorAssetRef,
+    HydratedRendererMaterialBinding, InspectorOrder, LevelObject, MaterialAlphaMode, MaterialAsset,
+    MaterialDesc, MaterialInstanceAsset, MaterialOverride, MaterialRef, StaticMeshRenderer,
+    StaticMeshRendererEntry, COMPONENT_COLLIDER_DESC, COMPONENT_MATERIAL_DESC,
     COMPONENT_STATIC_MESH_RENDERER,
 };
 
@@ -35,16 +38,39 @@ struct ResolvedStaticMeshMaterial {
     material_label: String,
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct ResolvedRendererDraw {
+    pub mesh_label: String,
+    pub source_node: Option<String>,
+}
+
 /// Cache for generated static mesh artifact lookups.
 #[derive(Resource, Default)]
 pub struct StaticMeshArtifactCache {
     parts: HashMap<(String, String), ResolvedStaticMeshPart>,
     materials: HashMap<(String, String), ResolvedStaticMeshMaterial>,
+    draw_bindings: HashMap<(String, String), ResolvedRendererDraw>,
     loaded_assets: HashSet<String>,
     failed_assets: HashSet<String>,
+    project_materials: HashMap<MaterialRef, Handle<StandardMaterial>>,
 }
 
 impl StaticMeshArtifactCache {
+    pub(crate) fn resolve_draw_binding(
+        &mut self,
+        asset_id: &str,
+        slot_id: &crate::ComponentInstanceId,
+    ) -> Option<ResolvedRendererDraw> {
+        let key = (asset_id.to_string(), slot_id.0.clone());
+        if let Some(binding) = self.draw_bindings.get(&key) {
+            return Some(binding.clone());
+        }
+        if !self.loaded_assets.contains(asset_id) && !self.failed_assets.contains(asset_id) {
+            self.load_artifact(asset_id);
+        }
+        self.draw_bindings.get(&key).cloned()
+    }
+
     fn resolve(&mut self, mesh: &EditorAssetRef) -> Option<ResolvedStaticMeshPart> {
         if !mesh.is_resolved() {
             return None;
@@ -95,17 +121,18 @@ impl StaticMeshArtifactCache {
                     } else {
                         part.id.clone()
                     };
-                    self.parts.insert(
-                        (asset_id.to_string(), part_id),
-                        ResolvedStaticMeshPart {
-                            source_path: manifest.source.path.clone(),
+                    let slot_id = format!("slot:{part_id}");
+                    self.draw_bindings.insert(
+                        (asset_id.to_string(), slot_id),
+                        ResolvedRendererDraw {
                             mesh_label: part.mesh_label.clone(),
-                            material_label: part.material_label.clone(),
+                            source_node: part.source_node.clone(),
                         },
                     );
-                    if let Some(material_label) = part.material_label {
+                    if let Some(material_label) = part.material_label.clone() {
                         let material_id = part
                             .material_id
+                            .clone()
                             .filter(|id| !id.trim().is_empty())
                             .unwrap_or_else(|| material_id_from_label(&material_label));
                         self.materials
@@ -115,6 +142,24 @@ impl StaticMeshArtifactCache {
                                 material_label,
                             });
                     }
+                    if part.skinned
+                        || manifest.metadata.animation_count > 0
+                        || manifest.metadata.skin_count > 0
+                    {
+                        warn!(
+                            "Static mesh artifact part {} requires an animated/skinned hierarchy and was excluded from StaticMeshRenderer hydration",
+                            part.mesh_label
+                        );
+                        continue;
+                    }
+                    self.parts.insert(
+                        (asset_id.to_string(), part_id),
+                        ResolvedStaticMeshPart {
+                            source_path: manifest.source.path.clone(),
+                            mesh_label: part.mesh_label.clone(),
+                            material_label: part.material_label.clone(),
+                        },
+                    );
                 }
                 self.loaded_assets.insert(asset_id.to_string());
             }
@@ -130,9 +175,19 @@ impl StaticMeshArtifactCache {
 struct StaticMeshResolveManifest {
     source: StaticMeshResolveSource,
     #[serde(default)]
+    metadata: StaticMeshResolveMetadata,
+    #[serde(default)]
     parts: Vec<StaticMeshResolvePart>,
 }
 
+#[derive(Debug, Default, Deserialize)]
+struct StaticMeshResolveMetadata {
+    #[serde(default)]
+    animation_count: usize,
+    #[serde(default)]
+    skin_count: usize,
+}
+
 #[derive(Debug, Deserialize)]
 struct StaticMeshResolveSource {
     path: String,
@@ -147,6 +202,10 @@ struct StaticMeshResolvePart {
     material_id: Option<String>,
     #[serde(default)]
     material_label: Option<String>,
+    #[serde(default)]
+    source_node: Option<String>,
+    #[serde(default)]
+    skinned: bool,
 }
 
 #[allow(clippy::type_complexity)]
@@ -162,6 +221,7 @@ pub fn hydrate_static_mesh_renderers(
             Option<&MaterialDesc>,
             Option<&MaterialOverride>,
             Option<&ColliderDesc>,
+            Option<&AuthoringComponentStates>,
             Option<&InspectorOrder>,
         ),
         (
@@ -172,6 +232,7 @@ pub fn hydrate_static_mesh_renderers(
                 Changed<MaterialDesc>,
                 Changed<MaterialOverride>,
                 Changed<ColliderDesc>,
+                Changed<AuthoringComponentStates>,
                 Changed<InspectorOrder>,
             )>,
         ),
@@ -179,15 +240,17 @@ pub fn hydrate_static_mesh_renderers(
     children: Query<&Children>,
     generated_parts: Query<(), With<HydratedStaticMeshPart>>,
 ) {
-    for (entity, renderer, parent_material, material_override, collider, order) in &renderers {
+    for (entity, renderer, parent_material, material_override, collider, states, order) in
+        &renderers
+    {
         despawn_static_mesh_parts(&mut commands, entity, &children, &generated_parts);
-        if !inspector_component_active(order, COMPONENT_STATIC_MESH_RENDERER) {
+        if !authoring_component_active(states, order, COMPONENT_STATIC_MESH_RENDERER) {
             continue;
         }
-        let parent_material =
-            parent_material.filter(|_| inspector_component_active(order, COMPONENT_MATERIAL_DESC));
+        let parent_material = parent_material
+            .filter(|_| authoring_component_active(states, order, COMPONENT_MATERIAL_DESC));
         let collider =
-            collider.filter(|_| inspector_component_active(order, COMPONENT_COLLIDER_DESC));
+            collider.filter(|_| authoring_component_active(states, order, COMPONENT_COLLIDER_DESC));
         spawn_static_mesh_parts(
             &mut commands,
             &asset_server,
@@ -237,6 +300,7 @@ pub fn spawn_static_mesh_parts(
             asset_server,
             materials,
             artifact_cache,
+            renderer,
             entry,
             &resolved,
             parent_material,
@@ -253,6 +317,11 @@ pub fn spawn_static_mesh_parts(
             Name::new(name),
             Mesh3d(mesh_handle),
             MeshMaterial3d(material_handle),
+            HydratedRendererMaterialBinding {
+                owner: parent,
+                slot_id: effective_material_slot_id(entry),
+                effective_material: effective_material_ref(renderer, entry).cloned(),
+            },
             entry.local_transform,
             Visibility::Visible,
             ChildOf(parent),
@@ -296,6 +365,7 @@ fn material_for_entry(
     asset_server: &AssetServer,
     materials: &mut Assets<StandardMaterial>,
     artifact_cache: &mut StaticMeshArtifactCache,
+    renderer: &StaticMeshRenderer,
     entry: &StaticMeshRendererEntry,
     resolved: &ResolvedStaticMeshPart,
     parent_material: Option<&MaterialDesc>,
@@ -315,8 +385,13 @@ fn material_for_entry(
         return materials.add(material_from_desc(asset_server, override_material));
     }
 
-    if let Some(material_ref) = entry.material.as_ref() {
-        if let Some(resolved_material) = artifact_cache.resolve_material(material_ref) {
+    if let Some(material_ref) = effective_material_ref(renderer, entry) {
+        if let Some(handle) =
+            resolve_shared_material(asset_server, materials, artifact_cache, material_ref)
+        {
+            return handle;
+        }
+        if let Some(resolved_material) = artifact_cache.resolve_material(&material_ref.0) {
             let source_path = asset_server_path(&resolved_material.source_path);
             return asset_server.load(standard_material_asset_path(
                 &source_path,
@@ -325,16 +400,121 @@ fn material_for_entry(
         }
         debug!(
             "Static mesh material ref unresolved: asset_id='{}' material='{}' label='{}'",
-            material_ref.asset_id, material_ref.sub_asset_id, material_ref.label
+            material_ref.0.asset_id, material_ref.0.sub_asset_id, material_ref.0.label
         );
     }
 
+    // Read-only compatibility path for schema-v1/v2 scenes. The explicit project upgrader moves
+    // this reference into `RendererMaterialSet` and clears the legacy draw-part field.
+    if let Some(material_ref) = entry.material.as_ref() {
+        let material_ref = MaterialRef::new(material_ref.clone());
+        if let Some(handle) =
+            resolve_shared_material(asset_server, materials, artifact_cache, &material_ref)
+        {
+            return handle;
+        }
+        if let Some(resolved_material) = artifact_cache.resolve_material(&material_ref.0) {
+            let source_path = asset_server_path(&resolved_material.source_path);
+            return asset_server.load(standard_material_asset_path(
+                &source_path,
+                &resolved_material.material_label,
+            ));
+        }
+    }
+
     if let Some(label) = resolved.material_label.as_deref() {
         let source_path = asset_server_path(&resolved.source_path);
         return asset_server.load(standard_material_asset_path(&source_path, label));
     }
 
-    materials.add(StandardMaterial::default())
+    materials.add(error_material())
+}
+
+fn effective_material_slot_id(entry: &StaticMeshRendererEntry) -> crate::ComponentInstanceId {
+    if entry.material_slot_id.0.trim().is_empty() {
+        entry.id.clone()
+    } else {
+        entry.material_slot_id.clone()
+    }
+}
+
+fn effective_material_ref<'a>(
+    renderer: &'a StaticMeshRenderer,
+    entry: &'a StaticMeshRendererEntry,
+) -> Option<&'a MaterialRef> {
+    let slot_id = effective_material_slot_id(entry);
+    renderer.materials.effective_material(&slot_id)
+}
+
+fn resolve_shared_material(
+    asset_server: &AssetServer,
+    materials: &mut Assets<StandardMaterial>,
+    cache: &mut StaticMeshArtifactCache,
+    reference: &MaterialRef,
+) -> Option<Handle<StandardMaterial>> {
+    if let Some(handle) = cache.project_materials.get(reference) {
+        return Some(handle.clone());
+    }
+    let path = reference.0.source_path.as_deref()?;
+    let desc_and_state = MaterialAsset::load_from_path(path)
+        .map(|asset| (asset.material, asset.render_state))
+        .or_else(|_| {
+            let instance = MaterialInstanceAsset::load_from_path(path)?;
+            let base_path = instance.base.0.source_path.as_deref().ok_or_else(|| {
+                format!(
+                    "material instance {} has no loadable base path",
+                    instance.label
+                )
+            })?;
+            let base = MaterialAsset::load_from_path(base_path)?;
+            let mut desc = base.material;
+            instance.apply_to(&mut desc);
+            Ok::<_, String>((desc, base.render_state))
+        })
+        .ok()?;
+    let mut material = material_from_desc(asset_server, &desc_and_state.0);
+    material.alpha_mode = match desc_and_state.1.alpha_mode {
+        MaterialAlphaMode::Opaque => AlphaMode::Opaque,
+        MaterialAlphaMode::Cutout => AlphaMode::Mask(desc_and_state.1.alpha_cutoff),
+    };
+    material.cull_mode = (!desc_and_state.1.double_sided).then_some(Face::Back);
+    let handle = materials.add(material);
+    cache
+        .project_materials
+        .insert(reference.clone(), handle.clone());
+    Some(handle)
+}
+
+pub(crate) fn resolve_renderer_material_handle(
+    asset_server: &AssetServer,
+    materials: &mut Assets<StandardMaterial>,
+    cache: &mut StaticMeshArtifactCache,
+    reference: &MaterialRef,
+) -> Option<Handle<StandardMaterial>> {
+    if let Some(handle) = resolve_shared_material(asset_server, materials, cache, reference) {
+        return Some(handle);
+    }
+    let resolved = cache.resolve_material(&reference.0)?;
+    let source_path = asset_server_path(&resolved.source_path);
+    Some(asset_server.load(standard_material_asset_path(
+        &source_path,
+        &resolved.material_label,
+    )))
+}
+
+pub(crate) fn renderer_error_material(
+    materials: &mut Assets<StandardMaterial>,
+) -> Handle<StandardMaterial> {
+    materials.add(error_material())
+}
+
+fn error_material() -> StandardMaterial {
+    StandardMaterial {
+        base_color: Color::srgb(1.0, 0.0, 1.0),
+        perceptual_roughness: 0.35,
+        metallic: 0.0,
+        ..default()
+    }
 }
 
 fn labeled_asset_path(path: &str, label: &str) -> String {
@@ -392,3 +572,58 @@ fn stable_sub_asset_slug(label: &str) -> String {
     }
     slug.trim_matches('_').to_string()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::path::PathBuf;
+
+    struct TestManifest(PathBuf);
+
+    impl Drop for TestManifest {
+        fn drop(&mut self) {
+            let _ = std::fs::remove_file(&self.0);
+        }
+    }
+
+    fn write_manifest(asset_id: &str, animation_count: usize, skinned: bool) -> TestManifest {
+        let path = PathBuf::from(static_mesh_manifest_path(asset_id));
+        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+        std::fs::write(
+            &path,
+            format!(
+                r#"(
+                    source: (path: "assets/models/test.glb"),
+                    metadata: (animation_count: {animation_count}),
+                    parts: [(
+                        id: "mesh:test",
+                        mesh_label: "Mesh0/Primitive0",
+                        skinned: {skinned},
+                    )],
+                )"#
+            ),
+        )
+        .unwrap();
+        TestManifest(path)
+    }
+
+    #[test]
+    fn cache_refuses_skin_bound_parts() {
+        const ASSET_ID: &str = "7cd29974-1503-4084-b4a0-7483d0a57d7d";
+        let _manifest = write_manifest(ASSET_ID, 0, true);
+        let mut cache = StaticMeshArtifactCache::default();
+        let reference = EditorAssetRef::new(ASSET_ID, "mesh:test", "Test");
+
+        assert!(cache.resolve(&reference).is_none());
+    }
+
+    #[test]
+    fn cache_refuses_geometry_from_animated_sources() {
+        const ASSET_ID: &str = "7f6fcf6a-e978-4dc6-8738-16d52fc3ed03";
+        let _manifest = write_manifest(ASSET_ID, 1, false);
+        let mut cache = StaticMeshArtifactCache::default();
+        let reference = EditorAssetRef::new(ASSET_ID, "mesh:test", "Test");
+
+        assert!(cache.resolve(&reference).is_none());
+    }
+}
diff --git a/crates/shared/src/lib.rs b/crates/shared/src/lib.rs
index f1dcf4c..451ba8a 100644
--- a/crates/shared/src/lib.rs
+++ b/crates/shared/src/lib.rs
@@ -10,8 +10,10 @@ pub mod brush_math;
 mod components;
 mod hydration;
 mod material_asset;
+mod navigation;
 mod post_process_effect_asset;
 mod prefab_overrides;
+mod renderer_material;
 mod rendering_profile_asset;
 
 pub use actor::{infer_actor_kind, validate_actor, ActorValidationError};
@@ -20,17 +22,21 @@ pub use components::*;
 pub use hydration::{
     cascade_config_from_rendering, flush_level_object_hydration, material_from_desc,
     strip_hydrated, strip_hydrated_entity, HydratedModelRoot, HydratedPrefabMember,
-    HydratedPrefabReady, HydrationPlugin, PrefabHydrationBlocked,
+    HydratedPrefabReady, HydratedSkinnedMeshRoot, HydrationPlugin, PrefabHydrationBlocked,
 };
 pub use material_asset::{
-    MaterialAsset, ShaderPropertyDesc, ShaderPropertyType, ShaderSchemaAsset,
+    MaterialAlphaMode, MaterialAsset, MaterialInstanceAsset, MaterialRenderState,
+    ShaderPropertyDesc, ShaderPropertyType, ShaderSchemaAsset, MATERIAL_ASSET_SCHEMA_VERSION,
+    MATERIAL_INSTANCE_SCHEMA_VERSION, SURFACE_SHADER_SCHEMA_VERSION,
 };
+pub use navigation::*;
 pub use post_process_effect_asset::{PostProcessEffectAsset, PostProcessEffectKind};
 pub use prefab_overrides::{
     apply_prefab_overrides_on_ready, decode_prefab_overrides, encode_prefab_overrides,
     PrefabActorPath, PrefabComponentOverride, PrefabOverrides, PrefabPropertyOverride,
     PrefabStructuralOverride, PREFAB_OVERRIDE_FORMAT_VERSION,
 };
+pub use renderer_material::*;
 pub use rendering_profile_asset::RenderingProfileAsset;
 
 /// Converts catalog-style paths (`assets/models/foo.fbx`) to Bevy AssetServer paths.
@@ -73,14 +79,25 @@ impl Plugin for SharedTypesPlugin {
             .register_type::<SubsceneReference>()
             .register_type::<HierarchySiblingIndex>()
             .register_type::<InspectorOrder>()
+            .register_type::<AuthoringComponentStates>()
             .register_type::<InspectorComponentState>()
             .register_type::<ComponentInstanceId>()
             .register_type::<EditorAssetRef>()
+            .register_type::<MaterialRef>()
+            .register_type::<RendererMaterialSlot>()
+            .register_type::<RendererMaterialSet>()
+            .register_type::<OrphanedMaterialAssignment>()
             .register_type::<AnimationSkeletonSignature>()
+            .register_type::<SkinnedMeshRenderer>()
             .register_type::<AnimationPlaybackRange>()
             .register_type::<AnimationEventDesc>()
             .register_type::<AnimationStateDesc>()
             .register_type::<AnimationControllerDesc>()
+            .register_type::<NavigationAgentProfile>()
+            .register_type::<NavigationBounds>()
+            .register_type::<NavigationObstacle>()
+            .register_type::<NavigationArea>()
+            .register_type::<NavigationLink>()
             .register_type::<AudioSourceDesc>()
             .register_type::<AudioListenerDesc>()
             .register_type::<AudioAttenuationDesc>()
@@ -127,13 +144,37 @@ impl Plugin for SharedTypesPlugin {
             .register_type::<PostProcessVolumeOverrides>()
             .register_type::<TeamSpawn>()
             .register_type::<ObjectiveMarker>()
+            .add_systems(Update, migrate_legacy_authoring_component_states)
             .add_plugins(HydrationPlugin);
     }
 }
 
+fn migrate_legacy_authoring_component_states(
+    mut commands: Commands,
+    mut legacy: Query<
+        (Entity, &mut InspectorOrder),
+        (With<LevelObject>, Without<AuthoringComponentStates>),
+    >,
+) {
+    for (entity, mut order) in &mut legacy {
+        let mut states = std::mem::take(&mut order.component_states);
+        for state in &mut states {
+            if state.component_id.is_empty() {
+                if let Some(component_id) = authoring_component_id(&state.type_name) {
+                    state.component_id = component_id.to_string();
+                    state.type_name.clear();
+                }
+            }
+        }
+        commands
+            .entity(entity)
+            .insert(AuthoringComponentStates { states });
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use super::standard_material_asset_path;
+    use super::*;
 
     #[test]
     fn gltf_standard_material_paths_use_pbr_conversion_label() {
@@ -162,4 +203,68 @@ mod tests {
             "models/robot.glb#Material3/std"
         );
     }
+
+    #[test]
+    fn legacy_inspector_active_state_moves_to_authoring_component_states() {
+        let mut app = App::new();
+        app.add_systems(Update, migrate_legacy_authoring_component_states);
+        let mut order = InspectorOrder::default();
+        order.component_states.push(InspectorComponentState {
+            component_id: String::new(),
+            type_name: COMPONENT_LIGHT_DESC.to_string(),
+            active: false,
+        });
+        let entity = app.world_mut().spawn((LevelObject, order)).id();
+
+        app.update();
+
+        let states = app.world().get::<AuthoringComponentStates>(entity).unwrap();
+        assert!(!states.is_component_active(COMPONENT_LIGHT_DESC));
+        assert_eq!(states.states[0].component_id, AUTHORING_COMPONENT_LIGHT);
+        assert!(states.states[0].type_name.is_empty());
+        assert!(app
+            .world()
+            .get::<InspectorOrder>(entity)
+            .unwrap()
+            .component_states
+            .is_empty());
+    }
+
+    #[test]
+    fn new_active_state_takes_precedence_over_legacy_order() {
+        let mut legacy = InspectorOrder::default();
+        legacy.set_component_active(COMPONENT_LIGHT_DESC, false);
+        let mut states = AuthoringComponentStates::default();
+        states.set_component_active(COMPONENT_LIGHT_DESC, true);
+
+        assert!(authoring_component_active(
+            Some(&states),
+            Some(&legacy),
+            COMPONENT_LIGHT_DESC
+        ));
+    }
+
+    #[test]
+    fn inspector_order_migrates_legacy_type_paths_to_stable_ids_on_edit() {
+        let present = [COMPONENT_LIGHT_DESC, COMPONENT_PRIMITIVE];
+        let mut order = InspectorOrder {
+            component_type_names: present.iter().map(|value| value.to_string()).collect(),
+            ..Default::default()
+        };
+
+        assert_eq!(order.ordered_components(&present), present);
+        assert!(order.move_component(COMPONENT_PRIMITIVE, -1, &present));
+        assert!(order.component_type_names.is_empty());
+        assert_eq!(
+            order.component_ids,
+            vec![
+                AUTHORING_COMPONENT_PRIMITIVE.to_string(),
+                AUTHORING_COMPONENT_LIGHT.to_string()
+            ]
+        );
+        assert_eq!(
+            order.ordered_components(&present),
+            vec![COMPONENT_PRIMITIVE, COMPONENT_LIGHT_DESC]
+        );
+    }
 }
diff --git a/crates/shared/src/material_asset.rs b/crates/shared/src/material_asset.rs
index 3a1e0cc..8fe04a1 100644
--- a/crates/shared/src/material_asset.rs
+++ b/crates/shared/src/material_asset.rs
@@ -1,15 +1,73 @@
-//! Serializable material asset files under `assets/materials/`.
+//! Versioned material, material-instance, and surface-shader asset documents.
 
+use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use crate::{MaterialDesc, MaterialParameter, MaterialShaderKind, MaterialTextureBinding};
+use crate::{
+    EditorAssetRef, MaterialDesc, MaterialParameter, MaterialRef, MaterialShaderKind,
+    MaterialTextureBinding,
+};
+
+pub const MATERIAL_ASSET_SCHEMA_VERSION: u32 = 1;
+pub const MATERIAL_INSTANCE_SCHEMA_VERSION: u32 = 1;
+pub const SURFACE_SHADER_SCHEMA_VERSION: u32 = 1;
+
+const fn default_material_schema_version() -> u32 {
+    MATERIAL_ASSET_SCHEMA_VERSION
+}
+
+const fn default_material_instance_schema_version() -> u32 {
+    MATERIAL_INSTANCE_SCHEMA_VERSION
+}
+
+const fn default_surface_shader_schema_version() -> u32 {
+    SURFACE_SHADER_SCHEMA_VERSION
+}
+
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq, Eq)]
+pub enum MaterialAlphaMode {
+    #[default]
+    Opaque,
+    Cutout,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
+pub struct MaterialRenderState {
+    #[serde(default)]
+    pub alpha_mode: MaterialAlphaMode,
+    #[serde(default = "default_alpha_cutoff")]
+    pub alpha_cutoff: f32,
+    #[serde(default)]
+    pub double_sided: bool,
+}
+
+const fn default_alpha_cutoff() -> f32 {
+    0.5
+}
+
+impl Default for MaterialRenderState {
+    fn default() -> Self {
+        Self {
+            alpha_mode: MaterialAlphaMode::Opaque,
+            alpha_cutoff: default_alpha_cutoff(),
+            double_sided: false,
+        }
+    }
+}
 
 /// RON material asset: label plus authoring [`MaterialDesc`].
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Asset, TypePath, Debug, Clone, Serialize, Deserialize)]
 pub struct MaterialAsset {
+    #[serde(default = "default_material_schema_version")]
+    pub schema_version: u32,
     pub label: String,
+    /// Legacy path/label retained for v0 compatibility. New assets use `shader_ref`.
     #[serde(default)]
     pub shader: Option<String>,
+    #[serde(default)]
+    pub shader_ref: Option<EditorAssetRef>,
+    #[serde(default)]
+    pub render_state: MaterialRenderState,
     pub material: MaterialDesc,
 }
 
@@ -21,6 +79,81 @@ impl MaterialAsset {
     }
 }
 
+/// Explicit reusable overrides over one project Material asset.
+#[derive(Asset, TypePath, Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct MaterialInstanceAsset {
+    #[serde(default = "default_material_instance_schema_version")]
+    pub schema_version: u32,
+    pub label: String,
+    pub base: MaterialRef,
+    #[serde(default)]
+    pub parameters: Vec<MaterialParameter>,
+    #[serde(default)]
+    pub textures: Vec<MaterialTextureBinding>,
+}
+
+impl MaterialInstanceAsset {
+    pub fn load_from_path(catalog_path: &str) -> Result<Self, String> {
+        let text = std::fs::read_to_string(catalog_path)
+            .map_err(|err| format!("could not read {catalog_path}: {err}"))?;
+        ron::from_str(&text)
+            .map_err(|err| format!("invalid material-instance RON in {catalog_path}: {err}"))
+    }
+
+    /// Applies this instance's sparse overrides without mutating the shared base asset.
+    pub fn apply_to(&self, material: &mut MaterialDesc) {
+        for parameter in &self.parameters {
+            match (parameter.name.as_str(), &parameter.value) {
+                ("base_color", crate::MaterialParameterValue::Color(value)) => {
+                    material.base_color = *value;
+                }
+                ("metallic", crate::MaterialParameterValue::Float(value)) => {
+                    material.metallic = *value;
+                }
+                ("roughness", crate::MaterialParameterValue::Float(value)) => {
+                    material.roughness = *value;
+                }
+                ("emissive_color", crate::MaterialParameterValue::Color(value)) => {
+                    material.emissive_color = *value;
+                }
+                ("emissive_intensity", crate::MaterialParameterValue::Float(value)) => {
+                    material.emissive_intensity = *value;
+                }
+                _ => upsert_parameter(&mut material.parameters, parameter.clone()),
+            }
+        }
+        for texture in &self.textures {
+            let path = texture
+                .texture
+                .as_ref()
+                .and_then(|reference| reference.source_path.clone());
+            match texture.name.as_str() {
+                "base_color_texture" => material.base_color_texture = path,
+                "emissive_texture" => material.emissive_texture = path,
+                "normal_map_texture" => material.normal_map_texture = path,
+                "metallic_roughness_texture" => material.metallic_roughness_texture = path,
+                _ => upsert_texture(&mut material.textures, texture.clone()),
+            }
+        }
+    }
+}
+
+fn upsert_parameter(values: &mut Vec<MaterialParameter>, value: MaterialParameter) {
+    if let Some(existing) = values.iter_mut().find(|entry| entry.name == value.name) {
+        *existing = value;
+    } else {
+        values.push(value);
+    }
+}
+
+fn upsert_texture(values: &mut Vec<MaterialTextureBinding>, value: MaterialTextureBinding) {
+    if let Some(existing) = values.iter_mut().find(|entry| entry.name == value.name) {
+        *existing = value;
+    } else {
+        values.push(value);
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum ShaderPropertyType {
     Bool,
@@ -42,8 +175,10 @@ pub struct ShaderPropertyDesc {
 }
 
 /// RON shader schema describing material inspector parameters.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Asset, TypePath, Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct ShaderSchemaAsset {
+    #[serde(default = "default_surface_shader_schema_version")]
+    pub schema_version: u32,
     pub label: String,
     pub kind: MaterialShaderKind,
     #[serde(default)]
@@ -56,6 +191,78 @@ pub struct ShaderSchemaAsset {
     pub default_textures: Vec<MaterialTextureBinding>,
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn legacy_material_defaults_to_current_schema_and_opaque() {
+        let parsed: MaterialAsset = ron::from_str(
+            r#"(label: "Legacy", material: (base_color: (r: 1.0, g: 1.0, b: 1.0, a: 1.0), metallic: 0.0, roughness: 0.5, base_color_texture: None, normal_map_texture: None, metallic_roughness_texture: None))"#,
+        )
+        .expect("legacy material should remain readable");
+
+        assert_eq!(parsed.schema_version, MATERIAL_ASSET_SCHEMA_VERSION);
+        assert_eq!(parsed.render_state.alpha_mode, MaterialAlphaMode::Opaque);
+    }
+
+    #[test]
+    fn material_instance_requires_an_explicit_base_ref() {
+        let instance = MaterialInstanceAsset {
+            schema_version: MATERIAL_INSTANCE_SCHEMA_VERSION,
+            label: "Red Variant".into(),
+            base: MaterialRef::new(EditorAssetRef::new(
+                "material-id",
+                "material:source",
+                "Base",
+            )),
+            parameters: Vec::new(),
+            textures: Vec::new(),
+        };
+
+        assert!(instance.base.is_resolved());
+    }
+
+    #[test]
+    fn material_instance_applies_standard_and_custom_overrides() {
+        let mut material = MaterialDesc::default();
+        let instance = MaterialInstanceAsset {
+            schema_version: MATERIAL_INSTANCE_SCHEMA_VERSION,
+            label: "Variant".into(),
+            base: MaterialRef::default(),
+            parameters: vec![
+                MaterialParameter {
+                    name: "roughness".into(),
+                    value: crate::MaterialParameterValue::Float(0.2),
+                },
+                MaterialParameter {
+                    name: "edge_width".into(),
+                    value: crate::MaterialParameterValue::Float(3.0),
+                },
+            ],
+            textures: vec![MaterialTextureBinding {
+                name: "base_color_texture".into(),
+                texture: Some(
+                    EditorAssetRef::new("texture", "texture:source", "Grid")
+                        .with_source_path("assets/textures/grid.png"),
+                ),
+            }],
+        };
+
+        instance.apply_to(&mut material);
+
+        assert_eq!(material.roughness, 0.2);
+        assert_eq!(
+            material.base_color_texture.as_deref(),
+            Some("assets/textures/grid.png")
+        );
+        assert!(material
+            .parameters
+            .iter()
+            .any(|value| value.name == "edge_width"));
+    }
+}
+
 impl ShaderSchemaAsset {
     pub fn load_from_path(catalog_path: &str) -> Result<Self, String> {
         let text = std::fs::read_to_string(catalog_path)
diff --git a/crates/shared/src/navigation.rs b/crates/shared/src/navigation.rs
new file mode 100644
index 0000000..22f3494
--- /dev/null
+++ b/crates/shared/src/navigation.rs
@@ -0,0 +1,181 @@
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+pub const COMPONENT_NAVIGATION_BOUNDS: &str = "shared::navigation::NavigationBounds";
+pub const COMPONENT_NAVIGATION_OBSTACLE: &str = "shared::navigation::NavigationObstacle";
+pub const COMPONENT_NAVIGATION_AREA: &str = "shared::navigation::NavigationArea";
+pub const COMPONENT_NAVIGATION_LINK: &str = "shared::navigation::NavigationLink";
+
+/// Agent dimensions and deterministic Rerecast bake settings.
+#[derive(Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct NavigationAgentProfile {
+    pub id: String,
+    pub radius: f32,
+    pub height: f32,
+    pub max_climb: f32,
+    pub max_slope_deg: f32,
+    pub cell_size_fraction: f32,
+    pub cell_height_fraction: f32,
+    pub min_region_size: u16,
+    pub merge_region_size: u16,
+}
+
+impl Default for NavigationAgentProfile {
+    fn default() -> Self {
+        Self {
+            id: "humanoid".into(),
+            radius: 0.35,
+            height: 1.8,
+            max_climb: 0.45,
+            max_slope_deg: 45.0,
+            cell_size_fraction: 3.0,
+            cell_height_fraction: 6.0,
+            min_region_size: 4,
+            merge_region_size: 12,
+        }
+    }
+}
+
+impl NavigationAgentProfile {
+    pub fn validate(&self) -> Result<(), &'static str> {
+        if self.id.trim().is_empty() {
+            return Err("agent profile ID must not be empty");
+        }
+        if !self.radius.is_finite() || self.radius <= 0.0 {
+            return Err("agent radius must be finite and greater than zero");
+        }
+        if !self.height.is_finite() || self.height <= self.radius * 2.0 {
+            return Err("agent height must be finite and greater than twice its radius");
+        }
+        if !self.max_climb.is_finite() || self.max_climb < 0.0 || self.max_climb >= self.height {
+            return Err("maximum climb must be finite, non-negative, and below agent height");
+        }
+        if !self.max_slope_deg.is_finite() || !(0.0..90.0).contains(&self.max_slope_deg) {
+            return Err("maximum slope must be finite and in [0, 90) degrees");
+        }
+        if !self.cell_size_fraction.is_finite() || self.cell_size_fraction <= 0.0 {
+            return Err("cell size fraction must be finite and greater than zero");
+        }
+        if !self.cell_height_fraction.is_finite() || self.cell_height_fraction <= 0.0 {
+            return Err("cell height fraction must be finite and greater than zero");
+        }
+        Ok(())
+    }
+}
+
+/// Axis-aligned world region baked for one agent profile.
+#[derive(Component, Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct NavigationBounds {
+    pub half_extents: Vec3,
+    pub agent: NavigationAgentProfile,
+    pub artifact_path: String,
+    #[serde(default)]
+    pub auto_bake: bool,
+}
+
+impl Default for NavigationBounds {
+    fn default() -> Self {
+        Self {
+            half_extents: Vec3::new(20.0, 4.0, 20.0),
+            agent: NavigationAgentProfile::default(),
+            artifact_path: "assets/navigation/generated/main_humanoid.nav.ron".into(),
+            auto_bake: false,
+        }
+    }
+}
+
+/// Axis-aligned volume carved from every overlapping navigation bake.
+#[derive(Component, Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct NavigationObstacle {
+    pub half_extents: Vec3,
+    #[serde(default)]
+    pub dynamic: bool,
+}
+
+impl Default for NavigationObstacle {
+    fn default() -> Self {
+        Self {
+            half_extents: Vec3::splat(0.5),
+            dynamic: false,
+        }
+    }
+}
+
+/// Named navigation area volume retained in the bake artifact.
+#[derive(Component, Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct NavigationArea {
+    pub id: String,
+    pub half_extents: Vec3,
+    pub cost: f32,
+    #[serde(default = "default_true")]
+    pub walkable: bool,
+}
+
+impl Default for NavigationArea {
+    fn default() -> Self {
+        Self {
+            id: "default".into(),
+            half_extents: Vec3::splat(1.0),
+            cost: 1.0,
+            walkable: true,
+        }
+    }
+}
+
+/// Explicit off-mesh connection. Endpoints are local to the owning actor.
+#[derive(Component, Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[reflect(Component, Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct NavigationLink {
+    pub start: Vec3,
+    pub end: Vec3,
+    #[serde(default = "default_true")]
+    pub bidirectional: bool,
+    #[serde(default = "default_one")]
+    pub cost: f32,
+    #[serde(default = "default_true")]
+    pub enabled: bool,
+}
+
+impl Default for NavigationLink {
+    fn default() -> Self {
+        Self {
+            start: Vec3::ZERO,
+            end: Vec3::new(0.0, 0.0, 2.0),
+            bidirectional: true,
+            cost: 1.0,
+            enabled: true,
+        }
+    }
+}
+
+fn default_true() -> bool {
+    true
+}
+
+fn default_one() -> f32 {
+    1.0
+}
+
+#[cfg(test)]
+mod tests {
+    use super::NavigationAgentProfile;
+
+    #[test]
+    fn default_agent_profile_is_valid() {
+        assert_eq!(NavigationAgentProfile::default().validate(), Ok(()));
+    }
+
+    #[test]
+    fn invalid_agent_dimensions_are_actionable() {
+        let mut profile = NavigationAgentProfile::default();
+        profile.height = profile.radius;
+        assert_eq!(
+            profile.validate(),
+            Err("agent height must be finite and greater than twice its radius")
+        );
+    }
+}
diff --git a/crates/shared/src/renderer_material.rs b/crates/shared/src/renderer_material.rs
new file mode 100644
index 0000000..e210c0d
--- /dev/null
+++ b/crates/shared/src/renderer_material.rs
@@ -0,0 +1,155 @@
+//! Shared material references and renderer-slot authoring contracts.
+
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use crate::{ComponentInstanceId, EditorAssetRef, MaterialParameter, MaterialTextureBinding};
+
+/// A stable reference to a project material, material instance, or imported material subasset.
+///
+/// The registry UUID/subasset ID are authoritative. `EditorAssetRef::source_path` is only a
+/// load-time cache and may be repaired when an asset moves.
+#[derive(Reflect, Default, Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MaterialRef(pub EditorAssetRef);
+
+impl MaterialRef {
+    pub fn new(asset: EditorAssetRef) -> Self {
+        Self(asset)
+    }
+
+    pub fn is_resolved(&self) -> bool {
+        self.0.is_resolved()
+    }
+}
+
+impl From<EditorAssetRef> for MaterialRef {
+    fn from(value: EditorAssetRef) -> Self {
+        Self(value)
+    }
+}
+
+/// One stable, named material assignment exposed by a renderer.
+#[derive(Reflect, Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct RendererMaterialSlot {
+    pub id: ComponentInstanceId,
+    pub name: String,
+    /// Read-only imported default. Clearing `material` returns to this reference.
+    #[serde(default)]
+    pub source_material: Option<MaterialRef>,
+    /// Explicit shared Material or Material Instance assignment.
+    #[serde(default)]
+    pub material: Option<MaterialRef>,
+}
+
+impl RendererMaterialSlot {
+    pub fn effective_material(&self) -> Option<&MaterialRef> {
+        self.material.as_ref().or(self.source_material.as_ref())
+    }
+}
+
+/// Assignment retained after a source reimport removes or renames its draw slot.
+#[derive(Reflect, Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct OrphanedMaterialAssignment {
+    pub slot_id: ComponentInstanceId,
+    #[serde(default)]
+    pub last_known_name: String,
+    pub material: MaterialRef,
+}
+
+/// Material slots shared by static and skinned renderer authoring components.
+#[derive(Reflect, Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
+pub struct RendererMaterialSet {
+    #[serde(default)]
+    pub slots: Vec<RendererMaterialSlot>,
+    #[serde(default)]
+    pub orphaned_assignments: Vec<OrphanedMaterialAssignment>,
+}
+
+impl RendererMaterialSet {
+    pub fn slot(&self, id: &ComponentInstanceId) -> Option<&RendererMaterialSlot> {
+        self.slots.iter().find(|slot| &slot.id == id)
+    }
+
+    pub fn slot_mut(&mut self, id: &ComponentInstanceId) -> Option<&mut RendererMaterialSlot> {
+        self.slots.iter_mut().find(|slot| &slot.id == id)
+    }
+
+    pub fn effective_material(&self, id: &ComponentInstanceId) -> Option<&MaterialRef> {
+        self.slot(id)
+            .and_then(RendererMaterialSlot::effective_material)
+    }
+}
+
+/// Runtime-only property overrides analogous to a material property block.
+///
+/// Blocks never alter shared assets and are deliberately excluded from scene/prefab persistence.
+#[derive(Reflect, Default, Debug, Clone, PartialEq)]
+#[reflect(Default, Debug, PartialEq)]
+pub struct MaterialPropertyBlock {
+    pub slot_id: ComponentInstanceId,
+    #[reflect(ignore)]
+    pub parameters: Vec<MaterialParameter>,
+    #[reflect(ignore)]
+    pub textures: Vec<MaterialTextureBinding>,
+}
+
+#[derive(Component, Reflect, Default, Debug, Clone, PartialEq)]
+#[reflect(Component, Default, Debug, PartialEq)]
+pub struct MaterialPropertyBlocks {
+    pub slots: Vec<MaterialPropertyBlock>,
+}
+
+/// Runtime ownership/binding marker placed on every hydrated renderer draw entity.
+#[derive(Component, Reflect, Debug, Clone, PartialEq, Eq)]
+#[reflect(Component, Debug, PartialEq)]
+pub struct HydratedRendererMaterialBinding {
+    pub owner: Entity,
+    pub slot_id: ComponentInstanceId,
+    pub effective_material: Option<MaterialRef>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn material_ref(id: &str) -> MaterialRef {
+        MaterialRef::new(EditorAssetRef::new(id, "material:source", id))
+    }
+
+    #[test]
+    fn explicit_assignment_precedes_imported_source() {
+        let source = material_ref("source");
+        let assigned = material_ref("assigned");
+        let mut slot = RendererMaterialSlot {
+            id: ComponentInstanceId::new("slot:body"),
+            name: "Body".into(),
+            source_material: Some(source.clone()),
+            material: Some(assigned.clone()),
+        };
+
+        assert_eq!(slot.effective_material(), Some(&assigned));
+        slot.material = None;
+        assert_eq!(slot.effective_material(), Some(&source));
+    }
+
+    #[test]
+    fn missing_slot_does_not_fall_back_by_display_name() {
+        let set = RendererMaterialSet {
+            slots: vec![RendererMaterialSlot {
+                id: ComponentInstanceId::new("slot:body"),
+                name: "Body".into(),
+                source_material: Some(material_ref("source")),
+                material: None,
+            }],
+            orphaned_assignments: vec![],
+        };
+
+        assert!(set
+            .effective_material(&ComponentInstanceId::new("slot:renamed"))
+            .is_none());
+    }
+}
diff --git a/docs/README.md b/docs/README.md
index 89816bd..8b4ca99 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -46,6 +46,11 @@ Immutable-style log of significant decisions. Add a new numbered ADR when changi
 | [0029](adr/0029-validation-gated-build-profiles-and-packaging.md) | Shared validation-gated build profiles, runtime packaging, and metadata |
 | [0030](adr/0030-audio-authoring-and-bus-schema.md) | Serializable audio sources/listeners, stable clip references, and project bus graph |
 | [0031](adr/0031-animation-authoring-runtime-contract.md) | glTF animation artifacts, stable controller states, runtime hydration, and exact-signature retargeting |
+| [0032](adr/0032-versioned-navigation-bake-and-runtime-query.md) | Rerecast bake artifacts, Polyanya runtime queries, and editor/runtime ownership |
+| [0033](adr/0033-dedicated-skinned-mesh-renderer.md) | Dedicated skinned renderer, static/skinned import boundary, and scene migration |
+| [0034](adr/0034-registry-driven-authoring-components.md) | Stable component IDs, reflected lifecycle/history, composition, and independent active state |
+| [0035](adr/0035-shared-material-assets-and-renderer-slots.md) | Shared Material/Material Instance assets, stable renderer slots, and runtime-only property blocks |
+| [0036](adr/0036-surface-abi-and-solari-parity.md) | Constrained Surface ABI v1, raster/Solari evaluator parity, and deformed-geometry boundary |
 
 ## Editor framework
 
@@ -67,6 +72,10 @@ Immutable-style log of significant decisions. Add a new numbered ADR when changi
 | [editor/prefab-authoring.md](editor/prefab-authoring.md) | Linked instances, scoped overrides/source Apply, conflicts, variants, unpacking, and local conversion |
 | [editor/audio-authoring.md](editor/audio-authoring.md) | Audio clips, source/listener authoring, audition, buses, runtime parity, and validation |
 | [editor/animation-authoring.md](editor/animation-authoring.md) | glTF rigs/clips, controller states, preview, runtime requests, stable moves, and validation |
+| [editor/navigation-authoring.md](editor/navigation-authoring.md) | Bounds/obstacles/areas/links, deterministic bake, overlay, path preview, and runtime queries |
+| [editor/extensibility.md](editor/extensibility.md) | Static authoring component registration, lifecycle, composition, and history contract |
+| [editor/material-system.md](editor/material-system.md) | Shared material assets and instances, renderer-slot assignment, Surface evaluators, migration, and diagnostics |
+| [editor/evaluations/material-renderer-foundation/](editor/evaluations/material-renderer-foundation/) | Live screenshots and acceptance results for the renderer/material/component foundation |
 
 ## Working plans (not canonical long-term)
 
@@ -83,6 +92,8 @@ Detailed milestone and feature plans live in [`.cursor/plans/`](../.cursor/plans
 | `jackdaw_feature_roadmap_*.plan.md` | Jackdaw-inspired production roadmap; tracked in Gitea as `BS-JD-*` issues |
 | `blacksite_production_readiness_*.plan.md` | M6-M7 reliability, content production, shipping, and acceptance gates |
 | `animation_authoring_*.plan.md` | M7 glTF skeletal animation import, preview, controller, and runtime acceptance |
+| `navigation_authoring_*.plan.md` | M7 navigation bounds, deterministic bake, diagnostics, preview, and runtime query API |
+| `renderer_material_component_foundation_*.plan.md` | Renderer/material slots, skinned pose lifecycle, Surface ABI, and component foundation |
 
 ## Crate responsibilities (quick reference)
 
diff --git a/docs/adr/0009-authoring-vs-hydrated.md b/docs/adr/0009-authoring-vs-hydrated.md
index 811cb8f..df42af0 100644
--- a/docs/adr/0009-authoring-vs-hydrated.md
+++ b/docs/adr/0009-authoring-vs-hydrated.md
@@ -10,7 +10,9 @@ Level data must round-trip through save/load without leaking runtime ECS compone
 
 ## Decision
 
-- **Authoring components** (`Primitive`, `StaticMeshRenderer`, `MaterialDesc`, `MaterialOverride`, `LightDesc`, `ModelRef`, `RigidBodyDesc`, `ColliderDesc`, legacy `PhysicsBody`, `ActorKind`, etc.) are the only components written to `.scn.ron`.
+- **Authoring components** (`Primitive`, `StaticMeshRenderer`, `SkinnedMeshRenderer`,
+  `MaterialDesc`, `MaterialOverride`, `LightDesc`, `ModelRef`, `RigidBodyDesc`, `ColliderDesc`,
+  legacy `PhysicsBody`, `ActorKind`, etc.) are the only components written to `.scn.ron`.
 - **Hydration** in `crates/shared/src/hydration/` generates runtime components in a fixed `Update` chain.
 - **Save path** uses an explicit `DynamicSceneBuilder` allowlist and `strip_hydrated_entity` on each entity before serialize.
 
diff --git a/docs/adr/0010-actor-kind-and-inspector.md b/docs/adr/0010-actor-kind-and-inspector.md
index a132597..10d4f91 100644
--- a/docs/adr/0010-actor-kind-and-inspector.md
+++ b/docs/adr/0010-actor-kind-and-inspector.md
@@ -2,7 +2,7 @@
 
 ## Status
 
-Accepted
+Partially superseded by [ADR 0034](0034-registry-driven-authoring-components.md).
 
 ## Context
 
@@ -12,7 +12,9 @@ Inspector panels were routed by `if world.get::<LightDesc>` and mixed with `bevy
 
 - Every savable `LevelObject` carries a required **`ActorKind`** component (schema v2).
 - One-shot **`ActorKind` backfill** runs in `crates/scene` migration v1→v2; load-time backfill is a fallback only for unsaved in-memory entities.
-- **`validate_actor`** runs on save and rejects invalid component sets per kind.
+- **`validate_actor`** runs on save and rejects invalid component sets per kind. ADR 0034 replaces
+  this authority model with component-owned validation while retaining `ActorKind` as a derived
+  compatibility/display hint.
 - The default **Inspector** tab uses **`actor_inspector`** only (transform first, then authoring panels). No `ui_for_entity_with_children` in production builds.
 
 ## Consequences
diff --git a/docs/adr/0017-normalized-static-mesh-assets.md b/docs/adr/0017-normalized-static-mesh-assets.md
index ac5bf20..8555ae5 100644
--- a/docs/adr/0017-normalized-static-mesh-assets.md
+++ b/docs/adr/0017-normalized-static-mesh-assets.md
@@ -8,7 +8,8 @@ Accepted
 
 glTF/GLB and FBX previously entered the editor as imported scenes through `ModelRef`, with runtime hydration loading a format-specific `WorldAssetRoot`. That path is still useful for full scene playback, but it makes ordinary static mesh placement depend on source format behavior and prevents the inspector from exposing a stable renderer component.
 
-The editor needs model drag/drop to create editable static mesh actors by default, while retaining an explicit scene-instance path for animation, skinning, cameras, and other full-scene data.
+The editor needs model drag/drop to create editable static mesh actors for unrigged geometry while
+retaining explicit, separate paths for skinned geometry and generic full-scene data.
 
 ## Decision
 
@@ -18,7 +19,11 @@ The saved scene authoring component is `StaticMeshRenderer`. Its slots reference
 
 Asset import settings choose the default placement mode:
 
-- `StaticAsset` creates `ActorKind::StaticMesh + StaticMeshRenderer`; when collider generation is enabled it also creates `RigidBodyDesc + ColliderDesc::StaticMesh`.
+- `StaticAsset` creates `ActorKind::StaticMesh + StaticMeshRenderer` for unrigged sources; when
+  collider generation is enabled it also creates `RigidBodyDesc + ColliderDesc::StaticMesh`.
+- Sources containing skin-bound primitives or animation route to
+  `ActorKind::SkinnedMesh + SkinnedMeshRenderer` and never create static renderer slots or
+  automatic triangle-mesh colliders (ADR 0033).
 - `SceneInstance` creates the legacy `ActorKind::ImportedModel + ModelRef`.
 
 Hierarchy mode is also stored per asset. `SingleActor` places all mesh parts into one renderer. `SourceHierarchy` creates an authored root with child static mesh actors.
@@ -28,5 +33,6 @@ Hierarchy mode is also stored per asset. `SingleActor` places all mesh parts int
 - glTF/GLB and FBX placement consume the same renderer contract after processing.
 - Scene files store renderer intent, not runtime Bevy mesh/material handles.
 - Static mesh actors can expose renderer slots, source labels, shadows, collider policy, and material overrides in the inspector.
-- Animated/skinned playback remains on the scene-instance path until a future animation authoring component exists.
+- Skinned parts are marked in artifact schema v2 and excluded from static renderer construction and
+  hydration. Animation playback uses the dedicated contract in ADRs 0031 and 0033.
 - Generated artifacts are project files but are hidden from the Asset Browser catalog to avoid treating them as levels/prefabs.
diff --git a/docs/adr/0018-componentized-actor-inspector-and-materials.md b/docs/adr/0018-componentized-actor-inspector-and-materials.md
index 6cb3001..3cf85a2 100644
--- a/docs/adr/0018-componentized-actor-inspector-and-materials.md
+++ b/docs/adr/0018-componentized-actor-inspector-and-materials.md
@@ -2,7 +2,9 @@
 
 ## Status
 
-Accepted.
+Partially superseded by [ADR 0034](0034-registry-driven-authoring-components.md) for component
+lifecycle, active-state ownership, history, and composition. Material ownership is superseded by
+the renderer-material ADR.
 
 ## Context
 
@@ -23,9 +25,8 @@ Component footer rather than an ad hoc button near Transform.
   `ActorName`) and repeatable authoring items use `ComponentInstanceId`.
 - Editor-visible actor components are described by an
   `EditorComponentRegistry`; the Add Component footer reads from this registry.
-- `InspectorOrder` stores editor component order plus per-component active
-  state. Collapse state is session-only UI state; active state is persisted with
-  the scene and is undoable.
+- `InspectorOrder` stores editor component order. ADR 0034 moves persisted active state to
+  `AuthoringComponentStates`; collapse state remains session-only UI state.
 - `StaticMeshRenderer` stores `MeshRenderSlot` values that reference imported
   content-browser assets through `EditorAssetRef { asset_id, sub_asset_id,
   label }`. Actor renderer data does not store source FBX/glTF paths.
diff --git a/docs/adr/0021-brush-authoring-schema.md b/docs/adr/0021-brush-authoring-schema.md
index 1aa97df..3c16cc6 100644
--- a/docs/adr/0021-brush-authoring-schema.md
+++ b/docs/adr/0021-brush-authoring-schema.md
@@ -12,7 +12,9 @@ Jackdaw roadmap work needs blockout geometry that is editable as authored data,
 
 Add `ActorKind::Brush` and `BrushDesc` as persisted shared authoring data. A brush stores convex polygon faces with stable face IDs, plane data, material/texture references, UV parameters, smoothing group, and shadow flags. The MVP supports additive cube brushes and hydrates active brush components into generated mesh children; generated children are stripped from saved scenes.
 
-Brush actors conflict with `Primitive`, `StaticMeshRenderer`, `LightDesc`, and `ModelRef` in actor validation. Scene v1-to-v2 kind backfill infers `ActorKind::Brush` when an older level object contains `BrushDesc`.
+Brush actors conflict with `Primitive`, `StaticMeshRenderer`, `SkinnedMeshRenderer`, `LightDesc`,
+and `ModelRef` in actor validation. Scene v1-to-v2 kind backfill infers `ActorKind::Brush` when an
+older level object contains `BrushDesc`.
 
 ## Consequences
 
diff --git a/docs/adr/0031-animation-authoring-runtime-contract.md b/docs/adr/0031-animation-authoring-runtime-contract.md
index 6f8d85e..2ccc868 100644
--- a/docs/adr/0031-animation-authoring-runtime-contract.md
+++ b/docs/adr/0031-animation-authoring-runtime-contract.md
@@ -6,8 +6,8 @@ Accepted
 
 ## Context
 
-Blacksite currently records animation and skin counts while importing glTF and FBX models, but the
-authored scene contract contains only a path-based `ModelRef`. Scene-instance hydration loads a
+Blacksite previously recorded animation and skin counts while importing glTF and FBX models, but the
+authored scene contract contained only a path-based `ModelRef`. Generic scene-instance hydration loaded a
 model world without selecting or driving its clips, and the editor has no stable clip references,
 controller inspector, preview, or compatibility validation.
 
@@ -32,12 +32,12 @@ Each animated model has a versioned generated manifest under `assets/animations/
 by the model's stable asset-registry UUID. The manifest records the source path and fingerprint,
 skeletons and their exact signatures, stable clip sub-asset IDs, clip label/index/duration, target
 skeleton signature, normalized event markers, and import diagnostics. Registry UUID plus sub-asset
-ID is authoritative; cached `ModelRef` and `EditorAssetRef` source paths are only runtime-resolution
+ID is authoritative; cached `SkinnedMeshRenderer` and `EditorAssetRef` source paths are only runtime-resolution
 and repair hints. UUID-keyed generated manifests provide the current source path after a uniquely
 reconciled move.
 
 `shared` owns reflected, serializable `AnimationControllerDesc` and its named state/event value
-types. A controller sits beside the model scene reference and uses `EditorAssetRef` for skeleton and
+types. A controller sits beside the dedicated `SkinnedMeshRenderer` and uses `EditorAssetRef` for skeleton and
 clip references. It contains one layer of named states, one default state, a default crossfade
 duration, and per-state playback range, loop, and speed. State IDs are stable authored identifiers;
 display labels are not runtime keys.
@@ -50,7 +50,13 @@ stored in the manifest are display metadata and never compatibility keys. Blacks
 humanoid roles, rename joints, or perform proportional remapping in this version. This exact node
 identity contract is animation-manifest schema v2; v1 artifacts must be reimported.
 
-The runtime adapter waits for the model `WorldAssetRoot` instance to report readiness, finds its
+Animation-manifest schema v3 adds an optional stable default clip sub-asset ID sourced from model
+import settings. It is an explicit presentation policy: renderable animated-model placement creates
+a one-state controller only when this ID resolves. An absent value preserves the imported node pose;
+the importer and placement workflow never infer a first clip. Generic scene-instance placement does
+not consume this setting.
+
+The runtime adapter waits for the renderer's `HydratedSkinnedMeshRoot` instance to report readiness, finds its
 animation player, and derives Bevy graph/player state from the controller. Generated instance,
 graph, player, transition, and playback bookkeeping is transient and excluded from authored scene
 serialization. Rehydration owns a dedicated generated instance root and must not despawn authored
@@ -61,6 +67,14 @@ authored/default crossfade. Invalid state requests are rejected without disturbi
 state. The editor's preview and scrub controls use the same runtime adapter; starting, stopping, or
 scrubbing a preview never changes the authored descriptor, history, or scene dirty state.
 
+When a hydrated hierarchy becomes ready, the runtime captures its descendant `Transform` and
+`MorphWeights` components before evaluating authored playback. Edit mode samples the configured
+default state at its range start and pauses it. Preview stop, controller removal, failed graph
+reconfiguration, and PIE exit first stop playback and restore the captured baseline; if a valid
+default remains, it is then sampled again without a crossfade. Skin validation checks each imported
+skin independently for joint/inverse-bind count and hierarchy ownership, including sources that
+reuse one joint hierarchy across multiple skin records.
+
 Interactive diagnostics, headless validation, and packaging resolve the same manifest and enforce
 source availability, stable reference resolution, supported formats, valid playback ranges/events,
 and exact skeleton compatibility.
@@ -79,9 +93,15 @@ the rigs into separate assets or export all clips beneath one common root.
 - One-layer named states provide a deterministic gameplay integration point without committing the
   editor to a visual graph format prematurely.
 - Exact-signature retargeting is intentionally restrictive but cannot silently deform the wrong rig.
+- Explicit edit-rest clips avoid malformed source presentation poses without coupling rendering to
+  animation; assets without a configured clip keep their imported rest pose.
+- Baseline restoration prevents stopped previews and mode changes from leaving sampled transforms or
+  morph weights behind.
 - Rejecting multiple animation roots prevents the runtime adapter from selecting an arbitrary first
   player and driving only part of a source.
 - A future visual graph, blend trees, root motion, IK, advanced retargeting, or animated FBX support
   must extend or supersede this contract explicitly rather than leaking runtime Bevy components into
   authored scenes.
 - Implementation and production acceptance are tracked in Gitea issue #46.
+- The static/skinned renderer boundary and v2-to-v3 scene migration are defined by
+  [ADR 0033](0033-dedicated-skinned-mesh-renderer.md).
diff --git a/docs/adr/0032-versioned-navigation-bake-and-runtime-query.md b/docs/adr/0032-versioned-navigation-bake-and-runtime-query.md
new file mode 100644
index 0000000..66dadc0
--- /dev/null
+++ b/docs/adr/0032-versioned-navigation-bake-and-runtime-query.md
@@ -0,0 +1,36 @@
+# ADR 0032: Versioned Navigation Bake And Runtime Query
+
+## Status
+
+Accepted
+
+## Context
+
+Blacksite needs a production navigation workflow on Bevy 0.19. Current high-level Bevy navigation
+plugins target older Bevy releases, while baking and pathfinding are difficult, established domains
+that should not be reimplemented locally. The editor also cannot own the runtime query contract:
+packaged games and headless validation must consume the same data and behavior.
+
+## Decision
+
+Use the engine-independent Rerecast crate for deterministic 3D walkable-surface generation and
+Polyanya for any-angle path queries. Blacksite owns reflected authoring components and a versioned
+generated artifact under `assets/navigation/generated/`. The artifact records the source scene,
+source fingerprint, agent profile, baked mesh, links, bounds, and diagnostics.
+
+The scene crate owns fingerprinting, bake artifact IO, and validation. The game crate owns artifact
+loading and path queries. Editor bake controls, overlays, and path preview call those shared/game
+contracts and keep all visual helpers transient. Relevant authored geometry changes mark the
+artifact stale; V1 debounces a full deterministic rebuild and reports the affected region until
+Rerecast provides production-ready tiled regeneration.
+
+## Consequences
+
+- Navigation remains usable on Bevy 0.19 without forking an older Bevy integration crate.
+- Rerecast and Polyanya versions become explicit serialized-artifact compatibility inputs; schema
+  migration or rebaking is required when their representation changes.
+- Static navigation and explicit links ship first. Runtime obstacle carving, crowd avoidance, and
+  partial tile rebuilding remain future work.
+- Primitive and additive-brush triangles are deterministic source geometry. Imported static meshes
+  use authored navigation obstacles until their normalized artifacts expose collision triangles.
+- Runtime code never depends on editor UI state, and authored scenes never contain bake visualizers.
diff --git a/docs/adr/0033-dedicated-skinned-mesh-renderer.md b/docs/adr/0033-dedicated-skinned-mesh-renderer.md
new file mode 100644
index 0000000..a558682
--- /dev/null
+++ b/docs/adr/0033-dedicated-skinned-mesh-renderer.md
@@ -0,0 +1,60 @@
+# ADR 0033: Dedicated Skinned Mesh Renderer
+
+## Status
+
+Accepted
+
+## Context
+
+The normalized model artifact originally exposed every imported primitive to
+`StaticMeshRenderer`, including primitives with joint indices and weights. Whole-model static
+placement could therefore detach rigged geometry from its joints and render it in bind pose. The
+animation workflow avoided individual skinned-part placement, but it still represented animated
+geometry as generic `ImportedModel + ModelRef`, leaving no authoring boundary between an arbitrary
+source scene and geometry that requires a skeleton hierarchy.
+
+Static, generic scene-instance, and skinned rendering have different ownership rules. Static parts
+can be flattened into independent slots and triangle-mesh colliders. A skinned mesh must retain the
+source joints, inverse bind poses, animation player, and hierarchy. A generic scene instance may
+contain cameras, lights, or other source data and does not imply an animation contract.
+
+## Decision
+
+Rigged geometry uses `ActorKind::SkinnedMesh + SkinnedMeshRenderer`. The renderer stores stable
+asset identity, cached source path, and source scene index. Its dedicated hydration system creates a
+`HydratedSkinnedMeshRoot` and instantiates the complete source hierarchy so Bevy owns the runtime
+`SkinnedMesh`, joints, inverse bind poses, and animation-player placement. The animation runtime
+binds only to this dedicated root. `AnimationControllerDesc` is valid only beside a
+`SkinnedMeshRenderer`.
+
+Renderer hydration itself remains animation-agnostic. The animation adapter captures the imported
+hierarchy baseline when that root becomes ready and optionally drives the explicit default clip
+recorded by animation-manifest schema v3. Without a controller, the dedicated renderer remains at
+the captured imported pose.
+
+Static-mesh artifact schema v2 marks every part as skinned or unskinned. Static renderer creation
+filters out skinned parts and all geometry from an animated source; static hydration enforces the
+same rule even if a scene contains a hand-authored slot. Automatic renderable-model placement
+chooses `SkinnedMeshRenderer` when any source part is skin-bound or the source contains animation,
+and otherwise chooses `StaticMeshRenderer`. Placing a skinned or animated subasset
+places its owning model through the dedicated renderer; it never creates a detached static slot.
+
+`ImportedModel + ModelRef` remains the explicit generic scene-instance path. It is not the animation
+renderer. Scene schema v3 migrates v2 entities containing both `ModelRef` and
+`AnimationControllerDesc` to `SkinnedMeshRenderer + ActorKind::SkinnedMesh`; unrelated imported
+scene instances remain unchanged.
+
+Automatic triangle-mesh collider generation applies only to static renderers. Animated collision
+must be authored explicitly with stable gameplay shapes or hitboxes rather than a deforming render
+surface.
+
+## Consequences
+
+- Static renderer slots can no longer silently accept newly imported skinned or animated geometry.
+- Rigged models retain the exact hierarchy Bevy needs for skinning and animation playback.
+- Generic scene instances, static meshes, and skinned meshes have distinct persisted components,
+  actor kinds, hydration markers, validation, and editor presentation.
+- A source containing both rigid and skinned nodes is placed as one skinned actor so the imported
+  hierarchy remains coherent; splitting it requires separate source assets.
+- FBX skinning and animation remain blocked by ADR 0031 until the FBX loader can build the same
+  runtime hierarchy and clip contract as glTF.
diff --git a/docs/adr/0034-registry-driven-authoring-components.md b/docs/adr/0034-registry-driven-authoring-components.md
new file mode 100644
index 0000000..baf3a19
--- /dev/null
+++ b/docs/adr/0034-registry-driven-authoring-components.md
@@ -0,0 +1,45 @@
+# ADR 0034: Registry-driven authoring components
+
+## Status
+
+Accepted
+
+## Context
+
+The Add Component palette was registry-backed, but presence checks, copy/paste, reset, removal,
+history, save filtering, validation, and most inspector dispatch were duplicated as Rust `match`
+statements. `InspectorOrder` also stored active state, causing hydration and game systems to depend
+on editor presentation metadata. `ActorKind` was used as validation authority, which prevented
+otherwise valid component composition such as a rendered mesh that also emits light.
+
+## Decision
+
+- Every authoring component registration has an immutable editor/protocol ID separate from its
+  reflected Rust type path. Startup validation rejects duplicate IDs/types, missing reflection
+  adapters, and unknown recommendation/conflict references.
+- Bevy reflection supplies generic presence, default insertion/reset, removal, copy/paste, and RON
+  values for atomic `ComponentTransaction` history. A transaction includes the derived
+  `ActorKind` hint so one undo restores the complete component edit.
+- The registry builds the scene component allowlist. A statically linked extension uses
+  `register_authoring_component` to register reflection metadata, lifecycle metadata, and an
+  inspector callback together.
+- Persisted `AuthoringComponentStates` owns component active state. `InspectorOrder` owns only card
+  ordering. Schema-v3 state embedded in `InspectorOrder` is moved lazily and remains a read fallback
+  during migration.
+- `ActorKind` remains serialized for compatibility and presentation, but is derived from component
+  composition on load and component transactions. Validation enforces component data and explicit
+  geometry-source conflicts rather than comparing behavior with the stored hint. Compatible
+  components, including mesh plus light, may coexist.
+
+## Consequences
+
+- New statically linked authoring components participate in save filtering and generic component
+  operations without adding editor-core history or persistence branches.
+- Runtime systems read active state independently from inspector layout. Old scenes preserve their
+  disabled components and upgrade in memory before their next save.
+- Geometry source conflicts remain explicit, while presentation categories no longer prohibit
+  unrelated behavior composition.
+- Existing whole-entity spawn/duplicate snapshots still have typed fields. Moving those snapshots
+  and every built-in inspector renderer to the reflected registry is follow-up work; the generic
+  transaction path is the required path for new component operations.
+
diff --git a/docs/adr/0035-shared-material-assets-and-renderer-slots.md b/docs/adr/0035-shared-material-assets-and-renderer-slots.md
new file mode 100644
index 0000000..154e941
--- /dev/null
+++ b/docs/adr/0035-shared-material-assets-and-renderer-slots.md
@@ -0,0 +1,60 @@
+# ADR 0035: Shared Material Assets and Renderer Slots
+
+## Status
+
+Accepted
+
+## Context
+
+Renderer material authoring previously mixed copied `MaterialDesc` values, imported source-material
+defaults, and static-mesh draw data. That made a renderer's ownership unclear, encouraged material
+copies per actor, and left rigged geometry without the same assignment model as static geometry.
+Matching imported materials by a display name was also unsafe: names are neither unique nor stable
+when a model is reimported.
+
+Static and skinned renderers need the same Unity-like authoring contract without sharing their mesh
+or hydration components. A project material must be reusable, an instance must express explicit
+overrides over one base material, and each renderer must expose stable material slots independently
+from its draw or skeleton representation.
+
+## Decision
+
+- Project materials use versioned `MaterialAsset` documents. A `MaterialInstanceAsset` references
+  one direct base `MaterialAsset` and stores parameter and texture overrides. Nested material
+  instances are invalid.
+- `MaterialRef` is the assignment type. Its registry UUID and subasset ID are authoritative;
+  `source_path` is a cached loading hint that validation or migration may repair after a move.
+- `StaticMeshRenderer` and `SkinnedMeshRenderer` each own a `RendererMaterialSet`. They do not share
+  a mesh component or hydration path. Each `RendererMaterialSlot` has a stable ID, a presentation
+  name, a read-only imported `source_material`, and an optional explicit `material` assignment.
+  Explicit assignment wins; clearing it returns to the imported source material.
+- Static draw parts and imported skinned-hierarchy draws bind to material slots by stable IDs.
+  Reimport reconciles by ID only. An explicit assignment whose source slot disappears is retained as
+  an `OrphanedMaterialAssignment`; the editor never silently reconnects it by display name.
+- Asset Browser **Apply Material** assigns a shared material or material instance to every material
+  slot on each selected static or skinned renderer. Renderer inspectors provide per-slot
+  Browse/Select/Locate/Clear controls and expose orphan warnings.
+- `HydratedRendererMaterialBinding` identifies each runtime draw's owner, slot, and effective
+  material. A skinned renderer material-only edit patches the instantiated hierarchy without
+  reloading its source hierarchy or joints.
+- `MaterialPropertyBlocks` are runtime-only, per-slot overrides. They do not mutate a shared asset
+  and are excluded from scene and prefab persistence. Persisting a reusable variation requires an
+  explicit material instance.
+- Scene schema v4 migrates legacy renderer assignments into `RendererMaterialSet`. Project material,
+  material-instance, shader-schema, and scene rewrites are performed by the explicit transactional
+  `cargo upgrade-project` command; ordinary loading remains read-only.
+
+## Consequences
+
+- Static and skinned renderers have a consistent material-slot workflow while retaining distinct
+  geometry ownership and hydration behavior.
+- An assignment remains a reference rather than a copied material value, so editing or replacing a
+  shared asset does not create actor-local material copies. Material/base/schema/evaluator
+  dependency revisions update the shared runtime handle in place across all assigned slots.
+- Source reimport cannot silently move an override to the wrong draw. Orphans require an explicit
+  user decision to reassign or discard.
+- Legacy primitive/actor `MaterialDesc` paths remain compatibility paths until their consumers move
+  to renderer slots; new mesh-renderer work uses shared references.
+- Runtime property blocks have no editor promotion workflow yet.
+- Material graph authoring, nested instances, blended/transmissive materials, and a generalized
+  per-renderer property-block inspector are outside this decision.
diff --git a/docs/adr/0036-surface-abi-and-solari-parity.md b/docs/adr/0036-surface-abi-and-solari-parity.md
new file mode 100644
index 0000000..fa4926e
--- /dev/null
+++ b/docs/adr/0036-surface-abi-and-solari-parity.md
@@ -0,0 +1,72 @@
+# ADR 0036: Surface ABI v1 and Solari Evaluator Parity
+
+## Status
+
+Accepted
+
+## Context
+
+Arbitrary full-pipeline WGSL cannot be carried safely between Bevy's raster pipelines and Solari's
+ray-hit shaders. A custom fragment shader may own bindings, entry points, derivatives, discard, or
+other stage-specific behavior that has no direct ray-tracing equivalent. Treating such a shader as
+a `StandardMaterial` in Solari would produce a different material, while tracing skinned source
+vertices would produce bind-pose geometry instead of the rasterized deformation.
+
+Blacksite needs one constrained material expression that can produce the same surface values in
+forward/deferred raster rendering and at Solari ray hits, while leaving transforms, skinning,
+lighting, fog, shadows, and render-pipeline bindings under engine ownership.
+
+## Decision
+
+- `blacksite_surface` owns versioned Surface ABI v1. A custom evaluator implements:
+
+  ```wgsl
+  fn evaluate(
+      input: SurfaceInput,
+      params: SurfaceParams,
+      samples: SurfaceSamples,
+  ) -> Surface
+  ```
+
+  `SurfaceInput` provides UV0, world position, and world normal. `Surface` returns base color,
+  tangent-space normal, emissive, metallic, perceptual roughness, reflectance, occlusion, alpha,
+  and lit/unlit model selection.
+- The ABI has 16 `vec4` parameter lanes, eight sampled 2D texture slots with UV transforms, and a
+  400-byte `SurfaceUniform`. Shader schemas map typed Bool/Float/Vec2/Vec3/Color/Enum properties and
+  texture properties into that fixed layout. Exceeding either limit is a validation error.
+- Evaluators cannot declare bindings or shader entry points and cannot use compute/storage,
+  ray-query, derivative, discard, barrier/subgroup, texture-store, or atomic constructs. The engine
+  supplies resources, entry points, vertex transforms/skinning, lighting, fog, and shadows.
+- Raster rendering composes the evaluator between the engine-owned Surface header and footer and
+  installs it as an `ExtendedMaterial<StandardMaterial, SurfaceExtension>` for forward, deferred,
+  and prepass pipelines. Tangent-space normals are applied when the mesh supplies tangents.
+- The maintained `third_party/bevy_solari` fork packs the same uniform and texture set, namespaces
+  validated evaluator functions, and generates a shader-ID dispatch library for ray hits. Eligible
+  non-deformed geometry uses the evaluator for hit material fields, tangent-space normal, emissive,
+  unlit behavior, and cutout candidate acceptance.
+- Opaque and cutout are the supported alpha modes. Solari treats geometry as potentially
+  non-opaque and evaluates the exact Surface alpha and cutoff before accepting a cutout ray
+  candidate.
+- Plain materials without a custom evaluator keep Bevy's standard raster and Solari material path.
+  Dependency revisions cover Material Instances, their direct base, shader schema, and evaluator.
+  Naga syntax/semantic validation and the cross-pipeline restrictions run before installation;
+  invalid updates produce diagnostics and retain the last successfully installed evaluator/library.
+- Meshes with `SkinnedMesh`, runtime morph weights, or morph targets are excluded from Solari until
+  an instance-keyed deformed-vertex and BLAS update path exists. They continue to render through
+  Bevy's raster path; Solari diagnostics report the exclusion. No bind-pose ray-tracing fallback is
+  allowed.
+
+## Consequences
+
+- Custom material code is portable because it describes a surface, not an entire render stage.
+- Raster and Solari evaluate the same source for supported, Solari-eligible static or rigid
+  geometry. Normal parity requires tangents; Solari compatibility diagnostics identify missing
+  tangents and other unsupported mesh layouts.
+- Dynamic skinned/morph Solari geometry remains deliberate future work. This is a geometry parity
+  limit, not permission to substitute source/bind-pose vertices.
+- ABI layout or semantic changes require a new version and migration. The fixed lanes and texture
+  count trade arbitrary resource layouts for deterministic cross-renderer packing.
+- Blend, transmission, refraction, custom vertex displacement, arbitrary entry points, and
+  stage-specific shader behavior are unsupported by Surface ABI v1.
+- Maintaining evaluator parity requires carrying the focused Solari fork until the necessary hooks
+  exist upstream; its dispatch and cutout behavior are covered by local tests.
diff --git a/docs/editor/Bevy_Editor_Component_System_Spec.md b/docs/editor/Bevy_Editor_Component_System_Spec.md
index fc77a1d..a4c6c4f 100644
--- a/docs/editor/Bevy_Editor_Component_System_Spec.md
+++ b/docs/editor/Bevy_Editor_Component_System_Spec.md
@@ -36,6 +36,8 @@ Each actor should contain:
 Actor
 ActorName
 InspectorOrder
+AuthoringComponentStates
+ActorKind // derived compatibility/display hint
 ```
 
 Use stable IDs for save files:
@@ -59,6 +61,7 @@ Every editor-visible component should be registered.
 
 ```rust
 pub struct EditorComponentDescriptor {
+    pub id: &'static str,        // stable editor/protocol identity
     pub type_name: &'static str,
     pub display_name: &'static str,
     pub addable: bool,
@@ -69,12 +72,19 @@ pub struct EditorComponentDescriptor {
 
 The registry controls:
 
+- Scene persistence and reflected presence
 - Visibility
 - Addability
 - Removal rules
 - Custom inspectors
 - Search metadata
 - Categories
+- Requirements, recommendations, and conflicts
+
+Add, remove, reset, copy/paste, and extension-owned edits use reflected
+`ComponentTransaction` history. All component deltas plus the derived `ActorKind` update are one
+undo step. See [the extensibility guide](extensibility.md) and
+[ADR 0034](../adr/0034-registry-driven-authoring-components.md).
 
 ## Inspector Layout
 
@@ -183,6 +193,9 @@ Asset selector requirements:
 
 ## Static Mesh Renderer
 
+This renderer is restricted to unrigged, non-animated geometry. Imported parts marked skinned, or
+parts from a source containing animation, are not valid static slots.
+
 Recommended structure:
 
 ```rust
@@ -222,6 +235,24 @@ Static Mesh Renderer
 
 Collapsed slots reduce inspector height.
 
+## Skinned Mesh Renderer
+
+Rigged, skin-bound, or animated model geometry uses a separate asset-owned renderer:
+
+```rust
+pub struct SkinnedMeshRenderer {
+    pub asset_id: String,
+    pub path: String,
+    pub scene_index: usize,
+}
+```
+
+It has no independent static slots. Hydration instantiates the source hierarchy beneath a
+`HydratedSkinnedMeshRoot`, retaining Bevy joint entities, inverse bind poses, `SkinnedMesh`
+bindings, and animation-player placement. The inspector shows the source, scene, and stable asset
+ID; source reassignment happens through asset placement rather than field-by-field mesh editing.
+`AnimationControllerDesc` is an optional sibling component and requires this renderer.
+
 ## Property Drawing
 
 Generic reflection is the fallback.
@@ -230,6 +261,7 @@ Custom inspectors should exist for:
 
 - Transform
 - Static Mesh Renderer
+- Skinned Mesh Renderer
 - Materials
 - Physics
 - Audio
diff --git a/docs/editor/README.md b/docs/editor/README.md
index 45148ad..e174db7 100644
--- a/docs/editor/README.md
+++ b/docs/editor/README.md
@@ -20,6 +20,10 @@ Docs for the in-process egui editor (`crates/editor/`). Update this index when a
 | [prefab-authoring.md](prefab-authoring.md) | Stable nested overrides, source Apply/conflicts, variants, unpacking, and local conversion |
 | [audio-authoring.md](audio-authoring.md) | Audio clip placement, source/listener controls, audition, buses, runtime parity, and validation |
 | [animation-authoring.md](animation-authoring.md) | glTF rig/clip import, stable controller states, preview, runtime API, and validation |
+| [navigation-authoring.md](navigation-authoring.md) | Bounds, source geometry, deterministic bake, viewport path preview, and runtime query workflow |
+| [extensibility.md](extensibility.md) | Static authoring component lifecycle registration, stable IDs, composition, and generic history |
+| [material-system.md](material-system.md) | Shared Material/Material Instance assets, static/skinned renderer slots, Surface ABI, Solari scope, and migration |
+| [evaluations/material-renderer-foundation/](evaluations/material-renderer-foundation/) | Live screenshots and verification record for the renderer/material/component foundation |
 
 ## Subsystems (code → doc)
 
@@ -32,6 +36,9 @@ Docs for the in-process egui editor (`crates/editor/`). Update this index when a
 | `play/` | PIE session, editor mode state | architecture.md |
 | `play/audio_preview.rs` / `game::audio` | Non-dirty editor audition and authored runtime playback/bus adapter | audio-authoring.md, ADR 0030 |
 | `assets/animation.rs` / `ui/animation_inspector.rs` / `game::animation` | Generated animation manifests, controller authoring/preview, and runtime state adapter | animation-authoring.md, ADR 0031 |
+| `ui/navigation_inspector.rs` / `scene::navigation` / `game::navigation` | Navigation authoring, deterministic bake artifacts, viewport preview, and runtime path queries | navigation-authoring.md, ADR 0032 |
+| `assets/materials.rs` / `shared::renderer_material` / `shared::hydration::{static_meshes,skinned_meshes}` | Shared material discovery, stable renderer slots, and draw binding | material-system.md, ADR 0035 |
+| `blacksite_surface` / `game_hot::rendering::solari` / `third_party/bevy_solari` | Surface ABI packing, raster composition, Solari evaluator dispatch, and deformation eligibility | material-system.md, rendering.md, ADR 0036 |
 | `assets/` | Catalog, asset DB, static mesh artifacts, `thumbnails/`, `materials.rs`, prefab overrides v2 | this file (below), prefab-authoring.md, ADR 0017, ADR 0027 |
 | `shared::prefab_overrides` | Versioned stable override schema and editor-independent runtime application | prefab-authoring.md, ADR 0027 |
 | `project/` | Workspace, settings UI, user prefs, support diagnostics | roadmap Phase 1 |
@@ -41,7 +48,7 @@ Docs for the in-process egui editor (`crates/editor/`). Update this index when a
 | `ext/` | Command palette, BRP, game panel adapters | ADR 0007 |
 | `ui/mod.rs` | Dock layout, unified viewport, menus | README controls |
 | `ui/scene_tabs.rs` | Main-toolbar scene tabs and composition controls | multi-scene-composition.md, ADR 0026 |
-| `ui/component_registry.rs` | Editor-visible component descriptors and Add Component palette metadata | ADR 0018 |
+| `ui/component_registry.rs` | Stable authoring component identities, lifecycle metadata, save policy, and inspector callbacks | extensibility.md, ADR 0034 |
 | `ui/asset_browser/` | Asset Browser tree, grid/list, details | roadmap Phase 4b |
 | `history/` | Undo/redo command stack | README controls |
 | `crates/scene` | Schema stamp/migrate/validate (shared) | ADR 0006, ADR 0008 |
@@ -57,23 +64,26 @@ Docs for the in-process egui editor (`crates/editor/`). Update this index when a
 - **Unified viewport** uses one render-to-texture target for both the editor fly camera and the possessed player camera so HDR/atmosphere is not broken by sub-viewport cropping.
 - **PIE:** F8 possess/eject while sim runs; **F6** pauses/resumes simulation in Play; project settings drive shared rendering for the active viewport camera.
 - **Asset browser** mirrors the on-disk `assets/` directory with project tree, breadcrumb, search/filter/sort, grid/list views, texture/model/material thumbnails, a details pane, and context-aware row/menu actions; narrow docks prioritize content, keep the root panel fixed, switch list view to a compact single-column layout, and hide tree/details panes when they would crowd the content area. The footer stays pinned while only the project tree, asset content, and details panels scroll. **Built-ins** holds spawnable primitives and lights. **Materials** folder scans `assets/materials/*.ron`, renders material thumbnails on a sphere using `MaterialDesc`, and exposes shader-schema-driven parameters/textures in the details editor; **Shaders** holds shader schema RON files. **Audio** accepts Bevy-supported Ogg/Vorbis and Speex (`.ogg`, `.oga`, `.spx`), WAV, MP3, and FLAC clips under `assets/audio/`, with a dedicated filter, waveform icon, format/file details, and stable registry-backed references that retain a runtime source path. glTF/GLB/FBX rows can expand into a shelf of normalized embedded mesh, material, and texture subassets with independent generated thumbnails. Mesh subassets can be selected, dragged into the viewport, or placed from details/context menus; material subassets render source-material spheres; texture subassets can be applied to the selected actor. Model import settings are staged with **Apply** / **Revert**, asset context menus can regenerate thumbnails, material asset details edit shared `MaterialAsset` fields, and file asset deletion moves sources/generated artifacts into `assets/.trash/`. Before thumbnail loading, glTF sources preflight local external buffers/images and show a stable non-retryable failure state when a dependency is missing instead of repeatedly invoking the asset loader.
-- **Static mesh renderer** — model drag/drop defaults to `ActorKind::StaticMesh + StaticMeshRenderer` using normalized artifacts under `assets/meshes/generated/`. Renderer slots store imported `EditorAssetRef` mesh/material references, not source FBX/glTF paths. `SceneInstance` placement keeps the legacy `ImportedModel + ModelRef` path for full scene playback.
-- **Animation authoring** — glTF/GLB imports generate UUID-keyed rig/clip manifests and expandable skeleton/clip shelves. Clip drag creates an animated actor or adds one exact-signature-compatible state to a selected imported model through typed history. `AnimationControllerDesc` exposes named states, ranges, loop/speed, default/crossfade, and non-dirty runtime-backed preview; project validation resolves the same stable refs and blocks animated/skinned FBX with conversion guidance. Production acceptance remains open in Gitea #46. See [animation-authoring.md](animation-authoring.md) and [ADR 0031](../adr/0031-animation-authoring-runtime-contract.md).
+- **Static/skinned renderer split** — model drag/drop uses normalized artifacts under `assets/meshes/generated/`. Unrigged, non-animated sources create `ActorKind::StaticMesh + StaticMeshRenderer`; skin-bound or animated sources create `ActorKind::SkinnedMesh + SkinnedMeshRenderer` and preserve the imported hierarchy. Static slots never contain marked skinned primitives or geometry from animated sources. `SceneInstance` placement keeps `ImportedModel + ModelRef` for generic full-source scenes. See [ADR 0033](../adr/0033-dedicated-skinned-mesh-renderer.md).
+- **Animation authoring** — glTF/GLB imports generate UUID-keyed rig/clip manifests and expandable skeleton/clip shelves. Clip drag creates a skinned actor or adds one exact-signature-compatible state to a selected skinned actor through typed history. `AnimationControllerDesc` exposes named states, ranges, loop/speed, default/crossfade, and non-dirty runtime-backed preview; project validation resolves the same stable refs and blocks animated/skinned FBX with conversion guidance. Production acceptance completed in Gitea #46. See [animation-authoring.md](animation-authoring.md) and [ADR 0031](../adr/0031-animation-authoring-runtime-contract.md).
+- **Navigation authoring** — bounds, obstacles, areas, and links use typed history and viewport visualizers. Rerecast produces a versioned fingerprinted artifact; Polyanya powers both editor path preview and the game-owned runtime API. The existing horizontal toolbar path button creates or bakes bounds, while Scene > Navigation exposes the complete workflow. See [navigation-authoring.md](navigation-authoring.md) and [ADR 0032](../adr/0032-versioned-navigation-bake-and-runtime-query.md).
 - **Brush authoring** — `ActorKind::Brush + BrushDesc` stores persisted convex blockout faces, validates authored geometry in the inspector and Window → Brush Diagnostics, and hydrates active valid brushes into generated mesh children. See [brushes.md](brushes.md).
 - **Draw Brush** — `B`, toolbar pencil, or command `brush.draw` enters a floor-polygon draw mode. LMB places snapped points, Backspace removes the last point, Enter locks the outline for height editing, mouse up/down adjusts height, and Enter/LMB creates additive prism brushes through history. Esc/right-click cancels. Simple concave outlines decompose into convex brush parts; self-intersections remain blocked.
 - **Brush edit modes** — with a brush selected, `1`/`2`/`3`/`4` enter vertex, edge, face, and clip element modes. Element modes show brush handles in the viewport, own LMB picking, support Shift multi-select, show a mode badge, and Esc returns to object mode. Vertex/edge/face selections use the standard `W`/`E`/`R` gizmo at the element pivot and commit undoable `SetBrush` edits. Clip previews a bounds-based half-brush and commits with Enter; command-palette intersect, convex merge, and subtract operations use the same preview/commit lifecycle for conservative cuboid/prism blockout.
 - **Collider split** — imported mesh collision lives in a separate `ColliderDesc::StaticMesh` plus optional `RigidBodyDesc`; renderer slots own only render visibility, shadows, mesh, and material references.
-- **Material assets** — `MaterialAsset` RON (`label` + `MaterialDesc`) is shader-schema aware. Actor material edits live on the actor `MaterialDesc`; static mesh slot material refs are source/default selectors, and content-browser asset inspectors are the path for editing shared material assets.
+- **Material assets and renderer slots** — Material and direct-base Material Instance documents are shared assets. `StaticMeshRenderer` and `SkinnedMeshRenderer` each own stable material slots with imported source defaults and explicit shared assignments; Clear returns to the source default, while reimported missing slots retain overrides as orphans instead of matching by name. Runtime-only property blocks never mutate or persist into the shared asset. Custom Surface evaluators use the same constrained ABI for raster and Solari-eligible non-deformed geometry; skinned/morph geometry is deliberately excluded from Solari until deformed BLAS updates exist. See [material-system.md](material-system.md), [ADR 0035](../adr/0035-shared-material-assets-and-renderer-slots.md), and [ADR 0036](../adr/0036-surface-abi-and-solari-parity.md).
 - **Prefab authoring** — shared `PrefabOverrides` targets generated actors by nested anchor chain plus stable `ActorId`, and applies reflected property/component plus same-layer structural operations in editor and game hydration. The editor supports scoped Revert and transactional **Apply to source** with three-way conflict checks, exact-file undo guards, and recoverable changed/broken/conflict states. `HydratedPrefabMember` keeps generated content out of owner serialization; linked-root saves retain local structure as variants. **Unpack Layer** preserves nested links, while **Convert to Local** recursively removes them. See [prefab-authoring.md](prefab-authoring.md) and [ADR 0027](../adr/0027-stable-prefab-ownership-and-variants.md).
 - **Visual language** uses a near-black industrial shell, a compact Blacksite identity mark, restrained amber actions/primary selection, cyan secondary selection, semantic status colors, stable grouped controls, and shared elevated viewport chips. Primary/secondary selection roles remain consistent across hierarchy rows, viewport x-ray shells/corner brackets, the selection HUD, and transform interactions. See [visual-language.md](visual-language.md).
 - **Hierarchy** shows authored objects plus useful runtime context (`Player`, `PlayerCamera`, Project Sun). Ordinary runtime rows remain read-only; generated prefab rows expose override-aware inspection and same-layer remove/reparent actions while rejecting cross-instance/layer and composition-boundary drops. Locks prevent selection, gizmos, drag participation, structural targets, and mutating context actions. Authored reparenting preserves world placement and records parent/local-transform/manual-order changes as one undoable command.
 - **Player placement** is authored through `PlayerSpawn`; selecting the runtime player in Edit mode redirects to a saved `Player Start`.
 - **World lighting** has two layers: project default sun/ambient settings, and optional scene-authored directional `LightDesc` overrides. **Scene → Lighting** menu and **Rendering** panel (Window) restore project sun or bake a scene directional from project settings. **Apply** in Project Settings updates ambient and sun illuminance live.
 - **Rendering** — `GiMode` + post-process volumes; see [rendering.md](rendering.md). **Window → Rendering** shows requested/effective active-camera stack, fallback reason, Solari eligibility, viewport GI badge, and volume HUD.
-- **Inspector** shows a responsive header, **Transform**, registered authoring component cards, and an Add Component footer (`actor_inspector`) that expands an inline search shelf above the button; only the component body scrolls. Rows wrap or stack inside narrow docks instead of forcing the panel wider, and legacy authoring sections use the same component-card shell. Component card carets collapse/expand for the current editor session, status dots toggle persisted active state, and triple-dot menus provide reset, copy/paste values, move, remove, and documentation slots. Inactive authoring components remain in the scene but are skipped by hydration/runtime queries, stripping their generated meshes, lights, physics, or post-process effects. The Add Component shelf is registry-driven with persistent search, category groups, descriptions, hydration hints, duplicate/conflict disabled states, and recommendation hints. `StaticMeshRenderer` uses concept-style slot cards with model thumbnails, imported mesh/source-material selectors, visibility, and shadow flags. Actor material authoring lives in the `Authoring Material` component, whose texture refs use Asset Browser picker/drop controls. Empty source material refs display the inherited source material from the generated static mesh artifact as **Source default**; selector **Browse** assigns explicit normalized imported sub-assets, **Locate** focuses the owning asset in the Asset Browser, and **Clear** returns optional material slots to the inherited source default. `ColliderDesc` and `RigidBodyDesc` are separate component cards. Game crates add sections via `ActorInspectorSection` + `game::editor_ext::actor_inspector_section_ids()`.
+- **Inspector** shows a responsive header, **Transform**, registered authoring component cards, and an Add Component footer (`actor_inspector`) that expands an inline search shelf above the button; only the component body scrolls. Rows wrap or stack inside narrow docks instead of forcing the panel wider, and legacy authoring sections use the same component-card shell. Component card carets collapse/expand for the current editor session, status dots toggle persisted `AuthoringComponentStates`, and triple-dot menus provide registry-backed reset, copy/paste values, move, remove, and documentation slots. `InspectorOrder` controls presentation only. The Add Component shelf is registry-driven with persistent search, category groups, descriptions, hydration hints, duplicate/conflict disabled states, and recommendation hints. Static game/editor extensions register reflected lifecycle metadata and their inspector together; see [extensibility.md](extensibility.md) and [ADR 0034](../adr/0034-registry-driven-authoring-components.md).
 - **Command palette** (`Ctrl+P`): opens centered, clears and focuses the filter, selects the first result, searches both human-facing labels and stable command IDs, and supports arrow-key selection and Enter to run. Commands include `scene.reset_lighting`, `brush.draw`, `brush.subtract`, `brush.intersect`, `brush.merge_convex`, `rendering.create_volume`, `rendering.select_volumes_at_camera`, `rendering.focus_active_volumes`, `selection.group`, `selection.focus`, `selection.reset_transform`, and play commands.
 - **Editor input routing** gives egui text fields first claim on keyboard input. Viewport shortcut keys require viewport pointer focus and are suspended while RMB/MMB camera navigation is active.
-- **ActorKind** is required on saved level objects (schema v2). Save strips hydrated ECS before writing `.scn.ron`.
+- **ActorKind** remains required as a saved compatibility/display hint, is repaired from primary
+  components on load and component transactions, and does not prohibit compatible composition such
+  as renderer plus light. Component validation owns requirements and geometry-source conflicts.
 - **Scene persistence and recovery** use transactional same-directory writes for authored scenes and bounded user-local recovery snapshots for dirty saved scenes. Recovery runs every 120 seconds by default, keeps five generations, never marks the scene clean, and appears as a status/File-menu restore or discard action when newer than the authored file. Restore leaves the original scene dirty until manually saved. See [ADR 0023](../adr/0023-transactional-scene-persistence-and-recovery.md).
 - **Scene visualizers** expose actor root icons, colliders, lights, player spawns, gameplay markers, volumes, prefab/model anchors, Project Sun, and runtime player/camera markers without changing saved scene data. Spot lights show inner/outer cones and cameras show near/far frusta. Viewport options independently gate visualizer categories and include actor icon and transform-gizmo size sliders.
 - **Clean game-view overlay** (`G`) hides editor chrome, grid, selection outlines, transform gizmos, actor root icons, visualizers, and selectable proxies without changing camera ownership; `Ctrl+G` toggles grid.
diff --git a/docs/editor/animation-authoring.md b/docs/editor/animation-authoring.md
index 066a25e..2afe794 100644
--- a/docs/editor/animation-authoring.md
+++ b/docs/editor/animation-authoring.md
@@ -15,15 +15,22 @@ mesh artifact. Expanding a model row shows:
 - animation clips with duration and event count;
 - mesh, material, and texture entries from the static import contract.
 
+Model Import Settings also exposes **Default animation**. Choosing a clip stores its stable
+sub-asset ID and makes normal renderable-model placement create a one-state controller for that
+exact clip. The editor samples the clip at its authored range start and pauses it as the edit-mode
+rest presentation. **Imported rest pose** creates no controller and preserves the source node pose;
+Blacksite never guesses the first clip. Generic Scene Instance placement remains animation-free.
+
 Skeleton rows are inspect-only. Dragging an animation clip into the viewport creates one
-`ImportedModel` actor with a stable `ModelRef` and `AnimationControllerDesc` and selects it for
-immediate inspection. When an imported-model actor is selected, the same drag assigns the clip as a
+`SkinnedMesh` actor with a stable `SkinnedMeshRenderer` and `AnimationControllerDesc` and selects it for
+immediate inspection. When a skinned-mesh actor is selected, the same drag assigns the clip as a
 new controller state instead. Assignment is one undoable command and requires an exact
 skeleton-signature match.
 
-Skinned primitive rows are inspect-only because their vertex data requires the source skin
-hierarchy. Their thumbnails render the complete source scene, and drag/place actions direct authors
-to place the model or an animation clip instead of creating an invalid detached mesh.
+Skinned primitive rows place their owning model through `SkinnedMeshRenderer` because their vertex
+data requires the source skin hierarchy. Their thumbnails render the complete source scene; no
+drag, details action, or context-menu action can create an invalid detached static-mesh slot.
+Unrigged primitives continue to place independently through `StaticMeshRenderer`.
 
 ## Controller Inspector
 
@@ -35,7 +42,10 @@ and property changes use typed editor history and participate in scene dirty tra
 The Preview section selects a state, plays or pauses it, stops playback, and scrubs within the
 authored range. Preview requests use the game runtime adapter and do not change the controller,
 history, or scene dirty state. Entering PIE clears any paused edit-mode scrub so the authored
-default state can run; leaving PIE clears transient playback while retaining authored data.
+default state can run; leaving PIE clears transient playback while retaining authored data. The
+runtime captures imported descendant transforms and morph weights before evaluating animation.
+Stop, controller removal, invalid graph rebuild, and PIE exit restore that baseline before the
+configured edit-rest state is sampled again, so a preview cannot strand the actor in its last pose.
 
 ## Runtime API
 
@@ -51,31 +61,34 @@ game::animation::request_animation_state(
 An omitted crossfade uses the controller default. Invalid actor or state requests return an error
 and preserve current playback. If edited controller data cannot rebuild its runtime graph, the old
 graph is stopped and cleared instead of continuing stale playback. `AnimationGraph`,
-`AnimationPlayer`, transitions, preview state, and hydrated model roots are runtime-only and never
+`AnimationPlayer`, transitions, preview state, and hydrated skinned-mesh roots are runtime-only and never
 serialize into authored scenes.
 
 ## Stable Identity And Moves
 
-`ModelRef`, skeleton references, and clip references carry the model registry UUID. Generated
+`SkinnedMeshRenderer`, skeleton references, and clip references carry the model registry UUID. Generated
 artifacts are keyed by that UUID; source paths are cached resolution and repair hints. When one
 model is moved or renamed on disk, catalog refresh reconciles it by its animation-manifest content
 hash, preserves the UUID, and regenerates both manifests with the new source path. An identical copy
 is not treated as a move while the original still exists. Ambiguous content matches intentionally
 receive a new identity rather than silently binding the wrong asset.
 
-Legacy path-only `ModelRef` values remain readable and use their cached path. Reassign or replace a
-legacy model actor to opt it into stable move resolution.
+Scene schema v3 migrates legacy animated actors that paired `ModelRef` with
+`AnimationControllerDesc` to the dedicated skinned renderer. Generic `ImportedModel + ModelRef`
+scene instances remain readable and intentionally do not become animation actors.
 
 Skeleton compatibility hashes the exact Bevy 0.19 glTF node-name segments and bind poses, including
 whitespace and slash characters. The readable joint paths shown by the editor are deliberately not
 used as identity. Animation-manifest schema v1 artifacts must be reimported to generate schema v2
-signatures.
+signatures; schema v3 adds the explicit default-clip ID. Schema v2 deserializes as Imported rest
+pose and never receives an inferred default.
 
 ## Validation And Format Boundary
 
 Interactive diagnostics and `cargo validate-levels` resolve registry UUIDs, generated manifests,
 stable subasset IDs, source dependencies, default/state IDs, playback ranges, speeds, crossfades,
-runtime format support, exact source-content fingerprints, and exact rig compatibility. Findings
+runtime format support, explicit default-clip resolution, exact source-content fingerprints, and
+exact rig compatibility. Findings
 identify the owning actor and controller property and include a repair action. Packaging includes
 the same source files and generated artifacts checked by validation.
 
@@ -86,6 +99,7 @@ Bevy creates a separate `AnimationPlayer` for each root. Split those rigs into s
 export them beneath one common root. Animation v1 also does not provide implicit retargeting, blend
 trees, a visual state graph, root motion, IK, or motion matching.
 
-See [ADR 0031](../adr/0031-animation-authoring-runtime-contract.md) for the persistent/runtime
-boundary and [the working implementation plan](../../.cursor/plans/animation_authoring_2026-07-11.plan.md)
+See [ADR 0031](../adr/0031-animation-authoring-runtime-contract.md) for the controller/runtime
+boundary, [ADR 0033](../adr/0033-dedicated-skinned-mesh-renderer.md) for renderer ownership, and
+[the working implementation plan](../../.cursor/plans/animation_authoring_2026-07-11.plan.md)
 for acceptance gates.
diff --git a/docs/editor/architecture.md b/docs/editor/architecture.md
index deba28b..b21e625 100644
--- a/docs/editor/architecture.md
+++ b/docs/editor/architecture.md
@@ -182,18 +182,45 @@ On play enter/exit the editor snapshots **player sim state only** (transform, ve
 2. `EditorOnly` entities (cameras, helpers) are filtered from hierarchy and save; visualizer proxies can be picked but resolve back to source entities.
 3. Player placement is stored as `PlayerSpawn`; the runtime `Player` is never serialized.
 4. `SceneIo` writes native Bevy dynamic scenes under `assets/levels/`, routed through `scene::document::SceneDocument`. The active tab is materialized in the ECS world; inactive tabs retain normalized authored snapshots and independent dirty/recovery state. `SceneComposition` resources reference validated project-relative subscenes by stable IDs, and runtime-only `ComposedSceneMember` ownership prevents child actors from being flattened into the owner save. See [multi-scene-composition.md](multi-scene-composition.md) and ADR 0026.
-5. Hydration systems in `game` spawn meshes, colliders, lights, and static mesh renderer parts at runtime. Level-object roots are initialized with Bevy visibility hierarchy components before generated children are attached, so authoring `EditorVisibility` participates in normal visibility propagation. `ActorId` and `ComponentInstanceId` are the persisted identities; raw Bevy `Entity` IDs are runtime-only and must not become tool-facing document IDs.
+5. Hydration systems in `game` spawn meshes, colliders, lights, static mesh renderer parts, and
+   dedicated skinned-model hierarchies at runtime. Level-object roots are initialized with Bevy
+   visibility hierarchy components before generated children are attached, so authoring
+   `EditorVisibility` participates in normal visibility propagation. `ActorId` and
+   `ComponentInstanceId` are the persisted identities; raw Bevy `Entity` IDs are runtime-only and
+   must not become tool-facing document IDs.
 6. Brush actors store authored convex geometry as `BrushDesc`; hydration rebuilds generated mesh children from those faces and strips the children before save.
 
 ## Model import (glTF + FBX)
 
 - **Import:** File → Import Assets copies glTF/GLB/FBX into `assets/models/`. FBX imports also copy a sibling `{name}.fbm/` folder when present (embedded textures).
-- **Processing:** the asset registry generates normalized static mesh manifests under `assets/meshes/generated/`. The manifests store stable part IDs, glTF/FBX mesh/material subasset labels, source metadata, dependencies, and import settings. These artifacts are hidden from the Asset Browser catalog.
-- **Browser subassets:** model rows can expand into a content shelf backed by the generated manifest. Mesh subassets can be selected or dragged into the viewport as `StaticMeshRenderer` actors, material subassets expose source defaults, and texture dependencies can be applied to selected actors without treating glTF and FBX differently. The thumbnail studio renders each generated model/subasset/material preview into its own render target before registering it in the cache so later thumbnails cannot overwrite earlier cache entries.
-- **Default placement:** model drag/drop creates `ActorKind::StaticMesh + StaticMeshRenderer`. Renderer slots reference imported `EditorAssetRef` values (`asset_id` + `sub_asset_id`) and hydration resolves those through the generated artifact. `SingleActor` hierarchy mode stores all parts in one renderer; `SourceHierarchy` creates a root with child static mesh actors.
-- **Collision:** when collider generation is enabled, placement adds `RigidBodyDesc` and `ColliderDesc::StaticMesh` using the same imported mesh refs. Renderer slots no longer own collider state.
-- **Scene-instance placement:** asset details can switch placement to `SceneInstance`; that keeps `ImportedModel + ModelRef`, which hydrates to `WorldAssetRoot`. glTF uses `GltfAssetLabel::Scene`; FBX uses `bevy_ufbx` (`path#SceneN`). `FbxPlugin` is registered in `GamePlugin`.
-- **Limitations:** Binary FBX only (not ASCII). Static mesh placement stores animation/skinning/camera/light metadata and warnings but does not play those features; use Scene Instance for full-scene playback.
+- **Processing:** the asset registry generates normalized model manifests under
+  `assets/meshes/generated/`. The manifests store stable part IDs, glTF/FBX mesh/material subasset
+  labels, whether each part is skin-bound, source metadata, dependencies, and import settings.
+  These artifacts are hidden from the Asset Browser catalog.
+- **Browser subassets:** model rows can expand into a content shelf backed by the generated
+  manifest. Unrigged mesh subassets place as independent `StaticMeshRenderer` actors. A skinned
+  subasset places its owning source through `SkinnedMeshRenderer`, retaining joints and inverse bind
+  poses. Material subassets expose source defaults, and texture dependencies can be applied to
+  selected actors. The thumbnail studio renders each generated model/subasset/material preview into
+  its own render target before registering it in the cache so later thumbnails cannot overwrite
+  earlier cache entries.
+- **Default placement:** **Renderable Asset (Auto)** creates
+  `ActorKind::StaticMesh + StaticMeshRenderer` for unrigged, non-animated models and
+  `ActorKind::SkinnedMesh + SkinnedMeshRenderer` when any part is skin-bound or the source contains
+  animation. Static renderer slots
+  reference imported `EditorAssetRef` values and exclude skinned parts. Static `SingleActor` mode
+  stores all parts in one renderer; `SourceHierarchy` creates a root with child static mesh actors.
+  Skinned placement always preserves the imported source hierarchy.
+- **Collision:** when collider generation is enabled, static placement adds `RigidBodyDesc` and
+  `ColliderDesc::StaticMesh` using the same imported mesh refs. Skinned render surfaces do not
+  receive automatic triangle colliders; author stable gameplay collision explicitly.
+- **Scene-instance placement:** asset details can switch placement to `SceneInstance`; that keeps
+  `ImportedModel + ModelRef` for a generic source scene and hydrates to `WorldAssetRoot`. It is not
+  the animation renderer. glTF uses `GltfAssetLabel::Scene`; FBX uses `bevy_ufbx` (`path#SceneN`).
+  `FbxPlugin` is registered in `GamePlugin`.
+- **Limitations:** Binary FBX only (not ASCII). Animated or skinned FBX remains blocked until its
+  loader can construct the same hierarchy and clips as the glTF skinned path. See ADRs 0031 and
+  0033.
 
 ## Undo / history
 
diff --git a/docs/editor/brp.md b/docs/editor/brp.md
index b70262e..bbf3596 100644
--- a/docs/editor/brp.md
+++ b/docs/editor/brp.md
@@ -24,8 +24,8 @@ Default HTTP endpoint follows Bevy 0.19 remote defaults (port **15702**, routes
 | Allowed (examples) | Forbidden on level objects |
 |--------------------|----------------------------|
 | `Transform`, `Name`, `ActorKind` | `PointLight`, `SpotLight`, `DirectionalLight` |
-| `Primitive`, `StaticMeshRenderer`, `MaterialDesc`, `MaterialOverride`, `LightDesc` | `Mesh3d`, `MeshMaterial3d`, `RigidBody`, `Collider` |
-| `ModelRef`, `RigidBodyDesc`, `ColliderDesc`, legacy `PhysicsBody`, gameplay markers | `WorldAssetRoot`, generated static mesh children, internal visibility types |
+| `Primitive`, `StaticMeshRenderer`, `SkinnedMeshRenderer`, `MaterialDesc`, `MaterialOverride`, `LightDesc` | `Mesh3d`, `MeshMaterial3d`, `RigidBody`, `Collider` |
+| `ModelRef`, `RigidBodyDesc`, `ColliderDesc`, legacy `PhysicsBody`, gameplay markers | `WorldAssetRoot`, generated static/skinned roots, internal visibility types |
 | `PostProcessVolumeDesc` | Runtime post-process components on cameras |
 
 Prefer:
@@ -33,7 +33,8 @@ Prefer:
 1. Editing `LightDesc` instead of `SpotLight` / `DirectionalLight`
 2. Editing `MaterialDesc` instead of `StandardMaterial` handles
 3. Editing `StaticMeshRenderer` instead of child `Mesh3d` entities
-4. Editing `ColliderDesc` / `RigidBodyDesc` instead of runtime Avian components
+4. Editing `SkinnedMeshRenderer` instead of its hydrated joint/mesh hierarchy
+5. Editing `ColliderDesc` / `RigidBodyDesc` instead of runtime Avian components
 5. Version-controlled `assets/levels/*.scn.ron` for durable changes
 
 See [ADR 0009 — Authoring vs hydrated](../adr/0009-authoring-vs-hydrated.md).
diff --git a/docs/editor/evaluations/material-renderer-foundation/README.md b/docs/editor/evaluations/material-renderer-foundation/README.md
new file mode 100644
index 0000000..514b7c5
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/README.md
@@ -0,0 +1,96 @@
+# Renderer, Material, and Component Foundation Evaluation
+
+Date: 2026-07-11  
+Branch: `codex/renderer-material-component-foundation`
+
+This record captures implementation evidence for the dedicated skinned renderer, shared Material
+and Material Instance workflow, registry-driven authoring components, and custom Surface contract.
+The permanent design contracts live in [ADR 0033](../../../adr/0033-dedicated-skinned-mesh-renderer.md),
+[ADR 0034](../../../adr/0034-registry-driven-authoring-components.md),
+[ADR 0035](../../../adr/0035-shared-material-assets-and-renderer-slots.md), and
+[ADR 0036](../../../adr/0036-surface-abi-and-solari-parity.md). The user workflow lives in the
+[material-system guide](../../material-system.md).
+
+## Live editor evidence
+
+All images below are native Wayland captures from the running editor. The temporary actors and
+assignments used for visual verification were not saved into the authored scene.
+
+### Dedicated skinned renderer and stable material slots
+
+![RobotExpressive in its explicit Standing edit pose with a dedicated Skinned Mesh Renderer and stable named material slots](skinned-mesh-renderer-material-slots.png)
+
+The actor is hydrated through `SkinnedMeshRenderer`, not `StaticMeshRenderer`. Its imported
+hierarchy remains intact, the configured default Standing clip is sampled in edit mode, and every
+draw binding exposes a stable slot ID plus source-material fallback.
+
+### Shared custom Surface assigned through a Material Instance
+
+![Custom Surface Material Instance assigned across the skinned renderer slots](custom-surface-on-skinned-renderer.png)
+
+Applying `surface_tint_instance` updates the existing hydrated draw bindings in place. The visible
+blue Surface evaluation does not respawn the hierarchy or reset the sampled pose.
+
+### Sparse Material Instance authoring
+
+![Material Instance editor showing sparse shader and texture overrides](material-instance-sparse-overrides.png)
+
+Instances reference one direct base Material. Unchecked values inherit; selecting or dropping a
+texture creates only that override, and **Clear** removes the binding so inheritance resumes.
+
+### Registry-driven component composition
+
+![One actor composed from Static Mesh Renderer and Light components](mesh-light-component-composition.png)
+
+The actor combines renderer and light components without an `ActorKind` exclusivity rule. The
+registry owns add/remove/reset/copy/paste/history/persistence behavior; `ActorKind` remains a
+derived compatibility and presentation hint.
+
+### Larger material thumbnail previews
+
+![Material thumbnails with tightly framed sphere previews](larger-material-thumbnail-previews.png)
+
+Material spheres now fill roughly 78-81% of the preview while retaining edge padding. Model and
+mesh-subasset framing is unchanged.
+
+Additional captures:
+
+- [Material editor and Create Instance action](material-editor-create-instance.png)
+- [Registry-driven Add Component categories](component-registry-add-menu.png)
+
+## Acceptance results
+
+| Area | Result | Evidence |
+|------|--------|----------|
+| Dedicated static/skinned ownership | Pass | Separate authored/hydrated renderer types; rigged/animated manifests are rejected by static hydration |
+| Pose lifecycle | Pass | Explicit stable default clip; transform and morph-weight baseline restore on stop, controller removal, preview reset, and PIE exit |
+| Renderer material slots | Pass | Stable named IDs, imported fallback, explicit assignment, orphan retention, and in-place material patching |
+| Material assets/instances | Pass | Versioned shared assets, direct-base sparse instances, transient property blocks, Apply/Revert/Create Instance |
+| Texture parameters | Pass | Project-wide picker includes imported texture subassets; base/schema/stored/instance slots share browse, drop, reject, and clear behavior |
+| Component lifecycle | Pass | Stable registry IDs, reflected transactions/history, persistence allowlist, independent active state, and compatible composition |
+| Surface raster/Solari semantics | Pass for eligible geometry | Shared ABI packing, evaluator, textures, normal/emissive/unlit values, and cutout predicate |
+| Project migration | Pass | Transactional schema-v4 upgrader, backup/rollback path, canonical slots and active-state split; second dry run is empty |
+| Project validation | Pass | 59 dependencies, 5 non-blocking findings, 0 blocking errors |
+
+## Automated verification
+
+| Command/suite | Result |
+|---------------|--------|
+| `cargo test -p shared --offline` | 84 passed |
+| `cargo test -p scene --offline` | 64 passed, 1 ignored migration fixture |
+| `cargo test -p game --lib --offline` | 37 passed |
+| `cargo test -p game_hot --lib --offline` | 16 passed |
+| `cargo test -p editor --lib --offline` | 171 passed |
+| `cargo test -p blacksite_surface --offline` | 3 passed plus doc tests |
+| `cargo test -p bevy_solari --lib --offline` | 1 passed |
+| `cargo --locked --offline validate-levels` | 0 blocking errors |
+| `cargo --offline upgrade-project --project . --json` | No pending changes or warnings |
+| `cargo fmt --all -- --check` / `git diff --check` | Pass |
+
+## Deliberate boundary
+
+Bevy 0.19's maintained Solari path does not expose dynamic post-morph/post-skin vertex buffers and
+BLAS updates. Skinned and morph-deformed actors therefore remain visible in raster but are omitted
+from ray tracing with an actionable diagnostic. This is safer than tracing a stale bind-pose ghost;
+dynamic deformed BLAS support remains future work and the corresponding Gitea acceptance item stays
+open.
diff --git a/docs/editor/evaluations/material-renderer-foundation/component-registry-add-menu.png b/docs/editor/evaluations/material-renderer-foundation/component-registry-add-menu.png
new file mode 100644
index 0000000..d9f775b
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/component-registry-add-menu.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08d9771989d5e57be688a70996914f7b35d281cb625aa4f879718d6417460ab8
+size 2098568
diff --git a/docs/editor/evaluations/material-renderer-foundation/custom-surface-on-skinned-renderer.png b/docs/editor/evaluations/material-renderer-foundation/custom-surface-on-skinned-renderer.png
new file mode 100644
index 0000000..48a7d3a
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/custom-surface-on-skinned-renderer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:762ebdc3d3ea62d4a5b147e7a6544a3320df1ca86181884ab5617c54143d66ad
+size 2161775
diff --git a/docs/editor/evaluations/material-renderer-foundation/larger-material-thumbnail-previews.png b/docs/editor/evaluations/material-renderer-foundation/larger-material-thumbnail-previews.png
new file mode 100644
index 0000000..794754a
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/larger-material-thumbnail-previews.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a0da8912de92743ff2cd6c5f37456552e7a2b512def3bd4f5e5741e7bd78fee
+size 2015015
diff --git a/docs/editor/evaluations/material-renderer-foundation/material-editor-create-instance.png b/docs/editor/evaluations/material-renderer-foundation/material-editor-create-instance.png
new file mode 100644
index 0000000..3855319
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/material-editor-create-instance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b438b97c4b34576a620545f24b64dfb383f55f8aa3e26521da580cfb59297d14
+size 2149701
diff --git a/docs/editor/evaluations/material-renderer-foundation/material-instance-sparse-overrides.png b/docs/editor/evaluations/material-renderer-foundation/material-instance-sparse-overrides.png
new file mode 100644
index 0000000..6fb61fe
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/material-instance-sparse-overrides.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5187a8678688efafa3e271ffb42e7f001393820d89638b0f691b94ed9288d39
+size 2152944
diff --git a/docs/editor/evaluations/material-renderer-foundation/mesh-light-component-composition.png b/docs/editor/evaluations/material-renderer-foundation/mesh-light-component-composition.png
new file mode 100644
index 0000000..5605b8c
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/mesh-light-component-composition.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2121b9c05eb22e5722e35fbff910e860fa4c0aee39bef1dc7ef31fa53e5d5d1
+size 2135868
diff --git a/docs/editor/evaluations/material-renderer-foundation/skinned-mesh-renderer-material-slots.png b/docs/editor/evaluations/material-renderer-foundation/skinned-mesh-renderer-material-slots.png
new file mode 100644
index 0000000..26d5485
--- /dev/null
+++ b/docs/editor/evaluations/material-renderer-foundation/skinned-mesh-renderer-material-slots.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d1ec243d93adf00b235a0b1dac3c0d4ae16ce48a0b57b6610715450aa1cacfb
+size 2164447
diff --git a/docs/editor/extensibility.md b/docs/editor/extensibility.md
new file mode 100644
index 0000000..bb46c8b
--- /dev/null
+++ b/docs/editor/extensibility.md
@@ -0,0 +1,49 @@
+# Authoring component extensibility
+
+The authoring component registry is the lifecycle boundary between game-owned components and the
+editor. Stable component IDs are API keys; reflected Rust type paths are serialization adapters and
+may change during refactors.
+
+## Register a statically linked component
+
+Derive `Component`, `Reflect`, and `Default`, and expose Bevy's component/default reflection data:
+
+```rust
+#[derive(Component, Reflect, Default)]
+#[reflect(Component, Default)]
+struct WeaponTuning {
+    damage: f32,
+}
+```
+
+During editor setup, call
+`editor::ui::component_registry::register_authoring_component::<WeaponTuning>(...)` with an
+`EditorComponentDescriptor` and inspector callback. The descriptor's stable `id` must never be a
+Rust type path. Registration fails on duplicate IDs or reflected types, and startup checks that all
+declared types and relationships resolve.
+
+Once registered, the component automatically participates in registry presence checks, scene save
+filtering, default add/reset, reflected copy/paste and removal, and atomic component history. The
+inspector callback owns the component's UI body; mutations should use
+`history::reflected_component_transaction` so component data and the derived `ActorKind` hint undo
+together.
+
+## Composition and enable state
+
+`ActorKind` is a compatibility/display hint, not a component container. Requirements and conflicts
+belong to component registrations. Render, light, audio, physics, and gameplay behaviors may be
+composed unless an explicit conflict prohibits the pair; primary geometry sources are mutually
+exclusive.
+
+Persisted enablement lives in `AuthoringComponentStates`. `InspectorOrder` only controls visual card
+order. Runtime and hydration code must use
+`authoring_component_active(states, legacy_order, component_type_path)`; the legacy order argument
+preserves disabled state while schema-v3 scenes migrate.
+
+## Current boundary
+
+Whole-entity spawn/duplicate snapshots and built-in inspector bodies still contain typed adapters.
+Do not extend those match lists for new component-only edits: use the registry transaction API.
+Dynamic-library component types are not supported; extensions are statically linked and registered
+before the editor's startup validation runs.
+
diff --git a/docs/editor/material-system.md b/docs/editor/material-system.md
new file mode 100644
index 0000000..259c798
--- /dev/null
+++ b/docs/editor/material-system.md
@@ -0,0 +1,149 @@
+# Material System
+
+Blacksite uses shared project materials and renderer-owned material slots. Static and skinned mesh
+renderers expose the same assignment workflow, but remain separate components with separate mesh
+and hydration ownership. The permanent contracts are [ADR 0035](../adr/0035-shared-material-assets-and-renderer-slots.md)
+and [ADR 0036](../adr/0036-surface-abi-and-solari-parity.md).
+
+## Mental model
+
+| Concept | Owns | Saved? |
+|---------|------|--------|
+| Material asset | Reusable shader choice, render state, parameters, and textures | Yes, under `assets/materials/` |
+| Material instance | Overrides over one direct base material | Yes, under `assets/materials/` |
+| Renderer material slot | A stable reference on one static or skinned renderer | Yes, in scenes/prefabs |
+| Imported source material | Read-only default supplied by model import | Yes, as the slot fallback |
+| Material property block | Temporary per-renderer/per-slot runtime overrides | No |
+
+A renderer slot stores a `MaterialRef`, not a copy of the material. The registry UUID and subasset
+ID identify the target; the cached path is only a loading hint. A material instance may reference a
+material, but may not reference another instance.
+
+## Assign materials
+
+1. Select a static- or skinned-mesh actor.
+2. In **Static Mesh Renderer** or **Skinned Mesh Renderer**, find the material slot by its imported
+   name and stable ID.
+3. Use **Browse** or **Select** to assign a Material or Material Instance. **Locate** reveals the
+   current asset in the Asset Browser.
+4. Use **Clear** to remove only the explicit assignment. The slot returns to its read-only imported
+   source material.
+
+From the Asset Browser, **Apply Material** assigns the selected material to every material slot on
+each selected static or skinned renderer. Use the per-slot inspector when different draws need
+different assignments.
+
+Static draw slots and material slots are separate. Removing a static draw retains its explicit
+material assignment as an orphan rather than guessing a replacement. Reimport also reconciles
+slots by stable ID, never by display name. Resolve an orphan explicitly in the renderer inspector.
+
+## Author shared assets
+
+Material files and material-instance files are RON documents under `assets/materials/`. The Asset
+Browser identifies the document kind, exposes its schema-driven properties and texture bindings,
+and uses stable subasset IDs (`material:source` or `material:instance`). Built-in shader schemas
+live under `assets/shaders/`.
+
+Select a Material and use **Create Instance** to create a direct-base variant beside it. The
+instance inspector exposes its base Material plus sparse property and texture override checkboxes;
+unchecked values continue to inherit. Material instances cannot inherit from other instances.
+Material render state exposes Opaque/Cutout, alpha cutoff, and Double Sided in the base Material
+inspector.
+
+Every standard and shader-schema texture slot uses the project texture picker. **Browse** lists
+texture assets across the project, including imported model texture subassets, and a texture can be
+dragged from the Asset Browser directly onto a slot. Non-texture drops are ignored. **Clear** removes
+the base Material value; on a Material Instance it removes the sparse override so the slot inherits
+from its base again. Dropping or browsing a texture onto an unchecked instance slot creates the
+override automatically.
+
+The supported render states are:
+
+- **Opaque** — no alpha candidate test.
+- **Cutout** — alpha is compared with the material's cutoff in raster and, for eligible geometry,
+  at Solari ray candidates.
+- **Double sided** — stored on the shared material render state.
+
+Editing a shared asset never writes copies into renderer components. The runtime watches the
+Material, direct base, shader schema, and evaluator dependencies and updates the shared hydrated
+handle in place. Standard and custom Surface changes therefore propagate to every assigned static
+or skinned renderer slot without reloading geometry, joints, or the current animation pose. Invalid
+Surface edits retain the last-good evaluator generation and emit diagnostics.
+
+## Custom Surface evaluators
+
+A custom shader schema may reference evaluator WGSL. Evaluators return material properties through
+one constrained entry point:
+
+```wgsl
+fn evaluate(
+    input: SurfaceInput,
+    params: SurfaceParams,
+    samples: SurfaceSamples,
+) -> Surface {
+    var surface = surface_default();
+    surface.base_color = samples.values[0];
+    surface.perceptual_roughness = params.lanes[0].x;
+    return surface;
+}
+```
+
+Surface ABI v1 supplies UV0, world position, world normal, 16 parameter lanes, and eight sampled 2D
+textures. The evaluator returns base color/alpha, tangent-space normal, emissive, metallic,
+roughness, reflectance, occlusion, and lit/unlit model selection. Mesh tangents are required for a
+custom tangent-space normal to affect raster output and for Solari mesh compatibility.
+
+Do not declare bindings or `@vertex`, `@fragment`, or `@compute` entry points. Storage resources,
+ray queries, derivatives, discard, barriers/subgroups, texture stores, and atomics are rejected.
+The engine owns the render stages and composes the same validated evaluator into raster and Solari.
+
+## Solari scope
+
+For eligible non-deformed triangle geometry, Solari uses the same Surface evaluator, packed
+parameters, textures, normal, emissive/unlit choice, and cutout alpha decision as raster rendering.
+The standard material path remains unchanged for materials without a custom evaluator. See the
+[rendering guide](rendering.md) for GI selection and fallback diagnostics.
+
+Skinned meshes and morph-deformed meshes are currently excluded from Solari. This prevents rays
+from tracing their undeformed source/bind pose while raster shows the animated pose. They remain
+visible in raster, and Rendering diagnostics report the deformed exclusion. Dynamic deformed
+vertex/BLAS updates are future work.
+
+Surface ABI v1 does not support blended transparency, transmission/refraction, custom vertex
+displacement, or arbitrary pipeline stages.
+
+`assets/materials/surface_tint.ron` and `assets/shaders/surface_tint.*` are the committed minimal
+custom-Surface example used for editor and renderer verification.
+
+## Upgrade and validate a project
+
+Normal project loading does not rewrite material or scene files. Preview the explicit transactional
+upgrade first:
+
+```bash
+cargo upgrade-project --project .
+cargo upgrade-project --project . --apply
+```
+
+Apply mode stages the complete rewrite, creates a timestamped backup under
+`.blacksite/backups/material-component-v4-*`, and rolls back on failure. Commit or otherwise back up
+the project before applying, inspect the diff afterward, then run:
+
+```bash
+cargo --locked validate-levels
+```
+
+Validation reports unresolved material/schema/texture references, nested or incompatible instance
+bases, and unsupported project content through the same editor/headless finding model.
+
+## Troubleshooting
+
+| Symptom | Check |
+|---------|-------|
+| Clearing a slot appears to do nothing | Clear removes the explicit override; the imported source material is still effective. |
+| Assignment disappeared after reimport | Look for an orphaned assignment. Slots are intentionally not matched by name. |
+| Skinned material edit resets the pose | This is a regression: material-only changes must patch the existing hierarchy rather than reload it. |
+| Custom evaluator is rejected | Check the required `evaluate` signature, ABI lane/texture limits, and forbidden constructs. |
+| Custom normal has no visible effect | Verify the mesh has tangents. |
+| Animated actor is missing from Solari GI | Expected for current skinned/morph geometry; inspect the deformed-exclusion diagnostic. |
+| Material reference is unresolved | Run project validation and repair/reselect the stable asset reference; do not hand-edit a display-name match. |
diff --git a/docs/editor/navigation-authoring.md b/docs/editor/navigation-authoring.md
new file mode 100644
index 0000000..2e8bf48
--- /dev/null
+++ b/docs/editor/navigation-authoring.md
@@ -0,0 +1,66 @@
+# Navigation Authoring
+
+Blacksite navigation v1 uses authored bounds, obstacles, areas, and links to produce a deterministic
+Rerecast bake artifact. Editor preview and packaged gameplay query that artifact through the same
+`game::navigation::NavigationRuntime` Polyanya path API.
+
+## Authoring
+
+Use **Scene > Navigation** or the path icon in the existing top toolbar to create navigation actors:
+
+- **Navigation Bounds** defines an axis-aligned bake region, agent profile, generated artifact path,
+  and optional debounced auto-bake.
+- **Navigation Obstacle** carves a blocked volume from overlapping bounds.
+- **Navigation Area** records a named walkable/blocked volume and traversal cost. V1 applies blocked
+  areas during bake and retains walkable cost metadata for a future per-polygon cost callback.
+- **Navigation Link** connects otherwise isolated regions. Endpoints are local to the actor;
+  direction, enabled state, and traversal cost are authored.
+
+V1 source geometry includes primitives and additive brushes. Imported static-mesh manifests do not
+yet contain normalized collision triangles, so imported objects require authored navigation
+obstacles until that artifact contract is extended.
+
+Each navigation actor must own exactly one navigation component. Inspector changes are undoable and
+save-time validation rejects invalid extents, profiles, area IDs/costs, and link endpoints.
+
+## Bake And Preview
+
+Select a bounds actor and click **Bake** in its Inspector, use **Scene > Navigation > Bake Selected
+Bounds**, or click the toolbar path icon. The generated artifact must remain under
+`assets/navigation/generated/`. Its fingerprint includes the source scene, bounds, agent settings,
+overlapping primitive/additive-brush triangles, obstacles, areas, and links. Distant authoring is
+excluded so independent bounds do not invalidate one another. Relevant edits immediately mark it
+stale; auto-bake waits 0.75 seconds after the latest change before rebuilding. A failed auto-bake
+reports once and waits for another authored change before retrying.
+
+The viewport overlay draws authored volumes, baked polygon edges, link endpoints, and the current
+path test. Set **Path start** and **Path end** on the bounds card and choose **Test Path**. Green/red
+endpoint markers and an amber route show the exact result returned by the game runtime API.
+
+## Headless And Runtime
+
+Bake one scene or every scene under `assets/levels/`:
+
+```bash
+cargo bake-navigation --project . --scene assets/levels/navigation_authoring_showcase.scn.ron
+cargo bake-navigation --project .
+cargo bake-navigation --project . --check
+```
+
+`--check` never writes. It fails when an artifact is missing, malformed, or stale, making it suitable
+for CI. `cargo validate-levels` applies the same fingerprint policy, validates link proximity, and
+adds current navigation artifacts to package dependencies.
+
+Gameplay loads and queries an artifact without editor dependencies:
+
+```rust
+let navigation = game::navigation::NavigationRuntime::load(path)?;
+let path = navigation.query(start, destination)?;
+```
+
+The returned path contains world-space points, total length, and the optional stable actor ID of an
+off-mesh link used by the route.
+
+See [ADR 0032](../adr/0032-versioned-navigation-bake-and-runtime-query.md) for dependency and
+ownership decisions and [the implementation plan](../../.cursor/plans/navigation_authoring_2026-07-11.plan.md)
+for acceptance gates.
diff --git a/docs/editor/roadmap.md b/docs/editor/roadmap.md
index 000e329..fedb0b3 100644
--- a/docs/editor/roadmap.md
+++ b/docs/editor/roadmap.md
@@ -147,7 +147,7 @@ with implementation sequencing in
 | Milestone | Exit condition | Status |
 |-----------|----------------|--------|
 | M6 Reliability, recovery, and project workflow | Transactional save/recovery, stable sessions, project launcher, hardened hierarchy/prefabs, multi-scene composition | Implementation complete; all six scoped issues are closed after prefab #43 passed workspace, headless, packaged-runtime, and live editor acceptance |
-| M7 Content production and shipping | Build/package profiles, content release gate, animation, audio, navigation, collaborative safety | Active; #44, #45, and #47 are complete. Audio passed automated, headless, live editor/PIE, and packaged-runtime acceptance. Remaining scoped work is animation #46, navigation #48, source-control safety #49, and final readiness gate #50 |
+| M7 Content production and shipping | Build/package profiles, content release gate, animation, audio, navigation, collaborative safety | Active; #44, #45, #46, and #47 are complete. Navigation #48 is in implementation; source-control safety #49 and final readiness gate #50 remain. |
 
 Production readiness is not inferred from feature count. Gitea
 [`#50`](https://git.spacetrainclubhouse.com/Falling-Metal-Interactive/Blacksite/issues/50)
diff --git a/docs/mission.md b/docs/mission.md
index f430a3a..7c380c0 100644
--- a/docs/mission.md
+++ b/docs/mission.md
@@ -12,7 +12,9 @@ An **in-process Bevy editor and game foundation** for a server-authoritative mul
 4. **Input as intent** — Gameplay consumes `protocol` intent in `FixedUpdate`, enabling determinism, replays, and networking.
 5. **Strict crate boundaries** — `sim` and `protocol` stay rendering-free; native-only deps stay in `editor`.
 6. **BRP-aligned tooling** — Custom egui UX plus Bevy Remote Protocol for automation and future interop with the official Bevy editor. BRP mutates **authoring** components only ([editor/brp.md](editor/brp.md), [ADR 0009](adr/0009-authoring-vs-hydrated.md)).
-7. **Actor model** — Every saved level object has `ActorKind`; hydration is derived ([ADR 0010](adr/0010-actor-kind-and-inspector.md)).
+7. **Composable actor model** — Every saved level object carries a derived `ActorKind` display hint,
+   while registered authoring components own behavior, requirements, conflicts, persistence, and
+   hydration ([ADR 0034](adr/0034-registry-driven-authoring-components.md)).
 
 ## Audience
 
diff --git a/third_party/bevy_solari/.cargo-ok b/third_party/bevy_solari/.cargo-ok
new file mode 100644
index 0000000..5f8b795
--- /dev/null
+++ b/third_party/bevy_solari/.cargo-ok
@@ -0,0 +1 @@
+{"v":1}
\ No newline at end of file
diff --git a/third_party/bevy_solari/.cargo_vcs_info.json b/third_party/bevy_solari/.cargo_vcs_info.json
new file mode 100644
index 0000000..433091f
--- /dev/null
+++ b/third_party/bevy_solari/.cargo_vcs_info.json
@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "c6f634ca9f406d68ba5109d921247b654cb42c10"
+  },
+  "path_in_vcs": "crates/bevy_solari"
+}
\ No newline at end of file
diff --git a/third_party/bevy_solari/BLACKSITE_PATCH.md b/third_party/bevy_solari/BLACKSITE_PATCH.md
new file mode 100644
index 0000000..3b07f8f
--- /dev/null
+++ b/third_party/bevy_solari/BLACKSITE_PATCH.md
@@ -0,0 +1,24 @@
+# Blacksite Solari Patch Boundary
+
+Base: `bevy_solari` 0.19.0.
+
+Blacksite-owned changes are deliberately limited to the scene module and dependency manifest:
+
+- extract either `MeshMaterial3d<StandardMaterial>` or `MeshMaterial3d<SurfaceMaterial>`;
+- pack the Surface ABI v1 uniform lanes, UV transforms, and eight texture bindings into Solari's
+  scene material buffer;
+- rebuild the embedded scene shader library from the active, validated `SurfaceEvaluatorRegistry`;
+- namespace evaluator/helper functions by stable shader ID and use the same evaluator for ray-hit
+  shading and cutout candidate acceptance;
+- build shared mesh BLAS geometry as non-opaque so per-instance cutout materials can reject hits;
+- retain standard Bevy materials and reject blended material modes from the ray scene.
+
+The `game_hot` bridge owns eligibility and diagnostics. Until an instance-owned post-morph/post-skin
+vertex buffer can feed a dynamic BLAS, it removes `RaytracingMesh3d` from skinned or morphed entities
+and reports them through `deformed_meshes_excluded`. Rigid animated descendants remain supported
+because their geometry is static and their current/previous transforms are already extracted.
+
+When rebasing, compare upstream changes only in `src/scene/` first. Preserve the evaluator-registry
+extraction, GPU/WGSL material layouts, non-opaque BLAS flag, and candidate traversal as one atomic
+unit; a layout mismatch can pass Rust compilation but corrupt GPU reads. Validate the generated WGSL
+with Naga and run `cargo test -p game_hot --lib` after every rebase.
diff --git a/third_party/bevy_solari/Cargo.lock b/third_party/bevy_solari/Cargo.lock
new file mode 100644
index 0000000..81f35f4
--- /dev/null
+++ b/third_party/bevy_solari/Cargo.lock
@@ -0,0 +1,3602 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "android-activity"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
+dependencies = [
+ "android-properties",
+ "bitflags",
+ "cc",
+ "jni",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "android_log-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "ash"
+version = "0.38.0+1.3.281"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "assert_type_match"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f548ad2c4031f2902e3edc1f29c29e835829437de49562d8eb5dc5584d3a1043"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "atomicow"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301801c08259e328a1c7da556608c0c22687708831b22024dbd3a57ea741e6de"
+dependencies = [
+ "portable-atomic",
+ "portable-atomic-util",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "bevy_android"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e5e2a949be318bf7184eb084622892afcc1e8b2af44973ac53ab53201756e0"
+dependencies = [
+ "android-activity",
+]
+
+[[package]]
+name = "bevy_anti_alias"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "815414ea2e11afe1f2396d89279cfa0986907ef3ec673ec936d9fa695b2bfbf9"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_utils",
+ "dlss_wgpu",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_app"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671ae6f3a8d84f9ed696c531a138558596e041231a8414b6efeafa8469e841f9"
+dependencies = [
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "console_error_panic_hook",
+ "ctrlc",
+ "downcast-rs",
+ "log",
+ "thiserror 2.0.18",
+ "variadics_please",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "bevy_asset"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a05907de6a362d2c609a7a1d1b4dca3b58b768f746b719ca1a3c7dfa87d391"
+dependencies = [
+ "async-broadcast",
+ "async-channel",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "atomicow",
+ "bevy_android",
+ "bevy_app",
+ "bevy_asset_macros",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "bitflags",
+ "blake3",
+ "crossbeam-channel",
+ "derive_more",
+ "disqualified",
+ "downcast-rs",
+ "either",
+ "futures-io",
+ "futures-lite",
+ "futures-util",
+ "js-sys",
+ "ron",
+ "serde",
+ "stackfuture",
+ "thiserror 2.0.18",
+ "tracing",
+ "uuid",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "bevy_asset_macros"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9444998cc37b51dfd1572c23a501865733ea65619a7d88b47aa654ae2290a4f"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_camera"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20105c3e77c2fb391bf3ded3a473d60e4058b837c9bf4e3412225833e524c75a"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "derive_more",
+ "downcast-rs",
+ "serde",
+ "smallvec",
+ "thiserror 2.0.18",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_color"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e2dfc0091be6eb62fec9158b2d3e6f21b002be7bdb42dd3b8322e949c8426b0"
+dependencies = [
+ "bevy_math",
+ "bevy_reflect",
+ "bytemuck",
+ "derive_more",
+ "encase",
+ "serde",
+ "thiserror 2.0.18",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_core_pipeline"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "885d640bbff6c4fa3beadbb043d0d1ae53b2fda864da18a2bf2670fb90428865"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_light",
+ "bevy_log",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bitflags",
+ "indexmap",
+ "nonmax",
+]
+
+[[package]]
+name = "bevy_derive"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "293df2b2f7ed65ef2ce02b2e7359faac1a9a92a8cc96c182c9de77eb06049ae0"
+dependencies = [
+ "bevy_macro_utils",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_diagnostic"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a73e11555051f37c3e0e9ef7775e77108f2482310242996fb5bb6ef8b685b78e"
+dependencies = [
+ "atomic-waker",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_tasks",
+ "bevy_time",
+ "const-fnv1a-hash",
+ "log",
+ "serde",
+]
+
+[[package]]
+name = "bevy_ecs"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4654b9b3535fa7813d2878a50e1b5ad80a361dc1c913b96ded57667f65d70a01"
+dependencies = [
+ "arrayvec",
+ "bevy_ecs_macros",
+ "bevy_platform",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "bitflags",
+ "bumpalo",
+ "concurrent-queue",
+ "derive_more",
+ "fixedbitset",
+ "indexmap",
+ "log",
+ "nonmax",
+ "serde",
+ "slotmap",
+ "smallvec",
+ "thiserror 2.0.18",
+ "variadics_please",
+]
+
+[[package]]
+name = "bevy_ecs_macro_logic"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee0b98a74141ce8dce4654c60020ebbaefab32646f42af6bbae55f282ae65ff7"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_ecs_macros"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dc958a194d226d618404e0fea99a3c8b4146207a00a3ba07fa712bf71607240"
+dependencies = [
+ "bevy_ecs_macro_logic",
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_encase_derive"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dc5bf9e6cb46c4401a66625b5f7eb9654a7f3c8586423c428b79586a1c55cd"
+dependencies = [
+ "bevy_macro_utils",
+ "encase_derive_impl",
+]
+
+[[package]]
+name = "bevy_image"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37bc41f69a0c6ade2e7961602517545b39ab8e42bc8c4a729bd24ffee3bcd904"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_utils",
+ "bitflags",
+ "bytemuck",
+ "futures-lite",
+ "guillotiere",
+ "half",
+ "image",
+ "ktx2",
+ "rectangle-pack",
+ "serde",
+ "thiserror 2.0.18",
+ "tracing",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_input"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd221cf0732f5bf06caf594bdb233361ac735d4d416cf5849757b64bf4e8472a"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "derive_more",
+ "log",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "bevy_light"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7b5009e9cc765c30b21daf2277ea4423cbd347b05280ea0943b50c5a80cd42"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_log",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
+ "half",
+ "smallvec",
+ "tracing",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_log"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2017a5fe12ea230d00cfdca00c65c262924be26e0324f7e0033c64f8cc265888"
+dependencies = [
+ "android_log-sys",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_utils",
+ "tracing",
+ "tracing-log",
+ "tracing-oslog",
+ "tracing-subscriber",
+ "tracing-wasm",
+]
+
+[[package]]
+name = "bevy_macro_utils"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "746a19912c6dc1bbe79188778573e8a253d5832c696b2fcb95578c17b29ff7ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "toml_edit",
+]
+
+[[package]]
+name = "bevy_material"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "423710403b4a4d8e9ee872c6ac8108787f2396422b582d15a660a40731ddfbf0"
+dependencies = [
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_material_macros",
+ "bevy_mesh",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_shader",
+ "bevy_utils",
+ "encase",
+ "smallvec",
+ "thiserror 2.0.18",
+ "tracing",
+ "variadics_please",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_material_macros"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6928e167592472f6ee900f80de199cc2dafd31d4f082a86e8d594b81b973e3d"
+dependencies = [
+ "bevy_macro_utils",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_math"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c280440d2a5bc07ea393b5346b5712eec73ea30f0133097b8b13dade385beb"
+dependencies = [
+ "approx",
+ "arrayvec",
+ "bevy_reflect",
+ "derive_more",
+ "glam",
+ "itertools 0.14.0",
+ "rand",
+ "rand_distr",
+ "serde",
+ "thiserror 2.0.18",
+ "variadics_please",
+]
+
+[[package]]
+name = "bevy_mesh"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59863e6f37ef0ba1f37021bce9dd940f9dc31d15e03f548cda5fd3e674f409e"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_math",
+ "bevy_mikktspace",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_transform",
+ "bitflags",
+ "bytemuck",
+ "derive_more",
+ "encase",
+ "glam",
+ "half",
+ "hexasphere",
+ "thiserror 2.0.18",
+ "tracing",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_mikktspace"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bff34eb29ff4b8a8688bc7299f14fb6b597461ca80fec03ed7d22939ab33e48f"
+
+[[package]]
+name = "bevy_pbr"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38ebc777de2d7f45888c68e8e04949bfb8a40aee62f700283fc340f525e67f52"
+dependencies = [
+ "arrayvec",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_light",
+ "bevy_log",
+ "bevy_material",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_tasks",
+ "bevy_transform",
+ "bevy_utils",
+ "bitflags",
+ "bytemuck",
+ "derive_more",
+ "fixedbitset",
+ "indexmap",
+ "nonmax",
+ "offset-allocator",
+ "smallvec",
+ "static_assertions",
+ "thiserror 2.0.18",
+ "tracing",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_platform"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3120670bb2308980f723477c9d82476fcda31f08be9b256c3f0acdee82a65094"
+dependencies = [
+ "critical-section",
+ "foldhash 0.2.0",
+ "futures-channel",
+ "futures-lite",
+ "hashbrown 0.16.1",
+ "js-sys",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "spin",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-time",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "bevy_ptr"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b511e89f7078fd21fdea77061a0ca3e737297c7011bb10c073e0aecb17c9fea6"
+
+[[package]]
+name = "bevy_reflect"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92abd59cbba1524c1847e9a50f74d94e6b7836c80a8edfa9c47e59f7fd81021d"
+dependencies = [
+ "assert_type_match",
+ "bevy_platform",
+ "bevy_ptr",
+ "bevy_reflect_derive",
+ "bevy_utils",
+ "derive_more",
+ "disqualified",
+ "downcast-rs",
+ "erased-serde",
+ "foldhash 0.2.0",
+ "glam",
+ "indexmap",
+ "inventory",
+ "serde",
+ "smallvec",
+ "smol_str",
+ "thiserror 2.0.18",
+ "uuid",
+ "variadics_please",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_reflect_derive"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fa4e6b97fd2d582dd5ed96762a70d04505a477c833cf4f69d016dcd03d2d04"
+dependencies = [
+ "bevy_macro_utils",
+ "indexmap",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_render"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89b2cc850a4c3fd12a6a088a4fc3e80118b2e1b569da8936f6d4d99ca1b6ee7"
+dependencies = [
+ "async-channel",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_image",
+ "bevy_log",
+ "bevy_material",
+ "bevy_material_macros",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render_macros",
+ "bevy_shader",
+ "bevy_tasks",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bitflags",
+ "bytemuck",
+ "derive_more",
+ "downcast-rs",
+ "encase",
+ "glam",
+ "image",
+ "indexmap",
+ "itertools 0.14.0",
+ "js-sys",
+ "naga",
+ "nonmax",
+ "offset-allocator",
+ "send_wrapper",
+ "smallvec",
+ "thiserror 2.0.18",
+ "variadics_please",
+ "wasm-bindgen",
+ "weak-table",
+ "web-sys",
+ "wgpu",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_render_macros"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0eb5cffe5253a6ab4e4b84b2e40a6a2f4673deb16fd63ab9dfc4a015449873a"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_shader"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0ac51378bb6a021165ee334f846b515cd06082e24ce962adce58ad7df1c39a"
+dependencies = [
+ "bevy_asset",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_utils",
+ "naga",
+ "naga_oil",
+ "serde",
+ "thiserror 2.0.18",
+ "tracing",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_solari"
+version = "0.19.0"
+dependencies = [
+ "bevy_anti_alias",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_pbr",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_transform",
+ "bevy_utils",
+ "bytemuck",
+ "derive_more",
+ "tracing",
+]
+
+[[package]]
+name = "bevy_tasks"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa34e6b9b804851ec08a41c0346c859d82e2fa98c906d74b965ee61bbbb688e4"
+dependencies = [
+ "async-executor",
+ "async-task",
+ "atomic-waker",
+ "bevy_platform",
+ "crossbeam-queue",
+ "derive_more",
+ "futures-lite",
+ "heapless",
+ "web-task",
+]
+
+[[package]]
+name = "bevy_time"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c21e3be2aa4426ea1e0a7036d3d1dbbded84c319459d9f3e2a616b33563372f2"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "crossbeam-channel",
+ "log",
+ "serde",
+]
+
+[[package]]
+name = "bevy_transform"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c95fefe69c9223d10e6b52a0fdf12811bab9d0c7dcb27570cb86824b451f180d"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "derive_more",
+ "serde",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "bevy_utils"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3aceea6c7ffdd568f866d5ca4dfe50c33440c54f7bc230c13a9ba7ab0c91aed1"
+dependencies = [
+ "async-channel",
+ "bevy_platform",
+ "disqualified",
+ "indexmap",
+ "thread_local",
+]
+
+[[package]]
+name = "bevy_window"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efcc255b43db156fba393b2ff8fa552aac5e7e02ae4c6298eacdbab655ddf988"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "log",
+ "raw-window-handle",
+ "serde",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 2.1.2",
+ "shlex 1.3.0",
+ "syn",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+
+[[package]]
+name = "bitflags"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+dependencies = [
+ "bytemuck",
+ "serde_core",
+]
+
+[[package]]
+name = "blake3"
+version = "1.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+ "cpufeatures",
+]
+
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "cc"
+version = "1.2.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex 2.0.1",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+dependencies = [
+ "serde",
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
+dependencies = [
+ "serde",
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+ "portable-atomic",
+]
+
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "const-fnv1a-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
+
+[[package]]
+name = "const_panic"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e262cdaac42494e3ae34c43969f9cdeb7da178bdb4b66fa6a1ea2edb4c8ae652"
+dependencies = [
+ "typewit",
+]
+
+[[package]]
+name = "const_soft_float"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
+
+[[package]]
+name = "constgebra"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1aaf9b65849a68662ac6c0810c8893a765c960b907dd7cfab9c4a50bf764fbc"
+dependencies = [
+ "const_soft_float",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "ctrlc"
+version = "3.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
+dependencies = [
+ "dispatch2",
+ "nix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
+
+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn",
+ "unicode-xid",
+]
+
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags",
+ "block2",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "disqualified"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9c272297e804878a2a4b707cfcfc6d2328b5bb936944613b4fdf2b9269afdfd"
+
+[[package]]
+name = "dlss_wgpu"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75a51601d25ae0c9cc759d421fe40d3c5a031dd8c2e92970e9038a040ef178b4"
+dependencies = [
+ "ash",
+ "bindgen",
+ "bitflags",
+ "cc",
+ "thiserror 2.0.18",
+ "uuid",
+ "wgpu",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+dependencies = [
+ "litrs",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+
+[[package]]
+name = "either"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+
+[[package]]
+name = "encase"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e3e0ff2ee0b7aa97428308dd9e1e42369cb22f5fb8dc1c55546637443a60f1e"
+dependencies = [
+ "const_panic",
+ "encase_derive",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "encase_derive"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4d90c5d7d527c6cb8a3b114efd26a6304d9ab772656e73d8f4e32b1f3d601a2"
+dependencies = [
+ "encase_derive_impl",
+]
+
+[[package]]
+name = "encase_derive_impl"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8bad72d8308f7a382de2391ec978ddd736e0103846b965d7e2a63a75768af30"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec"
+dependencies = [
+ "serde",
+ "serde_core",
+ "typeid",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "euclid"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 5.3.0",
+ "wasip2",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "wasip2",
+ "wasip3",
+]
+
+[[package]]
+name = "glam"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f70749695b063ecbf6b62949ccccde2e733ec3ecbbd71d467dca4e5c6c97cca0"
+dependencies = [
+ "bytemuck",
+ "encase",
+ "rand",
+ "serde_core",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
+[[package]]
+name = "gpu-allocator"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795"
+dependencies = [
+ "ash",
+ "hashbrown 0.16.1",
+ "log",
+ "presser",
+ "thiserror 2.0.18",
+ "windows",
+]
+
+[[package]]
+name = "gpu-descriptor"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
+dependencies = [
+ "bitflags",
+ "gpu-descriptor-types",
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "gpu-descriptor-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "guillotiere"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782"
+dependencies = [
+ "euclid",
+ "svg_fmt",
+]
+
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "crunchy",
+ "num-traits",
+ "zerocopy",
+]
+
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
+[[package]]
+name = "heapless"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1edcd5a338e64688fbdcb7531a846cfd3476a54784dcb918a0844682bc7ada5"
+dependencies = [
+ "hash32",
+ "portable-atomic",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hexasphere"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177ea6330876de4ef08e184f827b98acc037614a4ce409902c5b0d53a9c2e951"
+dependencies = [
+ "constgebra",
+ "glam",
+ "tinyvec",
+]
+
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "image"
+version = "0.25.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.1",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "inventory"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ktx2"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d50be8a24c37debdf3170be6ca396d5b5b165f37f94837891adac735ca416b8"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+
+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "moxcms"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
+[[package]]
+name = "naga"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd91265cc2454558f659b3b4b9640f0ddb8cc6521277f166b8a8c181c898079"
+dependencies = [
+ "arrayvec",
+ "bit-set",
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "codespan-reporting 0.13.1",
+ "half",
+ "hashbrown 0.16.1",
+ "hexf-parse",
+ "indexmap",
+ "libm",
+ "log",
+ "num-traits",
+ "once_cell",
+ "pp-rs",
+ "rustc-hash 1.1.0",
+ "spirv",
+ "thiserror 2.0.18",
+ "unicode-ident",
+]
+
+[[package]]
+name = "naga_oil"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "319f03062940ed85c03da020042618356bb8ca5263020322930883b05e30208e"
+dependencies = [
+ "codespan-reporting 0.12.0",
+ "data-encoding",
+ "indexmap",
+ "naga",
+ "regex",
+ "rustc-hash 1.1.0",
+ "thiserror 2.0.18",
+ "tracing",
+ "unicode-ident",
+]
+
+[[package]]
+name = "ndk"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
+dependencies = [
+ "bitflags",
+ "jni-sys 0.3.1",
+ "log",
+ "ndk-sys",
+ "num_enum",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "ndk-sys"
+version = "0.6.0+11769913"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
+dependencies = [
+ "jni-sys 0.3.1",
+]
+
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nonmax"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
+dependencies = [
+ "num_enum_derive",
+ "rustversion",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags",
+ "dispatch2",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
+dependencies = [
+ "bitflags",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "offset-allocator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e234d535da3521eb95106f40f0b73483d80bfb3aacf27c40d7e2b72f1a3e00a2"
+dependencies = [
+ "log",
+ "nonmax",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "ordered-float"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "piper"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "pp-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "presser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
+
+[[package]]
+name = "pxfm"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "getrandom 0.4.2",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
+[[package]]
+name = "rand_distr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "range-alloc"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"
+
+[[package]]
+name = "raw-window-handle"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+
+[[package]]
+name = "raw-window-metal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
+dependencies = [
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "rectangle-pack"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+
+[[package]]
+name = "renderdoc-sys"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
+
+[[package]]
+name = "ron"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc"
+dependencies = [
+ "bitflags",
+ "once_cell",
+ "serde",
+ "serde_derive",
+ "typeid",
+ "unicode-ident",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "slotmap"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "smol_str"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "spin"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "spirv"
+version = "0.4.0+sdk-1.4.341.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "stackfuture"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115beb9c69db2393ff10b75a1b8587a51716e5551d015001e55320ed279d32f9"
+dependencies = [
+ "const_panic",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "svg_fmt"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl 2.0.18",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-oslog"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d76902d2a8d5f9f55a81155c08971734071968c90f2d9bfe645fe700579b2950"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "tracing-wasm"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
+[[package]]
+name = "typewit"
+version = "1.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "214ca0b2191785cbc06209b9ca1861e048e39b5ba33574b3cedd58363d5bb5f6"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "uuid"
+version = "1.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
+dependencies = [
+ "getrandom 0.4.2",
+ "js-sys",
+ "serde_core",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
+[[package]]
+name = "variadics_please"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b6d82be61465f97d42bd1d15bf20f3b0a3a0905018f38f9d6f6962055b0b5c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen 0.46.0",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen 0.51.0",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.122"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
+[[package]]
+name = "weak-table"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
+
+[[package]]
+name = "web-sys"
+version = "0.3.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-task"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cdc136a53ccd64a1211f107ccc34404769fbcc0f165f1afa065f5d88ab93538"
+dependencies = [
+ "async-task",
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wgpu"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb3feacc458f7bee8bc1737149b42b6c731aa461039a4264a67bb6681646b250"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "bytemuck",
+ "cfg-if",
+ "cfg_aliases",
+ "document-features",
+ "hashbrown 0.16.1",
+ "log",
+ "naga",
+ "portable-atomic",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02da3ad1b568337f25513b317870960ef87073ea0945502e44b864b67a8c77b7"
+dependencies = [
+ "arrayvec",
+ "bit-set",
+ "bit-vec",
+ "bitflags",
+ "bytemuck",
+ "cfg_aliases",
+ "document-features",
+ "hashbrown 0.16.1",
+ "indexmap",
+ "log",
+ "naga",
+ "once_cell",
+ "parking_lot",
+ "portable-atomic",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 2.0.18",
+ "wgpu-core-deps-apple",
+ "wgpu-core-deps-windows-linux-android",
+ "wgpu-hal",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core-deps-apple"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e51b5447e144b3dbba4feb01f80f4fa21696fa0cd99afb2c3df1affd6fdb28"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-windows-linux-android"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb01076d0aa08b0ba9bd741e178b5cc440f5abe99d9581323a4c8b5d1a1916"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31f8e1a9e7a8512f276f7c62e018c7fa8d60954303fed2e5750114332049193f"
+dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set",
+ "bitflags",
+ "block2",
+ "bytemuck",
+ "cfg-if",
+ "cfg_aliases",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hashbrown 0.16.1",
+ "libc",
+ "libloading",
+ "log",
+ "naga",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "objc2-metal",
+ "objc2-quartz-core",
+ "once_cell",
+ "ordered-float",
+ "parking_lot",
+ "portable-atomic",
+ "portable-atomic-util",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "raw-window-metal",
+ "renderdoc-sys",
+ "smallvec",
+ "thiserror 2.0.18",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+ "windows",
+ "windows-core",
+]
+
+[[package]]
+name = "wgpu-naga-bridge"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59c654c483f058800972c3645e95388a7eca31bf9fe1933bc20e036588a0be02"
+dependencies = [
+ "naga",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-types"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9bcc31518a0e9735aefebedb5f7a9ef3ed1c42549c9f4c882fa9060ceaac639"
+dependencies = [
+ "bitflags",
+ "bytemuck",
+ "js-sys",
+ "log",
+ "raw-window-handle",
+ "serde",
+ "web-sys",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core",
+ "windows-link",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/third_party/bevy_solari/Cargo.toml b/third_party/bevy_solari/Cargo.toml
new file mode 100644
index 0000000..27543dd
--- /dev/null
+++ b/third_party/bevy_solari/Cargo.toml
@@ -0,0 +1,159 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2024"
+name = "bevy_solari"
+version = "0.19.0"
+build = false
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
+description = "Provides raytraced lighting for Bevy Engine"
+homepage = "https://bevy.org"
+readme = "README.md"
+keywords = ["bevy"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/bevyengine/bevy"
+
+[package.metadata.docs.rs]
+rustdoc-args = [
+    "-Zunstable-options",
+    "--generate-link-to-definition",
+    "--generate-macro-expansion",
+]
+all-features = true
+
+[features]
+dlss = ["dep:bevy_anti_alias", "bevy_anti_alias/dlss"]
+force_disable_dlss = ["dep:bevy_anti_alias", "bevy_anti_alias/force_disable_dlss"]
+
+[lib]
+name = "bevy_solari"
+path = "src/lib.rs"
+
+[dependencies.bevy_anti_alias]
+version = "0.19.0"
+optional = true
+
+[dependencies.bevy_app]
+version = "0.19.0"
+
+[dependencies.bevy_asset]
+version = "0.19.0"
+
+[dependencies.bevy_camera]
+version = "0.19.0"
+
+[dependencies.bevy_color]
+version = "0.19.0"
+
+[dependencies.bevy_core_pipeline]
+version = "0.19.0"
+
+[dependencies.bevy_derive]
+version = "0.19.0"
+
+[dependencies.bevy_diagnostic]
+version = "0.19.0"
+
+[dependencies.bevy_ecs]
+version = "0.19.0"
+
+[dependencies.bevy_image]
+version = "0.19.0"
+
+[dependencies.bevy_math]
+version = "0.19.0"
+
+[dependencies.bevy_material]
+version = "0.19.0"
+
+[dependencies.bevy_mesh]
+version = "0.19.0"
+
+[dependencies.bevy_pbr]
+version = "0.19.0"
+features = ["dfg_lut"]
+
+[dependencies.bevy_platform]
+version = "0.19.0"
+features = ["std"]
+default-features = false
+
+[dependencies.bevy_reflect]
+version = "0.19.0"
+
+[dependencies.bevy_render]
+version = "0.19.0"
+
+[dependencies.bevy_shader]
+version = "0.19.0"
+
+[dependencies.bevy_transform]
+version = "0.19.0"
+
+[dependencies.bevy_utils]
+version = "0.19.0"
+
+[dependencies.blacksite_surface]
+path = "../../crates/blacksite_surface"
+
+[dependencies.bytemuck]
+version = "1"
+
+[dependencies.derive_more]
+version = "2"
+features = ["from"]
+default-features = false
+
+[dependencies.tracing]
+version = "0.1"
+features = ["std"]
+default-features = false
+
+[lints.clippy]
+alloc_instead_of_core = "warn"
+allow_attributes = "warn"
+allow_attributes_without_reason = "warn"
+doc_markdown = "warn"
+manual_let_else = "warn"
+match_same_arms = "warn"
+needless_lifetimes = "allow"
+nonstandard_macro_braces = "warn"
+print_stderr = "warn"
+print_stdout = "warn"
+ptr_as_ptr = "warn"
+ptr_cast_constness = "warn"
+redundant_closure_for_method_calls = "warn"
+redundant_else = "warn"
+ref_as_ptr = "warn"
+semicolon_if_nothing_returned = "warn"
+std_instead_of_alloc = "warn"
+std_instead_of_core = "warn"
+too_long_first_doc_paragraph = "allow"
+too_many_arguments = "allow"
+type_complexity = "allow"
+undocumented_unsafe_blocks = "warn"
+unwrap_or_default = "warn"
+
+[lints.rust]
+missing_docs = "warn"
+unsafe_code = "deny"
+unsafe_op_in_unsafe_fn = "warn"
+unused_qualifications = "warn"
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+priority = 0
+check-cfg = ["cfg(docsrs_dep)"]
diff --git a/third_party/bevy_solari/Cargo.toml.orig b/third_party/bevy_solari/Cargo.toml.orig
new file mode 100644
index 0000000..03b266d
--- /dev/null
+++ b/third_party/bevy_solari/Cargo.toml.orig
@@ -0,0 +1,55 @@
+[package]
+name = "bevy_solari"
+version = "0.19.0"
+edition = "2024"
+description = "Provides raytraced lighting for Bevy Engine"
+homepage = "https://bevy.org"
+repository = "https://github.com/bevyengine/bevy"
+license = "MIT OR Apache-2.0"
+keywords = ["bevy"]
+
+[dependencies]
+# bevy
+bevy_anti_alias = { path = "../bevy_anti_alias", version = "0.19.0" }
+bevy_app = { path = "../bevy_app", version = "0.19.0" }
+bevy_asset = { path = "../bevy_asset", version = "0.19.0" }
+bevy_camera = { path = "../bevy_camera", version = "0.19.0" }
+bevy_color = { path = "../bevy_color", version = "0.19.0" }
+bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.19.0" }
+bevy_derive = { path = "../bevy_derive", version = "0.19.0" }
+bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.19.0" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.19.0" }
+bevy_shader = { path = "../bevy_shader", version = "0.19.0" }
+bevy_math = { path = "../bevy_math", version = "0.19.0" }
+bevy_mesh = { path = "../bevy_mesh", version = "0.19.0" }
+bevy_pbr = { path = "../bevy_pbr", version = "0.19.0", features = [
+  "dfg_lut",
+] }
+bevy_platform = { path = "../bevy_platform", version = "0.19.0", default-features = false, features = [
+  "std",
+] }
+bevy_reflect = { path = "../bevy_reflect", version = "0.19.0" }
+bevy_render = { path = "../bevy_render", version = "0.19.0" }
+bevy_image = { path = "../bevy_image", version = "0.19.0" }
+bevy_utils = { path = "../bevy_utils", version = "0.19.0" }
+bevy_transform = { path = "../bevy_transform", version = "0.19.0" }
+
+# other 
+bytemuck = { version = "1" }
+derive_more = { version = "2", default-features = false, features = ["from"] }
+tracing = { version = "0.1", default-features = false, features = ["std"] }
+
+[features]
+dlss = ["bevy_anti_alias/dlss"]
+force_disable_dlss = ["bevy_anti_alias/force_disable_dlss"]
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+rustdoc-args = [
+  "-Zunstable-options",
+  "--generate-link-to-definition",
+  "--generate-macro-expansion",
+]
+all-features = true
diff --git a/third_party/bevy_solari/LICENSE-APACHE b/third_party/bevy_solari/LICENSE-APACHE
new file mode 100644
index 0000000..d9a10c0
--- /dev/null
+++ b/third_party/bevy_solari/LICENSE-APACHE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/third_party/bevy_solari/LICENSE-MIT b/third_party/bevy_solari/LICENSE-MIT
new file mode 100644
index 0000000..9cf1062
--- /dev/null
+++ b/third_party/bevy_solari/LICENSE-MIT
@@ -0,0 +1,19 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/third_party/bevy_solari/README.md b/third_party/bevy_solari/README.md
new file mode 100644
index 0000000..a2b89a3
--- /dev/null
+++ b/third_party/bevy_solari/README.md
@@ -0,0 +1,20 @@
+# Bevy Solari
+
+[![License](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](https://github.com/bevyengine/bevy#license)
+[![Crates.io](https://img.shields.io/crates/v/bevy_solari.svg)](https://crates.io/crates/bevy_solari)
+[![Downloads](https://img.shields.io/crates/d/bevy_solari.svg)](https://crates.io/crates/bevy_solari)
+[![Docs](https://docs.rs/bevy_solari/badge.svg)](https://docs.rs/bevy_solari/latest/bevy_solari/)
+[![Discord](https://img.shields.io/discord/691052431525675048.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/bevy)
+
+![Logo](../../assets/branding/bevy_solari.svg)
+
+## Blacksite fork
+
+This vendored Bevy 0.19 crate is patched to consume both Bevy `StandardMaterial` and Blacksite's
+versioned Surface ABI. Validated Surface evaluator generations are namespaced into the shared
+ray-query shader library, including evaluator-driven opaque/cutout candidate acceptance.
+
+Skinned and morphed meshes are intentionally not submitted by Blacksite's `game_hot` bridge. Bevy
+0.19 exposes the source mesh slab to Solari rather than the raster renderer's post-morph/post-skin
+vertices; tracing that slab would render a stale bind-pose proxy. See `BLACKSITE_PATCH.md` for the
+maintained boundary and upgrade notes.
diff --git a/third_party/bevy_solari/src/lib.rs b/third_party/bevy_solari/src/lib.rs
new file mode 100644
index 0000000..8cb48bc
--- /dev/null
+++ b/third_party/bevy_solari/src/lib.rs
@@ -0,0 +1,59 @@
+#![expect(missing_docs, reason = "Not all docs are written yet, see #3492.")]
+
+//! Provides raytraced lighting.
+//!
+//! See [`SolariPlugins`] for more info.
+//!
+//! ![`bevy_solari` logo](https://raw.githubusercontent.com/bevyengine/bevy/refs/heads/main/assets/branding/bevy_solari.svg)
+
+extern crate alloc;
+
+pub mod pathtracer;
+pub mod realtime;
+pub mod scene;
+
+/// The solari prelude.
+///
+/// This includes the most common types in this crate, re-exported for your convenience.
+pub mod prelude {
+    pub use super::SolariPlugins;
+    pub use crate::realtime::SolariLighting;
+    pub use crate::scene::RaytracingMesh3d;
+}
+
+use crate::realtime::SolariLightingPlugin;
+use crate::scene::RaytracingScenePlugin;
+use bevy_app::{PluginGroup, PluginGroupBuilder};
+use bevy_render::settings::WgpuFeatures;
+
+/// An experimental set of plugins for raytraced lighting.
+///
+/// This plugin group provides:
+/// * [`SolariLightingPlugin`] - Raytraced direct and indirect lighting.
+/// * [`RaytracingScenePlugin`] - BLAS building, resource and lighting binding.
+///
+/// There's also:
+/// * [`pathtracer::PathtracingPlugin`] - A non-realtime pathtracer for validation purposes (not added by default).
+///
+/// To get started, add this plugin to your app, and then add `RaytracingMesh3d` plus either a Bevy
+/// standard material or a validated Blacksite Surface material to your entities.
+pub struct SolariPlugins;
+
+impl PluginGroup for SolariPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            .add(RaytracingScenePlugin)
+            .add(SolariLightingPlugin)
+    }
+}
+
+impl SolariPlugins {
+    /// [`WgpuFeatures`] required for these plugins to function.
+    pub fn required_wgpu_features() -> WgpuFeatures {
+        WgpuFeatures::EXPERIMENTAL_RAY_QUERY
+            | WgpuFeatures::BUFFER_BINDING_ARRAY
+            | WgpuFeatures::TEXTURE_BINDING_ARRAY
+            | WgpuFeatures::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING
+            | WgpuFeatures::PARTIALLY_BOUND_BINDING_ARRAY
+    }
+}
diff --git a/third_party/bevy_solari/src/pathtracer/extract.rs b/third_party/bevy_solari/src/pathtracer/extract.rs
new file mode 100644
index 0000000..19db4f3
--- /dev/null
+++ b/third_party/bevy_solari/src/pathtracer/extract.rs
@@ -0,0 +1,36 @@
+use super::{prepare::PathtracerAccumulationTexture, Pathtracer};
+use bevy_camera::Camera;
+use bevy_ecs::{
+    change_detection::DetectChanges,
+    system::{Commands, Query},
+    world::Ref,
+};
+use bevy_render::{sync_world::RenderEntity, Extract};
+use bevy_transform::components::GlobalTransform;
+
+pub fn extract_pathtracer(
+    cameras_3d: Extract<
+        Query<(
+            RenderEntity,
+            &Camera,
+            Ref<GlobalTransform>,
+            Option<&Pathtracer>,
+        )>,
+    >,
+    mut commands: Commands,
+) {
+    for (entity, camera, global_transform, pathtracer) in &cameras_3d {
+        let mut entity_commands = commands
+            .get_entity(entity)
+            .expect("Camera entity wasn't synced.");
+        if let Some(pathtracer) = pathtracer
+            && camera.is_active
+        {
+            let mut pathtracer = pathtracer.clone();
+            pathtracer.reset |= global_transform.is_changed();
+            entity_commands.insert(pathtracer);
+        } else {
+            entity_commands.remove::<(Pathtracer, PathtracerAccumulationTexture)>();
+        }
+    }
+}
diff --git a/third_party/bevy_solari/src/pathtracer/mod.rs b/third_party/bevy_solari/src/pathtracer/mod.rs
new file mode 100644
index 0000000..01fd6c0
--- /dev/null
+++ b/third_party/bevy_solari/src/pathtracer/mod.rs
@@ -0,0 +1,68 @@
+mod extract;
+mod node;
+mod prepare;
+
+use crate::SolariPlugins;
+use bevy_app::{App, Plugin};
+use bevy_asset::embedded_asset;
+use bevy_camera::Hdr;
+use bevy_core_pipeline::{
+    schedule::{Core3d, Core3dSystems},
+    tonemapping::tonemapping,
+};
+use bevy_ecs::{component::Component, reflect::ReflectComponent, schedule::IntoScheduleConfigs};
+use bevy_reflect::{std_traits::ReflectDefault, Reflect};
+use bevy_render::{
+    renderer::RenderDevice, ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
+};
+use extract::extract_pathtracer;
+use node::{init_pathtracer_pipelines, pathtracer};
+use prepare::prepare_pathtracer_accumulation_texture;
+use tracing::warn;
+
+/// Non-realtime pathtracing.
+///
+/// This plugin is meant to generate reference screenshots to compare against,
+/// and is not intended to be used by games.
+pub struct PathtracingPlugin;
+
+impl Plugin for PathtracingPlugin {
+    fn build(&self, app: &mut App) {
+        embedded_asset!(app, "pathtracer.wgsl");
+    }
+
+    fn finish(&self, app: &mut App) {
+        let render_app = app.sub_app_mut(RenderApp);
+
+        let render_device = render_app.world().resource::<RenderDevice>();
+        let features = render_device.features();
+        if !features.contains(SolariPlugins::required_wgpu_features()) {
+            warn!(
+                "PathtracingPlugin not loaded. GPU lacks support for required features: {:?}.",
+                SolariPlugins::required_wgpu_features().difference(features)
+            );
+            return;
+        }
+
+        render_app
+            .add_systems(RenderStartup, init_pathtracer_pipelines)
+            .add_systems(ExtractSchedule, extract_pathtracer)
+            .add_systems(
+                Render,
+                prepare_pathtracer_accumulation_texture.in_set(RenderSystems::PrepareResources),
+            )
+            .add_systems(
+                Core3d,
+                pathtracer
+                    .after(Core3dSystems::MainPass)
+                    .before(tonemapping),
+            );
+    }
+}
+
+#[derive(Component, Reflect, Default, Clone)]
+#[reflect(Component, Default, Clone)]
+#[require(Hdr)]
+pub struct Pathtracer {
+    pub reset: bool,
+}
diff --git a/third_party/bevy_solari/src/pathtracer/node.rs b/third_party/bevy_solari/src/pathtracer/node.rs
new file mode 100644
index 0000000..2c0dad1
--- /dev/null
+++ b/third_party/bevy_solari/src/pathtracer/node.rs
@@ -0,0 +1,118 @@
+use super::{prepare::PathtracerAccumulationTexture, Pathtracer};
+use crate::scene::RaytracingSceneBindings;
+use bevy_asset::{load_embedded_asset, AssetServer};
+use bevy_ecs::{prelude::*, resource::Resource, system::Commands};
+use bevy_render::{
+    camera::ExtractedCamera,
+    render_resource::{
+        binding_types::{texture_storage_2d, uniform_buffer},
+        BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
+        CachedComputePipelineId, ComputePassDescriptor, ComputePipelineDescriptor,
+        ImageSubresourceRange, PipelineCache, ShaderStages, StorageTextureAccess, TextureFormat,
+    },
+    renderer::{RenderContext, RenderDevice, ViewQuery},
+    view::{ViewTarget, ViewUniform, ViewUniformOffset, ViewUniforms},
+};
+use bevy_utils::default;
+
+/// Resource holding the pathtracer pipeline configuration.
+#[derive(Resource)]
+pub struct PathtracerPipelines {
+    bind_group_layout: BindGroupLayoutDescriptor,
+    pipeline: CachedComputePipelineId,
+}
+
+/// Initializes the pathtracer pipelines at render startup.
+pub fn init_pathtracer_pipelines(
+    mut commands: Commands,
+    pipeline_cache: Res<PipelineCache>,
+    scene_bindings: Res<RaytracingSceneBindings>,
+    asset_server: Res<AssetServer>,
+) {
+    let bind_group_layout = BindGroupLayoutDescriptor::new(
+        "pathtracer_bind_group_layout",
+        &BindGroupLayoutEntries::sequential(
+            ShaderStages::COMPUTE,
+            (
+                texture_storage_2d(TextureFormat::Rgba32Float, StorageTextureAccess::ReadWrite),
+                texture_storage_2d(TextureFormat::Rgba16Float, StorageTextureAccess::WriteOnly),
+                uniform_buffer::<ViewUniform>(true),
+            ),
+        ),
+    );
+
+    let pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
+        label: Some("pathtracer_pipeline".into()),
+        layout: vec![
+            scene_bindings.bind_group_layout.clone(),
+            bind_group_layout.clone(),
+        ],
+        shader: load_embedded_asset!(asset_server.as_ref(), "pathtracer.wgsl"),
+        ..default()
+    });
+
+    commands.insert_resource(PathtracerPipelines {
+        bind_group_layout,
+        pipeline,
+    });
+}
+
+pub fn pathtracer(
+    view: ViewQuery<(
+        &Pathtracer,
+        &PathtracerAccumulationTexture,
+        &ExtractedCamera,
+        &ViewTarget,
+        &ViewUniformOffset,
+    )>,
+    pathtracer_pipelines: Option<Res<PathtracerPipelines>>,
+    pipeline_cache: Res<PipelineCache>,
+    scene_bindings: Res<RaytracingSceneBindings>,
+    view_uniforms: Res<ViewUniforms>,
+    render_device: Res<RenderDevice>,
+    mut ctx: RenderContext,
+) {
+    let (pathtracer_settings, accumulation_texture, camera, view_target, view_uniform_offset) =
+        view.into_inner();
+
+    let Some(pathtracer_pipelines) = pathtracer_pipelines else {
+        return;
+    };
+
+    let (Some(pipeline), Some(scene_bind_group), Some(viewport), Some(view_uniforms_binding)) = (
+        pipeline_cache.get_compute_pipeline(pathtracer_pipelines.pipeline),
+        &scene_bindings.bind_group,
+        camera.physical_viewport_size,
+        view_uniforms.uniforms.binding(),
+    ) else {
+        return;
+    };
+
+    let bind_group = render_device.create_bind_group(
+        "pathtracer_bind_group",
+        &pipeline_cache.get_bind_group_layout(&pathtracer_pipelines.bind_group_layout),
+        &BindGroupEntries::sequential((
+            &accumulation_texture.0.default_view,
+            view_target.get_unsampled_color_attachment().view,
+            view_uniforms_binding,
+        )),
+    );
+
+    let command_encoder = ctx.command_encoder();
+
+    if pathtracer_settings.reset {
+        command_encoder.clear_texture(
+            &accumulation_texture.0.texture,
+            &ImageSubresourceRange::default(),
+        );
+    }
+
+    let mut pass = command_encoder.begin_compute_pass(&ComputePassDescriptor {
+        label: Some("pathtracer"),
+        timestamp_writes: None,
+    });
+    pass.set_pipeline(pipeline);
+    pass.set_bind_group(0, scene_bind_group, &[]);
+    pass.set_bind_group(1, &bind_group, &[view_uniform_offset.offset]);
+    pass.dispatch_workgroups(viewport.x.div_ceil(8), viewport.y.div_ceil(8), 1);
+}
diff --git a/third_party/bevy_solari/src/pathtracer/pathtracer.wgsl b/third_party/bevy_solari/src/pathtracer/pathtracer.wgsl
new file mode 100644
index 0000000..9755dfe
--- /dev/null
+++ b/third_party/bevy_solari/src/pathtracer/pathtracer.wgsl
@@ -0,0 +1,118 @@
+enable wgpu_ray_query;
+
+#import bevy_core_pipeline::tonemapping::tonemapping_luminance as luminance
+#import bevy_pbr::pbr_functions::calculate_F0
+#import bevy_pbr::utils::{rand_f, rand_vec2f}
+#import bevy_render::maths::{PI, orthonormalize}
+#import bevy_render::view::View
+#import bevy_solari::brdf::{evaluate_brdf, evaluate_and_sample_brdf, fresnel}
+#import bevy_solari::sampling::{sample_random_light, random_emissive_light_pdf, ggx_vndf_pdf, power_heuristic}
+#import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, ResolvedRayHitFull, RAY_T_MIN, RAY_T_MAX, MIRROR_ROUGHNESS_THRESHOLD}
+
+@group(1) @binding(0) var accumulation_texture: texture_storage_2d<rgba32float, read_write>;
+@group(1) @binding(1) var view_output: texture_storage_2d<rgba16float, write>;
+@group(1) @binding(2) var<uniform> view: View;
+
+@compute @workgroup_size(8, 8, 1)
+fn pathtrace(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    if any(global_id.xy >= vec2u(view.viewport.zw)) {
+        return;
+    }
+
+    let old_color = textureLoad(accumulation_texture, global_id.xy);
+
+    // Setup RNG
+    let pixel_index = global_id.x + global_id.y * u32(view.viewport.z);
+    let frame_index = u32(old_color.a) * 5782582u;
+    var rng = pixel_index + frame_index;
+
+    // Shoot the first ray from the camera
+    let pixel_center = vec2<f32>(global_id.xy) + 0.5;
+    let jitter = rand_vec2f(&rng) - 0.5;
+    let pixel_uv = (pixel_center + jitter) / view.viewport.zw;
+    let pixel_ndc = (pixel_uv * 2.0) - 1.0;
+    let primary_ray_target = view.world_from_clip * vec4(pixel_ndc.x, -pixel_ndc.y, 1.0, 1.0);
+    var ray_origin = view.world_position;
+    var ray_direction = normalize((primary_ray_target.xyz / primary_ray_target.w) - ray_origin);
+    var ray_t_min = 0.0;
+
+    // Path trace
+    var radiance = vec3(0.0);
+    var throughput = vec3(1.0);
+    var p_bounce = 0.0;
+    loop {
+        let ray = trace_ray(ray_origin, ray_direction, ray_t_min, RAY_T_MAX, RAY_FLAG_NONE);
+        if ray.kind != RAY_QUERY_INTERSECTION_NONE {
+            let ray_hit = resolve_ray_hit_full(ray);
+            let wo = -ray_direction;
+
+            // Emissive contribution
+            var mis_weight = 1.0;
+            if p_bounce != 0.0 { // Not first bounce
+                let p_light = random_emissive_light_pdf(ray_hit);
+                mis_weight = power_heuristic(p_bounce, p_light);
+            }
+            radiance += mis_weight * throughput * ray_hit.material.emissive;
+
+            // Sample direct lighting, but only if the surface is not mirror-like
+            // TODO: randomly choose to use NEE or not with probability proportional to roughness and metallicness
+            let is_perfectly_specular = ray_hit.material.roughness <= MIRROR_ROUGHNESS_THRESHOLD && ray_hit.material.metallic > 0.9999;
+            if !is_perfectly_specular {
+                let direct_lighting = sample_random_light(ray_hit.world_position, ray_hit.world_normal, &rng);
+
+                mis_weight = 1.0;
+                if direct_lighting.brdf_rays_can_hit {
+                    let pdf_of_bounce = brdf_pdf(wo, direct_lighting.wi, ray_hit);
+                    mis_weight = power_heuristic(1.0 / direct_lighting.inverse_pdf, pdf_of_bounce);
+                }
+
+                let direct_lighting_brdf = evaluate_brdf(wo, direct_lighting.wi, ray_hit.world_normal, ray_hit.material);
+                radiance += mis_weight * throughput * direct_lighting.radiance * direct_lighting.inverse_pdf * direct_lighting_brdf;
+            }
+
+            // Sample new ray direction from the material BRDF for next bounce and apply BRDF
+            let next_bounce = evaluate_and_sample_brdf(wo, ray_hit.world_normal, ray_hit.material, &rng);
+            if next_bounce.pdf == 0.0 { break; }
+            ray_direction = next_bounce.wi;
+            ray_origin = ray_hit.world_position + (ray_hit.geometric_world_normal * RAY_T_MIN);
+            ray_t_min = RAY_T_MIN;
+            p_bounce = next_bounce.pdf;
+            throughput *= next_bounce.throughput;
+
+            // Russian roulette for early termination
+            let p = luminance(throughput);
+            if rand_f(&rng) > p { break; }
+            throughput /= p;
+        } else { break; }
+    }
+
+    // Camera exposure
+    radiance *= view.exposure;
+
+    // Accumulation over time via running average
+    let new_color = mix(old_color.rgb, radiance, 1.0 / (old_color.a + 1.0));
+    textureStore(accumulation_texture, global_id.xy, vec4(new_color, old_color.a + 1.0));
+    textureStore(view_output, global_id.xy, vec4(new_color, 1.0));
+}
+
+fn brdf_pdf(wo: vec3<f32>, wi: vec3<f32>, ray_hit: ResolvedRayHitFull) -> f32 {
+    let NdotV = max(dot(ray_hit.world_normal, wo), 0.0001);
+    let F0 = calculate_F0(ray_hit.material.base_color, ray_hit.material.metallic, vec3(ray_hit.material.reflectance));
+    let df = 1.0 - luminance(fresnel(F0, NdotV));
+
+    let diffuse_weight = mix(df, 0.0, ray_hit.material.metallic);
+    let specular_weight = 1.0 - diffuse_weight;
+
+    let TBN = orthonormalize(ray_hit.world_normal);
+    let T = TBN[0];
+    let B = TBN[1];
+    let N = TBN[2];
+
+    let wo_tangent = vec3(dot(wo, T), dot(wo, B), dot(wo, N));
+    let wi_tangent = vec3(dot(wi, T), dot(wi, B), dot(wi, N));
+
+    let diffuse_pdf = wi_tangent.z / PI;
+    let specular_pdf = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
+    let pdf = (diffuse_weight * diffuse_pdf) + (specular_weight * specular_pdf);
+    return pdf;
+}
diff --git a/third_party/bevy_solari/src/pathtracer/prepare.rs b/third_party/bevy_solari/src/pathtracer/prepare.rs
new file mode 100644
index 0000000..ddef965
--- /dev/null
+++ b/third_party/bevy_solari/src/pathtracer/prepare.rs
@@ -0,0 +1,47 @@
+use super::Pathtracer;
+use bevy_ecs::{
+    component::Component,
+    entity::Entity,
+    query::With,
+    system::{Commands, Query, Res, ResMut},
+};
+use bevy_image::ToExtents;
+use bevy_render::{
+    camera::ExtractedCamera,
+    render_resource::{TextureDescriptor, TextureDimension, TextureFormat, TextureUsages},
+    renderer::RenderDevice,
+    texture::{CachedTexture, TextureCache},
+};
+
+#[derive(Component)]
+pub struct PathtracerAccumulationTexture(pub CachedTexture);
+
+pub fn prepare_pathtracer_accumulation_texture(
+    query: Query<(Entity, &ExtractedCamera), With<Pathtracer>>,
+    mut texture_cache: ResMut<TextureCache>,
+    render_device: Res<RenderDevice>,
+    mut commands: Commands,
+) {
+    for (entity, camera) in &query {
+        let Some(viewport) = camera.physical_viewport_size else {
+            continue;
+        };
+
+        let descriptor = TextureDescriptor {
+            label: Some("pathtracer_accumulation_texture"),
+            size: viewport.to_extents(),
+            mip_level_count: 1,
+            sample_count: 1,
+            dimension: TextureDimension::D2,
+            format: TextureFormat::Rgba32Float,
+            usage: TextureUsages::STORAGE_BINDING,
+            view_formats: &[],
+        };
+
+        commands
+            .entity(entity)
+            .insert(PathtracerAccumulationTexture(
+                texture_cache.get(&render_device, descriptor),
+            ));
+    }
+}
diff --git a/third_party/bevy_solari/src/realtime/extract.rs b/third_party/bevy_solari/src/realtime/extract.rs
new file mode 100644
index 0000000..d2c1212
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/extract.rs
@@ -0,0 +1,27 @@
+use super::{prepare::SolariLightingResources, SolariLighting};
+use bevy_camera::Camera;
+use bevy_ecs::system::{Commands, ResMut};
+use bevy_pbr::deferred::SkipDeferredLighting;
+use bevy_render::{sync_world::RenderEntity, MainWorld};
+
+pub fn extract_solari_lighting(mut main_world: ResMut<MainWorld>, mut commands: Commands) {
+    let mut cameras_3d = main_world.query::<(RenderEntity, &Camera, Option<&mut SolariLighting>)>();
+
+    for (entity, camera, solari_lighting) in cameras_3d.iter_mut(&mut main_world) {
+        let mut entity_commands = commands
+            .get_entity(entity)
+            .expect("Camera entity wasn't synced.");
+        if let Some(mut solari_lighting) = solari_lighting
+            && camera.is_active
+        {
+            entity_commands.insert((solari_lighting.clone(), SkipDeferredLighting));
+            solari_lighting.reset = false;
+        } else {
+            entity_commands.remove::<(
+                SolariLighting,
+                SolariLightingResources,
+                SkipDeferredLighting,
+            )>();
+        }
+    }
+}
diff --git a/third_party/bevy_solari/src/realtime/gbuffer_utils.wgsl b/third_party/bevy_solari/src/realtime/gbuffer_utils.wgsl
new file mode 100644
index 0000000..941cb59
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/gbuffer_utils.wgsl
@@ -0,0 +1,55 @@
+#define_import_path bevy_solari::gbuffer_utils
+
+#import bevy_pbr::pbr_deferred_types::unpack_24bit_normal
+#import bevy_pbr::rgb9e5::rgb9e5_to_vec3_
+#import bevy_pbr::utils::octahedral_decode
+#import bevy_render::view::{View, depth_ndc_to_view_z}
+#import bevy_solari::scene_bindings::ResolvedMaterial
+
+struct ResolvedGPixel {
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+    material: ResolvedMaterial,
+}
+
+fn gpixel_resolve(gpixel: vec4<u32>, depth: f32, pixel_id: vec2<u32>, view_size: vec2<f32>, world_from_clip: mat4x4<f32>) -> ResolvedGPixel {
+    let world_position = reconstruct_world_position(pixel_id, depth, view_size, world_from_clip);
+    let world_normal = octahedral_decode(unpack_24bit_normal(gpixel.a));
+
+    let base_rough = unpack4x8unorm(gpixel.r);
+    let base_color = pow(base_rough.rgb, vec3(2.2));
+    let perceptual_roughness = base_rough.a;
+    let roughness = perceptual_roughness * perceptual_roughness;
+    let props = unpack4x8unorm(gpixel.b);
+    let reflectance = props.r;
+    let metallic = props.g;
+    let emissive = rgb9e5_to_vec3_(gpixel.g);
+    let material = ResolvedMaterial(base_color, emissive, reflectance, perceptual_roughness, roughness, metallic);
+
+    return ResolvedGPixel(world_position, world_normal, material);
+}
+
+fn reconstruct_world_position(pixel_id: vec2<u32>, depth: f32, view_size: vec2<f32>, world_from_clip: mat4x4<f32>) -> vec3<f32> {
+    let uv = (vec2<f32>(pixel_id) + 0.5) / view_size;
+    let xy_ndc = (uv - vec2(0.5)) * vec2(2.0, -2.0);
+    let world_pos = world_from_clip * vec4(xy_ndc, depth, 1.0);
+    return world_pos.xyz / world_pos.w;
+}
+
+// Reject if tangent plane differs more than 0.3% or angle between normals more than 90 degrees
+fn pixel_dissimilar(depth: f32, world_position: vec3<f32>, other_world_position: vec3<f32>, normal: vec3<f32>, other_normal: vec3<f32>, view: View) -> bool {
+    // https://developer.download.nvidia.com/video/gputechconf/gtc/2020/presentations/s22699-fast-denoising-with-self-stabilizing-recurrent-blurs.pdf#page=45
+    let tangent_plane_distance = abs(dot(normal, other_world_position - world_position));
+    let view_z = -depth_ndc_to_view_z(depth, view.clip_from_view, view.view_from_clip);
+
+    return tangent_plane_distance / view_z > 0.003 || dot(normal, other_normal) < 0.0;
+}
+
+fn permute_pixel(pixel_id: vec2<u32>, frame_index: u32, view_size: vec2<f32>) -> vec2<u32> {
+    let r = frame_index;
+    let offset = vec2(r & 3u, (r >> 2u) & 3u);
+    var shifted_pixel_id = pixel_id + offset;
+    shifted_pixel_id ^= vec2(3u);
+    shifted_pixel_id -= offset;
+    return min(shifted_pixel_id, vec2<u32>(view_size - 1.0));
+}
diff --git a/third_party/bevy_solari/src/realtime/mod.rs b/third_party/bevy_solari/src/realtime/mod.rs
new file mode 100644
index 0000000..bf8350e
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/mod.rs
@@ -0,0 +1,112 @@
+mod extract;
+mod node;
+mod prepare;
+
+use crate::SolariPlugins;
+use bevy_app::{App, Plugin};
+use bevy_asset::embedded_asset;
+use bevy_camera::Hdr;
+use bevy_core_pipeline::{
+    core_3d::main_opaque_pass_3d,
+    prepass::{
+        DeferredPrepass, DeferredPrepassDoubleBuffer, DepthPrepass, DepthPrepassDoubleBuffer,
+        MotionVectorPrepass,
+    },
+    schedule::{Core3d, Core3dSystems},
+};
+use bevy_ecs::{component::Component, reflect::ReflectComponent, schedule::IntoScheduleConfigs};
+use bevy_pbr::DefaultOpaqueRendererMethod;
+use bevy_reflect::{std_traits::ReflectDefault, Reflect};
+use bevy_render::{
+    renderer::RenderDevice, ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
+};
+use bevy_shader::load_shader_library;
+use extract::extract_solari_lighting;
+use node::{init_solari_lighting_pipelines, solari_lighting};
+use prepare::prepare_solari_lighting_resources;
+use tracing::warn;
+
+/// Raytraced direct and indirect lighting.
+///
+/// When using this plugin, it's highly recommended to set `shadow_maps_enabled: false` on all lights, as Solari replaces
+/// traditional shadow mapping.
+pub struct SolariLightingPlugin;
+
+impl Plugin for SolariLightingPlugin {
+    fn build(&self, app: &mut App) {
+        load_shader_library!(app, "gbuffer_utils.wgsl");
+        load_shader_library!(app, "realtime_bindings.wgsl");
+        load_shader_library!(app, "presample_light_tiles.wgsl");
+        embedded_asset!(app, "restir_di.wgsl");
+        embedded_asset!(app, "restir_gi.wgsl");
+        load_shader_library!(app, "specular_gi.wgsl");
+        load_shader_library!(app, "world_cache_query.wgsl");
+        embedded_asset!(app, "world_cache_compact.wgsl");
+        embedded_asset!(app, "world_cache_update.wgsl");
+
+        load_shader_library!(app, "resolve_dlss_rr_textures.wgsl");
+
+        app.insert_resource(DefaultOpaqueRendererMethod::deferred());
+    }
+
+    fn finish(&self, app: &mut App) {
+        let render_app = app.sub_app_mut(RenderApp);
+
+        let render_device = render_app.world().resource::<RenderDevice>();
+        let features = render_device.features();
+        if !features.contains(SolariPlugins::required_wgpu_features()) {
+            warn!(
+                "SolariLightingPlugin not loaded. GPU lacks support for required features: {:?}.",
+                SolariPlugins::required_wgpu_features().difference(features)
+            );
+            return;
+        }
+
+        render_app
+            .add_systems(RenderStartup, init_solari_lighting_pipelines)
+            .add_systems(ExtractSchedule, extract_solari_lighting)
+            .add_systems(
+                Render,
+                prepare_solari_lighting_resources.in_set(RenderSystems::PrepareResources),
+            )
+            .add_systems(
+                Core3d,
+                solari_lighting
+                    .before(main_opaque_pass_3d)
+                    .in_set(Core3dSystems::MainPass),
+            );
+    }
+}
+
+/// A component for a 3d camera entity to enable the Solari raytraced lighting system.
+///
+/// Must be used with `CameraMainTextureUsages::default().with(TextureUsages::STORAGE_BINDING)`, and
+/// `Msaa::Off`.
+#[derive(Component, Reflect, Clone)]
+#[reflect(Component, Default, Clone)]
+#[require(
+    Hdr,
+    DeferredPrepass,
+    DepthPrepass,
+    MotionVectorPrepass,
+    DeferredPrepassDoubleBuffer,
+    DepthPrepassDoubleBuffer
+)]
+pub struct SolariLighting {
+    /// Set to true to delete the saved temporal history (past frames).
+    ///
+    /// Useful for preventing ghosting when the history is no longer
+    /// representative of the current frame, such as in sudden camera cuts.
+    ///
+    /// After setting this to true, it will automatically be toggled
+    /// back to false at the end of the frame.
+    pub reset: bool,
+}
+
+impl Default for SolariLighting {
+    fn default() -> Self {
+        Self {
+            reset: true, // No temporal history on the first frame
+        }
+    }
+}
diff --git a/third_party/bevy_solari/src/realtime/node.rs b/third_party/bevy_solari/src/realtime/node.rs
new file mode 100644
index 0000000..3b36a38
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/node.rs
@@ -0,0 +1,597 @@
+use super::{
+    prepare::{SolariLightingResources, LIGHT_TILE_BLOCKS, WORLD_CACHE_SIZE},
+    SolariLighting,
+};
+use crate::scene::RaytracingSceneBindings;
+#[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+use bevy_anti_alias::dlss::ViewDlssRayReconstructionTextures;
+use bevy_asset::{load_embedded_asset, AssetServer, Handle};
+use bevy_core_pipeline::prepass::{
+    PreviousViewData, PreviousViewUniformOffset, PreviousViewUniforms, ViewPrepassTextures,
+};
+use bevy_diagnostic::FrameCount;
+use bevy_ecs::{prelude::*, resource::Resource, system::Commands};
+use bevy_render::{
+    diagnostic::RecordDiagnostics as _,
+    render_resource::{
+        binding_types::{
+            storage_buffer_sized, texture_2d, texture_depth_2d, texture_storage_2d, uniform_buffer,
+        },
+        BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
+        CachedComputePipelineId, ComputePassDescriptor, ComputePipelineDescriptor, LoadOp,
+        PipelineCache, RenderPassDescriptor, ShaderStages, StorageTextureAccess, TextureFormat,
+        TextureSampleType,
+    },
+    renderer::{RenderContext, RenderDevice, ViewQuery},
+    view::{ViewTarget, ViewUniform, ViewUniformOffset, ViewUniforms},
+};
+use bevy_shader::{Shader, ShaderDefVal};
+use bevy_utils::default;
+
+/// Resource holding the Solari lighting pipeline configuration.
+#[derive(Resource)]
+pub struct SolariLightingPipelines {
+    bind_group_layout: BindGroupLayoutDescriptor,
+    bind_group_layout_world_cache_active_cells_dispatch: BindGroupLayoutDescriptor,
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    bind_group_layout_resolve_dlss_rr_textures: BindGroupLayoutDescriptor,
+    decay_world_cache_pipeline: CachedComputePipelineId,
+    compact_world_cache_single_block_pipeline: CachedComputePipelineId,
+    compact_world_cache_blocks_pipeline: CachedComputePipelineId,
+    compact_world_cache_write_active_cells_pipeline: CachedComputePipelineId,
+    sample_di_for_world_cache_pipeline: CachedComputePipelineId,
+    sample_gi_for_world_cache_pipeline: CachedComputePipelineId,
+    blend_new_world_cache_samples_pipeline: CachedComputePipelineId,
+    presample_light_tiles_pipeline: CachedComputePipelineId,
+    di_initial_and_temporal_pipeline: CachedComputePipelineId,
+    di_spatial_and_shade_pipeline: CachedComputePipelineId,
+    gi_initial_and_temporal_pipeline: CachedComputePipelineId,
+    gi_spatial_and_shade_pipeline: CachedComputePipelineId,
+    specular_gi_pipeline: CachedComputePipelineId,
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    specular_gi_with_psr_pipeline: CachedComputePipelineId,
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    resolve_dlss_rr_textures_pipeline: CachedComputePipelineId,
+}
+
+#[cfg(any(not(feature = "dlss"), feature = "force_disable_dlss"))]
+type SolariLightingViewQuery = (
+    &'static SolariLighting,
+    &'static SolariLightingResources,
+    &'static ViewTarget,
+    &'static ViewPrepassTextures,
+    &'static ViewUniformOffset,
+    &'static PreviousViewUniformOffset,
+);
+
+#[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+type SolariLightingViewQuery = (
+    &'static SolariLighting,
+    &'static SolariLightingResources,
+    &'static ViewTarget,
+    &'static ViewPrepassTextures,
+    &'static ViewUniformOffset,
+    &'static PreviousViewUniformOffset,
+    Option<&'static ViewDlssRayReconstructionTextures>,
+);
+
+pub fn solari_lighting(
+    view: ViewQuery<SolariLightingViewQuery>,
+    solari_pipelines: Option<Res<SolariLightingPipelines>>,
+    pipeline_cache: Res<PipelineCache>,
+    scene_bindings: Res<RaytracingSceneBindings>,
+    view_uniforms: Res<ViewUniforms>,
+    previous_view_uniforms: Res<PreviousViewUniforms>,
+    frame_count: Res<FrameCount>,
+    render_device: Res<RenderDevice>,
+    mut ctx: RenderContext,
+) {
+    #[cfg(any(not(feature = "dlss"), feature = "force_disable_dlss"))]
+    let (
+        solari_lighting,
+        solari_lighting_resources,
+        view_target,
+        view_prepass_textures,
+        view_uniform_offset,
+        previous_view_uniform_offset,
+    ) = view.into_inner();
+
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    let (
+        solari_lighting,
+        solari_lighting_resources,
+        view_target,
+        view_prepass_textures,
+        view_uniform_offset,
+        previous_view_uniform_offset,
+        view_dlss_rr_textures,
+    ) = view.into_inner();
+
+    let Some(pipelines) = solari_pipelines else {
+        return;
+    };
+
+    #[cfg(not(all(feature = "dlss", not(feature = "force_disable_dlss"))))]
+    let specular_gi_pipeline = pipelines.specular_gi_pipeline;
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    let specular_gi_pipeline = if view_dlss_rr_textures.is_some() {
+        pipelines.specular_gi_with_psr_pipeline
+    } else {
+        pipelines.specular_gi_pipeline
+    };
+
+    let (
+        Some(decay_world_cache_pipeline),
+        Some(compact_world_cache_single_block_pipeline),
+        Some(compact_world_cache_blocks_pipeline),
+        Some(compact_world_cache_write_active_cells_pipeline),
+        Some(sample_di_for_world_cache_pipeline),
+        Some(sample_gi_for_world_cache_pipeline),
+        Some(blend_new_world_cache_samples_pipeline),
+        Some(presample_light_tiles_pipeline),
+        Some(di_initial_and_temporal_pipeline),
+        Some(di_spatial_and_shade_pipeline),
+        Some(gi_initial_and_temporal_pipeline),
+        Some(gi_spatial_and_shade_pipeline),
+        Some(specular_gi_pipeline),
+        Some(scene_bind_group),
+        Some(gbuffer),
+        Some(depth_buffer),
+        Some(motion_vectors),
+        Some(previous_gbuffer),
+        Some(previous_depth_buffer),
+        Some(view_uniforms_binding),
+        Some(previous_view_uniforms_binding),
+    ) = (
+        pipeline_cache.get_compute_pipeline(pipelines.decay_world_cache_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.compact_world_cache_single_block_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.compact_world_cache_blocks_pipeline),
+        pipeline_cache
+            .get_compute_pipeline(pipelines.compact_world_cache_write_active_cells_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.sample_di_for_world_cache_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.sample_gi_for_world_cache_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.blend_new_world_cache_samples_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.presample_light_tiles_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.di_initial_and_temporal_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.di_spatial_and_shade_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.gi_initial_and_temporal_pipeline),
+        pipeline_cache.get_compute_pipeline(pipelines.gi_spatial_and_shade_pipeline),
+        pipeline_cache.get_compute_pipeline(specular_gi_pipeline),
+        &scene_bindings.bind_group,
+        view_prepass_textures.deferred_view(),
+        view_prepass_textures.depth_view(),
+        view_prepass_textures.motion_vectors_view(),
+        view_prepass_textures.previous_deferred_view(),
+        view_prepass_textures.previous_depth_view(),
+        view_uniforms.uniforms.binding(),
+        previous_view_uniforms.uniforms.binding(),
+    )
+    else {
+        return;
+    };
+
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    let Some(resolve_dlss_rr_textures_pipeline) =
+        pipeline_cache.get_compute_pipeline(pipelines.resolve_dlss_rr_textures_pipeline)
+    else {
+        return;
+    };
+
+    let view_target_attachment = view_target.get_unsampled_color_attachment();
+
+    let s = solari_lighting_resources;
+    let bind_group = render_device.create_bind_group(
+        "solari_lighting_bind_group",
+        &pipeline_cache.get_bind_group_layout(&pipelines.bind_group_layout),
+        &BindGroupEntries::sequential((
+            view_target_attachment.view,
+            s.light_tile_samples.as_entire_binding(),
+            s.light_tile_resolved_samples.as_entire_binding(),
+            &s.di_reservoirs_a,
+            &s.di_reservoirs_b,
+            s.gi_reservoirs_a.as_entire_binding(),
+            s.gi_reservoirs_b.as_entire_binding(),
+            gbuffer,
+            depth_buffer,
+            motion_vectors,
+            previous_gbuffer,
+            previous_depth_buffer,
+            view_uniforms_binding,
+            previous_view_uniforms_binding,
+            s.world_cache_checksums.as_entire_binding(),
+            s.world_cache_life.as_entire_binding(),
+            s.world_cache_radiance.as_entire_binding(),
+            s.world_cache_geometry_data.as_entire_binding(),
+            s.world_cache_luminance_deltas.as_entire_binding(),
+            s.world_cache_active_cells_new_radiance.as_entire_binding(),
+            s.world_cache_a.as_entire_binding(),
+            s.world_cache_b.as_entire_binding(),
+            s.world_cache_active_cell_indices.as_entire_binding(),
+            s.world_cache_active_cells_count.as_entire_binding(),
+        )),
+    );
+    let bind_group_world_cache_active_cells_dispatch = render_device.create_bind_group(
+        "solari_lighting_bind_group_world_cache_active_cells_dispatch",
+        &pipeline_cache
+            .get_bind_group_layout(&pipelines.bind_group_layout_world_cache_active_cells_dispatch),
+        &BindGroupEntries::single(s.world_cache_active_cells_dispatch.as_entire_binding()),
+    );
+
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    let bind_group_resolve_dlss_rr_textures = view_dlss_rr_textures.map(|d| {
+        render_device.create_bind_group(
+            "solari_lighting_bind_group_resolve_dlss_rr_textures",
+            &pipeline_cache
+                .get_bind_group_layout(&pipelines.bind_group_layout_resolve_dlss_rr_textures),
+            &BindGroupEntries::sequential((
+                &d.diffuse_albedo.default_view,
+                &d.specular_albedo.default_view,
+                &d.normal_roughness.default_view,
+                &d.specular_motion_vectors.default_view,
+            )),
+        )
+    });
+
+    // Choice of number here is arbitrary
+    let frame_index = frame_count.0.wrapping_mul(5782582);
+
+    let diagnostics = ctx.diagnostic_recorder();
+    let diagnostics = diagnostics.as_deref();
+
+    let command_encoder = ctx.command_encoder();
+
+    // Clear the view target if we're the first node to write to it
+    if matches!(view_target_attachment.ops.load, LoadOp::Clear(_)) {
+        command_encoder.begin_render_pass(&RenderPassDescriptor {
+            label: Some("solari_lighting_clear"),
+            color_attachments: &[Some(view_target_attachment)],
+            depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
+            multiview_mask: None,
+        });
+    }
+
+    let mut pass = command_encoder.begin_compute_pass(&ComputePassDescriptor {
+        label: Some("solari_lighting"),
+        timestamp_writes: None,
+    });
+
+    let dx = solari_lighting_resources.view_size.x.div_ceil(8);
+    let dy = solari_lighting_resources.view_size.y.div_ceil(8);
+
+    pass.set_bind_group(0, scene_bind_group, &[]);
+    pass.set_bind_group(
+        1,
+        &bind_group,
+        &[
+            view_uniform_offset.offset,
+            previous_view_uniform_offset.offset,
+        ],
+    );
+
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    if let Some(bind_group_resolve_dlss_rr_textures) = &bind_group_resolve_dlss_rr_textures {
+        pass.set_bind_group(2, bind_group_resolve_dlss_rr_textures, &[]);
+        pass.set_pipeline(resolve_dlss_rr_textures_pipeline);
+        pass.dispatch_workgroups(dx, dy, 1);
+    }
+
+    let d = diagnostics.time_span(&mut pass, "solari_lighting/presample_light_tiles");
+    pass.set_pipeline(presample_light_tiles_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups(LIGHT_TILE_BLOCKS as u32, 1, 1);
+    d.end(&mut pass);
+
+    let d = diagnostics.time_span(&mut pass, "solari_lighting/world_cache");
+
+    pass.set_bind_group(2, &bind_group_world_cache_active_cells_dispatch, &[]);
+
+    pass.set_pipeline(decay_world_cache_pipeline);
+    pass.dispatch_workgroups((WORLD_CACHE_SIZE / 1024) as u32, 1, 1);
+
+    pass.set_pipeline(compact_world_cache_single_block_pipeline);
+    pass.dispatch_workgroups((WORLD_CACHE_SIZE / 1024) as u32, 1, 1);
+
+    pass.set_pipeline(compact_world_cache_blocks_pipeline);
+    pass.dispatch_workgroups(1, 1, 1);
+
+    pass.set_pipeline(compact_world_cache_write_active_cells_pipeline);
+    pass.dispatch_workgroups((WORLD_CACHE_SIZE / 1024) as u32, 1, 1);
+
+    pass.set_bind_group(2, None, &[]);
+
+    pass.set_pipeline(sample_di_for_world_cache_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups_indirect(
+        &solari_lighting_resources.world_cache_active_cells_dispatch,
+        0,
+    );
+
+    pass.set_pipeline(sample_gi_for_world_cache_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups_indirect(
+        &solari_lighting_resources.world_cache_active_cells_dispatch,
+        0,
+    );
+
+    pass.set_pipeline(blend_new_world_cache_samples_pipeline);
+    pass.dispatch_workgroups_indirect(
+        &solari_lighting_resources.world_cache_active_cells_dispatch,
+        0,
+    );
+
+    d.end(&mut pass);
+
+    let d = diagnostics.time_span(&mut pass, "solari_lighting/direct_lighting");
+
+    pass.set_pipeline(di_initial_and_temporal_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups(dx, dy, 1);
+
+    pass.set_pipeline(di_spatial_and_shade_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups(dx, dy, 1);
+
+    d.end(&mut pass);
+
+    let d = diagnostics.time_span(&mut pass, "solari_lighting/diffuse_indirect_lighting");
+
+    pass.set_pipeline(gi_initial_and_temporal_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups(dx, dy, 1);
+
+    pass.set_pipeline(gi_spatial_and_shade_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups(dx, dy, 1);
+
+    d.end(&mut pass);
+
+    let d = diagnostics.time_span(&mut pass, "solari_lighting/specular_indirect_lighting");
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    if let Some(bind_group_resolve_dlss_rr_textures) = &bind_group_resolve_dlss_rr_textures {
+        pass.set_bind_group(2, bind_group_resolve_dlss_rr_textures, &[]);
+    }
+    pass.set_pipeline(specular_gi_pipeline);
+    pass.set_immediates(
+        0,
+        bytemuck::cast_slice(&[frame_index, solari_lighting.reset as u32]),
+    );
+    pass.dispatch_workgroups(dx, dy, 1);
+    d.end(&mut pass);
+
+    drop(pass);
+
+    diagnostics.record_u32(
+        ctx.command_encoder(),
+        &s.world_cache_active_cells_count.slice(..),
+        "solari_lighting/world_cache_active_cells_count",
+    );
+}
+
+/// Initializes the Solari lighting pipelines at render startup.
+pub fn init_solari_lighting_pipelines(
+    mut commands: Commands,
+    pipeline_cache: Res<PipelineCache>,
+    scene_bindings: Res<RaytracingSceneBindings>,
+    asset_server: Res<AssetServer>,
+) {
+    let bind_group_layout = BindGroupLayoutDescriptor::new(
+        "solari_lighting_bind_group_layout",
+        &BindGroupLayoutEntries::sequential(
+            ShaderStages::COMPUTE,
+            (
+                texture_storage_2d(TextureFormat::Rgba16Float, StorageTextureAccess::ReadWrite),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                texture_storage_2d(TextureFormat::Rgba32Uint, StorageTextureAccess::ReadWrite),
+                texture_storage_2d(TextureFormat::Rgba32Uint, StorageTextureAccess::ReadWrite),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                texture_2d(TextureSampleType::Uint),
+                texture_depth_2d(),
+                texture_2d(TextureSampleType::Float { filterable: true }),
+                texture_2d(TextureSampleType::Uint),
+                texture_depth_2d(),
+                uniform_buffer::<ViewUniform>(true),
+                uniform_buffer::<PreviousViewData>(true),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+                storage_buffer_sized(false, None),
+            ),
+        ),
+    );
+
+    let bind_group_layout_world_cache_active_cells_dispatch = BindGroupLayoutDescriptor::new(
+        "solari_lighting_bind_group_layout_world_cache_active_cells_dispatch",
+        &BindGroupLayoutEntries::single(ShaderStages::COMPUTE, storage_buffer_sized(false, None)),
+    );
+
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+    let bind_group_layout_resolve_dlss_rr_textures = BindGroupLayoutDescriptor::new(
+        "solari_lighting_bind_group_layout_resolve_dlss_rr_textures",
+        &BindGroupLayoutEntries::sequential(
+            ShaderStages::COMPUTE,
+            (
+                texture_storage_2d(TextureFormat::Rgba8Unorm, StorageTextureAccess::WriteOnly),
+                texture_storage_2d(TextureFormat::Rgba8Unorm, StorageTextureAccess::WriteOnly),
+                texture_storage_2d(TextureFormat::Rgba16Float, StorageTextureAccess::WriteOnly),
+                texture_storage_2d(TextureFormat::Rg16Float, StorageTextureAccess::WriteOnly),
+            ),
+        ),
+    );
+
+    let create_pipeline = |label: &'static str,
+                           entry_point: &'static str,
+                           shader: Handle<Shader>,
+                           extra_bind_group_layout: Option<&BindGroupLayoutDescriptor>,
+                           extra_shader_defs: Vec<ShaderDefVal>| {
+        let mut layout = vec![
+            scene_bindings.bind_group_layout.clone(),
+            bind_group_layout.clone(),
+        ];
+        if let Some(extra_bind_group_layout) = extra_bind_group_layout {
+            layout.push(extra_bind_group_layout.clone());
+        }
+
+        let mut shader_defs = vec![ShaderDefVal::UInt(
+            "WORLD_CACHE_SIZE".into(),
+            WORLD_CACHE_SIZE as u32,
+        )];
+        shader_defs.extend_from_slice(&extra_shader_defs);
+
+        pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
+            label: Some(label.into()),
+            layout,
+            immediate_size: 8,
+            shader,
+            shader_defs,
+            entry_point: Some(entry_point.into()),
+            ..default()
+        })
+    };
+
+    commands.insert_resource(SolariLightingPipelines {
+        bind_group_layout: bind_group_layout.clone(),
+        bind_group_layout_world_cache_active_cells_dispatch:
+            bind_group_layout_world_cache_active_cells_dispatch.clone(),
+        #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+        bind_group_layout_resolve_dlss_rr_textures: bind_group_layout_resolve_dlss_rr_textures
+            .clone(),
+        decay_world_cache_pipeline: create_pipeline(
+            "solari_lighting_decay_world_cache_pipeline",
+            "decay_world_cache",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_compact.wgsl"),
+            Some(&bind_group_layout_world_cache_active_cells_dispatch),
+            vec!["WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER".into()],
+        ),
+        compact_world_cache_single_block_pipeline: create_pipeline(
+            "solari_lighting_compact_world_cache_single_block_pipeline",
+            "compact_world_cache_single_block",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_compact.wgsl"),
+            Some(&bind_group_layout_world_cache_active_cells_dispatch),
+            vec!["WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER".into()],
+        ),
+        compact_world_cache_blocks_pipeline: create_pipeline(
+            "solari_lighting_compact_world_cache_blocks_pipeline",
+            "compact_world_cache_blocks",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_compact.wgsl"),
+            Some(&bind_group_layout_world_cache_active_cells_dispatch),
+            vec![],
+        ),
+        compact_world_cache_write_active_cells_pipeline: create_pipeline(
+            "solari_lighting_compact_world_cache_write_active_cells_pipeline",
+            "compact_world_cache_write_active_cells",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_compact.wgsl"),
+            Some(&bind_group_layout_world_cache_active_cells_dispatch),
+            vec!["WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER".into()],
+        ),
+        sample_di_for_world_cache_pipeline: create_pipeline(
+            "solari_lighting_sample_di_for_world_cache_pipeline",
+            "sample_di",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_update.wgsl"),
+            None,
+            vec![],
+        ),
+        sample_gi_for_world_cache_pipeline: create_pipeline(
+            "solari_lighting_sample_gi_for_world_cache_pipeline",
+            "sample_gi",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_update.wgsl"),
+            None,
+            vec!["WORLD_CACHE_QUERY_ATOMIC_MAX_LIFETIME".into()],
+        ),
+        blend_new_world_cache_samples_pipeline: create_pipeline(
+            "solari_lighting_blend_new_world_cache_samples_pipeline",
+            "blend_new_samples",
+            load_embedded_asset!(asset_server.as_ref(), "world_cache_update.wgsl"),
+            None,
+            vec![],
+        ),
+        presample_light_tiles_pipeline: create_pipeline(
+            "solari_lighting_presample_light_tiles_pipeline",
+            "presample_light_tiles",
+            load_embedded_asset!(asset_server.as_ref(), "presample_light_tiles.wgsl"),
+            None,
+            vec![],
+        ),
+        di_initial_and_temporal_pipeline: create_pipeline(
+            "solari_lighting_di_initial_and_temporal_pipeline",
+            "initial_and_temporal",
+            load_embedded_asset!(asset_server.as_ref(), "restir_di.wgsl"),
+            None,
+            vec![],
+        ),
+        di_spatial_and_shade_pipeline: create_pipeline(
+            "solari_lighting_di_spatial_and_shade_pipeline",
+            "spatial_and_shade",
+            load_embedded_asset!(asset_server.as_ref(), "restir_di.wgsl"),
+            None,
+            vec![],
+        ),
+        gi_initial_and_temporal_pipeline: create_pipeline(
+            "solari_lighting_gi_initial_and_temporal_pipeline",
+            "initial_and_temporal",
+            load_embedded_asset!(asset_server.as_ref(), "restir_gi.wgsl"),
+            None,
+            vec!["WORLD_CACHE_FIRST_BOUNCE_LIGHT_LEAK_PREVENTION".into()],
+        ),
+        gi_spatial_and_shade_pipeline: create_pipeline(
+            "solari_lighting_gi_spatial_and_shade_pipeline",
+            "spatial_and_shade",
+            load_embedded_asset!(asset_server.as_ref(), "restir_gi.wgsl"),
+            None,
+            vec![],
+        ),
+        specular_gi_pipeline: create_pipeline(
+            "solari_lighting_specular_gi_pipeline",
+            "specular_gi",
+            load_embedded_asset!(asset_server.as_ref(), "specular_gi.wgsl"),
+            None,
+            vec![],
+        ),
+        #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+        specular_gi_with_psr_pipeline: create_pipeline(
+            "solari_lighting_specular_gi_with_psr_pipeline",
+            "specular_gi",
+            load_embedded_asset!(asset_server.as_ref(), "specular_gi.wgsl"),
+            Some(&bind_group_layout_resolve_dlss_rr_textures),
+            vec!["DLSS_RR_GUIDE_BUFFERS".into()],
+        ),
+        #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+        resolve_dlss_rr_textures_pipeline: create_pipeline(
+            "solari_lighting_resolve_dlss_rr_textures_pipeline",
+            "resolve_dlss_rr_textures",
+            load_embedded_asset!(asset_server.as_ref(), "resolve_dlss_rr_textures.wgsl"),
+            Some(&bind_group_layout_resolve_dlss_rr_textures),
+            vec!["DLSS_RR_GUIDE_BUFFERS".into()],
+        ),
+    });
+}
diff --git a/third_party/bevy_solari/src/realtime/prepare.rs b/third_party/bevy_solari/src/realtime/prepare.rs
new file mode 100644
index 0000000..865c8c8
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/prepare.rs
@@ -0,0 +1,324 @@
+use super::SolariLighting;
+#[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+use bevy_anti_alias::dlss::{
+    Dlss, DlssRayReconstructionFeature, ViewDlssRayReconstructionTextures,
+};
+use bevy_camera::MainPassResolutionOverride;
+#[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+use bevy_ecs::query::Has;
+use bevy_ecs::{
+    component::Component,
+    entity::Entity,
+    query::With,
+    system::{Commands, Query, Res},
+};
+use bevy_image::ToExtents;
+use bevy_math::UVec2;
+#[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+use bevy_render::texture::CachedTexture;
+use bevy_render::{
+    camera::ExtractedCamera,
+    render_resource::{
+        Buffer, BufferDescriptor, BufferUsages, TextureDescriptor, TextureDimension, TextureFormat,
+        TextureUsages, TextureView, TextureViewDescriptor,
+    },
+    renderer::RenderDevice,
+};
+
+/// Size of the `LightSample` shader struct in bytes.
+const LIGHT_SAMPLE_STRUCT_SIZE: u64 = 8;
+
+/// Size of the `ResolvedLightSamplePacked` shader struct in bytes.
+const RESOLVED_LIGHT_SAMPLE_STRUCT_SIZE: u64 = 24;
+
+/// Size of the GI `Reservoir` shader struct in bytes.
+const GI_RESERVOIR_STRUCT_SIZE: u64 = 48;
+
+pub const LIGHT_TILE_BLOCKS: u64 = 128;
+pub const LIGHT_TILE_SAMPLES_PER_BLOCK: u64 = 1024;
+
+/// Amount of entries in the world cache (must be a power of 2, and >= 2^10)
+pub const WORLD_CACHE_SIZE: u64 = 2u64.pow(20);
+
+/// Internal rendering resources used for Solari lighting.
+#[derive(Component)]
+pub struct SolariLightingResources {
+    pub light_tile_samples: Buffer,
+    pub light_tile_resolved_samples: Buffer,
+    pub di_reservoirs_a: TextureView,
+    pub di_reservoirs_b: TextureView,
+    pub gi_reservoirs_a: Buffer,
+    pub gi_reservoirs_b: Buffer,
+    pub world_cache_checksums: Buffer,
+    pub world_cache_life: Buffer,
+    pub world_cache_radiance: Buffer,
+    pub world_cache_geometry_data: Buffer,
+    pub world_cache_luminance_deltas: Buffer,
+    pub world_cache_active_cells_new_radiance: Buffer,
+    pub world_cache_a: Buffer,
+    pub world_cache_b: Buffer,
+    pub world_cache_active_cell_indices: Buffer,
+    pub world_cache_active_cells_count: Buffer,
+    pub world_cache_active_cells_dispatch: Buffer,
+    pub view_size: UVec2,
+}
+
+pub fn prepare_solari_lighting_resources(
+    #[cfg(any(not(feature = "dlss"), feature = "force_disable_dlss"))] query: Query<
+        (
+            Entity,
+            &ExtractedCamera,
+            Option<&SolariLightingResources>,
+            Option<&MainPassResolutionOverride>,
+        ),
+        With<SolariLighting>,
+    >,
+    #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))] query: Query<
+        (
+            Entity,
+            &ExtractedCamera,
+            Option<&SolariLightingResources>,
+            Option<&MainPassResolutionOverride>,
+            Has<Dlss<DlssRayReconstructionFeature>>,
+        ),
+        With<SolariLighting>,
+    >,
+    render_device: Res<RenderDevice>,
+    mut commands: Commands,
+) {
+    for query_item in &query {
+        #[cfg(any(not(feature = "dlss"), feature = "force_disable_dlss"))]
+        let (entity, camera, solari_lighting_resources, resolution_override) = query_item;
+        #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+        let (entity, camera, solari_lighting_resources, resolution_override, has_dlss_rr) =
+            query_item;
+
+        let Some(mut view_size) = camera.physical_viewport_size else {
+            continue;
+        };
+        if let Some(MainPassResolutionOverride(resolution_override)) = resolution_override {
+            view_size = *resolution_override;
+        }
+
+        if solari_lighting_resources.map(|r| r.view_size) == Some(view_size) {
+            continue;
+        }
+
+        let light_tile_samples = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_light_tile_samples"),
+            size: LIGHT_TILE_BLOCKS * LIGHT_TILE_SAMPLES_PER_BLOCK * LIGHT_SAMPLE_STRUCT_SIZE,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let light_tile_resolved_samples = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_light_tile_resolved_samples"),
+            size: LIGHT_TILE_BLOCKS
+                * LIGHT_TILE_SAMPLES_PER_BLOCK
+                * RESOLVED_LIGHT_SAMPLE_STRUCT_SIZE,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let di_reservoirs = |name| {
+            render_device
+                .create_texture(&TextureDescriptor {
+                    label: Some(name),
+                    size: view_size.to_extents(),
+                    mip_level_count: 1,
+                    sample_count: 1,
+                    dimension: TextureDimension::D2,
+                    format: TextureFormat::Rgba32Uint,
+                    usage: TextureUsages::STORAGE_BINDING,
+                    view_formats: &[],
+                })
+                .create_view(&TextureViewDescriptor::default())
+        };
+        let di_reservoirs_a = di_reservoirs("solari_lighting_di_reservoirs_a");
+        let di_reservoirs_b = di_reservoirs("solari_lighting_di_reservoirs_b");
+
+        let gi_reservoirs = |name| {
+            render_device.create_buffer(&BufferDescriptor {
+                label: Some(name),
+                size: (view_size.x * view_size.y) as u64 * GI_RESERVOIR_STRUCT_SIZE,
+                usage: BufferUsages::STORAGE,
+                mapped_at_creation: false,
+            })
+        };
+        let gi_reservoirs_a = gi_reservoirs("solari_lighting_gi_reservoirs_a");
+        let gi_reservoirs_b = gi_reservoirs("solari_lighting_gi_reservoirs_b");
+
+        let world_cache_checksums = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_checksums"),
+            size: WORLD_CACHE_SIZE * size_of::<u32>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_life = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_life"),
+            size: WORLD_CACHE_SIZE * size_of::<u32>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_radiance = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_radiance"),
+            size: WORLD_CACHE_SIZE * size_of::<[f32; 4]>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_geometry_data = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_geometry_data"),
+            size: WORLD_CACHE_SIZE * size_of::<[f32; 8]>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_luminance_deltas = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_luminance_deltas"),
+            size: WORLD_CACHE_SIZE * size_of::<f32>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_active_cells_new_radiance =
+            render_device.create_buffer(&BufferDescriptor {
+                label: Some("solari_lighting_world_cache_active_cells_new_radiance"),
+                size: WORLD_CACHE_SIZE * size_of::<[f32; 4]>() as u64,
+                usage: BufferUsages::STORAGE,
+                mapped_at_creation: false,
+            });
+
+        let world_cache_a = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_a"),
+            size: WORLD_CACHE_SIZE * size_of::<u32>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+        let world_cache_b = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_b"),
+            size: 1024 * size_of::<u32>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_active_cell_indices = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_active_cell_indices"),
+            size: WORLD_CACHE_SIZE * size_of::<u32>() as u64,
+            usage: BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_active_cells_count = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_active_cells_count"),
+            size: size_of::<u32>() as u64,
+            usage: BufferUsages::STORAGE | BufferUsages::COPY_SRC,
+            mapped_at_creation: false,
+        });
+
+        let world_cache_active_cells_dispatch = render_device.create_buffer(&BufferDescriptor {
+            label: Some("solari_lighting_world_cache_active_cells_dispatch"),
+            size: size_of::<[u32; 3]>() as u64,
+            usage: BufferUsages::INDIRECT | BufferUsages::STORAGE,
+            mapped_at_creation: false,
+        });
+
+        commands.entity(entity).insert(SolariLightingResources {
+            light_tile_samples,
+            light_tile_resolved_samples,
+            di_reservoirs_a,
+            di_reservoirs_b,
+            gi_reservoirs_a,
+            gi_reservoirs_b,
+            world_cache_checksums,
+            world_cache_life,
+            world_cache_radiance,
+            world_cache_geometry_data,
+            world_cache_luminance_deltas,
+            world_cache_active_cells_new_radiance,
+            world_cache_a,
+            world_cache_b,
+            world_cache_active_cell_indices,
+            world_cache_active_cells_count,
+            world_cache_active_cells_dispatch,
+            view_size,
+        });
+
+        #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
+        if has_dlss_rr {
+            let diffuse_albedo = render_device.create_texture(&TextureDescriptor {
+                label: Some("solari_lighting_diffuse_albedo"),
+                size: view_size.to_extents(),
+                mip_level_count: 1,
+                sample_count: 1,
+                dimension: TextureDimension::D2,
+                format: TextureFormat::Rgba8Unorm,
+                usage: TextureUsages::TEXTURE_BINDING | TextureUsages::STORAGE_BINDING,
+                view_formats: &[],
+            });
+            let diffuse_albedo_view = diffuse_albedo.create_view(&TextureViewDescriptor::default());
+
+            let specular_albedo = render_device.create_texture(&TextureDescriptor {
+                label: Some("solari_lighting_specular_albedo"),
+                size: view_size.to_extents(),
+                mip_level_count: 1,
+                sample_count: 1,
+                dimension: TextureDimension::D2,
+                format: TextureFormat::Rgba8Unorm,
+                usage: TextureUsages::TEXTURE_BINDING | TextureUsages::STORAGE_BINDING,
+                view_formats: &[],
+            });
+            let specular_albedo_view =
+                specular_albedo.create_view(&TextureViewDescriptor::default());
+
+            let normal_roughness = render_device.create_texture(&TextureDescriptor {
+                label: Some("solari_lighting_normal_roughness"),
+                size: view_size.to_extents(),
+                mip_level_count: 1,
+                sample_count: 1,
+                dimension: TextureDimension::D2,
+                format: TextureFormat::Rgba16Float,
+                usage: TextureUsages::TEXTURE_BINDING | TextureUsages::STORAGE_BINDING,
+                view_formats: &[],
+            });
+            let normal_roughness_view =
+                normal_roughness.create_view(&TextureViewDescriptor::default());
+
+            let specular_motion_vectors = render_device.create_texture(&TextureDescriptor {
+                label: Some("solari_lighting_specular_motion_vectors"),
+                size: view_size.to_extents(),
+                mip_level_count: 1,
+                sample_count: 1,
+                dimension: TextureDimension::D2,
+                format: TextureFormat::Rg16Float,
+                usage: TextureUsages::TEXTURE_BINDING | TextureUsages::STORAGE_BINDING,
+                view_formats: &[],
+            });
+            let specular_motion_vectors_view =
+                specular_motion_vectors.create_view(&TextureViewDescriptor::default());
+
+            commands
+                .entity(entity)
+                .insert(ViewDlssRayReconstructionTextures {
+                    diffuse_albedo: CachedTexture {
+                        texture: diffuse_albedo,
+                        default_view: diffuse_albedo_view,
+                    },
+                    specular_albedo: CachedTexture {
+                        texture: specular_albedo,
+                        default_view: specular_albedo_view,
+                    },
+                    normal_roughness: CachedTexture {
+                        texture: normal_roughness,
+                        default_view: normal_roughness_view,
+                    },
+                    specular_motion_vectors: CachedTexture {
+                        texture: specular_motion_vectors,
+                        default_view: specular_motion_vectors_view,
+                    },
+                });
+        }
+    }
+}
diff --git a/third_party/bevy_solari/src/realtime/presample_light_tiles.wgsl b/third_party/bevy_solari/src/realtime/presample_light_tiles.wgsl
new file mode 100644
index 0000000..1b67a4c
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/presample_light_tiles.wgsl
@@ -0,0 +1,43 @@
+// https://cwyman.org/papers/hpg21_rearchitectingReSTIR.pdf
+
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::presample_light_tiles
+
+#import bevy_pbr::rgb9e5::{vec3_to_rgb9e5_, rgb9e5_to_vec3_}
+#import bevy_pbr::utils::{octahedral_encode, octahedral_decode}
+#import bevy_render::view::View
+#import bevy_solari::sampling::{generate_random_light_sample, LightSample, ResolvedLightSample}
+#import bevy_solari::realtime_bindings::{light_tile_samples, light_tile_resolved_samples, view, constants, ResolvedLightSamplePacked}
+
+@compute @workgroup_size(1024, 1, 1)
+fn presample_light_tiles(@builtin(workgroup_id) workgroup_id: vec3<u32>, @builtin(local_invocation_index) sample_index: u32) {
+    let tile_id = workgroup_id.x;
+    var rng = (tile_id * 5782582u) + sample_index + constants.frame_index;
+
+    let sample = generate_random_light_sample(&rng);
+
+    let i = (tile_id * 1024u) + sample_index;
+    light_tile_samples[i] = sample.light_sample;
+    light_tile_resolved_samples[i] = pack_resolved_light_sample(sample.resolved_light_sample);
+}
+
+fn pack_resolved_light_sample(sample: ResolvedLightSample) -> ResolvedLightSamplePacked {
+    return ResolvedLightSamplePacked(
+        sample.world_position.x,
+        sample.world_position.y,
+        sample.world_position.z,
+        pack2x16unorm(octahedral_encode(sample.world_normal)),
+        vec3_to_rgb9e5_(log2(sample.radiance * view.exposure + 1.0)),
+        sample.inverse_pdf * select(1.0, -1.0, sample.world_position.w == 0.0),
+    );
+}
+
+fn unpack_resolved_light_sample(packed: ResolvedLightSamplePacked, exposure: f32) -> ResolvedLightSample {
+    return ResolvedLightSample(
+        vec4(packed.world_position_x, packed.world_position_y, packed.world_position_z, select(1.0, 0.0, packed.inverse_pdf < 0.0)),
+        octahedral_decode(unpack2x16unorm(packed.world_normal)),
+        (exp2(rgb9e5_to_vec3_(packed.radiance)) - 1.0) / exposure,
+        abs(packed.inverse_pdf),
+    );
+}
diff --git a/third_party/bevy_solari/src/realtime/realtime_bindings.wgsl b/third_party/bevy_solari/src/realtime/realtime_bindings.wgsl
new file mode 100644
index 0000000..5dbbc65
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/realtime_bindings.wgsl
@@ -0,0 +1,74 @@
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::realtime_bindings
+
+#import bevy_render::view::View
+#import bevy_pbr::prepass_bindings::PreviousViewUniforms
+#import bevy_solari::sampling::LightSample
+
+@group(1) @binding(0) var view_output: texture_storage_2d<rgba16float, read_write>;
+@group(1) @binding(1) var<storage, read_write> light_tile_samples: array<LightSample>;
+@group(1) @binding(2) var<storage, read_write> light_tile_resolved_samples: array<ResolvedLightSamplePacked>;
+@group(1) @binding(3) var di_reservoirs_a: texture_storage_2d<rgba32uint, read_write>;
+@group(1) @binding(4) var di_reservoirs_b: texture_storage_2d<rgba32uint, read_write>;
+@group(1) @binding(5) var<storage, read_write> gi_reservoirs_a: array<Reservoir>;
+@group(1) @binding(6) var<storage, read_write> gi_reservoirs_b: array<Reservoir>;
+@group(1) @binding(7) var gbuffer: texture_2d<u32>;
+@group(1) @binding(8) var depth_buffer: texture_depth_2d;
+@group(1) @binding(9) var motion_vectors: texture_2d<f32>;
+@group(1) @binding(10) var previous_gbuffer: texture_2d<u32>;
+@group(1) @binding(11) var previous_depth_buffer: texture_depth_2d;
+@group(1) @binding(12) var<uniform> view: View;
+@group(1) @binding(13) var<uniform> previous_view: PreviousViewUniforms;
+
+@group(1) @binding(14) var<storage, read_write> world_cache_checksums: array<atomic<u32>, #{WORLD_CACHE_SIZE}>;
+#ifdef WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER
+@group(1) @binding(15) var<storage, read_write> world_cache_life: array<u32, #{WORLD_CACHE_SIZE}>;
+#else
+@group(1) @binding(15) var<storage, read_write> world_cache_life: array<atomic<u32>, #{WORLD_CACHE_SIZE}>;
+#endif
+@group(1) @binding(16) var<storage, read_write> world_cache_radiance: array<vec4<f32>, #{WORLD_CACHE_SIZE}>;
+@group(1) @binding(17) var<storage, read_write> world_cache_geometry_data: array<WorldCacheGeometryData, #{WORLD_CACHE_SIZE}>;
+@group(1) @binding(18) var<storage, read_write> world_cache_luminance_deltas: array<f32, #{WORLD_CACHE_SIZE}>;
+@group(1) @binding(19) var<storage, read_write> world_cache_active_cells_new_radiance: array<vec3<f32>, #{WORLD_CACHE_SIZE}>;
+@group(1) @binding(20) var<storage, read_write> world_cache_a: array<u32, #{WORLD_CACHE_SIZE}>;
+@group(1) @binding(21) var<storage, read_write> world_cache_b: array<u32, 1024u>;
+@group(1) @binding(22) var<storage, read_write> world_cache_active_cell_indices: array<u32, #{WORLD_CACHE_SIZE}>;
+@group(1) @binding(23) var<storage, read_write> world_cache_active_cells_count: u32;
+
+#ifdef DLSS_RR_GUIDE_BUFFERS
+@group(2) @binding(0) var diffuse_albedo: texture_storage_2d<rgba8unorm, write>;
+@group(2) @binding(1) var specular_albedo: texture_storage_2d<rgba8unorm, write>;
+@group(2) @binding(2) var normal_roughness: texture_storage_2d<rgba16float, write>;
+@group(2) @binding(3) var specular_motion_vectors: texture_storage_2d<rg16float, write>;
+#endif
+
+struct PushConstants { frame_index: u32, reset: u32 }
+var<immediate> constants: PushConstants;
+
+// Don't adjust the size of this struct without also adjusting `prepare::RESOLVED_LIGHT_SAMPLE_STRUCT_SIZE`.
+struct ResolvedLightSamplePacked {
+    world_position_x: f32,
+    world_position_y: f32,
+    world_position_z: f32,
+    world_normal: u32,
+    radiance: u32,
+    inverse_pdf: f32,
+}
+
+// Don't adjust the size of this struct without also adjusting `prepare::GI_RESERVOIR_STRUCT_SIZE`.
+struct Reservoir {
+    sample_point_world_position: vec3<f32>,
+    weight_sum: f32,
+    radiance: vec3<f32>,
+    confidence_weight: f32,
+    sample_point_world_normal: vec3<f32>,
+    unbiased_contribution_weight: f32,
+}
+
+struct WorldCacheGeometryData {
+    world_position: vec3<f32>,
+    padding_a: u32,
+    world_normal: vec3<f32>,
+    padding_b: u32
+}
diff --git a/third_party/bevy_solari/src/realtime/resolve_dlss_rr_textures.wgsl b/third_party/bevy_solari/src/realtime/resolve_dlss_rr_textures.wgsl
new file mode 100644
index 0000000..066cc8b
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/resolve_dlss_rr_textures.wgsl
@@ -0,0 +1,59 @@
+enable wgpu_ray_query;
+#define_import_path bevy_solari::resolve_dlss_rr_textures
+
+#import bevy_pbr::pbr_functions::{calculate_diffuse_color, calculate_F0}
+#import bevy_render::view::View
+#import bevy_solari::gbuffer_utils::gpixel_resolve
+#import bevy_solari::realtime_bindings::{gbuffer, depth_buffer, motion_vectors, view, diffuse_albedo, specular_albedo, normal_roughness, specular_motion_vectors}
+
+@compute @workgroup_size(8, 8, 1)
+fn resolve_dlss_rr_textures(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    let pixel_id = global_id.xy;
+    if any(pixel_id >= vec2u(view.main_pass_viewport.zw)) { return; }
+
+    textureStore(specular_motion_vectors, pixel_id, textureLoad(motion_vectors, pixel_id, 0));
+
+    let depth = textureLoad(depth_buffer, global_id.xy, 0);
+    if depth == 0.0 {
+        textureStore(diffuse_albedo, pixel_id, vec4(0.0));
+        textureStore(specular_albedo, pixel_id, vec4(0.5));
+        textureStore(normal_roughness, pixel_id, vec4(0.0, 0.0, 1.0, 0.0));
+        return;
+    }
+
+    let surface = gpixel_resolve(textureLoad(gbuffer, pixel_id, 0), depth, pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
+    let F0 = calculate_F0(surface.material.base_color, surface.material.metallic, vec3(surface.material.reflectance));
+    let wo = normalize(view.world_position - surface.world_position);
+
+    textureStore(diffuse_albedo, pixel_id, vec4(calculate_diffuse_color(surface.material.base_color, surface.material.metallic, 0.0, 0.0), 0.0));
+    textureStore(specular_albedo, pixel_id, vec4(env_brdf_approx2(F0, surface.material.roughness, surface.world_normal, wo), 0.0));
+    textureStore(normal_roughness, pixel_id, vec4(surface.world_normal, surface.material.perceptual_roughness));
+}
+
+fn env_brdf_approx2(specular_color: vec3<f32>, alpha: f32, N: vec3<f32>, V: vec3<f32>) -> vec3<f32> {
+    let NoV = abs(dot(N, V));
+
+    var X: vec4<f32>;
+    X.x = 1.0;
+    X.y = NoV;
+    X.z = NoV * NoV;
+    X.w = NoV * X.z;
+
+    var Y: vec4<f32>;
+    Y.x = 1.0;
+    Y.y = alpha;
+    Y.z = alpha * alpha;
+    Y.w = alpha * Y.z;
+
+    let M1 = mat2x2<f32>(0.99044, 1.29678, -1.28514, -0.755907);
+    let M2 = mat3x3<f32>(1.0, 20.3225, 121.563, 2.92338, -27.0302, 626.13, 59.4188, 222.592, 316.627);
+    let M3 = mat2x2<f32>(0.0365463, 9.0632, 3.32707, -9.04756);
+    let M4 = mat3x3<f32>(1.0, 9.04401, 5.56589, 3.59685, -16.3174, 19.7886, -1.36772, 9.22949, -20.2123);
+
+    var bias = dot(M1 * X.xy, Y.xy) / dot(M2 * X.xyw, Y.xyw);
+    let scale = dot(M3 * X.xy, Y.xy) / dot(M4 * X.xzw, Y.xyw);
+
+    bias *= saturate(specular_color.g * 50.0);
+
+    return fma(specular_color, vec3(max(0.0, scale)), vec3(max(0.0, bias)));
+}
diff --git a/third_party/bevy_solari/src/realtime/restir_di.wgsl b/third_party/bevy_solari/src/realtime/restir_di.wgsl
new file mode 100644
index 0000000..ab3f18b
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/restir_di.wgsl
@@ -0,0 +1,339 @@
+// https://intro-to-restir.cwyman.org/presentations/2023ReSTIR_Course_Notes.pdf
+// https://d1qx31qr3h6wln.cloudfront.net/publications/ReSTIR%20GI.pdf
+
+enable wgpu_ray_query;
+
+#import bevy_core_pipeline::tonemapping::tonemapping_luminance as luminance
+#import bevy_pbr::prepass_bindings::PreviousViewUniforms
+#import bevy_pbr::utils::{rand_f, rand_range_u, sample_disk}
+#import bevy_render::maths::PI
+#import bevy_render::view::View
+#import bevy_solari::brdf::{evaluate_diffuse_brdf, evaluate_specular_brdf}
+#import bevy_solari::gbuffer_utils::{gpixel_resolve, pixel_dissimilar, permute_pixel}
+#import bevy_solari::presample_light_tiles::unpack_resolved_light_sample
+#import bevy_solari::sampling::{LightSample, ResolvedLightSample, NULL_LIGHT_ID, calculate_resolved_light_contribution, resolve_and_calculate_light_contribution, resolve_light_sample, trace_light_visibility, balance_heuristic}
+#import bevy_solari::scene_bindings::{light_sources, previous_frame_light_id_translations, LIGHT_NOT_PRESENT_THIS_FRAME, RAY_T_MIN}
+#import bevy_solari::specular_gi::SPECULAR_GI_FOR_DI_ROUGHNESS_THRESHOLD
+#import bevy_solari::realtime_bindings::{view_output, light_tile_samples, light_tile_resolved_samples, di_reservoirs_a, di_reservoirs_b, gbuffer, depth_buffer, motion_vectors, previous_gbuffer, previous_depth_buffer, view, previous_view, constants, ResolvedLightSamplePacked}
+
+const INITIAL_SAMPLES = 8u;
+const SPATIAL_REUSE_RADIUS_PIXELS = 30.0;
+const CONFIDENCE_WEIGHT_CAP = 20.0;
+
+@compute @workgroup_size(8, 8, 1)
+fn initial_and_temporal(@builtin(workgroup_id) workgroup_id: vec3<u32>, @builtin(global_invocation_id) global_id: vec3<u32>) {
+    if any(global_id.xy >= vec2u(view.main_pass_viewport.zw)) { return; }
+
+    let pixel_index = global_id.x + global_id.y * u32(view.main_pass_viewport.z);
+    var rng = pixel_index + constants.frame_index;
+
+    let depth = textureLoad(depth_buffer, global_id.xy, 0);
+    if depth == 0.0 {
+        store_reservoir_b(global_id.xy, empty_reservoir());
+        return;
+    }
+    let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+
+    let diffuse_brdf = surface.material.base_color / PI;
+    let initial_reservoir = generate_initial_reservoir(surface.world_position, surface.world_normal, diffuse_brdf, workgroup_id.xy, &rng);
+    let temporal = load_temporal_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal);
+    let merge_result = merge_reservoirs(initial_reservoir, surface.world_position, surface.world_normal, diffuse_brdf,
+        temporal.reservoir, temporal.world_position, temporal.world_normal, temporal.diffuse_brdf, &rng);
+
+    store_reservoir_b(global_id.xy, merge_result.merged_reservoir);
+}
+
+@compute @workgroup_size(8, 8, 1)
+fn spatial_and_shade(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    if any(global_id.xy >= vec2u(view.main_pass_viewport.zw)) { return; }
+
+    let pixel_index = global_id.x + global_id.y * u32(view.main_pass_viewport.z);
+    var rng = pixel_index + constants.frame_index;
+
+    let depth = textureLoad(depth_buffer, global_id.xy, 0);
+    if depth == 0.0 {
+        store_reservoir_a(global_id.xy, empty_reservoir());
+        return;
+    }
+    let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+
+    let diffuse_brdf = surface.material.base_color / PI;
+    let input_reservoir = load_reservoir_b(global_id.xy);
+    let spatial = load_spatial_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal, &rng);
+    let merge_result = merge_reservoirs(input_reservoir, surface.world_position, surface.world_normal, diffuse_brdf,
+        spatial.reservoir, spatial.world_position, spatial.world_normal, spatial.diffuse_brdf, &rng);
+    var combined_reservoir = merge_result.merged_reservoir;
+
+    // More accuracy, less stability
+#ifndef BIASED_RESAMPLING
+    store_reservoir_a(global_id.xy, combined_reservoir);
+#endif
+
+    if reservoir_valid(combined_reservoir) {
+        combined_reservoir.unbiased_contribution_weight *= trace_light_visibility(surface.world_position + (surface.world_normal * RAY_T_MIN), merge_result.selected_light_world_position);
+    }
+
+    // More stability, less accuracy (shadows extend further out than they should)
+#ifdef BIASED_RESAMPLING
+    store_reservoir_a(global_id.xy, combined_reservoir);
+#endif
+
+    let wo = normalize(view.world_position - surface.world_position);
+    var brdf = evaluate_diffuse_brdf(wo, merge_result.wi, surface.world_normal, surface.material);
+    // Only consider the specular lobe if the surface is not smooth, else leave it for the specular GI pass to handle
+    if surface.material.roughness > SPECULAR_GI_FOR_DI_ROUGHNESS_THRESHOLD {
+        brdf += evaluate_specular_brdf(wo, merge_result.wi, surface.world_normal, surface.material);
+    }
+
+    var pixel_color = merge_result.selected_sample_radiance * combined_reservoir.unbiased_contribution_weight;
+    pixel_color *= brdf;
+    pixel_color += surface.material.emissive;
+    pixel_color *= view.exposure;
+    textureStore(view_output, global_id.xy, vec4(pixel_color, 1.0));
+}
+
+fn generate_initial_reservoir(world_position: vec3<f32>, world_normal: vec3<f32>, diffuse_brdf: vec3<f32>, workgroup_id: vec2<u32>, rng: ptr<function, u32>) -> Reservoir {
+    var workgroup_rng = (workgroup_id.x * 5782582u) + workgroup_id.y;
+    let light_tile_start = rand_range_u(128u, &workgroup_rng) * 1024u;
+
+    var reservoir = empty_reservoir();
+    var weight_sum = 0.0;
+    let mis_weight = 1.0 / f32(INITIAL_SAMPLES);
+
+    var reservoir_target_function = 0.0;
+    var light_sample_world_position = vec4(0.0);
+    var selected_tile_sample = 0u;
+    for (var i = 0u; i < INITIAL_SAMPLES; i++) {
+        let tile_sample = light_tile_start + rand_range_u(1024u, rng);
+        let resolved_light_sample = unpack_resolved_light_sample(light_tile_resolved_samples[tile_sample], view.exposure);
+        let light_contribution = calculate_resolved_light_contribution(resolved_light_sample, world_position, world_normal);
+
+        let target_function = luminance(light_contribution.radiance * diffuse_brdf * saturate(dot(light_contribution.wi, world_normal)));
+        let resampling_weight = mis_weight * (target_function * light_contribution.inverse_pdf);
+
+        weight_sum += resampling_weight;
+
+        if rand_f(rng) < resampling_weight / weight_sum {
+            reservoir_target_function = target_function;
+            light_sample_world_position = resolved_light_sample.world_position;
+            selected_tile_sample = tile_sample;
+        }
+    }
+
+    if reservoir_target_function != 0.0 {
+        reservoir.sample = light_tile_samples[selected_tile_sample];
+    }
+
+    if reservoir_valid(reservoir) {
+        let inverse_target_function = select(0.0, 1.0 / reservoir_target_function, reservoir_target_function > 0.0);
+        reservoir.unbiased_contribution_weight = weight_sum * inverse_target_function;
+
+        reservoir.unbiased_contribution_weight *= trace_light_visibility(world_position + (world_normal * RAY_T_MIN), light_sample_world_position);
+    }
+
+    reservoir.confidence_weight = 1.0;
+    return reservoir;
+}
+
+fn load_temporal_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> NeighborInfo {
+    let motion_vector = textureLoad(motion_vectors, pixel_id, 0).xy;
+    let temporal_pixel_id_float = round(vec2<f32>(pixel_id) - (motion_vector * view.main_pass_viewport.zw));
+    var point_temporal_pixel_id = vec2<u32>(temporal_pixel_id_float);
+
+    if bool(constants.reset) {
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
+    }
+
+    if any(temporal_pixel_id_float < vec2(0.0)) || any(temporal_pixel_id_float >= view.main_pass_viewport.zw) {
+        point_temporal_pixel_id = pixel_id;
+    }
+
+    let permuted_temporal_pixel_id = permute_pixel(point_temporal_pixel_id, constants.frame_index, view.main_pass_viewport.zw);
+    var temporal = load_temporal_reservoir_inner(permuted_temporal_pixel_id, depth, world_position, world_normal);
+
+    // Check if the light selected in the previous frame no longer exists in the current frame (e.g. entity despawned)
+    let previous_light_id = temporal.reservoir.sample.light_id >> 16u;
+    let triangle_id = temporal.reservoir.sample.light_id & 0xFFFFu;
+    let light_id = previous_frame_light_id_translations[previous_light_id];
+    if light_id == LIGHT_NOT_PRESENT_THIS_FRAME {
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
+    }
+    temporal.reservoir.sample.light_id = (light_id << 16u) | triangle_id;
+
+    temporal.reservoir.confidence_weight = min(temporal.reservoir.confidence_weight, CONFIDENCE_WEIGHT_CAP);
+
+    return temporal;
+}
+
+fn load_temporal_reservoir_inner(temporal_pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> NeighborInfo {
+    // Check if the pixel features have changed heavily between the current and previous frame
+    let temporal_depth = textureLoad(previous_depth_buffer, temporal_pixel_id, 0);
+    let temporal_surface = gpixel_resolve(textureLoad(previous_gbuffer, temporal_pixel_id, 0), temporal_depth, temporal_pixel_id, view.main_pass_viewport.zw, previous_view.world_from_clip);
+    let temporal_diffuse_brdf = temporal_surface.material.base_color / PI;
+    if pixel_dissimilar(depth, world_position, temporal_surface.world_position, world_normal, temporal_surface.world_normal, view) {
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
+    }
+
+    let temporal_reservoir = load_reservoir_a(temporal_pixel_id);
+    return NeighborInfo(temporal_reservoir, temporal_surface.world_position, temporal_surface.world_normal, temporal_diffuse_brdf);
+}
+
+fn load_spatial_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> NeighborInfo {
+    for (var i = 0u; i < 5u; i++) {
+        let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, SPATIAL_REUSE_RADIUS_PIXELS, rng);
+
+        let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
+        let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
+        let spatial_diffuse_brdf = spatial_surface.material.base_color / PI;
+        if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
+            continue;
+        }
+
+        let spatial_reservoir = load_reservoir_b(spatial_pixel_id);
+        return NeighborInfo(spatial_reservoir, spatial_surface.world_position, spatial_surface.world_normal, spatial_diffuse_brdf);
+    }
+
+    return NeighborInfo(empty_reservoir(), world_position, world_normal, vec3(0.0));
+}
+
+fn get_neighbor_pixel_id(center_pixel_id: vec2<u32>, search_radius: f32, rng: ptr<function, u32>) -> vec2<u32> {
+    var spatial_id = vec2<f32>(center_pixel_id) + sample_disk(search_radius, rng);
+    spatial_id = clamp(spatial_id, vec2(0.0), view.main_pass_viewport.zw - 1.0);
+    return vec2<u32>(spatial_id);
+}
+
+struct NeighborInfo {
+    reservoir: Reservoir,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+    diffuse_brdf: vec3<f32>,
+}
+
+struct Reservoir {
+    sample: LightSample,
+    confidence_weight: f32,
+    unbiased_contribution_weight: f32,
+}
+
+fn empty_reservoir() -> Reservoir {
+    return Reservoir(
+        LightSample(NULL_LIGHT_ID, 0u),
+        0.0,
+        0.0,
+    );
+}
+
+fn reservoir_valid(reservoir: Reservoir) -> bool {
+    return reservoir.sample.light_id != NULL_LIGHT_ID;
+}
+
+fn pack_reservoir(reservoir: Reservoir) -> vec4<u32> {
+    let weights = bitcast<vec2<u32>>(vec2<f32>(reservoir.confidence_weight, reservoir.unbiased_contribution_weight));
+    return vec4<u32>(reservoir.sample.light_id, reservoir.sample.seed, weights);
+}
+
+fn store_reservoir_a(pixel: vec2<u32>, reservoir: Reservoir) {
+    textureStore(di_reservoirs_a, pixel, pack_reservoir(reservoir));
+}
+
+fn store_reservoir_b(pixel: vec2<u32>, reservoir: Reservoir) {
+    textureStore(di_reservoirs_b, pixel, pack_reservoir(reservoir));
+}
+
+fn unpack_reservoir(packed: vec4<u32>) -> Reservoir {
+    let weights = bitcast<vec2<f32>>(packed.zw);
+    return Reservoir(LightSample(packed.x, packed.y), weights.x, weights.y);
+}
+
+fn load_reservoir_a(pixel: vec2<u32>) -> Reservoir {
+    return unpack_reservoir(textureLoad(di_reservoirs_a, pixel));
+}
+
+fn load_reservoir_b(pixel: vec2<u32>) -> Reservoir {
+    return unpack_reservoir(textureLoad(di_reservoirs_b, pixel));
+}
+
+struct ReservoirMergeResult {
+    merged_reservoir: Reservoir,
+    selected_sample_radiance: vec3<f32>,
+    wi: vec3<f32>,
+    selected_light_world_position: vec4<f32>,
+}
+
+fn merge_reservoirs(
+    canonical_reservoir: Reservoir,
+    canonical_world_position: vec3<f32>,
+    canonical_world_normal: vec3<f32>,
+    canonical_diffuse_brdf: vec3<f32>,
+    other_reservoir: Reservoir,
+    other_world_position: vec3<f32>,
+    other_world_normal: vec3<f32>,
+    other_diffuse_brdf: vec3<f32>,
+    rng: ptr<function, u32>,
+) -> ReservoirMergeResult {
+    // Resolve each light sample once, then evaluate at both positions
+    var canonical_resolved: ResolvedLightSample;
+    if reservoir_valid(canonical_reservoir) {
+        canonical_resolved = resolve_light_sample(canonical_reservoir.sample, light_sources[canonical_reservoir.sample.light_id >> 16u]);
+    }
+    var other_resolved: ResolvedLightSample;
+    if reservoir_valid(other_reservoir) {
+        other_resolved = resolve_light_sample(other_reservoir.sample, light_sources[other_reservoir.sample.light_id >> 16u]);
+    }
+
+    // Contributions for resampling (evaluate resolved samples at canonical position)
+    let canonical_contribution_canonical_sample = resolved_reservoir_contribution(canonical_reservoir, canonical_resolved, canonical_world_position, canonical_world_normal, canonical_diffuse_brdf);
+    let canonical_contribution_other_sample = resolved_reservoir_contribution(other_reservoir, other_resolved, canonical_world_position, canonical_world_normal, canonical_diffuse_brdf);
+
+    // Extra contributions for MIS (evaluate resolved samples at other position)
+    let other_contribution_canonical_sample = resolved_reservoir_contribution(canonical_reservoir, canonical_resolved, other_world_position, other_world_normal, other_diffuse_brdf);
+    let other_contribution_other_sample = resolved_reservoir_contribution(other_reservoir, other_resolved, other_world_position, other_world_normal, other_diffuse_brdf);
+
+    // Resampling weight for canonical sample
+    let canonical_sample_mis_weight = balance_heuristic(
+        canonical_reservoir.confidence_weight * canonical_contribution_canonical_sample.target_function,
+        other_reservoir.confidence_weight * other_contribution_canonical_sample.target_function,
+    );
+    let canonical_sample_resampling_weight = canonical_sample_mis_weight * canonical_contribution_canonical_sample.target_function * canonical_reservoir.unbiased_contribution_weight;
+
+    // Resampling weight for other sample
+    let other_sample_mis_weight = balance_heuristic(
+        other_reservoir.confidence_weight * other_contribution_other_sample.target_function,
+        canonical_reservoir.confidence_weight * canonical_contribution_other_sample.target_function,
+    );
+    let other_sample_resampling_weight = other_sample_mis_weight * canonical_contribution_other_sample.target_function * other_reservoir.unbiased_contribution_weight;
+
+    // Perform resampling
+    var combined_reservoir = empty_reservoir();
+    combined_reservoir.confidence_weight = canonical_reservoir.confidence_weight + other_reservoir.confidence_weight;
+    let weight_sum = canonical_sample_resampling_weight + other_sample_resampling_weight;
+
+    if rand_f(rng) < other_sample_resampling_weight / weight_sum {
+        combined_reservoir.sample = other_reservoir.sample;
+
+        let inverse_target_function = select(0.0, 1.0 / canonical_contribution_other_sample.target_function, canonical_contribution_other_sample.target_function > 0.0);
+        combined_reservoir.unbiased_contribution_weight = weight_sum * inverse_target_function;
+
+        return ReservoirMergeResult(combined_reservoir, canonical_contribution_other_sample.radiance, canonical_contribution_other_sample.wi, other_resolved.world_position);
+    } else {
+        combined_reservoir.sample = canonical_reservoir.sample;
+
+        let inverse_target_function = select(0.0, 1.0 / canonical_contribution_canonical_sample.target_function, canonical_contribution_canonical_sample.target_function > 0.0);
+        combined_reservoir.unbiased_contribution_weight = weight_sum * inverse_target_function;
+
+        return ReservoirMergeResult(combined_reservoir, canonical_contribution_canonical_sample.radiance, canonical_contribution_canonical_sample.wi, canonical_resolved.world_position);
+    }
+}
+
+struct ReservoirContribution {
+    radiance: vec3<f32>,
+    target_function: f32,
+    wi: vec3<f32>,
+}
+
+fn resolved_reservoir_contribution(reservoir: Reservoir, resolved: ResolvedLightSample, world_position: vec3<f32>, world_normal: vec3<f32>, diffuse_brdf: vec3<f32>) -> ReservoirContribution {
+    if !reservoir_valid(reservoir) { return ReservoirContribution(vec3(0.0), 0.0, vec3(0.0)); }
+    let light_contribution = calculate_resolved_light_contribution(resolved, world_position, world_normal);
+    let target_function = luminance(light_contribution.radiance * diffuse_brdf * saturate(dot(light_contribution.wi, world_normal)));
+    return ReservoirContribution(light_contribution.radiance, target_function, light_contribution.wi);
+}
diff --git a/third_party/bevy_solari/src/realtime/restir_gi.wgsl b/third_party/bevy_solari/src/realtime/restir_gi.wgsl
new file mode 100644
index 0000000..254d0ec
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/restir_gi.wgsl
@@ -0,0 +1,318 @@
+// https://intro-to-restir.cwyman.org/presentations/2023ReSTIR_Course_Notes.pdf
+enable wgpu_ray_query;
+
+#import bevy_core_pipeline::tonemapping::tonemapping_luminance as luminance
+#import bevy_pbr::prepass_bindings::PreviousViewUniforms
+#import bevy_pbr::utils::{rand_f, sample_uniform_hemisphere, uniform_hemisphere_inverse_pdf, sample_disk}
+#import bevy_render::maths::PI
+#import bevy_render::view::View
+#import bevy_solari::brdf::evaluate_diffuse_brdf
+#import bevy_solari::gbuffer_utils::{gpixel_resolve, pixel_dissimilar, permute_pixel}
+#import bevy_solari::sampling::{sample_random_light, trace_point_visibility, balance_heuristic, isnan}
+#import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, RAY_T_MIN, RAY_T_MAX}
+#import bevy_solari::world_cache::{query_world_cache, WORLD_CACHE_CELL_LIFETIME}
+#import bevy_solari::realtime_bindings::{view_output, gi_reservoirs_a, gi_reservoirs_b, gbuffer, depth_buffer, motion_vectors, previous_gbuffer, previous_depth_buffer, view, previous_view, constants, Reservoir}
+#import bevy_solari::specular_gi::DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD
+
+const SPATIAL_REUSE_RADIUS_PIXELS = 30.0;
+const CONFIDENCE_WEIGHT_CAP = 8.0;
+
+@compute @workgroup_size(8, 8, 1)
+fn initial_and_temporal(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    if any(global_id.xy >= vec2u(view.main_pass_viewport.zw)) { return; }
+
+    let pixel_index = global_id.x + global_id.y * u32(view.main_pass_viewport.z);
+    var rng = pixel_index + constants.frame_index;
+
+    let depth = textureLoad(depth_buffer, global_id.xy, 0);
+    if depth == 0.0 {
+        gi_reservoirs_b[pixel_index] = empty_reservoir();
+        return;
+    }
+    let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+    if surface.material.metallic > 0.9999 && surface.material.roughness <= DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD {
+        gi_reservoirs_b[pixel_index] = empty_reservoir();
+        return;
+    }
+
+    let initial_reservoir = generate_initial_reservoir(surface.world_position, surface.world_normal, &rng);
+    let temporal = load_temporal_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal);
+    let merge_result = merge_reservoirs(initial_reservoir, surface.world_position, surface.world_normal, surface.material.base_color / PI,
+        temporal.reservoir, temporal.world_position, temporal.world_normal, temporal.diffuse_brdf, &rng);
+
+    gi_reservoirs_b[pixel_index] = merge_result.merged_reservoir;
+}
+
+@compute @workgroup_size(8, 8, 1)
+fn spatial_and_shade(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    if any(global_id.xy >= vec2u(view.main_pass_viewport.zw)) { return; }
+
+    let pixel_index = global_id.x + global_id.y * u32(view.main_pass_viewport.z);
+    var rng = pixel_index + constants.frame_index;
+
+    let depth = textureLoad(depth_buffer, global_id.xy, 0);
+    if depth == 0.0 {
+        gi_reservoirs_a[pixel_index] = empty_reservoir();
+        return;
+    }
+    let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+    if surface.material.metallic > 0.9999 && surface.material.roughness <= DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD {
+        gi_reservoirs_a[pixel_index] = empty_reservoir();
+        return;
+    }
+
+    let input_reservoir = gi_reservoirs_b[pixel_index];
+    let spatial = load_spatial_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal, &rng);
+    let merge_result = merge_reservoirs(input_reservoir, surface.world_position, surface.world_normal, surface.material.base_color / PI,
+        spatial.reservoir, spatial.world_position, spatial.world_normal, spatial.diffuse_brdf, &rng);
+    var combined_reservoir = merge_result.merged_reservoir;
+
+    // More accuracy, less stability
+#ifndef BIASED_RESAMPLING
+    gi_reservoirs_a[pixel_index] = combined_reservoir;
+#endif
+
+    combined_reservoir.unbiased_contribution_weight *= trace_point_visibility(surface.world_position + (surface.world_normal * RAY_T_MIN), combined_reservoir.sample_point_world_position);
+
+    // More stability, less accuracy (shadows extend further out than they should)
+#ifdef BIASED_RESAMPLING
+    gi_reservoirs_a[pixel_index] = combined_reservoir;
+#endif
+
+    let wo = normalize(view.world_position - surface.world_position);
+    let brdf = evaluate_diffuse_brdf(wo, merge_result.wi, surface.world_normal, surface.material);
+
+    var pixel_color = textureLoad(view_output, global_id.xy);
+    pixel_color += vec4(merge_result.selected_sample_radiance * combined_reservoir.unbiased_contribution_weight * view.exposure * brdf, 0.0);
+    textureStore(view_output, global_id.xy, pixel_color);
+}
+
+fn generate_initial_reservoir(world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> Reservoir {
+    var reservoir = empty_reservoir();
+
+    let ray_direction = sample_uniform_hemisphere(world_normal, rng);
+    let ray = trace_ray(world_position + (world_normal * RAY_T_MIN), ray_direction, RAY_T_MIN, RAY_T_MAX, RAY_FLAG_NONE);
+
+    if ray.kind == RAY_QUERY_INTERSECTION_NONE {
+        return reservoir;
+    }
+
+    let sample_point = resolve_ray_hit_full(ray);
+
+    if any(sample_point.material.emissive != vec3(0.0)) {
+        return reservoir;
+    }
+
+    reservoir.sample_point_world_position = sample_point.world_position;
+    reservoir.sample_point_world_normal = sample_point.world_normal;
+    reservoir.confidence_weight = 1.0;
+
+#ifdef NO_WORLD_CACHE
+    let direct_lighting = sample_random_light(sample_point.world_position, sample_point.world_normal, rng);
+    reservoir.radiance = direct_lighting.radiance * saturate(dot(direct_lighting.wi, sample_point.world_normal));
+    reservoir.unbiased_contribution_weight = direct_lighting.inverse_pdf * uniform_hemisphere_inverse_pdf();
+#else
+    reservoir.radiance = query_world_cache(sample_point.world_position, sample_point.geometric_world_normal, view.world_position, ray.t, WORLD_CACHE_CELL_LIFETIME, rng);
+    reservoir.unbiased_contribution_weight = uniform_hemisphere_inverse_pdf();
+#endif
+
+    let sample_point_diffuse_brdf = sample_point.material.base_color / PI;
+    reservoir.radiance *= sample_point_diffuse_brdf;
+
+    return reservoir;
+}
+
+fn load_temporal_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> NeighborInfo {
+    let motion_vector = textureLoad(motion_vectors, pixel_id, 0).xy;
+    let temporal_pixel_id_float = round(vec2<f32>(pixel_id) - (motion_vector * view.main_pass_viewport.zw));
+    var point_temporal_pixel_id = vec2<u32>(temporal_pixel_id_float);
+
+    if bool(constants.reset) {
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
+    }
+
+    if any(temporal_pixel_id_float < vec2(0.0)) || any(temporal_pixel_id_float >= view.main_pass_viewport.zw) {
+        point_temporal_pixel_id = pixel_id;
+    }
+
+    let permuted_temporal_pixel_id = permute_pixel(point_temporal_pixel_id, constants.frame_index, view.main_pass_viewport.zw);
+    var temporal = load_temporal_reservoir_inner(permuted_temporal_pixel_id, depth, world_position, world_normal);
+
+    temporal.reservoir.confidence_weight = min(temporal.reservoir.confidence_weight, CONFIDENCE_WEIGHT_CAP);
+
+    return temporal;
+}
+
+fn load_temporal_reservoir_inner(temporal_pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> NeighborInfo {
+    // Check if the pixel features have changed heavily between the current and previous frame
+    let temporal_depth = textureLoad(previous_depth_buffer, temporal_pixel_id, 0);
+    let temporal_surface = gpixel_resolve(textureLoad(previous_gbuffer, temporal_pixel_id, 0), temporal_depth, temporal_pixel_id, view.main_pass_viewport.zw, previous_view.world_from_clip);
+    let temporal_diffuse_brdf = temporal_surface.material.base_color / PI;
+    if pixel_dissimilar(depth, world_position, temporal_surface.world_position, world_normal, temporal_surface.world_normal, view) {
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
+    }
+
+    let temporal_pixel_index = temporal_pixel_id.x + temporal_pixel_id.y * u32(view.main_pass_viewport.z);
+    let temporal_reservoir = gi_reservoirs_a[temporal_pixel_index];
+
+    return NeighborInfo(temporal_reservoir, temporal_surface.world_position, temporal_surface.world_normal, temporal_diffuse_brdf);
+}
+
+fn load_spatial_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> NeighborInfo {
+    for (var i = 0u; i < 5u; i++) {
+        let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, SPATIAL_REUSE_RADIUS_PIXELS, rng);
+
+        let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
+        let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
+        let spatial_diffuse_brdf = spatial_surface.material.base_color / PI;
+        if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
+            continue;
+        }
+
+        let spatial_pixel_index = spatial_pixel_id.x + spatial_pixel_id.y * u32(view.main_pass_viewport.z);
+        let spatial_reservoir = gi_reservoirs_b[spatial_pixel_index];
+        return NeighborInfo(spatial_reservoir, spatial_surface.world_position, spatial_surface.world_normal, spatial_diffuse_brdf);
+    }
+
+    return NeighborInfo(empty_reservoir(), world_position, world_normal, vec3(0.0));
+}
+
+fn get_neighbor_pixel_id(center_pixel_id: vec2<u32>, search_radius: f32, rng: ptr<function, u32>) -> vec2<u32> {
+    var spatial_id = vec2<f32>(center_pixel_id) + sample_disk(search_radius, rng);
+    spatial_id = clamp(spatial_id, vec2(0.0), view.main_pass_viewport.zw - 1.0);
+    return vec2<u32>(spatial_id);
+}
+
+struct NeighborInfo {
+    reservoir: Reservoir,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+    diffuse_brdf: vec3<f32>,
+}
+
+fn jacobian(
+    new_world_position: vec3<f32>,
+    original_world_position: vec3<f32>,
+    sample_point_world_position: vec3<f32>,
+    sample_point_world_normal: vec3<f32>,
+) -> f32 {
+    let r = new_world_position - sample_point_world_position;
+    let q = original_world_position - sample_point_world_position;
+    let rl = length(r);
+    let ql = length(q);
+    let phi_r = saturate(dot(r / rl, sample_point_world_normal));
+    let phi_q = saturate(dot(q / ql, sample_point_world_normal));
+    let jacobian = (phi_r * ql * ql) / (phi_q * rl * rl);
+    return select(jacobian, 0.0, isinf(jacobian) || isnan(jacobian));
+}
+
+fn isinf(x: f32) -> bool {
+    return (bitcast<u32>(x) & 0x7fffffffu) == 0x7f800000u;
+}
+
+fn empty_reservoir() -> Reservoir {
+    return Reservoir(
+        vec3(0.0),
+        0.0,
+        vec3(0.0),
+        0.0,
+        vec3(0.0),
+        0.0,
+    );
+}
+
+struct ReservoirMergeResult {
+    merged_reservoir: Reservoir,
+    selected_sample_radiance: vec3<f32>,
+    wi: vec3<f32>,
+}
+
+fn merge_reservoirs(
+    canonical_reservoir: Reservoir,
+    canonical_world_position: vec3<f32>,
+    canonical_world_normal: vec3<f32>,
+    canonical_diffuse_brdf: vec3<f32>,
+    other_reservoir: Reservoir,
+    other_world_position: vec3<f32>,
+    other_world_normal: vec3<f32>,
+    other_diffuse_brdf: vec3<f32>,
+    rng: ptr<function, u32>,
+) -> ReservoirMergeResult {
+    // Radiances for resampling
+    let canonical_sample_wi = normalize(canonical_reservoir.sample_point_world_position - canonical_world_position);
+    let other_sample_wi = normalize(other_reservoir.sample_point_world_position - canonical_world_position);
+
+    // Target functions for resampling and MIS
+    let canonical_target_function_canonical_sample = luminance(
+        canonical_reservoir.radiance * saturate(dot(canonical_sample_wi, canonical_world_normal)) * canonical_diffuse_brdf
+    );
+    let canonical_target_function_other_sample = luminance(
+        other_reservoir.radiance * saturate(dot(other_sample_wi, canonical_world_normal)) * canonical_diffuse_brdf
+    );
+
+    // Extra target functions for MIS
+    let other_target_function_canonical_sample = luminance(
+        canonical_reservoir.radiance * saturate(dot(normalize(canonical_reservoir.sample_point_world_position - other_world_position), other_world_normal)) * other_diffuse_brdf
+    );
+    let other_target_function_other_sample = luminance(
+        other_reservoir.radiance * saturate(dot(normalize(other_reservoir.sample_point_world_position - other_world_position), other_world_normal)) * other_diffuse_brdf
+    );
+
+    // Jacobians for resampling and MIS
+    let canonical_target_function_other_sample_jacobian = jacobian(
+        canonical_world_position,
+        other_world_position,
+        other_reservoir.sample_point_world_position,
+        other_reservoir.sample_point_world_normal
+    );
+    let other_target_function_canonical_sample_jacobian = jacobian(
+        other_world_position,
+        canonical_world_position,
+        canonical_reservoir.sample_point_world_position,
+        canonical_reservoir.sample_point_world_normal
+    );
+
+    // Don't merge samples with huge jacobians, as it explodes the variance
+    if canonical_target_function_other_sample_jacobian > 1.2 || other_target_function_canonical_sample_jacobian > 1.2 {
+        return ReservoirMergeResult(canonical_reservoir, canonical_reservoir.radiance, canonical_sample_wi);
+    }
+
+    // Resampling weight for canonical sample
+    let canonical_sample_mis_weight = balance_heuristic(
+        canonical_reservoir.confidence_weight * canonical_target_function_canonical_sample,
+        other_reservoir.confidence_weight * other_target_function_canonical_sample * other_target_function_canonical_sample_jacobian,
+    );
+    let canonical_sample_resampling_weight = canonical_sample_mis_weight * canonical_target_function_canonical_sample * canonical_reservoir.unbiased_contribution_weight;
+
+    // Resampling weight for other sample
+    let other_sample_mis_weight = balance_heuristic(
+        other_reservoir.confidence_weight * other_target_function_other_sample,
+        canonical_reservoir.confidence_weight * canonical_target_function_other_sample * canonical_target_function_other_sample_jacobian,
+    );
+    let other_sample_resampling_weight = other_sample_mis_weight * canonical_target_function_other_sample * other_reservoir.unbiased_contribution_weight * canonical_target_function_other_sample_jacobian;
+
+    // Perform resampling
+    var combined_reservoir = empty_reservoir();
+    combined_reservoir.confidence_weight = canonical_reservoir.confidence_weight + other_reservoir.confidence_weight;
+    combined_reservoir.weight_sum = canonical_sample_resampling_weight + other_sample_resampling_weight;
+
+    if rand_f(rng) < other_sample_resampling_weight / combined_reservoir.weight_sum {
+        combined_reservoir.sample_point_world_position = other_reservoir.sample_point_world_position;
+        combined_reservoir.sample_point_world_normal = other_reservoir.sample_point_world_normal;
+        combined_reservoir.radiance = other_reservoir.radiance;
+
+        let inverse_target_function = select(0.0, 1.0 / canonical_target_function_other_sample, canonical_target_function_other_sample > 0.0);
+        combined_reservoir.unbiased_contribution_weight = combined_reservoir.weight_sum * inverse_target_function;
+
+        return ReservoirMergeResult(combined_reservoir, other_reservoir.radiance, other_sample_wi);
+    } else {
+        combined_reservoir.sample_point_world_position = canonical_reservoir.sample_point_world_position;
+        combined_reservoir.sample_point_world_normal = canonical_reservoir.sample_point_world_normal;
+        combined_reservoir.radiance = canonical_reservoir.radiance;
+
+        let inverse_target_function = select(0.0, 1.0 / canonical_target_function_canonical_sample, canonical_target_function_canonical_sample > 0.0);
+        combined_reservoir.unbiased_contribution_weight = combined_reservoir.weight_sum * inverse_target_function;
+
+        return ReservoirMergeResult(combined_reservoir, canonical_reservoir.radiance, canonical_sample_wi);
+    }
+}
diff --git a/third_party/bevy_solari/src/realtime/specular_gi.wgsl b/third_party/bevy_solari/src/realtime/specular_gi.wgsl
new file mode 100644
index 0000000..3033b8e
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/specular_gi.wgsl
@@ -0,0 +1,242 @@
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::specular_gi
+
+#import bevy_core_pipeline::tonemapping::tonemapping_luminance as luminance
+#import bevy_pbr::pbr_functions::{calculate_diffuse_color, calculate_F0}
+#import bevy_pbr::utils::rand_f
+#import bevy_render::maths::{orthonormalize, PI}
+#import bevy_render::view::View
+#import bevy_solari::brdf::{evaluate_brdf, evaluate_specular_brdf}
+#import bevy_solari::gbuffer_utils::{gpixel_resolve, ResolvedGPixel}
+#import bevy_solari::sampling::{sample_random_light, random_emissive_light_pdf, sample_ggx_vndf, ggx_vndf_pdf, ggx_vndf_sample_invalid, power_heuristic}
+#import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, ResolvedRayHitFull, RAY_T_MIN, RAY_T_MAX, MIRROR_ROUGHNESS_THRESHOLD}
+#import bevy_solari::world_cache::{query_world_cache, get_cell_size, WORLD_CACHE_CELL_LIFETIME}
+#import bevy_solari::realtime_bindings::{view_output, gi_reservoirs_a, gbuffer, depth_buffer, view, constants}
+#ifdef DLSS_RR_GUIDE_BUFFERS
+#import bevy_solari::realtime_bindings::{diffuse_albedo, specular_albedo, normal_roughness, specular_motion_vectors, previous_view}
+#import bevy_solari::resolve_dlss_rr_textures::env_brdf_approx2
+#endif
+
+const DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD: f32 = 0.4;
+const SPECULAR_GI_FOR_DI_ROUGHNESS_THRESHOLD: f32 = 0.0225;
+
+@compute @workgroup_size(8, 8, 1)
+fn specular_gi(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    if any(global_id.xy >= vec2u(view.main_pass_viewport.zw)) { return; }
+
+    let pixel_index = global_id.x + global_id.y * u32(view.main_pass_viewport.z);
+    var rng = pixel_index + constants.frame_index;
+
+    let depth = textureLoad(depth_buffer, global_id.xy, 0);
+    if depth == 0.0 {
+        return;
+    }
+    let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+
+    let wo_unnormalized = view.world_position - surface.world_position;
+    let wo_length = length(wo_unnormalized);
+    let wo = wo_unnormalized / wo_length;
+
+    var radiance: vec3<f32>;
+    var wi: vec3<f32>;
+    if surface.material.roughness > DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD {
+        // Surface is very rough, reuse the ReSTIR GI reservoir
+        let gi_reservoir = gi_reservoirs_a[pixel_index];
+        wi = normalize(gi_reservoir.sample_point_world_position - surface.world_position);
+        radiance = gi_reservoir.radiance * gi_reservoir.unbiased_contribution_weight;
+    } else {
+        // Surface is glossy or mirror-like, trace a new path
+        let TBN = orthonormalize(surface.world_normal);
+        let T = TBN[0];
+        let B = TBN[1];
+        let N = TBN[2];
+        let wo_tangent = vec3(dot(wo, T), dot(wo, B), dot(wo, N));
+        let wi_tangent = sample_ggx_vndf(wo_tangent, surface.material.roughness, &rng);
+        if ggx_vndf_sample_invalid(wi_tangent) {
+            wi = vec3(0.0);
+            radiance = vec3(0.0);
+        } else {
+            wi = wi_tangent.x * T + wi_tangent.y * B + wi_tangent.z * N;
+            let pdf = ggx_vndf_pdf(wo_tangent, wi_tangent, surface.material.roughness);
+
+            radiance = trace_glossy_path(global_id.xy, surface, wo_length, wi, pdf, &rng);
+            if surface.material.roughness > MIRROR_ROUGHNESS_THRESHOLD {
+                radiance /= pdf;
+            }
+        }
+    }
+
+    let brdf = evaluate_specular_brdf(wo, wi, surface.world_normal, surface.material);
+    radiance *= brdf * view.exposure;
+
+    var pixel_color = textureLoad(view_output, global_id.xy);
+    pixel_color += vec4(radiance, 0.0);
+    textureStore(view_output, global_id.xy, pixel_color);
+
+#ifdef VISUALIZE_WORLD_CACHE
+    textureStore(view_output, global_id.xy, vec4(query_world_cache(surface.world_position, surface.world_normal, view.world_position, RAY_T_MAX, WORLD_CACHE_CELL_LIFETIME, &rng) * view.exposure, 1.0));
+#endif
+}
+
+fn trace_glossy_path(pixel_id: vec2<u32>, primary_surface: ResolvedGPixel, initial_ray_t: f32, initial_wi: vec3<f32>, initial_p_bounce: f32, rng: ptr<function, u32>) -> vec3<f32> {
+    var radiance = vec3(0.0);
+    var throughput = vec3(1.0);
+
+    var ray_origin = primary_surface.world_position + (primary_surface.world_normal * RAY_T_MIN);
+    var wi = initial_wi;
+    var p_bounce = initial_p_bounce;
+    var path_roughness = primary_surface.material.roughness;
+
+#ifdef DLSS_RR_GUIDE_BUFFERS
+    var mirror_rotations = reflection_matrix(primary_surface.world_normal);
+    var psr_finished = false;
+#endif
+
+    // Trace up to three bounces
+    for (var i = 0u; i < 3u; i += 1u) {
+        // Trace ray
+        let ray = trace_ray(ray_origin, wi, RAY_T_MIN, RAY_T_MAX, RAY_FLAG_NONE);
+        if ray.kind == RAY_QUERY_INTERSECTION_NONE { break; }
+        let ray_hit = resolve_ray_hit_full(ray);
+
+        let TBN = orthonormalize(ray_hit.world_normal);
+        let T = TBN[0];
+        let B = TBN[1];
+        let N = TBN[2];
+
+        let wo = -wi;
+        let wo_tangent = vec3(dot(wo, T), dot(wo, B), dot(wo, N));
+
+        // Add emissive contribution
+        let mis_weight = emissive_mis_weight(i, primary_surface.material.roughness, p_bounce, ray_hit);
+        radiance += throughput * mis_weight * ray_hit.material.emissive;
+
+        // Should not perform NEE for mirror-like surfaces
+        let surface_perfect_mirror = ray_hit.material.roughness <= MIRROR_ROUGHNESS_THRESHOLD && ray_hit.material.metallic > 0.9999;
+
+        // Primary surface replacement for perfect mirrors
+        // https://developer.nvidia.com/blog/rendering-perfect-reflections-and-refractions-in-path-traced-games/#primary_surface_replacement
+#ifdef DLSS_RR_GUIDE_BUFFERS
+        if !psr_finished && primary_surface.material.roughness <= MIRROR_ROUGHNESS_THRESHOLD && primary_surface.material.metallic > 0.9999 {
+            if surface_perfect_mirror {
+                mirror_rotations = mirror_rotations * reflection_matrix(ray_hit.world_normal);
+            } else {
+                psr_finished = true;
+                replace_primary_surface(pixel_id, ray_hit, mirror_rotations, primary_surface.world_position);
+            }
+        }
+#endif
+
+        // Terminate path in the world cache if the ray is long enough and the path spread is large enough
+        var rng_copy = *rng;
+        let world_cache_cell_size = get_cell_size(ray_hit.world_position, view.world_position, &rng_copy);
+        let ray_longer_than_cell = ray.t > sqrt(3.0) * world_cache_cell_size;
+
+        if i == 2u || (ray_longer_than_cell && path_roughness > DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD) {
+            let diffuse_brdf = ray_hit.material.base_color / PI;
+            radiance += throughput * diffuse_brdf * query_world_cache(ray_hit.world_position, ray_hit.geometric_world_normal, view.world_position, ray.t, WORLD_CACHE_CELL_LIFETIME, rng);
+            break;
+        } else if !surface_perfect_mirror {
+            // Sample direct lighting (NEE)
+            let direct_lighting = sample_random_light(ray_hit.world_position, ray_hit.world_normal, rng);
+            let direct_lighting_brdf = evaluate_brdf(wo, direct_lighting.wi, ray_hit.world_normal, ray_hit.material);
+            let mis_weight = nee_mis_weight(direct_lighting.inverse_pdf, direct_lighting.brdf_rays_can_hit, wo_tangent, direct_lighting.wi, ray_hit, TBN);
+            radiance += throughput * mis_weight * direct_lighting.radiance * direct_lighting.inverse_pdf * direct_lighting_brdf;
+        }
+
+        // Sample new ray direction from the GGX BRDF for next bounce
+        let wi_tangent = sample_ggx_vndf(wo_tangent, ray_hit.material.roughness, rng);
+        if ggx_vndf_sample_invalid(wi_tangent) { break; }
+        wi = wi_tangent.x * T + wi_tangent.y * B + wi_tangent.z * N;
+        ray_origin = ray_hit.world_position + (ray_hit.geometric_world_normal * RAY_T_MIN);
+
+        // Update throughput for next bounce
+        p_bounce = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
+        throughput *= evaluate_brdf(wo, wi, N, ray_hit.material);
+        if ray_hit.material.roughness > MIRROR_ROUGHNESS_THRESHOLD {
+            throughput /= p_bounce;
+        }
+        path_roughness += ray_hit.material.roughness;
+
+        // Russian roulette for early termination
+        let p = luminance(throughput);
+        if rand_f(rng) > p { break; }
+        throughput /= p;
+    }
+
+    return radiance;
+}
+
+fn emissive_mis_weight(i: u32, initial_roughness: f32, p_bounce: f32, ray_hit: ResolvedRayHitFull) -> f32 {
+    if i != 0u {
+        let p_light = random_emissive_light_pdf(ray_hit);
+        return power_heuristic(p_bounce, p_light);
+    } else {
+        // The first bounce gets MIS weight 0.0 or 1.0 depending on if ReSTIR DI shaded using the specular lobe or not
+        if initial_roughness <= SPECULAR_GI_FOR_DI_ROUGHNESS_THRESHOLD {
+            return 1.0;
+        } else {
+            return 0.0;
+        }
+    }
+}
+
+fn nee_mis_weight(inverse_p_light: f32, brdf_rays_can_hit: bool, wo_tangent: vec3<f32>, wi: vec3<f32>, ray_hit: ResolvedRayHitFull, TBN: mat3x3<f32>) -> f32 {
+    if !brdf_rays_can_hit {
+        return 1.0;
+    }
+
+    let T = TBN[0];
+    let B = TBN[1];
+    let N = TBN[2];
+    let wi_tangent = vec3(dot(wi, T), dot(wi, B), dot(wi, N));
+
+    let p_light = 1.0 / inverse_p_light;
+    let p_bounce = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
+    return power_heuristic(p_light, p_bounce);
+}
+
+#ifdef DLSS_RR_GUIDE_BUFFERS
+// https://en.wikipedia.org/wiki/Householder_transformation
+fn reflection_matrix(plane_normal: vec3f) -> mat3x3<f32> {
+    // N times Nᵀ.
+    let n_nt = mat3x3<f32>(
+        plane_normal * plane_normal.x,
+        plane_normal * plane_normal.y,
+        plane_normal * plane_normal.z,
+    );
+    let identity_matrix = mat3x3<f32>(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0);
+    return identity_matrix - n_nt * 2.0;
+}
+
+fn replace_primary_surface(pixel_id: vec2<u32>, ray_hit: ResolvedRayHitFull, mirror_rotations: mat3x3<f32>, primary_surface_world_position: vec3<f32>) {
+    // Simplification: Apply all rotations in the chain around the first mirror, rather than applying each rotation around its respective mirror
+    let virtual_position = (mirror_rotations * (ray_hit.world_position - primary_surface_world_position)) + primary_surface_world_position;
+    let virtual_previous_frame_position = (mirror_rotations * (ray_hit.previous_frame_world_position - primary_surface_world_position)) + primary_surface_world_position;
+    let specular_motion_vector = calculate_motion_vector(virtual_position, virtual_previous_frame_position);
+
+    let F0 = calculate_F0(ray_hit.material.base_color, ray_hit.material.metallic, vec3(ray_hit.material.reflectance));
+    let wo = normalize(view.world_position - virtual_position);
+    let virtual_normal = normalize(mirror_rotations * ray_hit.world_normal);
+
+    textureStore(specular_motion_vectors, pixel_id, vec4(specular_motion_vector, vec2(0.0)));
+    textureStore(diffuse_albedo, pixel_id, vec4(calculate_diffuse_color(ray_hit.material.base_color, ray_hit.material.metallic, 0.0, 0.0), 0.0));
+    textureStore(specular_albedo, pixel_id, vec4(env_brdf_approx2(F0, ray_hit.material.roughness, virtual_normal, wo), 0.0));
+    textureStore(normal_roughness, pixel_id, vec4(virtual_normal, ray_hit.material.perceptual_roughness));
+}
+
+fn calculate_motion_vector(world_position: vec3<f32>, previous_world_position: vec3<f32>) -> vec2<f32> {
+    let clip_position_t = view.unjittered_clip_from_world * vec4(world_position, 1.0);
+    let clip_position = clip_position_t.xy / clip_position_t.w;
+    let previous_clip_position_t = previous_view.clip_from_world * vec4(previous_world_position, 1.0);
+    let previous_clip_position = previous_clip_position_t.xy / previous_clip_position_t.w;
+    // These motion vectors are used as offsets to UV positions and are stored
+    // in the range -1,1 to allow offsetting from the one corner to the
+    // diagonally-opposite corner in UV coordinates, in either direction.
+    // A difference between diagonally-opposite corners of clip space is in the
+    // range -2,2, so this needs to be scaled by 0.5. And the V direction goes
+    // down where clip space y goes up, so y needs to be flipped.
+    return (clip_position - previous_clip_position) * vec2(0.5, -0.5);
+}
+#endif
diff --git a/third_party/bevy_solari/src/realtime/world_cache_compact.wgsl b/third_party/bevy_solari/src/realtime/world_cache_compact.wgsl
new file mode 100644
index 0000000..eaa3149
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/world_cache_compact.wgsl
@@ -0,0 +1,86 @@
+enable wgpu_ray_query;
+
+#import bevy_solari::world_cache::WORLD_CACHE_EMPTY_CELL
+#import bevy_solari::realtime_bindings::{
+    world_cache_life,
+    world_cache_checksums,
+    world_cache_radiance,
+    world_cache_luminance_deltas,
+    world_cache_a,
+    world_cache_b,
+    world_cache_active_cell_indices,
+    world_cache_active_cells_count,
+}
+
+@group(2) @binding(0) var<storage, read_write> world_cache_active_cells_dispatch: vec3<u32>;
+
+var<workgroup> w1: array<u32, 1024u>;
+var<workgroup> w2: array<u32, 1024u>;
+
+@compute @workgroup_size(1024, 1, 1)
+fn decay_world_cache(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    var life = world_cache_life[global_id.x];
+    if life > 0u {
+        life -= 1u;
+        world_cache_life[global_id.x] = life;
+
+        if life == 0u {
+            world_cache_checksums[global_id.x] = WORLD_CACHE_EMPTY_CELL;
+            world_cache_radiance[global_id.x] = vec4(0.0);
+            world_cache_luminance_deltas[global_id.x] = 0.0;
+        }
+    }
+}
+
+@compute @workgroup_size(1024, 1, 1)
+fn compact_world_cache_single_block(
+    @builtin(global_invocation_id) cell_id: vec3<u32>,
+    @builtin(local_invocation_index) t: u32,
+) {
+    if t == 0u { w1[0u] = 0u; } else { w1[t] = u32(world_cache_life[cell_id.x - 1u] != 0u); }; workgroupBarrier();
+    if t < 1u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 1u]; } workgroupBarrier();
+    if t < 2u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 2u]; } workgroupBarrier();
+    if t < 4u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 4u]; } workgroupBarrier();
+    if t < 8u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 8u]; } workgroupBarrier();
+    if t < 16u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 16u]; } workgroupBarrier();
+    if t < 32u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 32u]; } workgroupBarrier();
+    if t < 64u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 64u]; } workgroupBarrier();
+    if t < 128u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 128u]; } workgroupBarrier();
+    if t < 256u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 256u]; } workgroupBarrier();
+    if t < 512u { world_cache_a[cell_id.x] = w2[t]; } else { world_cache_a[cell_id.x] = w2[t] + w2[t - 512u]; }
+}
+
+@compute @workgroup_size(1024, 1, 1)
+fn compact_world_cache_blocks(@builtin(local_invocation_index) t: u32) {
+    if t == 0u { w1[0u] = 0u; } else { w1[t] = world_cache_a[t * 1024u - 1u]; }; workgroupBarrier();
+    if t < 1u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 1u]; } workgroupBarrier();
+    if t < 2u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 2u]; } workgroupBarrier();
+    if t < 4u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 4u]; } workgroupBarrier();
+    if t < 8u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 8u]; } workgroupBarrier();
+    if t < 16u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 16u]; } workgroupBarrier();
+    if t < 32u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 32u]; } workgroupBarrier();
+    if t < 64u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 64u]; } workgroupBarrier();
+    if t < 128u { w1[t] = w2[t]; } else { w1[t] = w2[t] + w2[t - 128u]; } workgroupBarrier();
+    if t < 256u { w2[t] = w1[t]; } else { w2[t] = w1[t] + w1[t - 256u]; } workgroupBarrier();
+    if t < 512u { world_cache_b[t] = w2[t]; } else { world_cache_b[t] = w2[t] + w2[t - 512u]; }
+}
+
+@compute @workgroup_size(1024, 1, 1)
+fn compact_world_cache_write_active_cells(
+    @builtin(global_invocation_id) cell_id: vec3<u32>,
+    @builtin(workgroup_id) workgroup_id: vec3<u32>,
+    @builtin(local_invocation_index) thread_index: u32,
+) {
+    let compacted_index = world_cache_a[cell_id.x] + world_cache_b[workgroup_id.x];
+    let cell_active = world_cache_life[cell_id.x] != 0u;
+
+    if cell_active {
+        world_cache_active_cell_indices[compacted_index] = cell_id.x;
+    }
+
+    if thread_index == 1023u && workgroup_id.x == 1023u {
+        let active_cell_count = compacted_index + u32(cell_active);
+        world_cache_active_cells_count = active_cell_count;
+        world_cache_active_cells_dispatch = vec3((active_cell_count + 63u) / 64u, 1u, 1u);
+    }
+}
diff --git a/third_party/bevy_solari/src/realtime/world_cache_query.wgsl b/third_party/bevy_solari/src/realtime/world_cache_query.wgsl
new file mode 100644
index 0000000..ce4e163
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/world_cache_query.wgsl
@@ -0,0 +1,148 @@
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::world_cache
+
+#import bevy_pbr::utils::{rand_f, rand_vec2f}
+#import bevy_render::maths::orthonormalize
+#import bevy_solari::realtime_bindings::{
+    world_cache_life,
+    world_cache_checksums,
+    world_cache_radiance,
+    world_cache_geometry_data,
+    world_cache_luminance_deltas,
+    world_cache_a,
+    world_cache_b,
+    world_cache_active_cell_indices,
+    world_cache_active_cells_count,
+    WorldCacheGeometryData,
+}
+
+/// How responsive the world cache is to changes in lighting (higher is less responsive but more stable, lower is more responsive but less stable)
+const WORLD_CACHE_MAX_TEMPORAL_SAMPLES: f32 = 32.0;
+/// How many direct light samples each cell takes when updating each frame
+const WORLD_CACHE_DIRECT_LIGHT_SAMPLE_COUNT: u32 = 32u;
+/// Maximum amount of distance to trace GI rays between two cache cells
+const WORLD_CACHE_MAX_GI_RAY_DISTANCE: f32 = 50.0;
+/// Soft upper limit on the amount of cache cells to update each frame
+const WORLD_CACHE_CELL_UPDATES_SOFT_CAP: u32 = 40000u;
+
+/// Maximum amount of frames a cell can live for without being queried
+const WORLD_CACHE_CELL_LIFETIME: u32 = 10u;
+/// Maximum amount of attempts to find a cache entry after a hash collision
+const WORLD_CACHE_MAX_SEARCH_STEPS: u32 = 3u;
+
+/// Size of a cache cell at the lowest LOD in meters
+const WORLD_CACHE_POSITION_BASE_CELL_SIZE: f32 = 0.15;
+/// How fast the world cache transitions between LODs as a function of distance to the camera
+const WORLD_CACHE_POSITION_LOD_SCALE: f32 = 15.0;
+
+/// Marker value for an empty cell
+const WORLD_CACHE_EMPTY_CELL: u32 = 0u;
+
+#ifndef WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER
+fn query_world_cache(world_position_in: vec3<f32>, world_normal: vec3<f32>, view_position: vec3<f32>, ray_t: f32, cell_lifetime: u32, rng: ptr<function, u32>) -> vec3<f32> {
+    var world_position = world_position_in;
+    var cell_size = get_cell_size(world_position, view_position, rng);
+
+#ifdef WORLD_CACHE_FIRST_BOUNCE_LIGHT_LEAK_PREVENTION
+    if ray_t < cell_size {
+        // Prevent light leaks
+        cell_size = WORLD_CACHE_POSITION_BASE_CELL_SIZE;
+    }
+#endif
+
+#ifndef NO_JITTER_WORLD_CACHE
+    // Jitter query point, which essentially blurs the cache a bit so it's not so grid-like
+    // https://tomclabault.github.io/blog/2025/regir, jitter_world_position_tangent_plane
+    let TBN = orthonormalize(world_normal);
+    let offset = (rand_vec2f(rng) * 2.0 - 1.0) * cell_size * 0.5;
+    world_position += offset.x * TBN[0] + offset.y * TBN[1];
+    cell_size = get_cell_size(world_position, view_position, rng);
+#endif
+
+    let world_position_quantized = bitcast<vec3<u32>>(quantize_position(world_position, cell_size));
+    let world_normal_quantized = bitcast<vec3<u32>>(quantize_normal(world_normal));
+    var key = compute_key(world_position_quantized, world_normal_quantized);
+    let checksum = compute_checksum(world_position_quantized, world_normal_quantized);
+
+    for (var i = 0u; i < WORLD_CACHE_MAX_SEARCH_STEPS; i++) {
+        let existing_checksum = atomicCompareExchangeWeak(&world_cache_checksums[key], WORLD_CACHE_EMPTY_CELL, checksum).old_value;
+
+        // Cell already exists or is empty - reset lifetime
+        if existing_checksum == checksum || existing_checksum == WORLD_CACHE_EMPTY_CELL {
+#ifndef WORLD_CACHE_QUERY_ATOMIC_MAX_LIFETIME
+            atomicStore(&world_cache_life[key], cell_lifetime);
+#else
+            atomicMax(&world_cache_life[key], cell_lifetime);
+#endif
+        }
+
+        if existing_checksum == checksum {
+            // Cache entry already exists - get radiance
+            return world_cache_radiance[key].rgb;
+        } else if existing_checksum == WORLD_CACHE_EMPTY_CELL {
+            // Cell is empty - initialize it
+            world_cache_geometry_data[key].world_position = world_position;
+            world_cache_geometry_data[key].world_normal = world_normal;
+            return vec3(0.0);
+        } else {
+            // Collision - linear probe to next entry
+            key += 1u;
+        }
+    }
+
+    return vec3(0.0);
+}
+#endif
+
+fn get_cell_size(world_position: vec3<f32>, view_position: vec3<f32>, rng: ptr<function, u32>) -> f32 {
+    let camera_distance = distance(view_position, world_position) / WORLD_CACHE_POSITION_LOD_SCALE;
+    let lod_f = log2(1.0 + camera_distance);
+    let lod_fract = fract(lod_f);
+    let lod = floor(lod_f) + select(0.0, 1.0, rand_f(rng) < lod_fract * lod_fract * lod_fract);
+    return WORLD_CACHE_POSITION_BASE_CELL_SIZE * exp2(lod);
+}
+
+fn quantize_position(world_position: vec3<f32>, quantization_factor: f32) -> vec3<f32> {
+    return floor(world_position / quantization_factor + 0.0001);
+}
+
+fn quantize_normal(world_normal: vec3<f32>) -> vec3<f32> {
+    return floor(world_normal * 2.0 + 0.0001);
+}
+
+// TODO: Clustering
+fn compute_key(world_position: vec3<u32>, world_normal: vec3<u32>) -> u32 {
+    var key = pcg_hash(world_position.x);
+    key = pcg_hash(key + world_position.y);
+    key = pcg_hash(key + world_position.z);
+    key = pcg_hash(key + world_normal.x);
+    key = pcg_hash(key + world_normal.y);
+    key = pcg_hash(key + world_normal.z);
+    return wrap_key(key);
+}
+
+fn compute_checksum(world_position: vec3<u32>, world_normal: vec3<u32>) -> u32 {
+    var key = iqint_hash(world_position.x);
+    key = iqint_hash(key + world_position.y);
+    key = iqint_hash(key + world_position.z);
+    key = iqint_hash(key + world_normal.x);
+    key = iqint_hash(key + world_normal.y);
+    key = iqint_hash(key + world_normal.z);
+    return max(key, 1u); // 0u is reserved for WORLD_CACHE_EMPTY_CELL
+}
+
+fn pcg_hash(input: u32) -> u32 {
+    let state = input * 747796405u + 2891336453u;
+    let word = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;
+    return (word >> 22u) ^ word;
+}
+
+fn iqint_hash(input: u32) -> u32 {
+    let n = (input << 13u) ^ input;
+    return n * (n * n * 15731u + 789221u) + 1376312589u;
+}
+
+fn wrap_key(key: u32) -> u32 {
+    return key & (#{WORLD_CACHE_SIZE} - 1u);
+}
diff --git a/third_party/bevy_solari/src/realtime/world_cache_update.wgsl b/third_party/bevy_solari/src/realtime/world_cache_update.wgsl
new file mode 100644
index 0000000..045132f
--- /dev/null
+++ b/third_party/bevy_solari/src/realtime/world_cache_update.wgsl
@@ -0,0 +1,129 @@
+enable wgpu_ray_query;
+
+#import bevy_core_pipeline::tonemapping::tonemapping_luminance as luminance
+#import bevy_pbr::utils::{rand_f, rand_range_u, sample_cosine_hemisphere}
+#import bevy_render::view::View
+#import bevy_solari::presample_light_tiles::{ResolvedLightSamplePacked, unpack_resolved_light_sample}
+#import bevy_solari::sampling::{calculate_resolved_light_contribution, trace_light_visibility}
+#import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, RAY_T_MIN}
+#import bevy_solari::world_cache::{
+    WORLD_CACHE_MAX_TEMPORAL_SAMPLES,
+    WORLD_CACHE_DIRECT_LIGHT_SAMPLE_COUNT,
+    WORLD_CACHE_MAX_GI_RAY_DISTANCE,
+    WORLD_CACHE_CELL_UPDATES_SOFT_CAP,
+    query_world_cache,
+}
+#import bevy_solari::realtime_bindings::{
+    light_tile_resolved_samples,
+    view,
+    constants,
+    world_cache_active_cells_count,
+    world_cache_active_cell_indices,
+    world_cache_life,
+    world_cache_geometry_data,
+    world_cache_radiance,
+    world_cache_luminance_deltas,
+    world_cache_active_cells_new_radiance,
+}
+
+@compute @workgroup_size(64, 1, 1)
+fn sample_di(@builtin(workgroup_id) workgroup_id: vec3<u32>, @builtin(global_invocation_id) active_cell_id: vec3<u32>) {
+    if active_cell_id.x >= world_cache_active_cells_count { return; }
+
+    let cell_index = world_cache_active_cell_indices[active_cell_id.x];
+    let geometry_data = world_cache_geometry_data[cell_index];
+    var rng = cell_index + constants.frame_index;
+
+    if rand_f(&rng) >= f32(WORLD_CACHE_CELL_UPDATES_SOFT_CAP) / f32(world_cache_active_cells_count) { return; }
+
+    let new_radiance = sample_random_light_ris(geometry_data.world_position, geometry_data.world_normal, workgroup_id.xy, &rng);
+
+    world_cache_active_cells_new_radiance[active_cell_id.x] = new_radiance;
+}
+
+@compute @workgroup_size(64, 1, 1)
+fn sample_gi(@builtin(workgroup_id) workgroup_id: vec3<u32>, @builtin(global_invocation_id) active_cell_id: vec3<u32>) {
+    if active_cell_id.x >= world_cache_active_cells_count { return; }
+
+    let cell_index = world_cache_active_cell_indices[active_cell_id.x];
+    let geometry_data = world_cache_geometry_data[cell_index];
+    var rng = cell_index + constants.frame_index;
+
+    if rand_f(&rng) >= f32(WORLD_CACHE_CELL_UPDATES_SOFT_CAP) / f32(world_cache_active_cells_count) { return; }
+
+    let ray_direction = sample_cosine_hemisphere(geometry_data.world_normal, &rng);
+    let ray = trace_ray(geometry_data.world_position + (geometry_data.world_normal * RAY_T_MIN), ray_direction, RAY_T_MIN, WORLD_CACHE_MAX_GI_RAY_DISTANCE, RAY_FLAG_NONE);
+    if ray.kind != RAY_QUERY_INTERSECTION_NONE {
+        let ray_hit = resolve_ray_hit_full(ray);
+        let cell_life = atomicLoad(&world_cache_life[cell_index]);
+        let radiance = query_world_cache(ray_hit.world_position, ray_hit.geometric_world_normal, view.world_position, ray.t, cell_life, &rng);
+        world_cache_active_cells_new_radiance[active_cell_id.x] += ray_hit.material.base_color * radiance;
+    }
+}
+
+@compute @workgroup_size(64, 1, 1)
+fn blend_new_samples(@builtin(global_invocation_id) active_cell_id: vec3<u32>) {
+    if active_cell_id.x >= world_cache_active_cells_count { return; }
+
+    let cell_index = world_cache_active_cell_indices[active_cell_id.x];
+    var rng = cell_index + constants.frame_index;
+
+    if rand_f(&rng) >= f32(WORLD_CACHE_CELL_UPDATES_SOFT_CAP) / f32(world_cache_active_cells_count) { return; }
+
+    let old_radiance = world_cache_radiance[cell_index];
+    let new_radiance = world_cache_active_cells_new_radiance[active_cell_id.x];
+    let luminance_delta = world_cache_luminance_deltas[cell_index];
+
+    // https://bsky.app/profile/gboisse.bsky.social/post/3m5blga3ftk2a
+    let sample_count = min(old_radiance.a + 1.0, WORLD_CACHE_MAX_TEMPORAL_SAMPLES);
+    let alpha = abs(luminance_delta) / max(luminance(old_radiance.rgb), 0.001);
+    let max_sample_count = mix(WORLD_CACHE_MAX_TEMPORAL_SAMPLES, 1.0, pow(saturate(alpha), 1.0 / 8.0));
+    var blend_amount = 1.0 / min(sample_count, max_sample_count);
+    if bool(constants.reset) {
+        blend_amount = 1.0;
+    }
+
+    let blended_radiance = mix(old_radiance.rgb, new_radiance, blend_amount);
+    let blended_luminance_delta = select(mix(luminance_delta, luminance(blended_radiance) - luminance(old_radiance.rgb), 1.0 / 8.0), 0.0, bool(constants.reset));
+
+    world_cache_radiance[cell_index] = vec4(blended_radiance, sample_count);
+    world_cache_luminance_deltas[cell_index] = blended_luminance_delta;
+}
+
+fn sample_random_light_ris(world_position: vec3<f32>, world_normal: vec3<f32>, workgroup_id: vec2<u32>, rng: ptr<function, u32>) -> vec3<f32> {
+    var workgroup_rng = (workgroup_id.x * 5782582u) + workgroup_id.y;
+    let light_tile_start = rand_range_u(128u, &workgroup_rng) * 1024u;
+
+    var weight_sum = 0.0;
+    var selected_sample_radiance = vec3(0.0);
+    var selected_sample_target_function = 0.0;
+    var selected_sample_world_position = vec4(0.0);
+    let mis_weight = 1.0 / f32(WORLD_CACHE_DIRECT_LIGHT_SAMPLE_COUNT);
+    for (var i = 0u; i < WORLD_CACHE_DIRECT_LIGHT_SAMPLE_COUNT; i++) {
+        let tile_sample = light_tile_start + rand_range_u(1024u, rng);
+        let resolved_light_sample = unpack_resolved_light_sample(light_tile_resolved_samples[tile_sample], view.exposure);
+        let light_contribution = calculate_resolved_light_contribution(resolved_light_sample, world_position, world_normal);
+
+        let contribution = light_contribution.radiance * saturate(dot(light_contribution.wi, world_normal));
+        let target_function = luminance(contribution);
+        let resampling_weight = mis_weight * (target_function * light_contribution.inverse_pdf);
+
+        weight_sum += resampling_weight;
+
+        if rand_f(rng) < resampling_weight / weight_sum {
+            selected_sample_radiance = contribution;
+            selected_sample_target_function = target_function;
+            selected_sample_world_position = resolved_light_sample.world_position;
+        }
+    }
+
+    var unbiased_contribution_weight = 0.0;
+    if all(selected_sample_radiance != vec3(0.0)) {
+        let inverse_target_function = select(0.0, 1.0 / selected_sample_target_function, selected_sample_target_function > 0.0);
+        unbiased_contribution_weight = weight_sum * inverse_target_function;
+
+        unbiased_contribution_weight *= trace_light_visibility(world_position + (world_normal * RAY_T_MIN), selected_sample_world_position);
+    }
+
+    return selected_sample_radiance * unbiased_contribution_weight;
+}
diff --git a/third_party/bevy_solari/src/scene/binder.rs b/third_party/bevy_solari/src/scene/binder.rs
new file mode 100644
index 0000000..e1d1bb0
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/binder.rs
@@ -0,0 +1,589 @@
+use super::{
+    RaytracingMesh3d,
+    blas::BlasManager,
+    extract::{RaytracingMaterial3d, StandardMaterialAssets, SurfaceMaterialAssets},
+};
+use bevy_asset::{AssetId, Handle};
+use bevy_color::{ColorToComponents, LinearRgba};
+use bevy_ecs::{
+    entity::{Entity, EntityHashMap},
+    resource::Resource,
+    system::{Query, Res, ResMut},
+};
+use bevy_material::AlphaMode;
+use bevy_math::{Mat4, UVec4, Vec3, Vec4, ops::cos};
+use bevy_pbr::{DfgLut, ExtractedDirectionalLight, PreviousGlobalTransform, StandardMaterial};
+use bevy_platform::{collections::HashMap, hash::FixedHasher};
+use bevy_render::{
+    mesh::allocator::MeshAllocator,
+    render_asset::RenderAssets,
+    render_resource::{binding_types::*, *},
+    renderer::{RenderDevice, RenderQueue},
+    texture::{FallbackImage, GpuImage},
+};
+use bevy_transform::components::GlobalTransform;
+use blacksite_surface::{SurfaceEvaluatorRegistry, SurfaceUniform};
+use core::{f32::consts::TAU, hash::Hash, num::NonZeroU32, ops::Deref};
+
+const MAX_MESH_SLAB_COUNT: NonZeroU32 = NonZeroU32::new(500).unwrap();
+const MAX_TEXTURE_COUNT: NonZeroU32 = NonZeroU32::new(5_000).unwrap();
+
+const TEXTURE_MAP_NONE: u32 = u32::MAX;
+const LIGHT_NOT_PRESENT_THIS_FRAME: u32 = u32::MAX;
+const MATERIAL_FLAG_ALPHA_CUTOUT: u32 = 1 << 0;
+const MATERIAL_FLAG_SURFACE: u32 = 1 << 1;
+
+#[derive(Resource)]
+pub struct RaytracingSceneBindings {
+    pub bind_group: Option<BindGroup>,
+    pub bind_group_layout: BindGroupLayoutDescriptor,
+    previous_frame_light_entities: Vec<Entity>,
+}
+
+pub fn prepare_raytracing_scene_bindings(
+    instances_query: Query<(
+        Entity,
+        &RaytracingMesh3d,
+        &RaytracingMaterial3d,
+        &GlobalTransform,
+        Option<&PreviousGlobalTransform>,
+    )>,
+    directional_lights_query: Query<(Entity, &ExtractedDirectionalLight)>,
+    mesh_allocator: Res<MeshAllocator>,
+    blas_manager: Res<BlasManager>,
+    material_assets: Res<StandardMaterialAssets>,
+    surface_material_assets: Res<SurfaceMaterialAssets>,
+    surface_evaluators: Res<SurfaceEvaluatorRegistry>,
+    texture_assets: Res<RenderAssets<GpuImage>>,
+    fallback_texture: Res<FallbackImage>,
+    dfg_lut: Res<DfgLut>,
+    render_device: Res<RenderDevice>,
+    pipeline_cache: Res<PipelineCache>,
+    render_queue: Res<RenderQueue>,
+    mut raytracing_scene_bindings: ResMut<RaytracingSceneBindings>,
+) {
+    raytracing_scene_bindings.bind_group = None;
+
+    let mut this_frame_entity_to_light_id = EntityHashMap::<u32>::default();
+    let previous_frame_light_entities: Vec<_> = raytracing_scene_bindings
+        .previous_frame_light_entities
+        .drain(..)
+        .collect();
+
+    if instances_query.iter().len() == 0 {
+        return;
+    }
+
+    let mut vertex_buffers = CachedBindingArray::new();
+    let mut index_buffers = CachedBindingArray::new();
+    let mut textures = CachedBindingArray::new();
+    let mut samplers = Vec::new();
+    let mut materials = StorageBufferList::<GpuMaterial>::default();
+    let mut tlas = render_device
+        .wgpu_device()
+        .create_tlas(&CreateTlasDescriptor {
+            label: Some("tlas"),
+            flags: AccelerationStructureFlags::PREFER_FAST_TRACE,
+            update_mode: AccelerationStructureUpdateMode::Build,
+            max_instances: instances_query.iter().len() as u32,
+        });
+    let mut transforms = StorageBufferList::<Mat4>::default();
+    let mut previous_frame_transforms = StorageBufferList::<Mat4>::default();
+    let mut geometry_ids = StorageBufferList::<GpuInstanceGeometryIds>::default();
+    let mut material_ids = StorageBufferList::<u32>::default();
+    let mut light_sources = StorageBufferList::<GpuLightSource>::default();
+    let mut directional_lights = StorageBufferList::<GpuDirectionalLight>::default();
+    let mut previous_frame_light_id_translations = StorageBufferList::<u32>::default();
+
+    let mut material_id_map: HashMap<RaytracingMaterialId, u32, FixedHasher> = HashMap::default();
+    let mut material_id = 0;
+    let mut process_texture = |texture_handle: &Option<Handle<_>>| -> Option<u32> {
+        match texture_handle {
+            Some(texture_handle) => match texture_assets.get(texture_handle.id()) {
+                Some(texture) => {
+                    let (texture_id, is_new) =
+                        textures.push_if_absent(texture.texture_view.deref(), texture_handle.id());
+                    if is_new {
+                        samplers.push(texture.sampler.deref());
+                    }
+                    Some(texture_id)
+                }
+                None => None,
+            },
+            None => Some(TEXTURE_MAP_NONE),
+        }
+    };
+    for (asset_id, material) in material_assets.iter() {
+        let Some((material_flags, alpha_cutoff)) = material_alpha_state(&material.alpha_mode)
+        else {
+            continue;
+        };
+        let Some(base_color_texture_id) = process_texture(&material.base_color_texture) else {
+            continue;
+        };
+        let Some(normal_map_texture_id) = process_texture(&material.normal_map_texture) else {
+            continue;
+        };
+        let Some(emissive_texture_id) = process_texture(&material.emissive_texture) else {
+            continue;
+        };
+        let Some(metallic_roughness_texture_id) =
+            process_texture(&material.metallic_roughness_texture)
+        else {
+            continue;
+        };
+
+        materials.get_mut().push(GpuMaterial::new(
+            UVec4::new(
+                normal_map_texture_id,
+                base_color_texture_id,
+                emissive_texture_id,
+                metallic_roughness_texture_id,
+            ),
+            [TEXTURE_MAP_NONE; 8],
+            material_flags,
+            alpha_cutoff,
+            material,
+            SurfaceUniform::default(),
+        ));
+
+        material_id_map.insert(RaytracingMaterialId::Standard(*asset_id), material_id);
+        material_id += 1;
+    }
+
+    for (asset_id, material) in surface_material_assets.iter() {
+        let Some(evaluator) = surface_evaluators
+            .evaluators
+            .get(&material.extension.uniform.shader_id)
+        else {
+            continue;
+        };
+        if evaluator.shader_id != material.extension.uniform.shader_id {
+            continue;
+        }
+        let Some((alpha_flags, alpha_cutoff)) = material_alpha_state(&material.base.alpha_mode)
+        else {
+            continue;
+        };
+        let Some(base_color_texture_id) = process_texture(&material.base.base_color_texture) else {
+            continue;
+        };
+        let Some(normal_map_texture_id) = process_texture(&material.base.normal_map_texture) else {
+            continue;
+        };
+        let Some(emissive_texture_id) = process_texture(&material.base.emissive_texture) else {
+            continue;
+        };
+        let Some(metallic_roughness_texture_id) =
+            process_texture(&material.base.metallic_roughness_texture)
+        else {
+            continue;
+        };
+        let surface_texture_handles = [
+            &material.extension.texture0,
+            &material.extension.texture1,
+            &material.extension.texture2,
+            &material.extension.texture3,
+            &material.extension.texture4,
+            &material.extension.texture5,
+            &material.extension.texture6,
+            &material.extension.texture7,
+        ];
+        let mut surface_texture_ids = [TEXTURE_MAP_NONE; 8];
+        let mut textures_ready = true;
+        for (texture_id, handle) in surface_texture_ids.iter_mut().zip(surface_texture_handles) {
+            let Some(id) = process_texture(handle) else {
+                textures_ready = false;
+                break;
+            };
+            *texture_id = id;
+        }
+        if !textures_ready {
+            continue;
+        }
+
+        materials.get_mut().push(GpuMaterial::new(
+            UVec4::new(
+                normal_map_texture_id,
+                base_color_texture_id,
+                emissive_texture_id,
+                metallic_roughness_texture_id,
+            ),
+            surface_texture_ids,
+            alpha_flags | MATERIAL_FLAG_SURFACE,
+            alpha_cutoff,
+            &material.base,
+            material.extension.uniform,
+        ));
+        material_id_map.insert(RaytracingMaterialId::Surface(*asset_id), material_id);
+        material_id += 1;
+    }
+
+    if material_id == 0 {
+        return;
+    }
+
+    if textures.is_empty() {
+        textures.vec.push(fallback_texture.d2.texture_view.deref());
+        samplers.push(fallback_texture.d2.sampler.deref());
+    }
+
+    let mut instance_id = 0;
+    for (entity, mesh, material, transform, previous_frame_transform) in &instances_query {
+        let Some(blas) = blas_manager.get(&mesh.id()) else {
+            continue;
+        };
+        let Some(vertex_slice) = mesh_allocator.mesh_vertex_slice(&mesh.id()) else {
+            continue;
+        };
+        let Some(index_slice) = mesh_allocator.mesh_index_slice(&mesh.id()) else {
+            continue;
+        };
+        let Some(material_id) = material_id_map
+            .get(&RaytracingMaterialId::from(material))
+            .copied()
+        else {
+            continue;
+        };
+        let Some(material) = materials.get().get(material_id as usize) else {
+            continue;
+        };
+
+        let transform = transform.to_matrix();
+        *tlas.get_mut_single(instance_id).unwrap() = Some(TlasInstance::new(
+            blas,
+            tlas_transform(&transform),
+            Default::default(),
+            0xFF,
+        ));
+
+        transforms.get_mut().push(transform);
+        previous_frame_transforms.get_mut().push(
+            previous_frame_transform
+                .map(|t| Mat4::from(t.0))
+                .unwrap_or(transform),
+        );
+
+        let (vertex_buffer_id, _) = vertex_buffers.push_if_absent(
+            vertex_slice.buffer.as_entire_buffer_binding(),
+            vertex_slice.buffer.id(),
+        );
+        let (index_buffer_id, _) = index_buffers.push_if_absent(
+            index_slice.buffer.as_entire_buffer_binding(),
+            index_slice.buffer.id(),
+        );
+
+        geometry_ids.get_mut().push(GpuInstanceGeometryIds {
+            vertex_buffer_id,
+            vertex_buffer_offset: vertex_slice.range.start,
+            index_buffer_id,
+            index_buffer_offset: index_slice.range.start,
+            triangle_count: (index_slice.range.len() / 3) as u32,
+        });
+
+        material_ids.get_mut().push(material_id);
+
+        if material.is_potentially_emissive() {
+            light_sources
+                .get_mut()
+                .push(GpuLightSource::new_emissive_mesh_light(
+                    instance_id as u32,
+                    (index_slice.range.len() / 3) as u32,
+                ));
+
+            this_frame_entity_to_light_id.insert(entity, light_sources.get().len() as u32 - 1);
+            raytracing_scene_bindings
+                .previous_frame_light_entities
+                .push(entity);
+        }
+
+        instance_id += 1;
+    }
+
+    if instance_id == 0 {
+        return;
+    }
+
+    for (entity, directional_light) in &directional_lights_query {
+        let directional_lights = directional_lights.get_mut();
+        let directional_light_id = directional_lights.len() as u32;
+
+        directional_lights.push(GpuDirectionalLight::new(directional_light));
+
+        light_sources
+            .get_mut()
+            .push(GpuLightSource::new_directional_light(directional_light_id));
+
+        this_frame_entity_to_light_id.insert(entity, light_sources.get().len() as u32 - 1);
+        raytracing_scene_bindings
+            .previous_frame_light_entities
+            .push(entity);
+    }
+
+    for previous_frame_light_entity in previous_frame_light_entities {
+        let current_frame_index = this_frame_entity_to_light_id
+            .get(&previous_frame_light_entity)
+            .copied()
+            .unwrap_or(LIGHT_NOT_PRESENT_THIS_FRAME);
+        previous_frame_light_id_translations
+            .get_mut()
+            .push(current_frame_index);
+    }
+
+    if light_sources.get().len() > u16::MAX as usize {
+        panic!("Too many light sources in the scene, maximum is 65535.");
+    }
+
+    materials.write_buffer(&render_device, &render_queue);
+    transforms.write_buffer(&render_device, &render_queue);
+    previous_frame_transforms.write_buffer(&render_device, &render_queue);
+    geometry_ids.write_buffer(&render_device, &render_queue);
+    material_ids.write_buffer(&render_device, &render_queue);
+    light_sources.write_buffer(&render_device, &render_queue);
+    directional_lights.write_buffer(&render_device, &render_queue);
+    previous_frame_light_id_translations.write_buffer(&render_device, &render_queue);
+
+    let mut command_encoder = render_device.create_command_encoder(&CommandEncoderDescriptor {
+        label: Some("build_tlas_command_encoder"),
+    });
+    command_encoder.build_acceleration_structures(&[], [&tlas]);
+    render_queue.submit([command_encoder.finish()]);
+
+    let (dfg_view, dfg_sampler) = texture_assets
+        .get(&dfg_lut.texture)
+        .map(|img| (&img.texture_view, &img.sampler))
+        .unwrap_or((
+            &fallback_texture.d2.texture_view,
+            &fallback_texture.d2.sampler,
+        ));
+
+    raytracing_scene_bindings.bind_group = Some(render_device.create_bind_group(
+        "raytracing_scene_bind_group",
+        &pipeline_cache.get_bind_group_layout(&raytracing_scene_bindings.bind_group_layout),
+        &BindGroupEntries::sequential((
+            vertex_buffers.as_slice(),
+            index_buffers.as_slice(),
+            textures.as_slice(),
+            samplers.as_slice(),
+            materials.binding().unwrap(),
+            tlas.as_binding(),
+            transforms.binding().unwrap(),
+            previous_frame_transforms.binding().unwrap(),
+            geometry_ids.binding().unwrap(),
+            material_ids.binding().unwrap(),
+            light_sources.binding().unwrap(),
+            directional_lights.binding().unwrap(),
+            previous_frame_light_id_translations.binding().unwrap(),
+            dfg_view,
+            dfg_sampler,
+        )),
+    ));
+}
+
+impl RaytracingSceneBindings {
+    pub fn new() -> Self {
+        Self {
+            bind_group: None,
+            bind_group_layout: BindGroupLayoutDescriptor::new(
+                "raytracing_scene_bind_group_layout",
+                &BindGroupLayoutEntries::sequential(
+                    ShaderStages::COMPUTE,
+                    (
+                        storage_buffer_read_only_sized(false, None).count(MAX_MESH_SLAB_COUNT),
+                        storage_buffer_read_only_sized(false, None).count(MAX_MESH_SLAB_COUNT),
+                        texture_2d(TextureSampleType::Float { filterable: true })
+                            .count(MAX_TEXTURE_COUNT),
+                        sampler(SamplerBindingType::Filtering).count(MAX_TEXTURE_COUNT),
+                        storage_buffer_read_only_sized(false, None),
+                        acceleration_structure(),
+                        storage_buffer_read_only_sized(false, None),
+                        storage_buffer_read_only_sized(false, None),
+                        storage_buffer_read_only_sized(false, None),
+                        storage_buffer_read_only_sized(false, None),
+                        storage_buffer_read_only_sized(false, None),
+                        storage_buffer_read_only_sized(false, None),
+                        storage_buffer_read_only_sized(false, None),
+                        texture_2d(TextureSampleType::Float { filterable: true }),
+                        sampler(SamplerBindingType::Filtering),
+                    ),
+                ),
+            ),
+            previous_frame_light_entities: Vec::new(),
+        }
+    }
+}
+
+impl Default for RaytracingSceneBindings {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+struct CachedBindingArray<T, I: Eq + Hash> {
+    map: HashMap<I, u32>,
+    vec: Vec<T>,
+}
+
+impl<T, I: Eq + Hash> CachedBindingArray<T, I> {
+    fn new() -> Self {
+        Self {
+            map: HashMap::default(),
+            vec: Vec::default(),
+        }
+    }
+
+    fn push_if_absent(&mut self, item: T, item_id: I) -> (u32, bool) {
+        let mut is_new = false;
+        let i = *self.map.entry(item_id).or_insert_with(|| {
+            is_new = true;
+            let i = self.vec.len() as u32;
+            self.vec.push(item);
+            i
+        });
+        (i, is_new)
+    }
+
+    fn is_empty(&self) -> bool {
+        self.vec.is_empty()
+    }
+
+    fn as_slice(&self) -> &[T] {
+        self.vec.as_slice()
+    }
+}
+
+type StorageBufferList<T> = StorageBuffer<Vec<T>>;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+enum RaytracingMaterialId {
+    Standard(AssetId<StandardMaterial>),
+    Surface(AssetId<blacksite_surface::SurfaceMaterial>),
+}
+
+impl From<&RaytracingMaterial3d> for RaytracingMaterialId {
+    fn from(material: &RaytracingMaterial3d) -> Self {
+        match material {
+            RaytracingMaterial3d::Standard(handle) => Self::Standard(handle.id()),
+            RaytracingMaterial3d::Surface(handle) => Self::Surface(handle.id()),
+        }
+    }
+}
+
+fn material_alpha_state(alpha_mode: &AlphaMode) -> Option<(u32, f32)> {
+    match alpha_mode {
+        AlphaMode::Opaque => Some((0, 0.0)),
+        AlphaMode::Mask(cutoff) => Some((MATERIAL_FLAG_ALPHA_CUTOUT, *cutoff)),
+        AlphaMode::AlphaToCoverage => Some((MATERIAL_FLAG_ALPHA_CUTOUT, 0.5)),
+        AlphaMode::Blend | AlphaMode::Premultiplied | AlphaMode::Add | AlphaMode::Multiply => None,
+    }
+}
+
+#[derive(ShaderType)]
+struct GpuInstanceGeometryIds {
+    vertex_buffer_id: u32,
+    vertex_buffer_offset: u32,
+    index_buffer_id: u32,
+    index_buffer_offset: u32,
+    triangle_count: u32,
+}
+
+#[derive(ShaderType)]
+struct GpuMaterial {
+    texture_ids: UVec4,
+    surface_texture_ids_0: UVec4,
+    surface_texture_ids_1: UVec4,
+    material_info: UVec4,
+    base_color: Vec4,
+    emissive_roughness: Vec4,
+    pbr: Vec4,
+    surface_uniform: SurfaceUniform,
+}
+
+impl GpuMaterial {
+    fn new(
+        texture_ids: UVec4,
+        surface_texture_ids: [u32; 8],
+        flags: u32,
+        alpha_cutoff: f32,
+        material: &StandardMaterial,
+        surface_uniform: SurfaceUniform,
+    ) -> Self {
+        Self {
+            texture_ids,
+            surface_texture_ids_0: UVec4::from_slice(&surface_texture_ids[..4]),
+            surface_texture_ids_1: UVec4::from_slice(&surface_texture_ids[4..]),
+            material_info: UVec4::new(flags, 0, 0, 0),
+            base_color: LinearRgba::from(material.base_color).to_vec4(),
+            emissive_roughness: material
+                .emissive
+                .to_vec3()
+                .extend(material.perceptual_roughness),
+            pbr: Vec4::new(material.metallic, material.reflectance, alpha_cutoff, 0.0),
+            surface_uniform,
+        }
+    }
+
+    fn emissive(&self) -> Vec3 {
+        self.emissive_roughness.truncate()
+    }
+
+    fn is_potentially_emissive(&self) -> bool {
+        (self.material_info.x & MATERIAL_FLAG_SURFACE) != 0 || self.emissive() != Vec3::ZERO
+    }
+}
+
+#[derive(ShaderType)]
+struct GpuLightSource {
+    kind: u32,
+    id: u32,
+}
+
+impl GpuLightSource {
+    fn new_emissive_mesh_light(instance_id: u32, triangle_count: u32) -> GpuLightSource {
+        if triangle_count > u16::MAX as u32 {
+            panic!("Too many triangles ({triangle_count}) in an emissive mesh, maximum is 65535.");
+        }
+
+        Self {
+            kind: triangle_count << 1,
+            id: instance_id,
+        }
+    }
+
+    fn new_directional_light(directional_light_id: u32) -> GpuLightSource {
+        Self {
+            kind: 1,
+            id: directional_light_id,
+        }
+    }
+}
+
+#[derive(ShaderType, Default)]
+struct GpuDirectionalLight {
+    direction_to_light: Vec3,
+    cos_theta_max: f32,
+    luminance: Vec3,
+    inverse_pdf: f32,
+}
+
+impl GpuDirectionalLight {
+    fn new(directional_light: &ExtractedDirectionalLight) -> Self {
+        let cos_theta_max = cos(directional_light.sun_disk_angular_size / 2.0);
+        let solid_angle = TAU * (1.0 - cos_theta_max);
+        let luminance =
+            (directional_light.color.to_vec3() * directional_light.illuminance) / solid_angle;
+
+        Self {
+            direction_to_light: directional_light.transform.back().into(),
+            cos_theta_max,
+            luminance,
+            inverse_pdf: solid_angle,
+        }
+    }
+}
+
+fn tlas_transform(transform: &Mat4) -> [f32; 12] {
+    transform.transpose().to_cols_array()[..12]
+        .try_into()
+        .unwrap()
+}
diff --git a/third_party/bevy_solari/src/scene/blas.rs b/third_party/bevy_solari/src/scene/blas.rs
new file mode 100644
index 0000000..6456100
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/blas.rs
@@ -0,0 +1,186 @@
+use alloc::collections::VecDeque;
+use bevy_asset::AssetId;
+use bevy_ecs::{
+    resource::Resource,
+    system::{Res, ResMut},
+};
+use bevy_mesh::{Indices, Mesh};
+use bevy_platform::collections::HashMap;
+use bevy_render::{
+    mesh::{
+        RenderMesh,
+        allocator::{MeshAllocator, MeshBufferSlice},
+    },
+    render_asset::ExtractedAssets,
+    render_resource::*,
+    renderer::{RenderDevice, RenderQueue},
+};
+
+/// After compacting this many vertices worth of meshes per frame, no further BLAS will be compacted.
+/// Lower this number to distribute the work across more frames.
+const MAX_COMPACTION_VERTICES_PER_FRAME: u32 = 400_000;
+
+#[derive(Resource, Default)]
+pub struct BlasManager {
+    blas: HashMap<AssetId<Mesh>, Blas>,
+    compaction_queue: VecDeque<(AssetId<Mesh>, u32, bool)>,
+}
+
+impl BlasManager {
+    pub fn get(&self, mesh: &AssetId<Mesh>) -> Option<&Blas> {
+        self.blas.get(mesh)
+    }
+}
+
+pub fn prepare_raytracing_blas(
+    mut blas_manager: ResMut<BlasManager>,
+    extracted_meshes: Res<ExtractedAssets<RenderMesh>>,
+    mesh_allocator: Res<MeshAllocator>,
+    render_device: Res<RenderDevice>,
+    render_queue: Res<RenderQueue>,
+) {
+    // Delete BLAS for deleted or modified meshes
+    for asset_id in extracted_meshes
+        .removed
+        .iter()
+        .chain(extracted_meshes.modified.iter())
+    {
+        blas_manager.blas.remove(asset_id);
+    }
+
+    if extracted_meshes.extracted.is_empty() {
+        return;
+    }
+
+    // Create new BLAS for added or changed meshes
+    let blas_resources = extracted_meshes
+        .extracted
+        .iter()
+        .filter(|(_, mesh)| is_mesh_raytracing_compatible(mesh))
+        .map(|(asset_id, _)| {
+            let vertex_slice = mesh_allocator.mesh_vertex_slice(asset_id).unwrap();
+            let index_slice = mesh_allocator.mesh_index_slice(asset_id).unwrap();
+
+            let (blas, blas_size) =
+                allocate_blas(&vertex_slice, &index_slice, asset_id, &render_device);
+
+            blas_manager.blas.insert(*asset_id, blas);
+            blas_manager
+                .compaction_queue
+                .push_back((*asset_id, blas_size.vertex_count, false));
+
+            (*asset_id, vertex_slice, index_slice, blas_size)
+        })
+        .collect::<Vec<_>>();
+
+    // Build geometry into each BLAS
+    let build_entries = blas_resources
+        .iter()
+        .map(|(asset_id, vertex_slice, index_slice, blas_size)| {
+            let geometry = BlasTriangleGeometry {
+                size: blas_size,
+                vertex_buffer: vertex_slice.buffer,
+                first_vertex: vertex_slice.range.start,
+                vertex_stride: 48,
+                index_buffer: Some(index_slice.buffer),
+                first_index: Some(index_slice.range.start),
+                transform_buffer: None,
+                transform_buffer_offset: None,
+            };
+            BlasBuildEntry {
+                blas: &blas_manager.blas[asset_id],
+                geometry: BlasGeometries::TriangleGeometries(vec![geometry]),
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let mut command_encoder = render_device.create_command_encoder(&CommandEncoderDescriptor {
+        label: Some("build_blas_command_encoder"),
+    });
+    command_encoder.build_acceleration_structures(&build_entries, &[]);
+    render_queue.submit([command_encoder.finish()]);
+}
+
+pub fn compact_raytracing_blas(
+    mut blas_manager: ResMut<BlasManager>,
+    render_queue: Res<RenderQueue>,
+) {
+    let queue_size = blas_manager.compaction_queue.len();
+    let mut meshes_processed = 0;
+    let mut vertices_compacted = 0;
+
+    while !blas_manager.compaction_queue.is_empty()
+        && vertices_compacted < MAX_COMPACTION_VERTICES_PER_FRAME
+        && meshes_processed < queue_size
+    {
+        meshes_processed += 1;
+
+        let (mesh, vertex_count, compaction_started) =
+            blas_manager.compaction_queue.pop_front().unwrap();
+
+        let Some(blas) = blas_manager.get(&mesh) else {
+            continue;
+        };
+
+        if !compaction_started {
+            blas.prepare_compaction_async(|_| {});
+        }
+
+        if blas.ready_for_compaction() {
+            let compacted_blas = render_queue.compact_blas(blas);
+            blas_manager.blas.insert(mesh, compacted_blas);
+
+            vertices_compacted += vertex_count;
+            continue;
+        }
+
+        // BLAS not ready for compaction, put back in queue
+        blas_manager
+            .compaction_queue
+            .push_back((mesh, vertex_count, true));
+    }
+}
+
+fn allocate_blas(
+    vertex_slice: &MeshBufferSlice,
+    index_slice: &MeshBufferSlice,
+    asset_id: &AssetId<Mesh>,
+    render_device: &RenderDevice,
+) -> (Blas, BlasTriangleGeometrySizeDescriptor) {
+    let blas_size = BlasTriangleGeometrySizeDescriptor {
+        vertex_format: Mesh::ATTRIBUTE_POSITION.format,
+        vertex_count: vertex_slice.range.len() as u32,
+        index_format: Some(IndexFormat::Uint32),
+        index_count: Some(index_slice.range.len() as u32),
+        // Surface ABI cutouts must inspect each triangle candidate before committing it. Mesh
+        // assets are shared by differently-materialed instances, so conservatively build every
+        // geometry as non-opaque and let the shared evaluator accept/reject candidates.
+        flags: AccelerationStructureGeometryFlags::empty(),
+    };
+
+    let blas = render_device.wgpu_device().create_blas(
+        &CreateBlasDescriptor {
+            label: Some(&asset_id.to_string()),
+            flags: AccelerationStructureFlags::PREFER_FAST_TRACE
+                | AccelerationStructureFlags::ALLOW_COMPACTION,
+            update_mode: AccelerationStructureUpdateMode::Build,
+        },
+        BlasGeometrySizeDescriptors::Triangles {
+            descriptors: vec![blas_size.clone()],
+        },
+    );
+
+    (blas, blas_size)
+}
+
+fn is_mesh_raytracing_compatible(mesh: &Mesh) -> bool {
+    let triangle_list = mesh.primitive_topology() == PrimitiveTopology::TriangleList;
+    let vertex_attributes = mesh.attributes().map(|(attribute, _)| attribute.id).eq([
+        Mesh::ATTRIBUTE_POSITION.id,
+        Mesh::ATTRIBUTE_NORMAL.id,
+        Mesh::ATTRIBUTE_UV_0.id,
+        Mesh::ATTRIBUTE_TANGENT.id,
+    ]);
+    let indexed_32 = matches!(mesh.indices(), Some(Indices::U32(..)));
+    mesh.enable_raytracing && triangle_list && vertex_attributes && indexed_32
+}
diff --git a/third_party/bevy_solari/src/scene/brdf.wgsl b/third_party/bevy_solari/src/scene/brdf.wgsl
new file mode 100644
index 0000000..67d8c47
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/brdf.wgsl
@@ -0,0 +1,121 @@
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::brdf
+
+#import bevy_core_pipeline::tonemapping::tonemapping_luminance as luminance
+#import bevy_pbr::lighting::{D_GGX, V_SmithGGXCorrelated, specular_multiscatter}
+#import bevy_pbr::pbr_functions::{calculate_diffuse_color, calculate_F0}
+#import bevy_pbr::utils::{rand_f, sample_cosine_hemisphere}
+#import bevy_render::maths::{PI, orthonormalize}
+#import bevy_solari::sampling::{sample_ggx_vndf, ggx_vndf_pdf, ggx_vndf_sample_invalid}
+#import bevy_solari::scene_bindings::{ResolvedMaterial, MIRROR_ROUGHNESS_THRESHOLD, brdf_dfg_lut, brdf_dfg_lut_sampler}
+
+struct EvaluateAndSampleBrdfResult {
+    wi: vec3<f32>,
+    throughput: vec3<f32>,
+    pdf: f32,
+}
+
+fn evaluate_and_sample_brdf(
+    wo: vec3<f32>,
+    world_normal: vec3<f32>,
+    material: ResolvedMaterial,
+    rng: ptr<function, u32>,
+) -> EvaluateAndSampleBrdfResult {
+    let NdotV = dot(world_normal, wo);
+    if NdotV < 0.0001 { return EvaluateAndSampleBrdfResult(vec3(0.0), vec3(0.0), 0.0); }
+    let F0 = calculate_F0(material.base_color, material.metallic, vec3(material.reflectance));
+    let df = 1.0 - luminance(fresnel(F0, NdotV));
+
+    let diffuse_weight = mix(df, 0.0, material.metallic);
+    let specular_weight = 1.0 - diffuse_weight;
+
+    let TBN = orthonormalize(world_normal);
+    let T = TBN[0];
+    let B = TBN[1];
+    let N = TBN[2];
+
+    let wo_tangent = vec3(dot(wo, T), dot(wo, B), dot(wo, N));
+
+    var wi: vec3<f32>;
+    var wi_tangent: vec3<f32>;
+    let diffuse_selected = rand_f(rng) < diffuse_weight;
+    if diffuse_selected {
+        wi = sample_cosine_hemisphere(world_normal, rng);
+        wi_tangent = vec3(dot(wi, T), dot(wi, B), dot(wi, N));
+    } else {
+        wi_tangent = sample_ggx_vndf(wo_tangent, material.roughness, rng);
+        if ggx_vndf_sample_invalid(wi_tangent) {
+            return EvaluateAndSampleBrdfResult(vec3(0.0), vec3(0.0), 0.0);
+        }
+        wi = wi_tangent.x * T + wi_tangent.y * B + wi_tangent.z * N;
+    }
+
+    let diffuse_pdf = wi_tangent.z / PI;
+    let specular_pdf = ggx_vndf_pdf(wo_tangent, wi_tangent, material.roughness);
+    let pdf = (diffuse_weight * diffuse_pdf) + (specular_weight * specular_pdf);
+
+    var throughput = evaluate_brdf(wo, wi, world_normal, material);
+    if diffuse_selected || material.roughness > MIRROR_ROUGHNESS_THRESHOLD {
+        throughput /= pdf;
+    } else {
+        throughput /= specular_weight;
+    }
+
+    return EvaluateAndSampleBrdfResult(wi, throughput, pdf);
+}
+
+fn evaluate_brdf(
+    wo: vec3<f32>,
+    wi: vec3<f32>,
+    world_normal: vec3<f32>,
+    material: ResolvedMaterial,
+) -> vec3<f32> {
+    return evaluate_diffuse_brdf(wo, wi, world_normal, material) + evaluate_specular_brdf(wo, wi, world_normal, material);
+}
+
+fn evaluate_diffuse_brdf(wo: vec3<f32>, wi: vec3<f32>, world_normal: vec3<f32>, material: ResolvedMaterial) -> vec3<f32> {
+    let diffuse_color = calculate_diffuse_color(material.base_color, material.metallic, 0.0, 0.0) / PI;
+
+    let NdotL = dot(world_normal, wi);
+    let NdotV = dot(world_normal, wo);
+    if NdotL < 0.0001 || NdotV < 0.0001 { return vec3(0.0); }
+    let F0 = calculate_F0(material.base_color, material.metallic, vec3(material.reflectance));
+    let layering = (1.0 - fresnel(F0, NdotL)) * (1.0 - fresnel(F0, NdotV));
+
+    return diffuse_color * layering * NdotL;
+}
+
+fn evaluate_specular_brdf(wo: vec3<f32>, wi: vec3<f32>, world_normal: vec3<f32>, material: ResolvedMaterial) -> vec3<f32> {
+    let H = normalize(wi + wo);
+    let NdotL = dot(world_normal, wi);
+    let NdotH = dot(world_normal, H);
+    let LdotH = dot(wi, H);
+    let NdotV = dot(world_normal, wo);
+    if NdotL < 0.0001 || NdotH < 0.0001 || LdotH < 0.0001 || NdotV < 0.0001 { return vec3(0.0); }
+
+    let F0 = calculate_F0(material.base_color, material.metallic, vec3(material.reflectance));
+    let F = fresnel(F0, LdotH);
+
+    if material.roughness <= MIRROR_ROUGHNESS_THRESHOLD {
+        if abs(NdotH - 1.0) < 0.0001 {
+            return F;
+        } else {
+            return vec3(0.0);
+        }
+    }
+
+    let D = D_GGX(material.roughness, NdotH);
+    let Vs = V_SmithGGXCorrelated(material.roughness, NdotV, NdotL);
+    let F_ab = F_AB(material.perceptual_roughness, NdotV);
+    return specular_multiscatter(D, Vs, F, F0, F_ab, 1.0) * NdotL;
+}
+
+fn fresnel(f0: vec3<f32>, LdotH: f32) -> vec3<f32> {
+    return f0 + (1.0 - f0) * pow(1.0 - LdotH, 5.0);
+}
+
+// Scale/bias approximation
+fn F_AB(perceptual_roughness: f32, NdotV: f32) -> vec2<f32> {
+    return textureSampleLevel(brdf_dfg_lut, brdf_dfg_lut_sampler, vec2<f32>(NdotV, perceptual_roughness), 0.0).rg;
+}
diff --git a/third_party/bevy_solari/src/scene/extract.rs b/third_party/bevy_solari/src/scene/extract.rs
new file mode 100644
index 0000000..978e3e8
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/extract.rs
@@ -0,0 +1,88 @@
+use super::RaytracingMesh3d;
+use bevy_asset::{AssetId, Assets};
+use bevy_derive::Deref;
+use bevy_ecs::{
+    component::Component,
+    resource::Resource,
+    system::{Commands, Query},
+};
+use bevy_pbr::{MeshMaterial3d, PreviousGlobalTransform, StandardMaterial};
+use bevy_platform::collections::HashMap;
+use bevy_render::{Extract, extract_resource::ExtractResource, sync_world::RenderEntity};
+use bevy_transform::components::GlobalTransform;
+use blacksite_surface::SurfaceMaterial;
+
+pub fn extract_raytracing_scene(
+    instances: Extract<
+        Query<(
+            RenderEntity,
+            &RaytracingMesh3d,
+            Option<&MeshMaterial3d<StandardMaterial>>,
+            Option<&MeshMaterial3d<SurfaceMaterial>>,
+            &GlobalTransform,
+            Option<&PreviousGlobalTransform>,
+        )>,
+    >,
+    mut commands: Commands,
+) {
+    for (render_entity, mesh, standard, surface, transform, previous_frame_transform) in &instances
+    {
+        let material = if let Some(surface) = surface {
+            RaytracingMaterial3d::Surface(surface.0.clone())
+        } else if let Some(standard) = standard {
+            RaytracingMaterial3d::Standard(standard.0.clone())
+        } else {
+            continue;
+        };
+        let mut commands = commands.entity(render_entity);
+
+        match previous_frame_transform.cloned() {
+            Some(previous_frame_transform) => commands.insert((
+                mesh.clone(),
+                material.clone(),
+                *transform,
+                previous_frame_transform,
+            )),
+            None => commands.insert((mesh.clone(), material.clone(), *transform)),
+        };
+    }
+}
+
+/// Render-world material identity selected during extraction.
+#[derive(Component, Clone, Debug)]
+pub enum RaytracingMaterial3d {
+    Standard(bevy_asset::Handle<StandardMaterial>),
+    Surface(bevy_asset::Handle<SurfaceMaterial>),
+}
+
+#[derive(Resource, Deref, Default)]
+pub struct StandardMaterialAssets(HashMap<AssetId<StandardMaterial>, StandardMaterial>);
+
+impl ExtractResource for StandardMaterialAssets {
+    type Source = Assets<StandardMaterial>;
+
+    fn extract_resource(source: &Self::Source) -> Self {
+        Self(
+            source
+                .iter()
+                .map(|(asset_id, material)| (asset_id, material.clone()))
+                .collect(),
+        )
+    }
+}
+
+#[derive(Resource, Deref, Default)]
+pub struct SurfaceMaterialAssets(HashMap<AssetId<SurfaceMaterial>, SurfaceMaterial>);
+
+impl ExtractResource for SurfaceMaterialAssets {
+    type Source = Assets<SurfaceMaterial>;
+
+    fn extract_resource(source: &Self::Source) -> Self {
+        Self(
+            source
+                .iter()
+                .map(|(asset_id, material)| (asset_id, material.clone()))
+                .collect(),
+        )
+    }
+}
diff --git a/third_party/bevy_solari/src/scene/mod.rs b/third_party/bevy_solari/src/scene/mod.rs
new file mode 100644
index 0000000..184dbbe
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/mod.rs
@@ -0,0 +1,249 @@
+mod binder;
+mod blas;
+mod extract;
+mod types;
+
+use bevy_asset::{Assets, Handle};
+use bevy_ecs::{
+    resource::Resource,
+    system::{Res, ResMut},
+};
+use bevy_shader::{Shader, load_shader_library};
+pub use binder::RaytracingSceneBindings;
+use blacksite_surface::SurfaceEvaluatorRegistry;
+pub use types::RaytracingMesh3d;
+
+use crate::SolariPlugins;
+use bevy_app::{App, Plugin, PostUpdate};
+use bevy_ecs::schedule::IntoScheduleConfigs;
+use bevy_render::{
+    ExtractSchedule, GpuResourceAppExt, Render, RenderApp, RenderSystems,
+    extract_resource::ExtractResourcePlugin,
+    mesh::{
+        RenderMesh,
+        allocator::{MeshAllocatorSettings, allocate_and_free_meshes},
+    },
+    render_asset::prepare_assets,
+    render_resource::BufferUsages,
+    renderer::RenderDevice,
+};
+use binder::prepare_raytracing_scene_bindings;
+use blas::{BlasManager, compact_raytracing_blas, prepare_raytracing_blas};
+use extract::{StandardMaterialAssets, SurfaceMaterialAssets, extract_raytracing_scene};
+use tracing::warn;
+
+const EVALUATOR_LIBRARY_MARKER: &str = "// BLACKSITE_SURFACE_EVALUATOR_LIBRARY";
+const EVALUATOR_DISPATCH_MARKER: &str = "// BLACKSITE_SURFACE_EVALUATOR_DISPATCH";
+
+#[derive(Resource)]
+struct SceneShaderLibraryHandle(Handle<Shader>);
+
+#[derive(Resource, Default)]
+struct SceneShaderEvaluatorRevisions(Vec<(u32, u64)>);
+
+/// Creates acceleration structures and binding arrays of resources for raytracing.
+pub struct RaytracingScenePlugin;
+
+impl Plugin for RaytracingScenePlugin {
+    fn build(&self, app: &mut App) {
+        load_shader_library!(app, "brdf.wgsl");
+        bevy_asset::embedded_asset!(app, "raytracing_scene_bindings.wgsl");
+        let scene_shader: Handle<Shader> =
+            bevy_asset::load_embedded_asset!(app, "raytracing_scene_bindings.wgsl");
+        app.insert_resource(SceneShaderLibraryHandle(scene_shader));
+        app.init_resource::<SceneShaderEvaluatorRevisions>()
+            .add_systems(PostUpdate, sync_surface_evaluator_library);
+        load_shader_library!(app, "sampling.wgsl");
+    }
+
+    fn finish(&self, app: &mut App) {
+        let render_app = app.sub_app_mut(RenderApp);
+        let render_device = render_app.world().resource::<RenderDevice>();
+        let features = render_device.features();
+        if !features.contains(SolariPlugins::required_wgpu_features()) {
+            warn!(
+                "RaytracingScenePlugin not loaded. GPU lacks support for required features: {:?}.",
+                SolariPlugins::required_wgpu_features().difference(features)
+            );
+            return;
+        }
+
+        app.add_plugins((
+            ExtractResourcePlugin::<StandardMaterialAssets>::default(),
+            ExtractResourcePlugin::<SurfaceMaterialAssets>::default(),
+            ExtractResourcePlugin::<SurfaceEvaluatorRegistry>::default(),
+        ));
+
+        let render_app = app.sub_app_mut(RenderApp);
+
+        render_app
+            .world_mut()
+            .resource_mut::<MeshAllocatorSettings>()
+            .extra_buffer_usages |= BufferUsages::BLAS_INPUT | BufferUsages::STORAGE;
+
+        render_app
+            .init_gpu_resource::<BlasManager>()
+            .init_gpu_resource::<StandardMaterialAssets>()
+            .init_gpu_resource::<SurfaceMaterialAssets>()
+            .init_gpu_resource::<SurfaceEvaluatorRegistry>()
+            .insert_resource(RaytracingSceneBindings::new())
+            .add_systems(ExtractSchedule, extract_raytracing_scene)
+            .add_systems(
+                Render,
+                (
+                    prepare_raytracing_blas
+                        .in_set(RenderSystems::PrepareAssets)
+                        .before(prepare_assets::<RenderMesh>)
+                        .after(allocate_and_free_meshes),
+                    compact_raytracing_blas
+                        .in_set(RenderSystems::PrepareAssets)
+                        .after(prepare_raytracing_blas),
+                    prepare_raytracing_scene_bindings.in_set(RenderSystems::PrepareBindGroups),
+                ),
+            );
+    }
+}
+
+fn sync_surface_evaluator_library(
+    registry: Res<SurfaceEvaluatorRegistry>,
+    handle: Res<SceneShaderLibraryHandle>,
+    mut revisions: ResMut<SceneShaderEvaluatorRevisions>,
+    mut shaders: ResMut<Assets<Shader>>,
+) {
+    let mut next_revisions = registry
+        .evaluators
+        .values()
+        .map(|record| (record.shader_id, record.revision))
+        .collect::<Vec<_>>();
+    next_revisions.sort_unstable();
+    if revisions.0 == next_revisions {
+        return;
+    }
+
+    let source =
+        generate_scene_shader_source(include_str!("raytracing_scene_bindings.wgsl"), &registry);
+    let shader = Shader::from_wgsl(source, "generated://bevy_solari/scene_bindings.wgsl");
+    if let Err(error) = shaders.insert(handle.0.id(), shader) {
+        warn!("Solari kept the last-good Surface evaluator library: {error}");
+        return;
+    }
+    revisions.0 = next_revisions;
+}
+
+fn generate_scene_shader_source(template: &str, registry: &SurfaceEvaluatorRegistry) -> String {
+    let mut records = registry.evaluators.values().collect::<Vec<_>>();
+    records.sort_unstable_by_key(|record| record.shader_id);
+
+    let mut library = String::new();
+    let mut dispatch = String::new();
+    for record in records {
+        let names = wgsl_declaration_names(&record.evaluator_source);
+        if !names.iter().any(|name| name == "evaluate") {
+            continue;
+        }
+        let prefix = format!("blacksite_{}_", record.shader_id);
+        let renamed = rename_wgsl_identifiers(&record.evaluator_source, &names, &prefix);
+        library.push_str(&renamed);
+        library.push('\n');
+        dispatch.push_str(&format!(
+            "    if shader_id == {}u {{ return {}evaluate(input, params, samples); }}\n",
+            record.shader_id, prefix
+        ));
+    }
+
+    template
+        .replace(EVALUATOR_LIBRARY_MARKER, &library)
+        .replace(EVALUATOR_DISPATCH_MARKER, &dispatch)
+}
+
+fn wgsl_declaration_names(source: &str) -> Vec<String> {
+    let bytes = source.as_bytes();
+    let mut names = Vec::new();
+    let mut index = 0;
+    while index < bytes.len() {
+        if !is_ident_start(bytes[index]) {
+            index += 1;
+            continue;
+        }
+        let token_start = index;
+        index += 1;
+        while index < bytes.len() && is_ident_continue(bytes[index]) {
+            index += 1;
+        }
+        if !matches!(
+            &source[token_start..index],
+            "fn" | "struct" | "alias" | "const" | "override"
+        ) {
+            continue;
+        }
+        while index < bytes.len() && bytes[index].is_ascii_whitespace() {
+            index += 1;
+        }
+        if index >= bytes.len() || !is_ident_start(bytes[index]) {
+            continue;
+        }
+        let name_start = index;
+        index += 1;
+        while index < bytes.len() && is_ident_continue(bytes[index]) {
+            index += 1;
+        }
+        let name = source[name_start..index].to_string();
+        if !names.contains(&name) {
+            names.push(name);
+        }
+    }
+    names
+}
+
+fn rename_wgsl_identifiers(source: &str, names: &[String], prefix: &str) -> String {
+    let bytes = source.as_bytes();
+    let mut result = String::with_capacity(source.len() + names.len() * prefix.len());
+    let mut index = 0;
+    while index < bytes.len() {
+        if !is_ident_start(bytes[index]) {
+            let character = source[index..]
+                .chars()
+                .next()
+                .expect("index is inside the source string");
+            result.push(character);
+            index += character.len_utf8();
+            continue;
+        }
+        let start = index;
+        index += 1;
+        while index < bytes.len() && is_ident_continue(bytes[index]) {
+            index += 1;
+        }
+        let token = &source[start..index];
+        if names.iter().any(|name| name == token) {
+            result.push_str(prefix);
+        }
+        result.push_str(token);
+    }
+    result
+}
+
+const fn is_ident_start(byte: u8) -> bool {
+    byte == b'_' || byte.is_ascii_alphabetic()
+}
+
+const fn is_ident_continue(byte: u8) -> bool {
+    is_ident_start(byte) || byte.is_ascii_digit()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn evaluator_generation_namespaces_helpers() {
+        let evaluator = "const SCALE: f32 = 1.0; fn helper(v: f32) -> f32 { return v * SCALE; } fn evaluate(input: SurfaceInput, params: SurfaceParams, samples: SurfaceSamples) -> Surface { var s = surface_default(); s.metallic = helper(1.0); return s; }";
+        let names = wgsl_declaration_names(evaluator);
+        let generated = rename_wgsl_identifiers(evaluator, &names, "blacksite_42_");
+        assert!(generated.contains("const blacksite_42_SCALE"));
+        assert!(generated.contains("v * blacksite_42_SCALE"));
+        assert!(generated.contains("fn blacksite_42_helper"));
+        assert!(generated.contains("blacksite_42_helper(1.0)"));
+        assert!(generated.contains("fn blacksite_42_evaluate"));
+    }
+}
diff --git a/third_party/bevy_solari/src/scene/raytracing_scene_bindings.wgsl b/third_party/bevy_solari/src/scene/raytracing_scene_bindings.wgsl
new file mode 100644
index 0000000..e707513
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/raytracing_scene_bindings.wgsl
@@ -0,0 +1,396 @@
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::scene_bindings
+
+#import bevy_pbr::lighting::perceptualRoughnessToRoughness
+#import bevy_pbr::pbr_functions::calculate_tbn_mikktspace
+
+struct InstanceGeometryIds {
+    vertex_buffer_id: u32,
+    vertex_buffer_offset: u32,
+    index_buffer_id: u32,
+    index_buffer_offset: u32,
+    triangle_count: u32,
+}
+
+struct VertexBuffer { vertices: array<PackedVertex> }
+
+struct IndexBuffer { indices: array<u32> }
+
+struct PackedVertex {
+    a: vec4<f32>,
+    b: vec4<f32>,
+    tangent: vec4<f32>,
+}
+
+struct Vertex {
+    position: vec3<f32>,
+    normal: vec3<f32>,
+    uv: vec2<f32>,
+    tangent: vec4<f32>,
+}
+
+fn unpack_vertex(packed: PackedVertex) -> Vertex {
+    var vertex: Vertex;
+    vertex.position = packed.a.xyz;
+    vertex.normal = vec3(packed.a.w, packed.b.xy);
+    vertex.uv = packed.b.zw;
+    vertex.tangent = packed.tangent;
+    return vertex;
+}
+
+struct SurfaceUniform {
+    shader_id: u32,
+    flags: u32,
+    alpha_cutoff: f32,
+    abi_version: u32,
+    params: array<vec4<f32>, 16>,
+    uv_transforms: array<vec4<f32>, 8>,
+}
+
+struct Material {
+    texture_ids: vec4<u32>,
+    surface_texture_ids_0: vec4<u32>,
+    surface_texture_ids_1: vec4<u32>,
+    material_info: vec4<u32>,
+    base_color: vec4<f32>,
+    emissive_roughness: vec4<f32>,
+    pbr: vec4<f32>,
+    surface_uniform: SurfaceUniform,
+}
+
+const TEXTURE_MAP_NONE = 0xFFFFFFFFu;
+const MATERIAL_FLAG_ALPHA_CUTOUT = 1u << 0u;
+const MATERIAL_FLAG_SURFACE = 1u << 1u;
+const BLACKSITE_SURFACE_UNLIT = 1u;
+
+const MIRROR_ROUGHNESS_THRESHOLD = 0.001f;
+
+struct LightSource {
+    kind: u32, // 1 bit for kind, 31 bits for extra data
+    id: u32,
+}
+
+const LIGHT_SOURCE_KIND_EMISSIVE_MESH = 0u;
+const LIGHT_SOURCE_KIND_DIRECTIONAL = 1u;
+
+struct DirectionalLight {
+    direction_to_light: vec3<f32>,
+    cos_theta_max: f32,
+    luminance: vec3<f32>,
+    inverse_pdf: f32,
+}
+
+const LIGHT_NOT_PRESENT_THIS_FRAME = 0xFFFFFFFFu;
+
+@group(0) @binding(0) var<storage> vertex_buffers: binding_array<VertexBuffer>;
+@group(0) @binding(1) var<storage> index_buffers: binding_array<IndexBuffer>;
+@group(0) @binding(2) var textures: binding_array<texture_2d<f32>>;
+@group(0) @binding(3) var samplers: binding_array<sampler>;
+@group(0) @binding(4) var<storage> materials: array<Material>;
+@group(0) @binding(5) var tlas: acceleration_structure;
+@group(0) @binding(6) var<storage> transforms: array<mat4x4<f32>>; // TODO: Use mat3x4<f32>?
+@group(0) @binding(7) var<storage> previous_frame_transforms: array<mat4x4<f32>>; // TODO: Use mat3x4<f32>?
+@group(0) @binding(8) var<storage> geometry_ids: array<InstanceGeometryIds>;
+@group(0) @binding(9) var<storage> material_ids: array<u32>; // TODO: Store material_id in instance_custom_index instead?
+@group(0) @binding(10) var<storage> light_sources: array<LightSource>;
+@group(0) @binding(11) var<storage> directional_lights: array<DirectionalLight>;
+@group(0) @binding(12) var<storage> previous_frame_light_id_translations: array<u32>;
+@group(0) @binding(13) var brdf_dfg_lut: texture_2d<f32>;
+@group(0) @binding(14) var brdf_dfg_lut_sampler: sampler;
+
+const RAY_T_MIN = 0.001f;
+const RAY_T_MAX = 100000.0f;
+
+const RAY_NO_CULL = 0xFFu;
+
+fn trace_ray(ray_origin: vec3<f32>, ray_direction: vec3<f32>, ray_t_min: f32, ray_t_max: f32, ray_flag: u32) -> RayIntersection {
+    let ray = RayDesc(ray_flag, RAY_NO_CULL, ray_t_min, ray_t_max, ray_origin, ray_direction);
+    var rq: ray_query;
+    rayQueryInitialize(&rq, tlas, ray);
+    while (rayQueryProceed(&rq)) {
+        let candidate = rayQueryGetCandidateIntersection(&rq);
+        if candidate.kind == RAY_QUERY_INTERSECTION_TRIANGLE && candidate_passes_alpha(candidate) {
+            rayQueryConfirmIntersection(&rq);
+        }
+    }
+    return rayQueryGetCommittedIntersection(&rq);
+}
+
+fn sample_texture(id: u32, uv: vec2<f32>) -> vec4<f32> {
+    return textureSampleLevel(textures[id], samplers[id], uv, 0.0); // TODO: Mipmap
+}
+
+struct SurfaceInput {
+    uv0: vec2<f32>,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+}
+
+struct SurfaceParams {
+    lanes: array<vec4<f32>, 16>,
+}
+
+struct SurfaceSamples {
+    values: array<vec4<f32>, 8>,
+}
+
+struct Surface {
+    base_color: vec4<f32>,
+    normal_ts: vec3<f32>,
+    emissive: vec3<f32>,
+    metallic: f32,
+    perceptual_roughness: f32,
+    reflectance: f32,
+    occlusion: f32,
+    model: u32,
+}
+
+fn surface_default() -> Surface {
+    var surface: Surface;
+    surface.base_color = vec4<f32>(1.0);
+    surface.normal_ts = vec3<f32>(0.0, 0.0, 1.0);
+    surface.emissive = vec3<f32>(0.0);
+    surface.metallic = 0.0;
+    surface.perceptual_roughness = 0.5;
+    surface.reflectance = 0.5;
+    surface.occlusion = 1.0;
+    surface.model = 0u;
+    return surface;
+}
+
+fn surface_texture_id(material: Material, index: u32) -> u32 {
+    if index < 4u {
+        return material.surface_texture_ids_0[index];
+    }
+    return material.surface_texture_ids_1[index - 4u];
+}
+
+fn surface_samples(material: Material, uv: vec2<f32>) -> SurfaceSamples {
+    var samples: SurfaceSamples;
+    for (var index = 0u; index < 8u; index += 1u) {
+        let transform = material.surface_uniform.uv_transforms[index];
+        let transformed_uv = uv * transform.xy + transform.zw;
+        let texture_id = surface_texture_id(material, index);
+        samples.values[index] = vec4<f32>(1.0);
+        if texture_id != TEXTURE_MAP_NONE {
+            samples.values[index] = sample_texture(texture_id, transformed_uv);
+        }
+    }
+    return samples;
+}
+
+// BLACKSITE_SURFACE_EVALUATOR_LIBRARY
+
+fn evaluate_surface(
+    shader_id: u32,
+    input: SurfaceInput,
+    params: SurfaceParams,
+    samples: SurfaceSamples,
+) -> Surface {
+// BLACKSITE_SURFACE_EVALUATOR_DISPATCH
+    return surface_default();
+}
+
+struct ResolvedMaterial {
+    base_color: vec3<f32>,
+    emissive: vec3<f32>,
+    reflectance: f32,
+    perceptual_roughness: f32,
+    roughness: f32,
+    metallic: f32,
+}
+
+struct ResolvedSurface {
+    material: ResolvedMaterial,
+    normal_ts: vec3<f32>,
+    alpha: f32,
+}
+
+struct ResolvedRayHitFull {
+    world_position: vec3<f32>,
+    previous_frame_world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+    geometric_world_normal: vec3<f32>,
+    world_tangent: vec4<f32>,
+    uv: vec2<f32>,
+    triangle_area: f32,
+    triangle_count: u32,
+    material: ResolvedMaterial,
+}
+
+fn resolve_standard_surface(material: Material, uv: vec2<f32>) -> ResolvedSurface {
+    var m: ResolvedMaterial;
+
+    var base_color = material.base_color;
+    if material.texture_ids.y != TEXTURE_MAP_NONE {
+        base_color *= sample_texture(material.texture_ids.y, uv);
+    }
+    m.base_color = base_color.rgb;
+
+    m.emissive = material.emissive_roughness.rgb;
+    if material.texture_ids.z != TEXTURE_MAP_NONE {
+        m.emissive *= sample_texture(material.texture_ids.z, uv).rgb;
+    }
+
+    m.reflectance = material.pbr.y;
+
+    m.perceptual_roughness = material.emissive_roughness.w;
+    m.metallic = material.pbr.x;
+    if material.texture_ids.w != TEXTURE_MAP_NONE {
+        let metallic_roughness = sample_texture(material.texture_ids.w, uv).rgb;
+        m.perceptual_roughness *= metallic_roughness.g;
+        m.metallic *= metallic_roughness.b;
+    }
+
+    m.roughness = m.perceptual_roughness * m.perceptual_roughness;
+
+    return ResolvedSurface(m, vec3<f32>(0.0, 0.0, 1.0), base_color.a);
+}
+
+fn resolve_surface(
+    material: Material,
+    uv: vec2<f32>,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+) -> ResolvedSurface {
+    if (material.material_info.x & MATERIAL_FLAG_SURFACE) == 0u {
+        return resolve_standard_surface(material, uv);
+    }
+
+    let input = SurfaceInput(uv, world_position, world_normal);
+    let params = SurfaceParams(material.surface_uniform.params);
+    let surface = evaluate_surface(
+        material.surface_uniform.shader_id,
+        input,
+        params,
+        surface_samples(material, uv),
+    );
+    var m: ResolvedMaterial;
+    m.base_color = surface.base_color.rgb * clamp(surface.occlusion, 0.0, 1.0);
+    m.emissive = surface.emissive;
+    m.reflectance = clamp(surface.reflectance, 0.0, 1.0);
+    m.perceptual_roughness = clamp(surface.perceptual_roughness, 0.001, 1.0);
+    m.roughness = m.perceptual_roughness * m.perceptual_roughness;
+    m.metallic = clamp(surface.metallic, 0.0, 1.0);
+    if surface.model == BLACKSITE_SURFACE_UNLIT {
+        m.emissive += surface.base_color.rgb;
+        m.base_color = vec3<f32>(0.0);
+        m.metallic = 0.0;
+        m.perceptual_roughness = 1.0;
+        m.roughness = 1.0;
+    }
+    return ResolvedSurface(m, surface.normal_ts, surface.base_color.a);
+}
+
+fn resolve_ray_hit_full(ray_hit: RayIntersection) -> ResolvedRayHitFull {
+    let barycentrics = vec3(1.0 - ray_hit.barycentrics.x - ray_hit.barycentrics.y, ray_hit.barycentrics);
+    return resolve_triangle_data_full(ray_hit.instance_index, ray_hit.primitive_index, barycentrics);
+}
+
+fn load_vertices(instance_geometry_ids: InstanceGeometryIds, triangle_id: u32) -> array<Vertex, 3> {
+    let index_buffer = &index_buffers[instance_geometry_ids.index_buffer_id].indices;
+    let vertex_buffer = &vertex_buffers[instance_geometry_ids.vertex_buffer_id].vertices;
+
+    let indices_i = (triangle_id * 3u) + vec3(0u, 1u, 2u) + instance_geometry_ids.index_buffer_offset;
+    let indices = vec3((*index_buffer)[indices_i.x], (*index_buffer)[indices_i.y], (*index_buffer)[indices_i.z]) + instance_geometry_ids.vertex_buffer_offset;
+
+    return array<Vertex, 3>(
+        unpack_vertex((*vertex_buffer)[indices.x]),
+        unpack_vertex((*vertex_buffer)[indices.y]),
+        unpack_vertex((*vertex_buffer)[indices.z])
+    );
+}
+
+fn transform_positions(transform: mat4x4<f32>, vertices: array<Vertex, 3>) -> array<vec3<f32>, 3> {
+    return array<vec3<f32>, 3>(
+        (transform * vec4(vertices[0].position, 1.0)).xyz,
+        (transform * vec4(vertices[1].position, 1.0)).xyz,
+        (transform * vec4(vertices[2].position, 1.0)).xyz
+    );
+}
+
+fn candidate_passes_alpha(candidate: RayIntersection) -> bool {
+    let material = materials[material_ids[candidate.instance_index]];
+    if (material.material_info.x & MATERIAL_FLAG_ALPHA_CUTOUT) == 0u {
+        return true;
+    }
+
+    let barycentrics = vec3(
+        1.0 - candidate.barycentrics.x - candidate.barycentrics.y,
+        candidate.barycentrics,
+    );
+    let instance_geometry_ids = geometry_ids[candidate.instance_index];
+    let vertices = load_vertices(instance_geometry_ids, candidate.primitive_index);
+    let transform = transforms[candidate.instance_index];
+    let world_vertices = transform_positions(transform, vertices);
+    let world_position = mat3x3(world_vertices[0], world_vertices[1], world_vertices[2]) * barycentrics;
+    let uv = mat3x2(vertices[0].uv, vertices[1].uv, vertices[2].uv) * barycentrics;
+    let local_normal = mat3x3(vertices[0].normal, vertices[1].normal, vertices[2].normal) * barycentrics;
+    let world_normal = normalize(mat3x3(transform[0].xyz, transform[1].xyz, transform[2].xyz) * local_normal);
+    let resolved = resolve_surface(material, uv, world_position, world_normal);
+    let cutoff = select(
+        material.pbr.z,
+        material.surface_uniform.alpha_cutoff,
+        (material.material_info.x & MATERIAL_FLAG_SURFACE) != 0u,
+    );
+    return resolved.alpha >= cutoff;
+}
+
+fn resolve_triangle_data_full(instance_id: u32, triangle_id: u32, barycentrics: vec3<f32>) -> ResolvedRayHitFull {
+    let material_id = material_ids[instance_id];
+    let material = materials[material_id];
+
+    let transform = transforms[instance_id];
+    let previous_frame_transform = previous_frame_transforms[instance_id];
+
+    let instance_geometry_ids = geometry_ids[instance_id];
+    let vertices = load_vertices(instance_geometry_ids, triangle_id);
+
+    let world_vertices = transform_positions(transform, vertices);
+    let world_position = mat3x3(world_vertices[0], world_vertices[1], world_vertices[2]) * barycentrics;
+
+    let previous_frame_world_vertices = transform_positions(previous_frame_transform, vertices);
+    let previous_frame_world_position = mat3x3(previous_frame_world_vertices[0], previous_frame_world_vertices[1], previous_frame_world_vertices[2]) * barycentrics;
+
+    let uv = mat3x2(vertices[0].uv, vertices[1].uv, vertices[2].uv) * barycentrics;
+
+    let local_tangent = mat3x3(vertices[0].tangent.xyz, vertices[1].tangent.xyz, vertices[2].tangent.xyz) * barycentrics;
+    let world_tangent = vec4(
+        normalize(mat3x3(transform[0].xyz, transform[1].xyz, transform[2].xyz) * local_tangent),
+        vertices[0].tangent.w,
+    );
+
+    let local_normal = mat3x3(vertices[0].normal, vertices[1].normal, vertices[2].normal) * barycentrics; // TODO: Use barycentric lerp, ray_hit.object_to_world, cross product geo normal
+    var world_normal = normalize(mat3x3(transform[0].xyz, transform[1].xyz, transform[2].xyz) * local_normal);
+    let geometric_world_normal = world_normal;
+    let resolved_surface = resolve_surface(material, uv, world_position, world_normal);
+    if (material.material_info.x & MATERIAL_FLAG_SURFACE) != 0u {
+        let TBN = calculate_tbn_mikktspace(world_normal, world_tangent);
+        let Nt = normalize(resolved_surface.normal_ts);
+        world_normal = normalize(Nt.x * TBN[0] + Nt.y * TBN[1] + Nt.z * TBN[2]);
+    } else if material.texture_ids.x != TEXTURE_MAP_NONE {
+        let TBN = calculate_tbn_mikktspace(world_normal, world_tangent);
+        let T = TBN[0];
+        let B = TBN[1];
+        let N = TBN[2];
+        let Nt = sample_texture(material.texture_ids.x, uv).xyz;
+        world_normal = normalize(Nt.x * T + Nt.y * B + Nt.z * N);
+    }
+
+    let triangle_edge0 = world_vertices[0] - world_vertices[1];
+    let triangle_edge1 = world_vertices[0] - world_vertices[2];
+    let triangle_area = length(cross(triangle_edge0, triangle_edge1)) / 2.0;
+
+    return ResolvedRayHitFull(
+        world_position,
+        previous_frame_world_position,
+        world_normal,
+        geometric_world_normal,
+        world_tangent,
+        uv,
+        triangle_area,
+        instance_geometry_ids.triangle_count,
+        resolved_surface.material,
+    );
+}
diff --git a/third_party/bevy_solari/src/scene/sampling.wgsl b/third_party/bevy_solari/src/scene/sampling.wgsl
new file mode 100644
index 0000000..4b22150
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/sampling.wgsl
@@ -0,0 +1,251 @@
+enable wgpu_ray_query;
+
+#define_import_path bevy_solari::sampling
+
+#import bevy_pbr::lighting::D_GGX
+#import bevy_pbr::utils::{rand_f, rand_vec2f, rand_u, rand_range_u}
+#import bevy_render::maths::{PI_2, orthonormalize}
+#import bevy_solari::scene_bindings::{trace_ray, RAY_T_MIN, RAY_T_MAX, light_sources, directional_lights, LightSource, LIGHT_SOURCE_KIND_DIRECTIONAL, resolve_triangle_data_full, ResolvedRayHitFull, MIRROR_ROUGHNESS_THRESHOLD}
+
+fn power_heuristic(f: f32, g: f32) -> f32 {
+    return balance_heuristic(f * f, g * g);
+}
+
+fn balance_heuristic(f: f32, g: f32) -> f32 {
+    // Need to guard against NaNs since ReSTIR reservoirs can have UCW=0
+    if f == 0.0 {
+        return 0.0;
+    }
+    return max(0.0, 1.0 / (1.0 + (g / f)));
+}
+
+// https://gpuopen.com/download/Bounded_VNDF_Sampling_for_Smith-GGX_Reflections.pdf (Listing 1)
+// Result is invalid when output.z <= 0.0, and must be discarded
+fn sample_ggx_vndf(wi_tangent: vec3<f32>, roughness: f32, rng: ptr<function, u32>) -> vec3<f32> {
+    // Mirror BRDF case
+    if roughness <= MIRROR_ROUGHNESS_THRESHOLD {
+        return vec3(-wi_tangent.xy, wi_tangent.z);
+    }
+
+    let i = wi_tangent;
+    let rand = rand_vec2f(rng);
+    let i_std = normalize(vec3(i.xy * roughness, i.z));
+    let phi = PI_2 * rand.x;
+    let a = roughness;
+    let s = 1.0 + length(vec2(i.xy));
+    let a2 = a * a;
+    let s2 = s * s;
+    let k = (1.0 - a2) * s2 / (s2 + a2 * i.z * i.z);
+    let b = select(i_std.z, k * i_std.z, i.z > 0.0);
+    let z = fma(1.0 - rand.y, 1.0 + b, -b);
+    let sin_theta = sqrt(saturate(1.0 - z * z));
+    let o_std = vec3(sin_theta * cos(phi), sin_theta * sin(phi), z);
+    let m_std = i_std + o_std;
+    let m = normalize(vec3(m_std.xy * roughness, m_std.z));
+    return 2.0 * dot(i, m) * m - i;
+}
+
+fn ggx_vndf_sample_invalid(ray_tangent: vec3<f32>) -> bool {
+    return !(ray_tangent.z > 0.0);
+}
+
+// https://gpuopen.com/download/Bounded_VNDF_Sampling_for_Smith-GGX_Reflections.pdf (Listing 2)
+fn ggx_vndf_pdf(wi_tangent: vec3<f32>, wo_tangent: vec3<f32>, roughness: f32) -> f32 {
+    // Mirror BRDF case
+    if roughness <= MIRROR_ROUGHNESS_THRESHOLD {
+        let mirror_wo = vec3(-wi_tangent.xy, wi_tangent.z);
+        if all(abs(mirror_wo - wo_tangent) < vec3(0.0001)) {
+            return bitcast<f32>(0x7F800000u); // INF
+        } else {
+            return 0.0;
+        }
+    }
+
+    let i = wi_tangent;
+    let o = wo_tangent;
+    let m = normalize(i + o);
+    let ndf = D_GGX(roughness, saturate(m.z));
+    let ai = roughness * i.xy;
+    let len2 = dot(ai, ai);
+    let t = sqrt(len2 + i.z * i.z);
+    var pdf: f32;
+    if i.z >= 0.0 {
+        let a = roughness;
+        let s = 1.0 + length(i.xy);
+        let a2 = a * a;
+        let s2 = s * s;
+        let k = (1.0 - a2) * s2 / (s2 + a2 * i.z * i.z);
+        pdf = ndf / (2.0 * (k * i.z + t));
+    } else {
+        pdf = ndf * (t - i.z) / (2.0 * len2);
+    }
+
+    return select(pdf, 0.0, isnan(pdf));
+}
+
+fn isnan(x: f32) -> bool {
+    return (bitcast<u32>(x) & 0x7fffffffu) > 0x7f800000u;
+}
+
+const NULL_LIGHT_ID = 0xFFFFFFFFu;
+
+struct LightSample {
+    light_id: u32,
+    seed: u32,
+}
+
+struct ResolvedLightSample {
+    world_position: vec4<f32>,
+    world_normal: vec3<f32>,
+    radiance: vec3<f32>,
+    inverse_pdf: f32,
+}
+
+struct LightContribution {
+    radiance: vec3<f32>,
+    inverse_pdf: f32,
+    wi: vec3<f32>,
+    brdf_rays_can_hit: bool,
+}
+
+struct LightContributionNoPdf {
+    radiance: vec3<f32>,
+    wi: vec3<f32>,
+}
+
+struct GenerateRandomLightSampleResult {
+    light_sample: LightSample,
+    resolved_light_sample: ResolvedLightSample,
+}
+
+fn sample_random_light(ray_origin: vec3<f32>, origin_world_normal: vec3<f32>, rng: ptr<function, u32>) -> LightContribution {
+    let sample = generate_random_light_sample(rng);
+    var light_contribution = calculate_resolved_light_contribution(sample.resolved_light_sample, ray_origin, origin_world_normal);
+    light_contribution.radiance *= trace_light_visibility(ray_origin, sample.resolved_light_sample.world_position);
+    return light_contribution;
+}
+
+fn random_emissive_light_pdf(hit: ResolvedRayHitFull) -> f32 {
+    let light_count = arrayLength(&light_sources);
+    return 1.0 / (f32(light_count) * f32(hit.triangle_count) * hit.triangle_area);
+}
+
+fn generate_random_light_sample(rng: ptr<function, u32>) -> GenerateRandomLightSampleResult {
+    let light_count = arrayLength(&light_sources);
+    let light_id = rand_range_u(light_count, rng);
+
+    let light_source = light_sources[light_id];
+
+    var triangle_id = 0u;
+    if light_source.kind != LIGHT_SOURCE_KIND_DIRECTIONAL {
+        let triangle_count = light_source.kind >> 1u;
+        triangle_id = rand_range_u(triangle_count, rng);
+    }
+
+    let seed = rand_u(rng);
+    let light_sample = LightSample((light_id << 16u) | triangle_id, seed);
+
+    var resolved_light_sample = resolve_light_sample(light_sample, light_source);
+    resolved_light_sample.inverse_pdf *= f32(light_count);
+
+    return GenerateRandomLightSampleResult(light_sample, resolved_light_sample);
+}
+
+fn resolve_light_sample(light_sample: LightSample, light_source: LightSource) -> ResolvedLightSample {
+    if light_source.kind == LIGHT_SOURCE_KIND_DIRECTIONAL {
+        let directional_light = directional_lights[light_source.id];
+
+#ifndef NO_DIRECTIONAL_LIGHT_SOFT_SHADOWS
+        // Sample a random direction within a cone whose base is the sun approximated as a disk
+        // https://www.realtimerendering.com/raytracinggems/unofficial_RayTracingGems_v1.9.pdf#0004286901.INDD%3ASec30%3A305
+        var rng = light_sample.seed;
+        let random = rand_vec2f(&rng);
+        let cos_theta = (1.0 - random.x) + random.x * directional_light.cos_theta_max;
+        let sin_theta = sqrt(1.0 - cos_theta * cos_theta);
+        let phi = random.y * PI_2;
+        let x = cos(phi) * sin_theta;
+        let y = sin(phi) * sin_theta;
+        var direction_to_light = vec3(x, y, cos_theta);
+
+        // Rotate the ray so that the cone it was sampled from is aligned with the light direction
+        direction_to_light = orthonormalize(directional_light.direction_to_light) * direction_to_light;
+#else
+        let direction_to_light = directional_light.direction_to_light;
+#endif
+
+        return ResolvedLightSample(
+        vec4(direction_to_light, 0.0),
+        -direction_to_light,
+        directional_light.luminance,
+        directional_light.inverse_pdf,
+    );
+} else {
+        let triangle_count = light_source.kind >> 1u;
+        let triangle_id = light_sample.light_id & 0xFFFFu;
+        let barycentrics = triangle_barycentrics(light_sample.seed);
+        let triangle_data = resolve_triangle_data_full(light_source.id, triangle_id, barycentrics);
+
+        return ResolvedLightSample(
+            vec4(triangle_data.world_position, 1.0),
+            triangle_data.world_normal,
+            triangle_data.material.emissive.rgb,
+            f32(triangle_count) * triangle_data.triangle_area,
+        );
+    }
+}
+
+fn calculate_resolved_light_contribution(resolved_light_sample: ResolvedLightSample, ray_origin: vec3<f32>, origin_world_normal: vec3<f32>) -> LightContribution {
+    let ray = resolved_light_sample.world_position.xyz - (resolved_light_sample.world_position.w * ray_origin);
+    let light_distance = length(ray);
+    let wi = ray / light_distance;
+
+    let cos_theta_light = saturate(dot(-wi, resolved_light_sample.world_normal));
+    let light_distance_squared = light_distance * light_distance;
+
+    let radiance = resolved_light_sample.radiance * (cos_theta_light / light_distance_squared);
+
+    return LightContribution(radiance, resolved_light_sample.inverse_pdf, wi, resolved_light_sample.world_position.w == 1.0);
+}
+
+fn resolve_and_calculate_light_contribution(light_sample: LightSample, ray_origin: vec3<f32>, origin_world_normal: vec3<f32>) -> LightContributionNoPdf {
+    let resolved_light_sample = resolve_light_sample(light_sample, light_sources[light_sample.light_id >> 16u]);
+    let light_contribution = calculate_resolved_light_contribution(resolved_light_sample, ray_origin, origin_world_normal);
+    return LightContributionNoPdf(light_contribution.radiance, light_contribution.wi);
+}
+
+fn trace_light_visibility(ray_origin: vec3<f32>, light_sample_world_position: vec4<f32>) -> f32 {
+    var ray_direction = light_sample_world_position.xyz;
+    var ray_t_max = RAY_T_MAX;
+
+    if light_sample_world_position.w == 1.0 {
+        let ray = ray_direction - ray_origin;
+        let dist = length(ray);
+        ray_direction = ray / dist;
+        ray_t_max = dist - RAY_T_MIN;
+    }
+
+    if ray_t_max < RAY_T_MIN { return 0.0; }
+
+    let ray_hit = trace_ray(ray_origin, ray_direction, RAY_T_MIN, ray_t_max, RAY_FLAG_TERMINATE_ON_FIRST_HIT);
+    return f32(ray_hit.kind == RAY_QUERY_INTERSECTION_NONE);
+}
+
+fn trace_point_visibility(ray_origin: vec3<f32>, point: vec3<f32>) -> f32 {
+    let ray = point - ray_origin;
+    let dist = length(ray);
+    let ray_direction = ray / dist;
+
+    let ray_t_max = dist - RAY_T_MIN;
+    if ray_t_max < RAY_T_MIN { return 0.0; }
+
+    let ray_hit = trace_ray(ray_origin, ray_direction, RAY_T_MIN, ray_t_max, RAY_FLAG_TERMINATE_ON_FIRST_HIT);
+    return f32(ray_hit.kind == RAY_QUERY_INTERSECTION_NONE);
+}
+
+// https://www.realtimerendering.com/raytracinggems/unofficial_RayTracingGems_v1.9.pdf#0004286901.INDD%3ASec22%3A297
+fn triangle_barycentrics(seed: u32) -> vec3<f32> {
+    var rng = seed;
+    var barycentrics = rand_vec2f(&rng);
+    if barycentrics.x + barycentrics.y > 1.0 { barycentrics = 1.0 - barycentrics; }
+    return vec3(1.0 - barycentrics.x - barycentrics.y, barycentrics);
+}
diff --git a/third_party/bevy_solari/src/scene/types.rs b/third_party/bevy_solari/src/scene/types.rs
new file mode 100644
index 0000000..860cac4
--- /dev/null
+++ b/third_party/bevy_solari/src/scene/types.rs
@@ -0,0 +1,24 @@
+use bevy_asset::Handle;
+use bevy_derive::{Deref, DerefMut};
+use bevy_ecs::{component::Component, prelude::ReflectComponent, template::FromTemplate};
+use bevy_mesh::Mesh;
+use bevy_reflect::{Reflect, prelude::ReflectDefault};
+use bevy_render::sync_world::SyncToRenderWorld;
+use bevy_transform::components::Transform;
+use derive_more::derive::From;
+
+/// A mesh component used for raytracing.
+///
+/// The mesh used in this component must have [`Mesh::enable_raytracing`] set to true,
+/// use the following set of vertex attributes: `{POSITION, NORMAL, UV_0, TANGENT}`, use [`bevy_mesh::PrimitiveTopology::TriangleList`],
+/// and use [`bevy_mesh::Indices::U32`].
+///
+/// The entity must also have either a standard Bevy material or a Blacksite Surface material.
+/// Unsupported or missing material generations are omitted from the ray-tracing scene instead of
+/// being rendered with an approximate fallback.
+#[derive(
+    Component, FromTemplate, Clone, Debug, Default, Deref, DerefMut, Reflect, PartialEq, Eq, From,
+)]
+#[reflect(Component, Default, Clone, PartialEq)]
+#[require(Transform, SyncToRenderWorld)]
+pub struct RaytracingMesh3d(pub Handle<Mesh>);
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 6f7faa5..1ee0c3a 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -18,6 +18,16 @@ name = "package-project"
 path = "src/package_project.rs"
 required-features = ["validate-levels"]
 
+[[bin]]
+name = "bake-navigation"
+path = "src/bake_navigation.rs"
+required-features = ["validate-levels"]
+
+[[bin]]
+name = "upgrade-project"
+path = "src/upgrade_project.rs"
+required-features = ["validate-levels"]
+
 [dependencies]
 walkdir = "2.5"
 scene = { path = "../crates/scene", optional = true }
diff --git a/xtask/src/bake_navigation.rs b/xtask/src/bake_navigation.rs
new file mode 100644
index 0000000..6324b40
--- /dev/null
+++ b/xtask/src/bake_navigation.rs
@@ -0,0 +1,125 @@
+//! Deterministically bake navigation artifacts from authored scene components.
+
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use scene::document::SceneDocument;
+use scene::navigation::{
+    bake_navigation, navigation_bake_jobs_from_document, write_navigation_artifact,
+};
+use walkdir::WalkDir;
+
+fn main() {
+    if let Err(error) = run() {
+        eprintln!("bake-navigation: {error}");
+        std::process::exit(1);
+    }
+}
+
+fn run() -> Result<(), String> {
+    let mut project_root = PathBuf::from(".");
+    let mut requested_scene = None;
+    let mut check = false;
+    let mut args = std::env::args().skip(1);
+    while let Some(argument) = args.next() {
+        match argument.as_str() {
+            "--project" => {
+                project_root = PathBuf::from(
+                    args.next()
+                        .ok_or_else(|| "--project requires a path".to_string())?,
+                );
+            }
+            "--scene" => {
+                requested_scene =
+                    Some(PathBuf::from(args.next().ok_or_else(|| {
+                        "--scene requires a project-relative path".to_string()
+                    })?));
+            }
+            "--check" => check = true,
+            _ => return Err(format!("unknown argument `{argument}`")),
+        }
+    }
+
+    let project_root = project_root
+        .canonicalize()
+        .map_err(|error| format!("could not resolve project root: {error}"))?;
+    let scenes = match requested_scene {
+        Some(scene) => vec![safe_project_path(&project_root, &scene)?],
+        None => discover_scenes(&project_root)?,
+    };
+
+    let mut artifact_count = 0usize;
+    for scene_path in scenes {
+        let relative_scene = scene_path
+            .strip_prefix(&project_root)
+            .map_err(|_| format!("scene {} escaped the project", scene_path.display()))?
+            .to_string_lossy()
+            .replace('\\', "/");
+        let text = fs::read_to_string(&scene_path)
+            .map_err(|error| format!("could not read {}: {error}", scene_path.display()))?;
+        let document = SceneDocument::from_ron_text(&text)
+            .map_err(|error| format!("{}: {error}", scene_path.display()))?;
+        for job in navigation_bake_jobs_from_document(&document, &relative_scene)? {
+            let artifact = bake_navigation(&job.input)?;
+            let output = safe_artifact_path(&project_root, &job.artifact_path)?;
+            if check {
+                let existing = scene::navigation::read_navigation_artifact(&output)?;
+                if existing.is_stale_for(&job.input) {
+                    return Err(format!(
+                        "{} is stale for {}",
+                        output.display(),
+                        scene_path.display()
+                    ));
+                }
+                println!("current {}", output.display());
+            } else {
+                write_navigation_artifact(&output, &artifact)?;
+                println!("baked {}", output.display());
+            }
+            artifact_count += 1;
+        }
+    }
+    println!("bake-navigation: {artifact_count} artifacts");
+    Ok(())
+}
+
+fn discover_scenes(project_root: &Path) -> Result<Vec<PathBuf>, String> {
+    let levels = project_root.join("assets/levels");
+    if !levels.is_dir() {
+        return Err(format!("missing levels directory {}", levels.display()));
+    }
+    let mut scenes: Vec<PathBuf> = WalkDir::new(&levels)
+        .follow_links(false)
+        .into_iter()
+        .filter_map(Result::ok)
+        .filter(|entry| entry.file_type().is_file())
+        .map(|entry| entry.into_path())
+        .filter(|path| path.to_string_lossy().ends_with(".scn.ron"))
+        .collect();
+    scenes.sort();
+    Ok(scenes)
+}
+
+fn safe_artifact_path(project_root: &Path, authored: &str) -> Result<PathBuf, String> {
+    let normalized = authored.replace('\\', "/");
+    if !normalized.starts_with("assets/navigation/generated/") {
+        return Err(format!(
+            "navigation artifact `{authored}` must be under assets/navigation/generated/"
+        ));
+    }
+    safe_project_path(project_root, Path::new(&normalized))
+}
+
+fn safe_project_path(project_root: &Path, relative: &Path) -> Result<PathBuf, String> {
+    if relative.is_absolute()
+        || relative
+            .components()
+            .any(|component| matches!(component, std::path::Component::ParentDir))
+    {
+        return Err(format!(
+            "project-relative path `{}` is unsafe",
+            relative.display()
+        ));
+    }
+    Ok(project_root.join(relative))
+}
diff --git a/xtask/src/upgrade_project.rs b/xtask/src/upgrade_project.rs
new file mode 100644
index 0000000..0c1e527
--- /dev/null
+++ b/xtask/src/upgrade_project.rs
@@ -0,0 +1,52 @@
+//! Transactional Blacksite project schema/material upgrader.
+
+use std::path::PathBuf;
+
+fn main() {
+    let mut project = PathBuf::from(".");
+    let mut apply = false;
+    let mut json = false;
+    let mut args = std::env::args().skip(1);
+    while let Some(argument) = args.next() {
+        match argument.as_str() {
+            "--project" => {
+                let Some(path) = args.next() else {
+                    eprintln!("upgrade-project: --project requires a path");
+                    std::process::exit(2);
+                };
+                project = PathBuf::from(path);
+            }
+            "--apply" => apply = true,
+            "--dry-run" => apply = false,
+            "--json" => json = true,
+            other => {
+                eprintln!("upgrade-project: unknown argument `{other}`");
+                std::process::exit(2);
+            }
+        }
+    }
+    match scene::upgrade_project(&project, apply) {
+        Ok(report) => {
+            if json {
+                println!("{}", serde_json::to_string_pretty(&report).unwrap());
+            } else {
+                println!(
+                    "upgrade-project: {} changes, applied={}, backup={}",
+                    report.changes.len(),
+                    report.applied,
+                    report.backup_path.as_deref().unwrap_or("none")
+                );
+                for change in report.changes {
+                    println!("  {} [{}]", change.path, change.kind);
+                }
+                for warning in report.warnings {
+                    eprintln!("  warning: {warning}");
+                }
+            }
+        }
+        Err(error) => {
+            eprintln!("upgrade-project failed: {error}");
+            std::process::exit(1);
+        }
+    }
+}