demostf/cutter
1
0
Fork 0
mirror of https://github.com/demostf/cutter.git synced 2026-06-03 20:04:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove baselines

Browse source
This commit is contained in:
Robin Appelman 2022-04-10 17:37:42 +02:00
commit 46efe08321
1 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/entity.rs
View file

@ -16,13 +16,13 @@ impl ActiveEntities {
pub fn handle_message(&mut self, msg: &PacketEntitiesMessage, state: &ParserState) { pub fn handle_message(&mut self, msg: &PacketEntitiesMessage, state: &ParserState) {
for entity in &msg.entities { for entity in &msg.entities {
if entity.pvs == PVS::Delete || entity.pvs == PVS::Leave { if entity.pvs == PVS::Delete || entity.pvs == PVS::Leave {
self.entities.remove(&entity.entity_index); self.remove_entity(entity.entity_index);
} else { } else {
self.handle_entity(entity, state); self.handle_entity(entity, state);
} }
} }
for deleted in msg.removed_entities.iter() { for deleted in msg.removed_entities.iter() {
self.entities.remove(deleted); self.remove_entity(*deleted);
} }
if msg.updated_base_line { if msg.updated_base_line {
let old_index = msg.base_line as usize; let old_index = msg.base_line as usize;
@ -37,10 +37,36 @@ impl ActiveEntities {
} }
} }
fn remove_entity(&mut self, entity_index: EntityId) {
self.entities.remove(&entity_index);
self.baselines[0].remove(&entity_index);
self.baselines[1].remove(&entity_index);
}
fn handle_entity(&mut self, entity: &PacketEntity, state: &ParserState) { fn handle_entity(&mut self, entity: &PacketEntity, state: &ParserState) {
self.entities self.entities
.entry(entity.entity_index) .entry(entity.entity_index)
.and_modify(|existing| update_entity(existing, entity, state)) .and_modify(|existing| {
if existing.serial_number != entity.serial_number {
*existing = entity.clone();
existing.pvs = PVS::Enter;
} else {
assert_eq!(
state.server_classes[usize::from(existing.server_class)],
state.server_classes[usize::from(entity.server_class)]
);
for prop in &entity.props {
match existing
.props
.iter_mut()
.find(|existing| existing.index == prop.index)
{
Some(existing) => existing.value = prop.value.clone(),
None => existing.props.push(prop.clone()),
}
}
}
})
.or_insert_with(|| entity.clone()); .or_insert_with(|| entity.clone());
} }
@ -72,25 +98,3 @@ fn encode_entities(mut entities: Vec<PacketEntity>) -> PacketEntitiesMessage {
updated_base_line: false, updated_base_line: false,
} }
} }
fn update_entity(old: &mut PacketEntity, new: &PacketEntity, _state: &ParserState) {
if old.serial_number != new.serial_number {
*old = new.clone();
old.pvs = PVS::Enter;
} else {
assert_eq!(
_state.server_classes[usize::from(old.server_class)],
_state.server_classes[usize::from(new.server_class)]
);
for prop in &new.props {
match old
.props
.iter_mut()
.find(|existing| existing.index == prop.index)
{
Some(existing) => existing.value = prop.value.clone(),
None => old.props.push(prop.clone()),
}
}
}
}