diff --git a/Cargo.lock b/Cargo.lock index 64084bf..f9d95e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2372,6 +2372,8 @@ dependencies = [ "byteorder-lite", "num-traits", "png", + "zune-core", + "zune-jpeg", ] [[package]] @@ -4960,3 +4962,18 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028" +dependencies = [ + "zune-core", +] diff --git a/Cargo.toml b/Cargo.toml index b69d09c..fb0f5bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,5 +4,5 @@ version = "0.1.0" edition = "2024" [dependencies] -bevy = "0.15.3" +bevy = { version="0.15.3", features = ["jpeg"]} bevy_asset_loader = { version ="0.22.0", features = ["standard_dynamic_assets"] } diff --git a/assets/main.assets.ron b/assets/main.assets.ron index f9a63ec..de28a0c 100644 --- a/assets/main.assets.ron +++ b/assets/main.assets.ron @@ -1,4 +1,4 @@ ({ "lebron": File (path: "images/KingLebron.png"), - "wall": File (path: "meshes/wall.glb"), + "wall": File (path: "meshes/House.glb"), }) diff --git a/assets/meshes/House.glb b/assets/meshes/House.glb new file mode 100644 index 0000000..f1bff48 Binary files /dev/null and b/assets/meshes/House.glb differ diff --git a/src/asset_loading/mod.rs b/src/asset_loading/mod.rs index cee0105..541cd4f 100644 --- a/src/asset_loading/mod.rs +++ b/src/asset_loading/mod.rs @@ -13,11 +13,12 @@ pub(super) fn plugin(app: &mut App) { LoadingState::new(GameState::Loading) .continue_to_state(GameState::Menu) .with_dynamic_assets_file::("main.assets.ron") - .load_collection::(), // .load_collection::() - // .load_collection::() - // .load_collection::() - // .load_collection::() - // .load_collection::(), + .load_collection::() + .load_collection::(), + // .load_collection::() + // .load_collection::() + // .load_collection::() + // .load_collection::(), ); } diff --git a/src/level_instantiation/mod.rs b/src/level_instantiation/mod.rs index bf7218a..d7c7da9 100644 --- a/src/level_instantiation/mod.rs +++ b/src/level_instantiation/mod.rs @@ -3,17 +3,15 @@ use bevy::prelude::*; use crate::{asset_loading::GltfAssets, GameState}; pub fn map_plugin(app: &mut App) { - // app.add_systems(OnEnter(GameState::Playing), spawn_level); + app.add_systems(OnEnter(GameState::Playing), spawn_level); } fn spawn_level( mut commands: Commands, models: Res>, - gltf_assets: Res) { + gltf_assets: Res +) { let gltf = models.get(&gltf_assets.wall).unwrap(); - // commands.spawn(SceneBundle { - // scene: gltf.scenes[0].clone(), - // ..default() - // }); + commands.spawn(SceneRoot(gltf.scenes[0].clone())); }