neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-04 17:23:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

world/layer: replace iproduct!() with nested loops

Browse source 
iproduct!() is slow for more than 2 parameters.
This commit is contained in:
Matthias Schiffer 2023-03-02 01:00:55 +01:00
parent ed5fb9a6cf
commit 1d4c7a86ff
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/world/layer.rs
View file

@ -1,5 +1,4 @@
use anyhow::{Context, Result};
use itertools::iproduct;
use serde::{Deserialize, Serialize};
use super::chunk::Chunk;
@ -98,30 +97,30 @@ pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
let mut done = 0;
let mut ret = Box::<BlockInfoArray>::default();
for ((section_y, section), y, xz) in iproduct!(
chunk.sections().rev(),
BlockY::iter().rev(),
BlockInfoArray::keys()
) {
let entry = &mut ret[xz];
if entry.done() {
continue;
}
for (section_y, section) in chunk.sections().rev() {
for y in BlockY::iter().rev() {
for xz in BlockInfoArray::keys() {
let entry = &mut ret[xz];
if entry.done() {
continue;
}
let coords = SectionBlockCoords { xz, y };
let Some(block_type) = section.block_at(coords)? else {
continue;
};
let height = BlockHeight::new(section_y, y)?;
if !entry.fill(height, block_type) {
continue;
}
let coords = SectionBlockCoords { xz, y };
let Some(block_type) = section.block_at(coords)? else {
continue;
};
let height = BlockHeight::new(section_y, y)?;
if !entry.fill(height, block_type) {
continue;
}
assert!(entry.done());
assert!(entry.done());
done += 1;
if done == N * N {
break;
done += 1;
if done == N * N {
break;
}
}
}
}