diff --git a/engine/world_generation/src/biome_painter.rs b/engine/world_generation/src/biome_painter.rs index 302e76b..802d3fc 100644 --- a/engine/world_generation/src/biome_painter.rs +++ b/engine/world_generation/src/biome_painter.rs @@ -1,17 +1,13 @@ -use asset_loader::create_asset_loader; use bevy::prelude::*; -use bevy::{asset::Asset, reflect::TypePath, render::render_resource::encase::rts_array::Length}; -use serde::{Deserialize, Serialize}; +use bevy::render::render_resource::encase::rts_array::Length; use crate::{biome_asset::BiomeAsset, map::biome_map::BiomeData}; use bevy_asset_loader::prelude::*; #[derive(AssetCollection, Debug, Clone, Resource)] pub struct BiomePainterAsset { - // #[serde(skip)] #[asset(key = "biomes", collection(typed))] pub biomes: Vec>, - // pub biomes_path: Vec, } impl BiomePainterAsset { diff --git a/game/main/src/map_rendering/map_init.rs b/game/main/src/map_rendering/map_init.rs index f4d7f0f..dd2735d 100644 --- a/game/main/src/map_rendering/map_init.rs +++ b/game/main/src/map_rendering/map_init.rs @@ -22,7 +22,7 @@ use world_generation::{ use crate::{ camera_system::components::*, - prelude::{ChunkAtlas, PhosChunk, PhosChunkRegistry}, + prelude::{PhosAssets, PhosChunk, PhosChunkRegistry}, shader_extensions::{ chunk_material::ChunkMaterial, water_material::{WaterMaterial, WaterSettings}, @@ -64,7 +64,8 @@ impl Plugin for MapInitPlugin { app.configure_loading_state( LoadingStateConfig::new(AssetLoadState::Loading) .with_dynamic_assets_file::("phos.assets.ron") - .load_collection::(), + .load_collection::() + .load_collection::() ); app.add_systems(Startup, load_textures.run_if(in_state(AssetLoadState::FinalizeAssets))); @@ -106,7 +107,7 @@ struct WaterInspect(Handle>); fn load_textures( mut commands: Commands, - mut atlas: ResMut, + mut atlas: ResMut, mut water_materials: ResMut>>, ) { let water_material = water_materials.add(ExtendedMaterial { @@ -141,7 +142,7 @@ fn finalize_biome_painter( } fn finalize_texture( - mut atlas: ResMut, + mut atlas: ResMut, mut images: ResMut>, mut chunk_materials: ResMut>>, mut next_load_state: ResMut>, @@ -237,7 +238,7 @@ fn spawn_map( mut heightmap: ResMut, mut commands: Commands, mut meshes: ResMut>, - atlas: Res, + atlas: Res, tile_assets: Res>, tile_mappers: Res>, mut generator_state: ResMut>, diff --git a/game/main/src/prelude.rs b/game/main/src/prelude.rs index ef0d99a..1196012 100644 --- a/game/main/src/prelude.rs +++ b/game/main/src/prelude.rs @@ -3,12 +3,13 @@ use bevy::pbr::ExtendedMaterial; use bevy::prelude::*; use bevy::prelude::{Component, Image, Resource}; use bevy_asset_loader::asset_collection::AssetCollection; +use world_generation::biome_painter::BiomePainterAsset; use crate::shader_extensions::chunk_material::ChunkMaterial; use crate::shader_extensions::water_material::WaterMaterial; #[derive(AssetCollection, Resource, Default)] -pub struct ChunkAtlas { +pub struct PhosAssets { #[asset(key = "chunk_atlas")] pub handle: Handle, pub chunk_material_handle: Handle>,