demostf/tf-demos-viewer
1
0
Fork 0
mirror of https://codeberg.org/demostf/tf-demos-viewer.git synced 2026-06-03 18:14:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix unpack

Browse source
This commit is contained in:
Robin Appelman 2020-10-10 01:27:51 +02:00
commit 2ecf3098c8
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/state.rs
View file

@ -109,7 +109,7 @@ impl PlayerState {
} }
#[allow(dead_code)] #[allow(dead_code)]
pub fn unpack(bytes: [u8; 8], world: &World) -> Self { pub fn unpack(bytes: [u8; 7], world: &World) -> Self {
fn unpack_f32(val: u16, min: f32, max: f32) -> f32 { fn unpack_f32(val: u16, min: f32, max: f32) -> f32 {
let ratio = val as f32 / (u16::max_value() as f32); let ratio = val as f32 / (u16::max_value() as f32);
ratio * (max - min) + min ratio * (max - min) + min
@ -125,10 +125,11 @@ impl PlayerState {
world.boundary_min.y, world.boundary_min.y,
world.boundary_max.y, world.boundary_max.y,
); );
let health = u16::from_le_bytes([bytes[4], bytes[5]]); let team_class_health = u16::from_le_bytes([bytes[4], bytes[5]]);
let health = team_class_health & 1023;
let angle = Angle(bytes[6]); let angle = Angle(bytes[6]);
let team = Team::new(bytes[7] >> 4); let team = Team::new(team_class_health >> 14);
let class = Class::new(bytes[7] & 15); let class = Class::new((team_class_health >> 10) & 15);
PlayerState { PlayerState {
position: VectorXY { x, y }, position: VectorXY { x, y },
@ -142,6 +143,8 @@ impl PlayerState {
#[test] #[test]
fn test_packing() { fn test_packing() {
use tf_demo_parser::demo::vector::Vector;
let world = World { let world = World {
boundary_max: Vector { boundary_max: Vector {
x: 10000.0, x: 10000.0,