diff --git a/crates/bevy_rpack/Cargo.toml b/crates/bevy_rpack/Cargo.toml index 59a9a6f..d3500ef 100644 --- a/crates/bevy_rpack/Cargo.toml +++ b/crates/bevy_rpack/Cargo.toml @@ -15,34 +15,36 @@ default = ["bevy"] bevy = ["dep:bevy_app", "dep:bevy_platform", "dep:bevy_math", "dep:bevy_image", "dep:bevy_asset", "dep:bevy_ecs", "dep:bevy_reflect", "dep:bevy_ui", "dep:bevy_derive", "dep:bevy_sprite"] [dependencies] -bevy_math = { version = "0.16", optional = true } -bevy_image = { version = "0.16", optional = true } -bevy_app = { version = "0.16", optional = true } -bevy_asset = { version = "0.16", optional = true } -bevy_ecs = { version = "0.16", optional = true } -bevy_reflect = { version = "0.16", optional = true } -bevy_ui = { version = "0.16", optional = true } -bevy_derive = { version = "0.16", optional = true } -bevy_platform = { version = "0.16", optional = true } -bevy_sprite = { version = "0.16", optional = true } +bevy_math = { version = "0.17.0-rc.2", optional = true } +bevy_image = { version = "0.17.0-rc.2", optional = true } +bevy_app = { version = "0.17.0-rc.2", optional = true } +bevy_asset = { version = "0.17.0-rc.2", optional = true } +bevy_ecs = { version = "0.17.0-rc.2", optional = true } +bevy_reflect = { version = "0.17.0-rc.2", optional = true } +bevy_ui = { version = "0.17.0-rc.2", optional = true } +bevy_derive = { version = "0.17.0-rc.2", optional = true } +bevy_platform = { version = "0.17.0-rc.2", optional = true } +bevy_sprite = { version = "0.17.0-rc.2", optional = true } serde = { version = "1", features = ["derive"] } serde_json = "1" thiserror = "2" [dev-dependencies] -bevy = { version = "0.16", default-features = false, features = [ +bevy = { version = "0.17.0-rc.2", default-features = false, features = [ "bevy_asset", "bevy_core_pipeline", + "bevy_log", "bevy_render", "bevy_sprite", + "bevy_sprite_render", "bevy_state", "bevy_window", "bevy_winit", "bevy_ui", + "bevy_ui_render", "multi_threaded", "png", - "webgl2", -] } + "webgl2"]} [lints.rust] unsafe_code = "forbid" diff --git a/crates/bevy_rpack/examples/simple.rs b/crates/bevy_rpack/examples/simple.rs index 33c5655..393d111 100644 --- a/crates/bevy_rpack/examples/simple.rs +++ b/crates/bevy_rpack/examples/simple.rs @@ -16,12 +16,12 @@ fn main() { } fn setup(mut commands: Commands, asset_server: Res) { - commands.insert_resource(Holder(asset_server.load("tilemap.rpack.json"))); commands.spawn(Camera2d); + commands.insert_resource(Holder(asset_server.load("tilemap.rpack.json"))); } fn atlas_loaded( - mut ev_asset: EventReader>, + mut ev_asset: MessageReader>, atlases: RpackAtlases, mut commands: Commands, ) { @@ -31,10 +31,17 @@ fn atlas_loaded( { return; } - if let Ok(sprite) = atlases.try_make_sprite("agents/spaceAstronauts_005") { - commands.spawn(sprite); - }; - if let Ok(image_node) = atlases.try_make_image_node("agents/spaceShips_006") { - commands.spawn(image_node); + info!("Atlas loaded"); + match atlases.try_make_sprite("agents/spaceAstronauts_005") { + Ok(sprite) => { + commands.spawn((sprite, Transform::from_xyz(0.0, 20.0, 0.0))); + } + Err(e) => error!("Error loading sprite: {}", e), + } + match atlases.try_make_image_node("agents/spaceShips_006") { + Ok(image_node) => { + commands.spawn(image_node); + } + Err(e) => error!("Error loading sprite for image node: {}", e), } }