diff options
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/cell/cell.rs | 21 | ||||
| -rw-r--r-- | src/sim/cell_sim/sim.rs | 46 | ||||
| -rw-r--r-- | src/sim/mod.rs | 56 | ||||
| -rw-r--r-- | src/sim/rb_sim/mod.rs | 1 |
4 files changed, 76 insertions, 48 deletions
diff --git a/src/sim/cell/cell.rs b/src/sim/cell/cell.rs index 2664721..c4b0a8f 100644 --- a/src/sim/cell/cell.rs +++ b/src/sim/cell/cell.rs @@ -9,6 +9,7 @@ pub struct Cell { impl Cell { const FLAG_PARITY: u8 = 0b0000_0001; + const FLAG_RB: u8 = 0b0000_0010; #[inline] pub fn parity(self) -> u8 { @@ -20,8 +21,24 @@ impl Cell { } #[inline] pub fn match_parity(&mut self, seqno: u64) { - // TODO this will break with more flags - self.flags = (seqno as u8) & 0b1; + let parity = seqno % 2 != 0; + if parity { + self.flags |= Self::FLAG_PARITY; + } else { + self.flags = self.flags & !Self::FLAG_PARITY + } + } + + #[inline] + pub fn rb(self) -> bool { + self.flags & Self::FLAG_RB == 1 + } + pub fn set_rb(&mut self, rb: bool) { + if rb { + self.flags |= Self::FLAG_RB + } else { + self.flags = self.flags & !Self::FLAG_RB + } } } diff --git a/src/sim/cell_sim/sim.rs b/src/sim/cell_sim/sim.rs index 0f02a23..8831bb4 100644 --- a/src/sim/cell_sim/sim.rs +++ b/src/sim/cell_sim/sim.rs @@ -181,52 +181,6 @@ const NEIGHBORHOOD_OFFSETS: [(i32, i32); 9] = [ (1, 1), ]; -pub fn write_rb_entity_to_world( - world: &mut World, - rb_sim_manager: &RbSimManager, - rb_entity_id: u32, - next_seqno: u64, -) { - if let Some(rb_entity) = rb_sim_manager.rb_entities.get(&rb_entity_id) - && let Some((rb_x, rb_y, cos, sin)) = rb_sim_manager.get_rb_entity_transform(rb_entity_id) - { - let half_size = CHUNK_SIZE as f32 / 2.0; - // half-extent of the rotated grid's axis-aligned bounding box, plus a cell of margin - let radius = half_size * (cos.abs() + sin.abs()) + 1.0; - - let world_xl = (rb_x - radius).floor() as i32; - let world_xu = (rb_x + radius).ceil() as i32; - let world_yl = (rb_y - radius).floor() as i32; - let world_yu = (rb_y + radius).ceil() as i32; - - for world_x in world_xl..=world_xu { - for world_y in world_yl..=world_yu { - // same as shader - let d = (world_x as f32 + 0.5 - rb_x, world_y as f32 + 0.5 - rb_y); - let q = (d.0.floor() + 0.5, d.1.floor() + 0.5); - let (lx, ly) = ( - (q.0 * cos + q.1 * sin + half_size).floor() as i32, - (-q.0 * sin + q.1 * cos + half_size).floor() as i32, - ); - - if lx < 0 || ly < 0 || lx >= CHUNK_SIZE || ly >= CHUNK_SIZE { - continue; - } - - let mut cell = rb_entity.get_cell_at_local_position(lx as u8, ly as u8); - if cell.material == MaterialId::Void { - continue; - } - - cell.match_parity(next_seqno); - - // TODO: OPTIMIZE!! - world.set_cell_from_game_position(world_x, world_y, cell, false); - } - } - } -} - pub fn sim_tick(world: &mut World, seqno: u64, use_threading: bool) { puffin::profile_function!(); diff --git a/src/sim/mod.rs b/src/sim/mod.rs index 63a9c56..dfc99c3 100644 --- a/src/sim/mod.rs +++ b/src/sim/mod.rs @@ -1,3 +1,59 @@ +use crate::{ + config::CHUNK_SIZE, + sim::{cell::materials::MaterialId, cell_sim::world::World, rb_sim::RbSimManager}, +}; + pub mod cell; pub mod cell_sim; pub mod rb_sim; + +pub fn write_rb_entity_to_world( + world: &mut World, + rb_sim_manager: &RbSimManager, + rb_entity_id: u32, + // make sure these cells will be simulated + seqno: u64, + // (entity_x, entity_y, cell_x, cell_y) +) -> Vec<(u8, u8, i32, i32)> { + let mut cells_written: Vec<(u8, u8, i32, i32)> = Vec::new(); + if let Some(rb_entity) = rb_sim_manager.rb_entities.get(&rb_entity_id) + && let Some((rb_x, rb_y, cos, sin)) = rb_sim_manager.get_rb_entity_transform(rb_entity_id) + { + let half_size = CHUNK_SIZE as f32 / 2.0; + // half-extent of the rotated grid's axis-aligned bounding box, plus a cell of margin + let radius = half_size * (cos.abs() + sin.abs()) + 1.0; + + let world_xl = (rb_x - radius).floor() as i32; + let world_xu = (rb_x + radius).ceil() as i32; + let world_yl = (rb_y - radius).floor() as i32; + let world_yu = (rb_y + radius).ceil() as i32; + + for world_x in world_xl..=world_xu { + for world_y in world_yl..=world_yu { + // same as shader + let d = (world_x as f32 + 0.5 - rb_x, world_y as f32 + 0.5 - rb_y); + let q = (d.0.floor() + 0.5, d.1.floor() + 0.5); + let (lx, ly) = ( + (q.0 * cos + q.1 * sin + half_size).floor() as i32, + (-q.0 * sin + q.1 * cos + half_size).floor() as i32, + ); + + if lx < 0 || ly < 0 || lx >= CHUNK_SIZE || ly >= CHUNK_SIZE { + continue; + } + + let mut cell = rb_entity.get_cell_at_local_position(lx as u8, ly as u8); + if cell.material == MaterialId::Void { + continue; + } + + cell.match_parity(seqno); + + // TODO: OPTIMIZE!! + world.set_cell_from_game_position(world_x, world_y, cell, false); + cells_written.push((lx as u8, ly as u8, world_x, world_y)); + } + } + } + cells_written +} diff --git a/src/sim/rb_sim/mod.rs b/src/sim/rb_sim/mod.rs index 10172a1..8101afd 100644 --- a/src/sim/rb_sim/mod.rs +++ b/src/sim/rb_sim/mod.rs @@ -163,6 +163,7 @@ impl RbSimManager { for y in CHUNK_SIZE / 2 - 5..CHUNK_SIZE / 2 + 5 { let cell_idx = x + y * CHUNK_SIZE; test_cells[cell_idx as usize] = Cell::from_material(material); + test_cells[cell_idx as usize].set_rb(true); } } |