Jayrude
/
voxel-rs
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Shader now considers the brickmap base shading table offset

This commit is contained in:
Jarrod Doyle 2023-04-24 20:20:38 +01:00
parent 225c76b1a8
commit 1d126eba10
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/shaders/voxel_volume.wgsl
View File

@ -31,17 +31,16 @@ struct AabbHitInfo {
distance: f32, distance: f32,
}; };
// TODO: Include brickmap base shading table offset
fn get_shading_offset(p: vec3<i32>) -> u32 { fn get_shading_offset(p: vec3<i32>) -> u32 {
let local_index = u32(p.x + p.y * 8 + p.z * 64); let local_index = u32(p.x + p.y * 8 + p.z * 64);
let bitmask_index = local_index / 32u; let bitmask_index = local_index / 32u;
var shading_offset = 0u; var map_voxel_idx = 0u;
for (var i: i32 = 0; i < i32(bitmask_index); i++) { for (var i: i32 = 0; i < i32(bitmask_index); i++) {
shading_offset += countOneBits(brickmap.bitmask[i]); map_voxel_idx += countOneBits(brickmap.bitmask[i]);
} }
let extracted_bits = extractBits(brickmap.bitmask[bitmask_index], 0u, (local_index % 32u)); let extracted_bits = extractBits(brickmap.bitmask[bitmask_index], 0u, (local_index % 32u));
shading_offset += countOneBits(extracted_bits); map_voxel_idx += countOneBits(extracted_bits);
return shading_offset; return brickmap.shading_table_offset + map_voxel_idx;
} }
fn ray_intersect_aabb(ray_pos: vec3<f32>, ray_dir: vec3<f32>) -> AabbHitInfo { fn ray_intersect_aabb(ray_pos: vec3<f32>, ray_dir: vec3<f32>) -> AabbHitInfo {