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

use baselines from parser

Browse source
This commit is contained in:
Robin Appelman 2022-04-18 13:11:37 +02:00
commit ebb80373e8
1 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/entity.rs
View file

@ -9,7 +9,6 @@ use tf_demo_parser::ParserState;
#[derive(Default)] #[derive(Default)]
pub struct ActiveEntities { pub struct ActiveEntities {
baselines: [HashMap<EntityId, PacketEntity>; 2],
entities: HashMap<EntityId, PacketEntity>, entities: HashMap<EntityId, PacketEntity>,
max_entities: u16, max_entities: u16,
} }
@ -27,30 +26,6 @@ impl ActiveEntities {
for deleted in msg.removed_entities.iter() { for deleted in msg.removed_entities.iter() {
self.remove_entity(*deleted); self.remove_entity(*deleted);
} }
if msg.updated_base_line {
let old_index = msg.base_line as usize;
let new_index = 1 - old_index;
self.baselines[new_index] = self.baselines[old_index].clone();
for entity in &msg.entities {
if entity.update_type == UpdateType::Enter {
let mut entity = match self.baselines[old_index].get(&entity.entity_index) {
Some(baseline)
if baseline.server_class == entity.server_class
&& msg.delta.is_some() =>
{
let mut baseline = baseline.clone();
baseline.apply_update(&entity.props);
baseline
}
_ => entity.clone(),
};
entity.baseline_props = vec![];
self.baselines[new_index].insert(entity.entity_index, entity);
}
}
}
} }
fn remove_entity(&mut self, entity_index: EntityId) { fn remove_entity(&mut self, entity_index: EntityId) {
@ -89,11 +64,17 @@ impl ActiveEntities {
// baselines in reverse order // baselines in reverse order
let mut baselines = [ let mut baselines = [
encode_entities( encode_entities(
self.baselines[1].clone().into_values().collect::<Vec<_>>(), state.instance_baselines[1]
.clone()
.into_values()
.collect::<Vec<_>>(),
self.max_entities, self.max_entities,
), ),
encode_entities( encode_entities(
self.baselines[0].clone().into_values().collect::<Vec<_>>(), state.instance_baselines[0]
.clone()
.into_values()
.collect::<Vec<_>>(),
self.max_entities, self.max_entities,
), ),
]; ];