Update to Bevy 0.19

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_obj"
-version = "0.18.2"
+version = "0.19.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/AmionSky/bevy_obj"
@@ -14,17 +14,17 @@ thiserror = "2.0.0"
 wobj = "0.3.0"
 
 [dependencies.bevy]
-version = "0.18.0"
+version = "0.19.0-rc"
 default-features = false
 features = ["bevy_asset", "bevy_mesh"]
 
 [dev-dependencies.bevy]
-version = "0.18.0"
+version = "0.19.0-rc"
 default-features = true
 
 [features]
 default = ["mesh", "scene"]
 # Support for loading OBJ file as a singular mesh
 mesh = []
 # Support for loading OBJ file as a scene with MTL materials
-scene = ["bevy/bevy_scene", "bevy/bevy_pbr", "bevy/bevy_log"]
+scene = ["bevy/bevy_world_serialization", "bevy/bevy_pbr", "bevy/bevy_log"]

examples/cubes.rs

@@ -29,7 +29,7 @@ fn load_mesh(
 fn load_scene(mut commands: Commands, asset_server: Res<AssetServer>) {
     // Spawn a spinning cube
     commands.spawn((
-        SceneRoot(asset_server.load("cube.obj")),
+        WorldAssetRoot(asset_server.load("cube.obj")),
         Transform::from_xyz(1.7, 0.0, -0.5),
         Spin,
     ));

examples/viewer.rs

@@ -25,7 +25,7 @@ fn spawn_obj(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
     obj_path: Query<&ObjPath, Changed<ObjPath>>,
-    query: Query<Entity, With<SceneRoot>>,
+    query: Query<Entity, With<WorldAssetRoot>>,
 ) {
     if let Ok(path) = obj_path.single()
         && let Some(path) = &path.0
@@ -40,7 +40,7 @@ fn spawn_obj(
 
             // Spawn new OBJ
             let scene = asset_server.load(path.clone());
-            commands.spawn((SceneRoot(scene), Transform::IDENTITY));
+            commands.spawn((WorldAssetRoot(scene), Transform::IDENTITY));
         } else {
             warn!("Not an OBJ file: {:?}", path);
         }

src/scene.rs

@@ -14,7 +14,7 @@ pub struct ObjLoader;
 impl AssetLoader for ObjLoader {
     type Error = ObjError;
     type Settings = ObjSettings;
-    type Asset = Scene;
+    type Asset = WorldAsset;
 
     fn load(
         &self,
@@ -57,7 +57,7 @@ fn resolve_path<'a>(source: &AssetPath<'a>, path: &Path) -> Result<AssetPath<'st
         && let Some(path) = path.to_str()
         && let Some(parent) = source.parent()
     {
-        Ok(parent.resolve(path)?)
+        Ok(parent.resolve_str(path)?)
     } else {
         Ok(path.to_path_buf().into())
     }
@@ -200,7 +200,7 @@ async fn load_obj_as_scene<'a>(
     bytes: &'a [u8],
     ctx: &'a mut LoadContext<'_>,
     settings: &'a ObjSettings,
-) -> Result<Scene, ObjError> {
+) -> Result<WorldAsset, ObjError> {
     let obj = wobj::Obj::parse(bytes).map_err(ObjError::ObjParseError)?;
 
     let mut materials = HashSet::new();
@@ -234,7 +234,7 @@ async fn load_obj_as_scene<'a>(
         world.spawn(entity);
     }
 
-    Ok(Scene::new(world))
+    Ok(WorldAsset::new(world))
 }
 
 #[cfg(test)]