Amatsugu/phos-neo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup states

Browse Source
This commit is contained in:
Amatsugu
2024-07-31 23:04:40 -04:00
parent 3f174d4e2f
commit d007aeab7d
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
game/main/src/map_rendering/map_init.rs
View File

@@ -67,27 +67,17 @@ impl Plugin for MapInitPlugin {
.load_collection::<BiomePainterAsset>(), .load_collection::<BiomePainterAsset>(),
); );
app.add_systems(Startup, load_textures.run_if(in_state(AssetLoadState::FinalizeAssets)));
app.add_systems( app.add_systems(
Update, Update,
create_heightmap.run_if(in_state(GeneratorState::GenerateHeightmap)), create_heightmap.run_if(in_state(GeneratorState::GenerateHeightmap)),
); );
// app.add_systems(
// Update,
// check_asset_load.run_if(in_state(AssetLoadState::FinalizeAssets)),
// );
app.add_systems( app.add_systems(
Update, Update,
(finalize_texture, finalize_biome_painter).run_if(in_state(AssetLoadState::FinalizeAssets)), (finalize_texture, setup_materials, finalize_biome_painter)
); .run_if(in_state(AssetLoadState::FinalizeAssets)),
app.add_systems(
Update,
finalize_biome_painter
.run_if(in_state(AssetLoadState::FinalizeAssets))
.run_if(in_state(AssetLoadState::LoadComplete)),
); );
app.add_systems(Update, despawn_map.run_if(in_state(GeneratorState::Regenerate))); app.add_systems(Update, despawn_map.run_if(in_state(GeneratorState::Regenerate)));
app.add_systems( app.add_systems(
Update, Update,
@@ -104,9 +94,9 @@ impl Plugin for MapInitPlugin {
#[reflect(Resource)] #[reflect(Resource)]
struct WaterInspect(Handle<ExtendedMaterial<StandardMaterial, WaterMaterial>>); struct WaterInspect(Handle<ExtendedMaterial<StandardMaterial, WaterMaterial>>);
fn load_textures( fn setup_materials(
mut commands: Commands, mut commands: Commands,
mut atlas: ResMut<PhosAssets>, mut phos_assets: ResMut<PhosAssets>,
mut water_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, WaterMaterial>>>, mut water_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, WaterMaterial>>>,
) { ) {
let water_material = water_materials.add(ExtendedMaterial { let water_material = water_materials.add(ExtendedMaterial {
@@ -125,7 +115,7 @@ fn load_textures(
}, },
}); });
commands.insert_resource(WaterInspect(water_material.clone())); commands.insert_resource(WaterInspect(water_material.clone()));
atlas.water_material = water_material; phos_assets.water_material = water_material;
} }
fn finalize_biome_painter( fn finalize_biome_painter(
@@ -137,7 +127,6 @@ fn finalize_biome_painter(
let biome_painter = biome_painter.build(&biomes); let biome_painter = biome_painter.build(&biomes);
commands.insert_resource(biome_painter); commands.insert_resource(biome_painter);
next_generator_state.set(GeneratorState::GenerateHeightmap); next_generator_state.set(GeneratorState::GenerateHeightmap);
println!("Finalize Biome");
} }
fn finalize_texture( fn finalize_texture(
@@ -146,7 +135,6 @@ fn finalize_texture(
mut chunk_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, ChunkMaterial>>>, mut chunk_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, ChunkMaterial>>>,
mut next_load_state: ResMut<NextState<AssetLoadState>>, mut next_load_state: ResMut<NextState<AssetLoadState>>,
) { ) {
println!("Finalize Tex");
let image = images.get_mut(atlas.handle.id()).unwrap(); let image = images.get_mut(atlas.handle.id()).unwrap();
let array_layers = image.height() / image.width(); let array_layers = image.height() / image.width();