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

fixed texture index packing

Browse Source
This commit is contained in:
Amatsugu
2024-04-24 20:25:39 -04:00
parent 985523a1cb
commit 54d0f762d2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@ pub fn generate_chunk_mesh(
return mesh; return mesh;
} }
const TEX_MULTI: Vec2 = Vec2::new(1000., 1.);
fn create_tile( fn create_tile(
pos: Vec3, pos: Vec3,
neighbors: &[Option<f32>; 6], neighbors: &[Option<f32>; 6],
@@ -90,13 +91,13 @@ fn create_tile(
let side_tex_off = Vec2::new(side_texture_index as f32, 0.); let side_tex_off = Vec2::new(side_texture_index as f32, 0.);
let idx = verts.len() as u32; let idx = verts.len() as u32;
uvs.push(uv_offset + tex_off); uvs.push((uv_offset / TEX_MULTI) + tex_off);
verts.push(pos); verts.push(pos);
for i in 0..6 { for i in 0..6 {
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_off); uvs.push((uv / TEX_MULTI) + tex_off);
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));
@@ -145,7 +146,7 @@ fn create_tile_wall(
indices.push(idx + 3); indices.push(idx + 3);
uvs.push(Vec2::ZERO + tex_off); uvs.push(Vec2::ZERO + tex_off);
uvs.push(Vec2::new(1., 0.) + tex_off); uvs.push((Vec2::new(1., 0.) / TEX_MULTI) + tex_off);
uvs.push(Vec2::new(0., pos.y - height) + tex_off); uvs.push((Vec2::new(0., pos.y - height) / TEX_MULTI) + tex_off);
uvs.push(Vec2::new(1., pos.y - height) + tex_off); uvs.push((Vec2::new(1., pos.y - height) / TEX_MULTI) + tex_off);
} }

2
game/main/assets

Submodule game/main/assets updated: 60527f41d5...b5c3a166a0