Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1

libraries/audio/src/AudioHRTF.cpp

@@ -840,7 +840,7 @@ static void nearFieldGainCorrection(float azimuth, float distance, float& gainL,
     // normalized distance factor = [0,1] as distance = [HRTF_NEARFIELD_MAX,HRTF_HEAD_RADIUS]
     assert(distance < HRTF_NEARFIELD_MAX);
     assert(distance > HRTF_HEAD_RADIUS);
-	float d = (HRTF_NEARFIELD_MAX - distance) * ( 1.0f / (HRTF_NEARFIELD_MAX - HRTF_HEAD_RADIUS));
+	float d = (HRTF_NEARFIELD_MAX - distance) * (1.0f / (HRTF_NEARFIELD_MAX - HRTF_HEAD_RADIUS));
 
     // angle of incidence at each ear
     float angleL = azimuth + HALFPI;
@@ -919,6 +919,9 @@ static void azimuthToIndex(float azimuth, int& index0, int& index1, float& frac)
     index1 = index0 + 1;
     frac = azimuth - (float)index0;
 
+    if (index0 >= HRTF_AZIMUTHS) {
+        index0 -= HRTF_AZIMUTHS;
+    }
     if (index1 >= HRTF_AZIMUTHS) {
         index1 -= HRTF_AZIMUTHS;
     }

scripts/system/libraries/entityCameraTool.js

@@ -77,17 +77,17 @@ CameraManager = function() {
     }
 
     var keyToActionMapping = {
-        "a": "orbitLeft",
+        65: "orbitLeft",     // "a"
-        "d": "orbitRight",
+        68: "orbitRight",    // "d"
-        "w": "orbitForward",
+        87: "orbitForward",  // "w"
-        "s": "orbitBackward",
+        83: "orbitBackward", // "s"
-        "e": "orbitUp",
+        69: "orbitUp",       // "e"
-        "c": "orbitDown",
+        67: "orbitDown",     // "c"
         
-        "LEFT": "orbitLeft",
+        16777234: "orbitLeft",     // "LEFT"
-        "RIGHT": "orbitRight",
+        16777236: "orbitRight",    // "RIGHT"
-        "UP": "orbitForward",
+        16777235: "orbitForward",  // "UP"
-        "DOWN": "orbitBackward",
+        16777237: "orbitBackward", // "DOWN"
     }
 
     var CAPTURED_KEYS = [];
@@ -96,7 +96,7 @@ CameraManager = function() {
     }
 
     function getActionForKeyEvent(event) {
-        var action = keyToActionMapping[event.text];
+        var action = keyToActionMapping[event.key];
         if (action !== undefined) {
             if (event.isShifted) {
                 if (action === "orbitForward") {

tools/dissectors/3-hf-avatar.lua

@@ -19,6 +19,8 @@ local f_avatar_data_valid_rotations = ProtoField.string("hf_avatar.avatar_data_v
 local f_avatar_data_valid_translations = ProtoField.string("hf_avatar.avatar_data_valid_translations", "Valid Translations")
 local f_avatar_data_default_rotations = ProtoField.string("hf_avatar.avatar_data_default_rotations", "Valid Default")
 local f_avatar_data_default_translations = ProtoField.string("hf_avatar.avatar_data_default_translations", "Valid Default")
+local f_avatar_data_sizes = ProtoField.string("hf_avatar.avatar_sizes", "Sizes")
+
 
 p_hf_avatar.fields = {
   f_avatar_id, f_avatar_data_parent_id
@@ -110,6 +112,9 @@ function add_avatar_data_subtrees(avatar_data)
   if avatar_data["default_translations"] then
     avatar_subtree:add(f_avatar_data_default_translations, avatar_data["default_translations"])
   end
+  if avatar_data["sizes"] then
+    avatar_subtree:add(f_avatar_data_sizes, avatar_data["sizes"])
+  end
 end
 
 function decode_vec3(buf)
@@ -154,6 +159,8 @@ function decode_avatar_data_packet(buf)
   local i = 0
   local result = {}
 
+  result["sizes"] = ""
+
   -- uint16 has_flags
   local has_flags = buf(i, 2):le_uint()
   i = i + 2
@@ -258,6 +265,8 @@ function decode_avatar_data_packet(buf)
 
   if has_joint_data then
 
+    local joint_poses_start = i
+
     local num_joints = buf(i, 1):uint()
     i = i + 1
     local num_validity_bytes = math.ceil(num_joints / 8)
@@ -279,6 +288,8 @@ function decode_avatar_data_packet(buf)
     -- TODO: skip hand controller data
     i = i + 24
 
+    result["sizes"] = result["sizes"] .. " Poses: " .. (i - joint_poses_start)
+
   end
 
   if has_joint_default_pose_flags then
@@ -295,5 +306,7 @@ function decode_avatar_data_packet(buf)
     result["default_translations"] = "Default Translations: " .. string.format("(%d/%d) {", #indices, num_joints) .. table.concat(indices, ", ") .. "}"
   end
 
+  result["sizes"] = result["sizes"] .. " Total: " .. i
+
   return result
 end

tools/dissectors/README.md

@@ -0,0 +1,14 @@
+High Fidelity Wireshark Plugins
+---------------------------------
+
+Install wireshark 2.4.6 or higher.
+
+Copy these lua files into c:\Users\username\AppData\Roaming\Wireshark\Plugins
+
+After a capture any detected High Fidelity Packets should be easily identifiable by one of the following protocols
+
+* HF-AUDIO - Streaming audio packets
+* HF-AVATAR - Streaming avatar mixer packets
+* HF-ENTITY - Entity server traffic
+* HF-DOMAIN - Domain server traffic
+* HFUDT - All other UDP traffic