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

merge normals generation

Browse Source
This commit is contained in:
Amatsugu
2024-04-27 19:28:25 -04:00
parent 9131f68624
commit e8cf54a578
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
engine/world_generation/src/mesh_generator.rs
View File

@@ -23,14 +23,6 @@ const HEX_CORNERS: [Vec3; 6] = [
Vec3::new(-INNER_RADIUS, 0., -0.5 * OUTER_RADIUS), Vec3::new(-INNER_RADIUS, 0., -0.5 * OUTER_RADIUS),
Vec3::new(-INNER_RADIUS, 0., 0.5 * OUTER_RADIUS), Vec3::new(-INNER_RADIUS, 0., 0.5 * OUTER_RADIUS),
]; ];
const HEX_NORMALS: [Vec3; 6] = [
Vec3::new(0., 0., OUTER_RADIUS),
Vec3::new(INNER_RADIUS, 0., 0.5 * OUTER_RADIUS),
Vec3::new(INNER_RADIUS, 0., -0.5 * OUTER_RADIUS),
Vec3::new(0., 0., -OUTER_RADIUS),
Vec3::new(-INNER_RADIUS, 0., -0.5 * OUTER_RADIUS),
Vec3::new(-INNER_RADIUS, 0., 0.5 * OUTER_RADIUS),
];
const HEX_NORMALS: [Vec3; 6] = [ const HEX_NORMALS: [Vec3; 6] = [
Vec3::new( Vec3::new(
@@ -129,7 +121,7 @@ fn create_tile(
let idx = verts.len() as u32; let idx = verts.len() as u32;
texture_indices.push(texture_index); texture_indices.push(texture_index);
uvs.push((uv_offset / TEX_MULTI) + tex_off); uvs.push(uv_offset);
verts.push(pos); verts.push(pos);
normals.push(Vec3::Y); normals.push(Vec3::Y);
@@ -137,7 +129,7 @@ fn create_tile(
let p = pos + HEX_CORNERS[i]; let p = pos + HEX_CORNERS[i];
verts.push(p); verts.push(p);
let uv = (HEX_CORNERS[i].xz() / 2.) + uv_offset; let uv = (HEX_CORNERS[i].xz() / 2.) + uv_offset;
uvs.push((uv / TEX_MULTI) + tex_off); uvs.push(uv);
indices.push(idx); indices.push(idx);
indices.push(idx + 1 + i as u32); indices.push(idx + 1 + i as u32);
indices.push(idx + 1 + ((i as u32 + 1) % 6)); indices.push(idx + 1 + ((i as u32 + 1) % 6));
@@ -178,7 +170,6 @@ fn create_tile_wall(
normals: &mut Vec<Vec3>, normals: &mut Vec<Vec3>,
texture_indices: &mut Vec<u32>, texture_indices: &mut Vec<u32>,
texture_index: u32, texture_index: u32,
tex_off: Vec2,
) { ) {
let p1 = HEX_CORNERS[(dir) % 6] + pos; let p1 = HEX_CORNERS[(dir) % 6] + pos;
let p2 = HEX_CORNERS[(dir + 1) % 6] + pos; let p2 = HEX_CORNERS[(dir + 1) % 6] + pos;