Skip to content

Allocate ChunkSection::changed_blocks on demand #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KonaeAkira wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allocate ChunkSection::changed_blocks on demand #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions crates/world/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,7 @@ pub struct ChunkSection {
block_count: u32,
#[cfg(feature = "networking")]
multi_block: CUpdateSectionBlocks,
changed_blocks: [i16; 16 * 16 * 16],
changed: bool,
changed_blocks: Option<Box<[i16; 16 * 16 * 16]>>,
}

impl ChunkSection {
Expand All @@ -279,8 +278,7 @@ impl ChunkSection {
chunk_z: 0,
records: Vec::new(),
},
changed_blocks: [-1; 16 * 16 * 16],
changed: false,
changed_blocks: None,
}
}

Expand All @@ -290,10 +288,9 @@ impl ChunkSection {

pub fn get_block(&self, x: u32, y: u32, z: u32) -> u32 {
let idx = ChunkSection::get_index(x, y, z);
if self.changed_blocks[idx] >= 0 {
self.changed_blocks[idx] as u32
} else {
self.buffer.get_entry(idx)
match &self.changed_blocks {
Some(changed_blocks) if changed_blocks[idx] >= 0 => changed_blocks[idx] as u32,
_ => self.buffer.get_entry(idx),
}
}

Expand All @@ -308,8 +305,10 @@ impl ChunkSection {
let idx = ChunkSection::get_index(x, y, z);
let changed = old_block != block;
if changed {
self.changed = true;
self.changed_blocks[idx] = block as i16;
let changed_blocks = self
.changed_blocks
.get_or_insert(Box::new([-1; 16 * 16 * 16]));
changed_blocks[idx] = block as i16;
}
changed
}
Expand Down Expand Up @@ -352,35 +351,38 @@ impl ChunkSection {
}

fn flush(&mut self) {
if self.changed {
for (i, block) in self.changed_blocks.iter().enumerate() {
if *block >= 0 {
self.buffer.set_entry(i, *block as u32);
if let Some(changed_blocks) = &self.changed_blocks {
for (i, block) in changed_blocks.iter().copied().enumerate() {
if block >= 0 {
self.buffer.set_entry(i, block as u32);
}
}
}
}

fn changed(&self) -> bool {
self.changed_blocks.is_some()
}

#[cfg(feature = "networking")]
fn multi_block(&mut self, chunk_x: i32, chunk_y: u32, chunk_z: i32) -> &CUpdateSectionBlocks {
self.multi_block.chunk_x = chunk_x;
self.multi_block.chunk_y = chunk_y;
self.multi_block.chunk_z = chunk_z;
if self.changed {
for (i, block) in self.changed_blocks.iter().enumerate() {
if *block >= 0 {
self.buffer.set_entry(i, *block as u32);
if let Some(changed_blocks) = &self.changed_blocks {
for (i, block) in changed_blocks.iter().copied().enumerate() {
if block >= 0 {
self.buffer.set_entry(i, block as u32);
self.multi_block.records.push(CUpdateSectionBlocksRecord {
block_id: *block as u32,
block_id: block as u32,
x: (i & 0xF) as u8,
y: (i >> 8) as u8,
z: ((i & 0xF0) >> 4) as u8,
});
}
}
self.changed = false;
self.changed_blocks = [-1; 16 * 16 * 16];
}
self.changed_blocks = None;
&self.multi_block
}
}
Expand All @@ -397,8 +399,7 @@ impl Default for ChunkSection {
chunk_z: 0,
records: Vec::new(),
},
changed_blocks: [-1; 16 * 16 * 16],
changed: false,
changed_blocks: None,
}
}
}
Expand Down Expand Up @@ -553,7 +554,7 @@ impl Chunk {
.enumerate()
.filter_map(move |(y, section)| {
section
.changed
.changed()
.then(move || section.multi_block(x, y as u32, z))
})
}
Expand Down