Advance M0 scene and rendering foundations
CI / Format, lint, test, build (push) Waiting to run

This commit is contained in:
Rbanh committed 2026-06-06 03:50:03 -04:00
1 parent 2fa64106c8
commit 2054fa2558
21 files changed
+711 -159

No files matched your search

+5 -5
View File
@@ -7,7 +7,7 @@ use bevy::scene::serde::SceneDeserializer;
use bevy::scene::DynamicScene;
use bevy::scene::DynamicSceneBuilder;
use bevy::window::PrimaryWindow;
use scene::{migrate_scene_text, stamp_schema_version, strip_schema_version, validate_level_text};
use scene::{document::SceneDocument, strip_schema_version, validate_level_text};
use serde::de::DeserializeSeed;
use shared::{
flush_level_object_hydration, infer_actor_kind, strip_hydrated_entity, validate_actor, ActorId,
@@ -495,8 +495,8 @@ fn save_entities(world: &mut World, path: &Path, entities: Vec<Entity>) -> Resul
std::fs::create_dir_all(parent)
.map_err(|err| format!("could not create {}: {err}", parent.display()))?;
}
let stamped = stamp_schema_version(&ron)?;
std::fs::write(path, stamped)
let document = SceneDocument::from_ron_text(&ron)?;
std::fs::write(path, document.to_ron_text()?)
.map_err(|err| format!("could not write {}: {err}", path.display()))?;
finalize_scene_load(world);
@@ -511,8 +511,8 @@ fn load_level(world: &mut World, path: &Path) -> Result<(), String> {
let text = std::fs::read_to_string(path)
.map_err(|err| format!("could not read {}: {err}", path.display()))?;
validate_level_text(&text)?;
let normalized = migrate_scene_text(&text)?;
let bevy_ron = strip_schema_version(&normalized)?;
let document = SceneDocument::from_ron_text(&text)?;
let bevy_ron = strip_schema_version(document.normalized_ron())?;
clear_loaded_scene_roots(world);
clear_level_objects(world);