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

Merge branch 'master' into lunex

Browse Source
This commit is contained in:
Amatsugu
2024-11-11 18:45:43 -05:00
parent c5a3d1c401 ba7b3abc25
commit 576ea96e9b
7 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/world_generation/src/consts.rs
View File

@@ -41,9 +41,9 @@ pub const HEX_NORMALS: [Vec3; 6] = [
];
pub const ATTRIBUTE_PACKED_VERTEX_DATA: MeshVertexAttribute =
MeshVertexAttribute::new("PackedVertexData", 988540817, VertexFormat::Uint32);
MeshVertexAttribute::new("PackedVertexData", 7, VertexFormat::Uint32);
pub const ATTRIBUTE_VERTEX_HEIGHT: MeshVertexAttribute =
MeshVertexAttribute::new("VertexHeight", 988540717, VertexFormat::Float32);
MeshVertexAttribute::new("VertexHeight", 8, VertexFormat::Float32);
pub const ATTRIBUTE_TEXTURE_INDEX: MeshVertexAttribute =
MeshVertexAttribute::new("TextureIndex", 988540917, VertexFormat::Uint32);

65
engine/world_generation/src/generators/packed_mesh_generator.rs
View File

@@ -1,9 +1,5 @@
use crate::hex_utils::HexCoord;
use crate::map::biome_map::BiomeChunk;
use crate::hex_utils::{offset3d_to_world, HexCoord};
use crate::prelude::*;
use crate::tile_manager::TileAsset;
use crate::tile_mapper::TileMapperAsset;
use crate::{biome_asset::BiomeAsset, biome_painter::BiomePainterAsset};
use bevy::{
prelude::*,
render::{
@@ -12,15 +8,7 @@ use bevy::{
},
};
pub fn generate_packed_chunk_mesh(
chunk: &Chunk,
map: &Map,
biome_chunk: &BiomeChunk,
painter: &BiomePainterAsset,
tiles: &Res<Assets<TileAsset>>,
biomes: &Res<Assets<BiomeAsset>>,
mappers: &Res<Assets<TileMapperAsset>>,
) -> Mesh {
pub fn generate_packed_chunk_mesh(chunk: &MeshChunkData) -> Mesh {
let vertex_count: usize = Chunk::SIZE * Chunk::SIZE * 6;
let mut packed_data = Vec::with_capacity(vertex_count);
let mut indices = Vec::with_capacity(vertex_count);
@@ -28,16 +16,10 @@ pub fn generate_packed_chunk_mesh(
for z in 0..Chunk::SIZE {
for x in 0..Chunk::SIZE {
let height = chunk.heights[x + z * Chunk::SIZE];
let data = biome_chunk.data[x + z * Chunk::SIZE];
let coord =
HexCoord::from_offset(IVec2::new(x as i32, z as i32) + (chunk.chunk_offset * Chunk::SIZE as i32));
let n = map.get_neighbors(&coord);
let biome = biomes.get(painter.sample_biome(biomes, &data)).unwrap();
let mapper = mappers.get(biome.tile_mapper.id());
let tile_handle = mapper.unwrap().sample_tile(height);
let tile = tiles.get(tile_handle).unwrap();
let idx = x + z * Chunk::SIZE;
let height = chunk.heights[idx];
let coord = HexCoord::from_grid_pos(x, z);
let n = chunk.get_neighbors(&coord);
create_packed_tile(
UVec2::new(x as u32, z as u32),
@@ -46,8 +28,8 @@ pub fn generate_packed_chunk_mesh(
&mut packed_data,
&mut indices,
&mut heights,
tile.texture_id,
tile.side_texture_id,
chunk.textures[idx][0],
chunk.textures[idx][1],
);
}
}
@@ -65,7 +47,7 @@ pub fn generate_packed_chunk_mesh(
fn create_packed_tile(
offset: UVec2,
height: f32,
neighbors: &[Option<f32>; 6],
neighbors: &[f32; 6],
packed_data: &mut Vec<u32>,
indices: &mut Vec<u32>,
heights: &mut Vec<f32>,
@@ -85,23 +67,18 @@ fn create_packed_tile(
}
for i in 0..neighbors.len() {
let cur_n = neighbors[i];
match cur_n {
Some(n_height) => {
if n_height < height {
create_packed_tile_wall(
offset,
height,
n_height,
i,
packed_data,
indices,
heights,
side_texture_index,
);
}
}
_ => {}
let n_height = neighbors[i];
if n_height < height {
create_packed_tile_wall(
offset,
height,
n_height,
i,
packed_data,
indices,
heights,
side_texture_index,
);
}
}
}

2
game/main/assets

Submodule game/main/assets updated: 3606ca0324...4082df18e0

1
game/main/src/main.rs
View File

@@ -14,6 +14,7 @@ mod prelude;
mod shader_extensions;
mod ui;
mod utlis;
mod ui;
fn main() {
App::new()

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

@@ -3,6 +3,7 @@ use bevy::log::*;
use bevy::{
pbr::{ExtendedMaterial, NotShadowCaster},
prelude::*,
render::render_resource::{ColorTargetState, FragmentState, RenderPipelineDescriptor},
};
use bevy_asset_loader::prelude::*;
@@ -219,6 +220,7 @@ fn spawn_map(
) {
paint_map(&mut heightmap, &biome_painter, &tile_assets, &tile_mappers);
//Prepare Mesh Data
let map_size = UVec2::new(heightmap.width as u32, heightmap.height as u32);
let chunk_meshes: Vec<_> = heightmap
.chunks
@@ -236,6 +238,8 @@ fn spawn_map(
.collect();
let mut registry = PhosChunkRegistry::new(chunk_meshes.len());
//Spawn Chunks
{
#[cfg(feature = "tracing")]
let _spawn_span = info_span!("Spawn Chunks").entered();
@@ -277,20 +281,6 @@ fn spawn_map(
}
}
// commands.spawn((
// MaterialMeshBundle {
// transform: Transform::from_translation(heightmap.get_center()),
// mesh: meshes.add(
// Plane3d::default()
// .mesh()
// .size(heightmap.get_world_width(), heightmap.get_world_height()),
// ),
// material: atlas.water_material.clone(),
// ..default()
// },
// NotShadowCaster,
// ));
commands.insert_resource(registry);
generator_state.set(GeneratorState::Idle);
if cur_game_state.get() != &MenuState::InGame {

61
game/main/src/shader_extensions/chunk_material.rs
View File

@@ -1,8 +1,10 @@
use bevy::asset::{Asset, Handle};
use bevy::pbr::MaterialExtension;
use bevy::pbr::{Material, MaterialExtension};
use bevy::reflect::TypePath;
use bevy::render::mesh::{MeshVertexAttribute, MeshVertexBufferLayoutRef};
use bevy::render::render_resource::{AsBindGroup, ShaderRef};
use bevy::render::texture::Image;
use world_generation::consts::{ATTRIBUTE_PACKED_VERTEX_DATA, ATTRIBUTE_VERTEX_HEIGHT};
#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
pub struct ChunkMaterial {
@@ -15,25 +17,50 @@ impl MaterialExtension for ChunkMaterial {
fn fragment_shader() -> ShaderRef {
"shaders/world/chunk.wgsl".into()
}
}
// fn vertex_shader() -> ShaderRef {
#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
pub struct PackedChunkMaterial {
#[texture(100, dimension = "2d_array")]
#[sampler(101)]
pub array_texture: Handle<Image>,
}
impl Material for PackedChunkMaterial {
fn fragment_shader() -> ShaderRef {
"shaders/world/chunk.wgsl".into()
}
fn vertex_shader() -> ShaderRef {
"shaders/world/chunk_packed.wgsl".into()
}
fn prepass_vertex_shader() -> ShaderRef {
"shaders/world/chunk_packed.wgsl".into()
}
// fn deferred_vertex_shader() -> ShaderRef {
// "shaders/world/chunk_packed.wgsl".into()
// }
// fn specialize(
// _pipeline: &bevy::pbr::MaterialExtensionPipeline,
// descriptor: &mut bevy::render::render_resource::RenderPipelineDescriptor,
// layout: &bevy::render::mesh::MeshVertexBufferLayout,
// _key: bevy::pbr::MaterialExtensionKey<Self>,
// ) -> Result<(), bevy::render::render_resource::SpecializedMeshPipelineError> {
// let vertex_layout = layout.get_layout(&[
// // Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
// // Mesh::ATTRIBUTE_UV_0.at_shader_location(1),
// // Mesh::ATTRIBUTE_NORMAL.at_shader_location(2),
// ATTRIBUTE_PACKED_VERTEX_DATA.at_shader_location(7),
// ATTRIBUTE_VERTEX_HEIGHT.at_shader_location(8),
// ])?;
// descriptor.vertex.buffers = vec![vertex_layout];
// Ok(())
// fn opaque_render_method(&self) -> bevy::pbr::OpaqueRendererMethod {
// return OpaqueRendererMethod::Auto;
// }
fn specialize(
_pipeline: &bevy::pbr::MaterialPipeline<Self>,
descriptor: &mut bevy::render::render_resource::RenderPipelineDescriptor,
layout: &MeshVertexBufferLayoutRef,
_key: bevy::pbr::MaterialPipelineKey<Self>,
) -> Result<(), bevy::render::render_resource::SpecializedMeshPipelineError> {
let vertex_layout = layout.0.get_layout(&[
// Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
// Mesh::ATTRIBUTE_UV_0.at_shader_location(1),
// Mesh::ATTRIBUTE_NORMAL.at_shader_location(2),
ATTRIBUTE_PACKED_VERTEX_DATA.at_shader_location(7),
ATTRIBUTE_VERTEX_HEIGHT.at_shader_location(8),
])?;
descriptor.vertex.buffers = vec![vertex_layout];
Ok(())
}
}

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

@@ -13,6 +13,7 @@ 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},