demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

use more optimized way to store things in state

Browse source
This commit is contained in:
Robin Appelman 2019-08-29 16:47:32 +02:00
commit 33b8d76e88
5 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/demo/message/packetentities.rs
View file

@ -108,7 +108,7 @@ pub struct PacketEntitiesMessage {
fn get_send_table(state: &ParserState, class: ClassId) -> Result<&SendTable> {
state
.send_tables
.get(&class)
.get(usize::from(class))
.ok_or_else(|| MalformedDemoError::UnknownServerClass(class).into())
}
@ -206,7 +206,7 @@ impl PacketEntitiesMessage {
let serial = stream.read_sized(10)?;
let send_table = state
.send_tables
.get(&class_index)
.get(usize::from(class_index))
.ok_or_else(|| MalformedDemoError::UnknownServerClass(class_index))?;
let props = match state.instance_baselines[baseline_index].get(&entity_index) {

16
src/demo/parser/state.rs
View file

@ -10,6 +10,7 @@ use crate::demo::packet::stringtable::StringTableEntry;
use crate::demo::parser::analyser::Analyser;
use crate::demo::parser::handler::MessageHandler;
use crate::demo::sendprop::SendProp;
use crate::nullhasher::NullHasherBuilder;
use crate::{Result, Stream};
use std::cell::RefCell;
use std::rc::Rc;
@ -26,8 +27,8 @@ pub struct ParserState {
pub parsed_static_baselines: RefCell<HashMap<ClassId, Vec<SendProp>>>,
pub event_definitions: Vec<GameEventDefinition>,
pub string_tables: Vec<StringTableMeta>,
pub entity_classes: HashMap<EntityId, ClassId>,
pub send_tables: HashMap<ClassId, SendTable>,
pub entity_classes: HashMap<EntityId, ClassId, NullHasherBuilder>,
pub send_tables: Vec<SendTable>, // indexed by ClassId
pub server_classes: Vec<ServerClass>,
pub instance_baselines: [HashMap<EntityId, Vec<SendProp>>; 2],
pub demo_meta: DemoMeta,
@ -57,8 +58,8 @@ impl ParserState {
parsed_static_baselines: RefCell::new(HashMap::new()),
event_definitions: Vec::new(),
string_tables: Vec::new(),
entity_classes: HashMap::new(),
send_tables: HashMap::new(),
entity_classes: HashMap::with_hasher(NullHasherBuilder),
send_tables: Vec::new(),
server_classes: Vec::new(),
instance_baselines: [HashMap::new(), HashMap::new()],
demo_meta: DemoMeta::default(),
@ -99,9 +100,14 @@ impl ParserState {
self.send_tables.reserve(self.server_classes.len());
let mut last: usize = 0;
for class in self.server_classes.iter() {
assert_eq!(usize::from(class.id), last);
last += 1;
if let Some(table) = send_tables.remove(&class.data_table) {
self.send_tables.insert(class.id, table);
self.send_tables.push(table);
}
}
}