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

cleanup
Some checks failed
Rust / build (push) Failing after 4s
Details

Browse Source
This commit is contained in:
Amatsugu
2026-03-13 18:02:11 -04:00
parent e3ddd3b5d4
commit b567dd00fd
24 changed files with 456 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
game/main/src/utlis/chunk_utils.rs
View File

@@ -13,7 +13,6 @@ use world_generation::{
generators::{
chunk_colliders::generate_chunk_collider,
mesh_generator::{generate_chunk_mesh, generate_chunk_water_mesh},
packed_mesh_generator::generate_packed_chunk_mesh,
},
hex_utils::offset_to_world,
prelude::{Chunk, Map, MeshChunkData},
@@ -26,7 +25,8 @@ pub fn paint_map(
painter: &BiomePainter,
tiles: &Res<Assets<TileAsset>>,
mappers: &Res<Assets<TileMapperAsset>>,
) {
)
{
map.chunks.par_iter_mut().for_each(|chunk: &mut Chunk| {
paint_chunk(chunk, painter, tiles, mappers);
});
@@ -37,9 +37,12 @@ pub fn paint_chunk(
painter: &BiomePainter,
tiles: &Res<Assets<TileAsset>>,
mappers: &Res<Assets<TileMapperAsset>>,
) {
for z in 0..Chunk::SIZE {
for x in 0..Chunk::SIZE {
)
{
for z in 0..Chunk::SIZE
{
for x in 0..Chunk::SIZE
{
let idx = x + z * Chunk::SIZE;
let height = chunk.heights[idx];
let biome_id = chunk.biome_id[idx];
@@ -58,7 +61,8 @@ pub fn prepare_chunk_mesh(
chunk_offset: IVec2,
chunk_index: usize,
map_size: UVec2,
) -> (Mesh, Mesh, (Vec<Vec3>, Vec<[u32; 3]>), Vec3, usize) {
) -> (Mesh, Mesh, (Vec<Vec3>, Vec<[u32; 3]>), Vec3, usize)
{
#[cfg(feature = "tracing")]
let _gen_mesh = info_span!("Generate Chunk").entered();
let chunk_mesh = generate_chunk_mesh(chunk);
@@ -80,7 +84,8 @@ pub fn prepare_chunk_mesh_with_collider(
chunk_offset: IVec2,
chunk_index: usize,
map_size: UVec2,
) -> (Mesh, Mesh, Collider, Vec3, usize) {
) -> (Mesh, Mesh, Collider, Vec3, usize)
{
let (chunk_mesh, water_mesh, (col_verts, col_indicies), pos, index) =
prepare_chunk_mesh(chunk, sealevel, chunk_offset, chunk_index, map_size);
let collider: Collider;

37
game/main/src/utlis/debug_plugin.rs
View File

@@ -1,4 +1,4 @@
use bevy::{gizmos::gizmos, prelude::*};
use bevy::prelude::*;
use shared::states::GameplayState;
use shared::{resources::TileUnderCursor, sets::GameplaySet};
use world_generation::{
@@ -11,8 +11,10 @@ use crate::camera_system::components::{PhosCamera, PhosOrbitCamera};
pub struct DebugPlugin;
impl Plugin for DebugPlugin {
fn build(&self, app: &mut App) {
impl Plugin for DebugPlugin
{
fn build(&self, app: &mut App)
{
app.insert_state(DebugState::Base);
app.add_systems(
@@ -29,7 +31,7 @@ impl Plugin for DebugPlugin {
.run_if(in_state(DebugState::Verbose)),
);
// app.add_systems(Update, camera_debug.in_set(GameplaySet));
app.add_systems(Update, camera_debug.in_set(GameplaySet));
app.add_systems(Update, regenerate_map.run_if(in_state(GeneratorState::Idle)));
app.insert_resource(Shape(Polyline3d::new([
@@ -48,7 +50,8 @@ impl Plugin for DebugPlugin {
struct Shape(pub Polyline3d);
#[derive(States, Debug, Clone, PartialEq, Eq, Hash)]
pub enum DebugState {
pub enum DebugState
{
Base,
None,
Verbose,
@@ -58,15 +61,19 @@ fn regenerate_map(
mut generator_state: ResMut<NextState<GeneratorState>>,
mut gameplay_state: ResMut<NextState<GameplayState>>,
input: Res<ButtonInput<KeyCode>>,
) {
if input.just_pressed(KeyCode::KeyR) {
)
{
if input.just_pressed(KeyCode::KeyR)
{
generator_state.set(GeneratorState::Regenerate);
gameplay_state.set(GameplayState::PlaceHQ);
}
}
fn show_tile_heights(map: Res<Map>, mut gizmos: Gizmos, shape: Res<Shape>, tile_under_cursor: Res<TileUnderCursor>) {
if let Some(contact) = tile_under_cursor.0 {
fn show_tile_heights(map: Res<Map>, mut gizmos: Gizmos, shape: Res<Shape>, tile_under_cursor: Res<TileUnderCursor>)
{
if let Some(contact) = tile_under_cursor.0
{
let height = map.sample_height(&contact.tile);
gizmos.primitive_3d(&shape.0, contact.tile.to_world(height + 0.01), Color::WHITE);
@@ -78,8 +85,11 @@ fn show_tile_heights(map: Res<Map>, mut gizmos: Gizmos, shape: Res<Shape>, tile_
}
}
fn show_water_corners(pos: Vec3, gizmos: &mut Gizmos) {
for i in 0..WATER_HEX_CORNERS.len() {
#[allow(dead_code)]
fn show_water_corners(pos: Vec3, gizmos: &mut Gizmos)
{
for i in 0..WATER_HEX_CORNERS.len()
{
let p = pos + WATER_HEX_CORNERS[i];
let p2 = pos + WATER_HEX_CORNERS[(i + 1) % WATER_HEX_CORNERS.len()];
@@ -87,8 +97,9 @@ fn show_water_corners(pos: Vec3, gizmos: &mut Gizmos) {
}
}
fn camera_debug(mut cam_query: Single<(&PhosCamera, &PhosOrbitCamera)>, mut gizmos: Gizmos) {
let (config, orbit) = cam_query.into_inner();
fn camera_debug(cam_query: Single<(&PhosCamera, &PhosOrbitCamera)>, mut gizmos: Gizmos)
{
let (_config, orbit) = cam_query.into_inner();
gizmos.sphere(orbit.target, 0.3, LinearRgba::RED);
let cam_proxy = orbit.target - (orbit.forward * 10.0);

160
game/main/src/utlis/editor_plugin.rs
View File

@@ -11,22 +11,25 @@ use world_generation::{map::map_utils::render_map, prelude::Map, states::Generat
pub struct EditorPlugin;
impl Plugin for EditorPlugin {
fn build(&self, app: &mut App) {
impl Plugin for EditorPlugin
{
fn build(&self, app: &mut App)
{
app.init_resource::<UIState>();
// app.add_systems(PostUpdate, prepare_image.run_if(in_state(GeneratorState::SpawnMap)));
// app.add_systems(
// Update,
// (render_map_ui, update_map_render, asset_reloaded).run_if(in_state(GeneratorState::Idle)),
// );
app.add_systems(PostUpdate, prepare_image.run_if(in_state(GeneratorState::SpawnMap)));
app.add_systems(
Update,
(render_map_ui, update_map_render, asset_reloaded).run_if(in_state(GeneratorState::Idle)),
);
}
}
#[derive(Resource)]
struct MapImage(pub Handle<Image>);
pub fn prepare_image(mut images: ResMut<Assets<Image>>, heightmap: Res<Map>, mut commands: Commands) {
pub fn prepare_image(mut images: ResMut<Assets<Image>>, heightmap: Res<Map>, mut commands: Commands)
{
let image = render_map(&heightmap, 0.1);
let handle = images.add(Image::from_dynamic(image.into(), true, RenderAssetUsages::RENDER_WORLD));
@@ -34,14 +37,17 @@ pub fn prepare_image(mut images: ResMut<Assets<Image>>, heightmap: Res<Map>, mut
}
#[derive(Resource)]
struct UIState {
struct UIState
{
pub is_open: bool,
pub target_map_type: MapDisplayType,
pub cur_map_type: MapDisplayType,
}
impl Default for UIState {
fn default() -> Self {
impl Default for UIState
{
fn default() -> Self
{
Self {
is_open: true,
target_map_type: default(),
@@ -51,7 +57,8 @@ impl Default for UIState {
}
#[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
enum MapDisplayType {
enum MapDisplayType
{
#[default]
HeightMap,
Biomes,
@@ -63,72 +70,77 @@ enum MapDisplayType {
fn asset_reloaded(
mut asset_events: MessageReader<AssetEvent<BiomeAsset>>,
mut biomes: ResMut<Assets<BiomeAsset>>,
biomes: Res<Assets<BiomeAsset>>,
biome_painter: Res<BiomePainterAsset>,
mut commands: Commands,
) {
)
{
let mut rebuild = false;
for event in asset_events.read() {
match event {
for event in asset_events.read()
{
match event
{
AssetEvent::Modified { .. } => rebuild = true,
_ => (),
}
}
if rebuild {
if rebuild
{
let painter = biome_painter.build(&biomes);
commands.insert_resource(painter);
}
}
// fn render_map_ui(
// image: Res<MapImage>,
// heightmap: Res<Map>,
// biome_map: Res<BiomeMap>,
// mut contexts: EguiContexts,
// mut state: ResMut<UIState>,
// ) {
// let id = contexts.add_image(image.0.clone());
fn render_map_ui(
// image: Res<MapImage>,
heightmap: Res<Map>,
biome_map: Res<BiomeMap>,
mut contexts: EguiContexts,
mut state: ResMut<UIState>,
)
{
// let id = contexts.add_image(image.0.);
let mut map_type = state.target_map_type;
let ctx = contexts.ctx_mut().expect("Failed to get egui context");
egui::Window::new("Map").open(&mut state.is_open).show(ctx, |ui| {
ui.label("Map Test");
egui::ComboBox::from_label("Display Type")
.selected_text(format!("{:?}", map_type))
.show_ui(ui, |ui| {
ui.selectable_value(&mut map_type, MapDisplayType::HeightMap, "Heightmap");
ui.selectable_value(&mut map_type, MapDisplayType::Biomes, "Biomes");
ui.selectable_value(&mut map_type, MapDisplayType::BiomeNoise, "Biome Noise");
ui.selectable_value(
&mut map_type,
MapDisplayType::BiomeNoiseTemp,
"Biome Noise: Tempurature",
);
ui.selectable_value(
&mut map_type,
MapDisplayType::BiomeNoiseContinent,
"Biome Noise: Continent",
);
ui.selectable_value(
&mut map_type,
MapDisplayType::BiomeNoiseMoisture,
"Biome Noise: Moisture",
);
});
// let mut map_type = state.target_map_type;
// let ctx = contexts.ctx_mut();
// egui::Window::new("Map").open(&mut state.is_open).show(ctx, |ui| {
// ui.label("Map Test");
// egui::ComboBox::from_label("Display Type")
// .selected_text(format!("{:?}", map_type))
// .show_ui(ui, |ui| {
// ui.selectable_value(&mut map_type, MapDisplayType::HeightMap, "Heightmap");
// ui.selectable_value(&mut map_type, MapDisplayType::Biomes, "Biomes");
// ui.selectable_value(&mut map_type, MapDisplayType::BiomeNoise, "Biome Noise");
// ui.selectable_value(
// &mut map_type,
// MapDisplayType::BiomeNoiseTemp,
// "Biome Noise: Tempurature",
// );
// ui.selectable_value(
// &mut map_type,
// MapDisplayType::BiomeNoiseContinent,
// "Biome Noise: Continent",
// );
// ui.selectable_value(
// &mut map_type,
// MapDisplayType::BiomeNoiseMoisture,
// "Biome Noise: Moisture",
// );
// });
// ui.add(egui::widgets::Image::new(egui::load::SizedTexture::new(
// id,
// [512.0, 512.0],
// )));
// ui.add(egui::widgets::Image::new(egui::load::SizedTexture::new(
// id,
// [512.0, 512.0],
// )));
if ui.button("Save Image").clicked()
{
let img = get_map_image(&heightmap, &biome_map, map_type);
_ = img.save(format!("{:?}.png", map_type));
}
});
// if ui.button("Save Image").clicked() {
// let img = get_map_image(&heightmap, &biome_map, map_type);
// _ = img.save(format!("{:?}.png", map_type));
// }
// });
// state.target_map_type = map_type;
// }
state.target_map_type = map_type;
}
fn update_map_render(
mut state: ResMut<UIState>,
@@ -136,22 +148,28 @@ fn update_map_render(
heightmap: Res<Map>,
biome_map: Res<BiomeMap>,
image: Res<MapImage>,
) {
if state.cur_map_type == state.target_map_type {
)
{
if state.cur_map_type == state.target_map_type
{
return;
}
let result = get_map_image(&heightmap, &biome_map, state.target_map_type);
images.insert(
image.0.id(),
Image::from_dynamic(result.into(), true, RenderAssetUsages::RENDER_WORLD),
);
images
.insert(
image.0.id(),
Image::from_dynamic(result.into(), true, RenderAssetUsages::RENDER_WORLD),
)
.expect("Failed to update map image");
state.cur_map_type = state.target_map_type;
}
fn get_map_image(heightmap: &Map, biome_map: &BiomeMap, map_type: MapDisplayType) -> ImageBuffer<Rgba<u8>, Vec<u8>> {
return match map_type {
fn get_map_image(heightmap: &Map, biome_map: &BiomeMap, map_type: MapDisplayType) -> ImageBuffer<Rgba<u8>, Vec<u8>>
{
return match map_type
{
MapDisplayType::HeightMap => render_map(&heightmap, 0.1),
MapDisplayType::Biomes => render_biome_map(&heightmap, &biome_map),
MapDisplayType::BiomeNoise => render_biome_noise_map(&biome_map, Vec3::ONE),

75
game/main/src/utlis/tile_selection_plugin.rs
View File

@@ -1,5 +1,5 @@
use bevy::{prelude::*, window::PrimaryWindow};
use bevy_rapier3d::{plugin::RapierContext, prelude::QueryFilter};
use bevy_rapier3d::{plugin::ReadRapierContext, prelude::QueryFilter};
use shared::{
resources::{TileContact, TileUnderCursor},
tags::MainCamera,
@@ -7,8 +7,10 @@ use shared::{
use world_generation::{hex_utils::HexCoord, prelude::Map, states::GeneratorState};
pub struct TileSelectionPlugin;
impl Plugin for TileSelectionPlugin {
fn build(&self, app: &mut App) {
impl Plugin for TileSelectionPlugin
{
fn build(&self, app: &mut App)
{
app.init_resource::<TileUnderCursor>();
app.add_systems(
PreUpdate,
@@ -20,42 +22,53 @@ impl Plugin for TileSelectionPlugin {
fn update_tile_under_cursor(
cam_query: Single<(&GlobalTransform, &Camera), With<MainCamera>>,
window: Single<&Window, With<PrimaryWindow>>,
// rapier_context: RapierContext,
rapier: ReadRapierContext,
map: Res<Map>,
mut tile_under_cursor: ResMut<TileUnderCursor>,
) {
)
{
let (cam_transform, camera) = cam_query.into_inner();
let Some(cursor_pos) = window.cursor_position() else {
let Some(cursor_pos) = window.cursor_position()
else
{
return;
};
let Ok(cam_ray) = camera.viewport_to_world(cam_transform, cursor_pos) else {
let Ok(cam_ray) = camera.viewport_to_world(cam_transform, cursor_pos)
else
{
return;
};
// let collision = rapier_context.cast_ray(
// cam_ray.origin,
// cam_ray.direction.into(),
// 500.,
// true,
// QueryFilter::only_fixed(),
// );
let ctx = rapier.single().expect("Failed to get rapier read context");
// if let Some((_e, dist)) = collision {
// let contact_point = cam_ray.get_point(dist);
// let contact_coord = HexCoord::from_world_pos(contact_point);
// //todo: handle correct tile detection when contacting a tile from the side
// if !map.is_in_bounds(&contact_coord) {
// tile_under_cursor.0 = None;
// return;
// }
// let surface = map.sample_height(&contact_coord);
// tile_under_cursor.0 = Some(TileContact::new(
// contact_coord,
// contact_point,
// contact_coord.to_world(surface),
// ));
// } else {
// tile_under_cursor.0 = None;
// }
let collision = ctx.cast_ray(
cam_ray.origin,
cam_ray.direction.into(),
500.,
true,
QueryFilter::only_fixed(),
);
if let Some((_e, dist)) = collision
{
let contact_point = cam_ray.get_point(dist);
let contact_coord = HexCoord::from_world_pos(contact_point);
//todo: handle correct tile detection when contacting a tile from the side
if !map.is_in_bounds(&contact_coord)
{
tile_under_cursor.0 = None;
return;
}
let surface = map.sample_height(&contact_coord);
tile_under_cursor.0 = Some(TileContact::new(
contact_coord,
contact_point,
contact_coord.to_world(surface),
));
}
else
{
tile_under_cursor.0 = None;
}
}