asset loader
added rapier
This commit is contained in:
@@ -7,9 +7,10 @@ build = "build.rs"
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
bevy = "0.13.1"
|
||||
bevy = "0.13.2"
|
||||
bevy-inspector-egui = "0.23.4"
|
||||
iyes_perf_ui = "0.2.3"
|
||||
noise = "0.8.2"
|
||||
world_generation ={path="../../engine/world_generation"}
|
||||
camera_system={path = "../camera_system"}
|
||||
bevy_rapier3d = { version = "0.25.0", features = [ "simd-stable", "debug-render-3d" ] }
|
||||
|
||||
5
game/main/assets/tiles/Terra/Grass.tile.json
Normal file
5
game/main/assets/tiles/Terra/Grass.tile.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"name": "Grass",
|
||||
"texture_id": 1,
|
||||
"side_texture_id": 2
|
||||
}
|
||||
1
game/main/src/macros.rs
Normal file
1
game/main/src/macros.rs
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
@@ -2,9 +2,12 @@ use crate::prelude::*;
|
||||
use bevy::asset::LoadState;
|
||||
use bevy::pbr::ExtendedMaterial;
|
||||
use bevy::{pbr::CascadeShadowConfig, prelude::*};
|
||||
use bevy_rapier3d::plugin::{NoUserData, RapierPhysicsPlugin};
|
||||
use bevy_rapier3d::render::RapierDebugRenderPlugin;
|
||||
use camera_system::PhosCameraPlugin;
|
||||
use iyes_perf_ui::prelude::*;
|
||||
use world_generation::hex_utils::offset_to_world;
|
||||
use world_generation::tile_manager::{TileAsset, TileAssetPlugin};
|
||||
use world_generation::{
|
||||
heightmap::generate_heightmap, mesh_generator::generate_chunk_mesh, prelude::*,
|
||||
};
|
||||
@@ -17,13 +20,24 @@ impl Plugin for PhosGamePlugin {
|
||||
.add_plugins(MaterialPlugin::<
|
||||
ExtendedMaterial<StandardMaterial, ChunkMaterial>,
|
||||
>::default());
|
||||
|
||||
//Systems - Startup
|
||||
app.add_systems(Startup, init_game)
|
||||
.add_systems(Startup, (load_textures, create_map).chain());
|
||||
app.add_systems(Update, (check_texture, spawn_map));
|
||||
//Systems - Update
|
||||
app.add_systems(Update, (check_texture, spawn_map, print_tiles));
|
||||
|
||||
//Perf UI
|
||||
app.add_plugins(bevy::diagnostic::FrameTimeDiagnosticsPlugin)
|
||||
.add_plugins(bevy::diagnostic::EntityCountDiagnosticsPlugin)
|
||||
.add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin)
|
||||
.add_plugins(PerfUiPlugin);
|
||||
|
||||
//Assets
|
||||
app.add_plugins(TileAssetPlugin);
|
||||
//Physics
|
||||
app.add_plugins(RapierPhysicsPlugin::<NoUserData>::default())
|
||||
.add_plugins(RapierDebugRenderPlugin::default());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,12 +66,25 @@ fn init_game(mut commands: Commands) {
|
||||
commands.insert_resource(PhosMap::default());
|
||||
}
|
||||
|
||||
#[derive(Resource)]
|
||||
struct TileResource(Handle<TileAsset>);
|
||||
|
||||
fn load_textures(mut commands: Commands, asset_server: Res<AssetServer>) {
|
||||
let main_tex = asset_server.load("textures/world/stack.png");
|
||||
commands.insert_resource(ChunkAtlas {
|
||||
handle: main_tex.clone(),
|
||||
is_loaded: false,
|
||||
});
|
||||
|
||||
let handle: Handle<TileAsset> = asset_server.load("tiles/Terra/Grass.tile.json");
|
||||
|
||||
commands.insert_resource(TileResource(handle));
|
||||
}
|
||||
|
||||
fn print_tiles(tile_assets: Res<Assets<TileAsset>>) {
|
||||
for (_, tile) in tile_assets.iter() {
|
||||
println!("Tile: {}", tile.name);
|
||||
}
|
||||
}
|
||||
|
||||
fn check_texture(
|
||||
|
||||
Reference in New Issue
Block a user