Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-06 20:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update avatar dissector to account for has flag bit reorder

Browse source
This commit is contained in:
Anthony Thibault 2019-04-22 15:37:53 -07:00
parent 0c0b847666
commit e28775b091
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/dissectors/3-hf-avatar.lua
View file

@ -439,10 +439,11 @@ function decode_avatar_data_packet(buf, avatar_data_sizes)
local has_additional_flags = (bit32.band(has_flags, 128) ~= 0)
local has_parent_info = (bit32.band(has_flags, 256) ~= 0)
local has_local_position = (bit32.band(has_flags, 512) ~= 0)
local has_face_tracker_info = (bit32.band(has_flags, 1024) ~= 0)
local has_joint_data = (bit32.band(has_flags, 2048) ~= 0)
local has_joint_default_pose_flags = (bit32.band(has_flags, 4096) ~= 0)
local has_grab_joints = (bit32.band(has_flags, 8192) ~= 0)
local has_hand_controllers = (bit32.band(has_flags, 1024) ~= 0)
local has_face_tracker_info = (bit32.band(has_flags, 2048) ~= 0)
local has_joint_data = (bit32.band(has_flags, 4096) ~= 0)
local has_joint_default_pose_flags = (bit32.band(has_flags, 8192) ~= 0)
local has_grab_joints = (bit32.band(has_flags, 16384) ~= 0)
result["has_flags"] = string.format("HasFlags: 0x%x", has_flags)
@ -519,6 +520,12 @@ function decode_avatar_data_packet(buf, avatar_data_sizes)
result["local_position"] = string.format("Local Position: %.3f, %.3f, %.3f", local_pos[1], local_pos[2], local_pos[3])
end
if has_hand_controllers then
-- TODO: skip faux joint data
i = i + (2 * 12)
avatar_data_sizes.joint_data_faux_joints_size = avatar_data_sizes.joint_data_faux_joints_size + (2 * 12)
end
if has_face_tracker_info then
local left_eye_blink = buf(i, 4):le_float()
i = i + 4
@ -574,10 +581,6 @@ function decode_avatar_data_packet(buf, avatar_data_sizes)
i = i + (#indices * 6)
avatar_data_sizes.joint_data_translations_size = avatar_data_sizes.joint_data_translations_size + (#indices * 6)
-- TODO: skip faux joint data
i = i + (2 * 12)
avatar_data_sizes.joint_data_faux_joints_size = avatar_data_sizes.joint_data_faux_joints_size + (2 * 12)
avatar_data_sizes.joint_data_size = avatar_data_sizes.joint_data_size + (i - joint_poses_start)
end