mirror of https://github.com/Leinnan/rpack.git
0.17 support
This commit is contained in:
parent
bc20f9b8b9
commit
090de0bb1a
|
|
@ -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"]
|
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]
|
[dependencies]
|
||||||
bevy_math = { version = "0.16", optional = true }
|
bevy_math = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_image = { version = "0.16", optional = true }
|
bevy_image = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_app = { version = "0.16", optional = true }
|
bevy_app = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_asset = { version = "0.16", optional = true }
|
bevy_asset = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_ecs = { version = "0.16", optional = true }
|
bevy_ecs = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_reflect = { version = "0.16", optional = true }
|
bevy_reflect = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_ui = { version = "0.16", optional = true }
|
bevy_ui = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_derive = { version = "0.16", optional = true }
|
bevy_derive = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_platform = { version = "0.16", optional = true }
|
bevy_platform = { version = "0.17.0-rc.2", optional = true }
|
||||||
bevy_sprite = { version = "0.16", optional = true }
|
bevy_sprite = { version = "0.17.0-rc.2", optional = true }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
thiserror = "2"
|
thiserror = "2"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
bevy = { version = "0.16", default-features = false, features = [
|
bevy = { version = "0.17.0-rc.2", default-features = false, features = [
|
||||||
"bevy_asset",
|
"bevy_asset",
|
||||||
"bevy_core_pipeline",
|
"bevy_core_pipeline",
|
||||||
|
"bevy_log",
|
||||||
"bevy_render",
|
"bevy_render",
|
||||||
"bevy_sprite",
|
"bevy_sprite",
|
||||||
|
"bevy_sprite_render",
|
||||||
"bevy_state",
|
"bevy_state",
|
||||||
"bevy_window",
|
"bevy_window",
|
||||||
"bevy_winit",
|
"bevy_winit",
|
||||||
"bevy_ui",
|
"bevy_ui",
|
||||||
|
"bevy_ui_render",
|
||||||
"multi_threaded",
|
"multi_threaded",
|
||||||
"png",
|
"png",
|
||||||
"webgl2",
|
"webgl2"]}
|
||||||
] }
|
|
||||||
|
|
||||||
[lints.rust]
|
[lints.rust]
|
||||||
unsafe_code = "forbid"
|
unsafe_code = "forbid"
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,12 @@ fn main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
||||||
commands.insert_resource(Holder(asset_server.load("tilemap.rpack.json")));
|
|
||||||
commands.spawn(Camera2d);
|
commands.spawn(Camera2d);
|
||||||
|
commands.insert_resource(Holder(asset_server.load("tilemap.rpack.json")));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn atlas_loaded(
|
fn atlas_loaded(
|
||||||
mut ev_asset: EventReader<AssetEvent<RpackAtlasAsset>>,
|
mut ev_asset: MessageReader<AssetEvent<RpackAtlasAsset>>,
|
||||||
atlases: RpackAtlases,
|
atlases: RpackAtlases,
|
||||||
mut commands: Commands,
|
mut commands: Commands,
|
||||||
) {
|
) {
|
||||||
|
|
@ -31,10 +31,17 @@ fn atlas_loaded(
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if let Ok(sprite) = atlases.try_make_sprite("agents/spaceAstronauts_005") {
|
info!("Atlas loaded");
|
||||||
commands.spawn(sprite);
|
match atlases.try_make_sprite("agents/spaceAstronauts_005") {
|
||||||
};
|
Ok(sprite) => {
|
||||||
if let Ok(image_node) = atlases.try_make_image_node("agents/spaceShips_006") {
|
commands.spawn((sprite, Transform::from_xyz(0.0, 20.0, 0.0)));
|
||||||
commands.spawn(image_node);
|
}
|
||||||
|
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),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue