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

buildings wip

Browse Source
This commit is contained in:
Amatsugu
2024-07-15 21:30:07 -04:00
parent 898acc2822
commit f52b44d0dd
8 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game/main/assets

Submodule game/main/assets updated: d7389cf5b1...59a833a575

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

@@ -1,15 +1,15 @@
#[cfg(feature = "tracing")]
use bevy::log::*;
use bevy::{
asset::{AssetEvents, LoadState},
asset::LoadState,
pbr::{ExtendedMaterial, NotShadowCaster},
prelude::*,
};
use bevy_inspector_egui::quick::ResourceInspectorPlugin;
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use shared::states::{GameplayState, MenuState};
use shared::states::{AssetLoadState, GameplayState, MenuState};
use world_generation::{
biome_asset::{BiomeAsset, BiomeAssetLoadState},
biome_asset::{BiomeAsset, BiomeAssetLoadState, BiomeAssetPlugin},
biome_painter::*,
heightmap::generate_heightmap,
hex_utils::{offset_to_index, SHORT_DIAGONAL},
@@ -42,6 +42,12 @@ impl Plugin for MapInitPlugin {
app.insert_state(GeneratorState::Startup);
app.insert_state(AssetLoadState::StartLoading);
//Assets
app.add_plugins(TileAssetPlugin);
app.add_plugins(TileMapperAssetPlugin);
app.add_plugins(BiomePainterPlugin);
app.add_plugins(BiomeAssetPlugin);
app.add_plugins(ResourceInspectorPlugin::<GenerationConfig>::default());
app.add_plugins(ResourceInspectorPlugin::<WaterInspect>::default());
app.register_type::<ExtendedMaterial<StandardMaterial, WaterMaterial>>();

8
game/main/src/phos.rs
View File

@@ -13,9 +13,6 @@ use buildings::BuildingPugin;
use iyes_perf_ui::prelude::*;
use shared::despawn::DespawnPuglin;
use shared::states::{GameplayState, MenuState};
use world_generation::tile_manager::TileAssetPlugin;
use world_generation::tile_mapper::TileMapperAssetPlugin;
use world_generation::{biome_asset::BiomeAssetPlugin, biome_painter::BiomePainterPlugin};
pub struct PhosGamePlugin;
@@ -44,11 +41,6 @@ impl Plugin for PhosGamePlugin {
.add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin)
.add_plugins(PerfUiPlugin);
//Assets
app.add_plugins(TileAssetPlugin);
app.add_plugins(TileMapperAssetPlugin);
app.add_plugins(BiomePainterPlugin);
app.add_plugins(BiomeAssetPlugin);
//Physics
app.add_plugins(RapierPhysicsPlugin::<NoUserData>::default());
// app.add_plugins(RapierDebugRenderPlugin::default());