Merge remote-tracking branch 'origin/feature/voxel_container' into feature/cube

# Conflicts:
#	src/main.rs
This commit is contained in:
NIHART, Jeremi
2023-09-28 07:50:46 +02:00
4 changed files with 33 additions and 14 deletions

View File

@@ -14,7 +14,7 @@ fn voxel_vec_1d(data: Vec<Voxel>) -> Voxel {
const Y: usize = 0;
const Z: usize = 0;
return data[X + Y * MAP_WIDTH + Z * MAP_WIDTH * MAP_HEIGHT];
data[X + Y * MAP_WIDTH + Z * MAP_WIDTH * MAP_HEIGHT]
}
fn voxel_vec_3d(data: Vec<Vec<Vec<Voxel>>>) -> Voxel {
@@ -22,7 +22,7 @@ fn voxel_vec_3d(data: Vec<Vec<Vec<Voxel>>>) -> Voxel {
const Y: usize = 0;
const Z: usize = 0;
return data[X][Y][Z];
data[X][Y][Z]
}
fn voxel_map_benchmark(c: &mut Criterion) {