Merge pull request #13315 from dback2/avatarFeet

Fix default avatar feet

interface/resources/meshes/defaultAvatar_full.fst

@@ -2,88 +2,88 @@ name = mannequin
 type = body+head
 scale = 1
 filename = mannequin/mannequin.baked.fbx
-joint = jointRoot = Hips
+joint = jointNeck = Neck
 joint = jointLean = Spine
-joint = jointLeftHand = LeftHand
-joint = jointHead = Head
 joint = jointEyeLeft = LeftEye
 joint = jointEyeRight = RightEye
+joint = jointRoot = Hips
+joint = jointLeftHand = LeftHand
 joint = jointRightHand = RightHand
-joint = jointNeck = Neck
+joint = jointHead = Head
 freeJoint = LeftArm
 freeJoint = LeftForeArm
 freeJoint = RightArm
 freeJoint = RightForeArm
-bs = EyeBlink_L = blink = 1
 bs = JawOpen = mouth_Open = 1
 bs = LipsFunnel = Oo = 1
 bs = BrowsU_L = brow_Up = 1
-jointIndex = RightHandPinky2 = 19
-jointIndex = LeftHandMiddle4 = 61
-jointIndex = LeftHand = 41
-jointIndex = LeftHandRing4 = 49
-jointIndex = RightHandMiddle3 = 36
-jointIndex = LeftHandThumb4 = 57
-jointIndex = RightToe_End = 10
-jointIndex = LeftHandRing1 = 46
-jointIndex = LeftForeArm = 40
-jointIndex = RightHandIndex4 = 29
-jointIndex = LeftShoulder = 38
-jointIndex = RightHandMiddle4 = 37
-jointIndex = RightShoulder = 14
-jointIndex = LeftLeg = 2
-jointIndex = LeftToe_End = 5
-jointIndex = Hips = 0
-jointIndex = RightFoot = 8
-jointIndex = RightHandThumb2 = 31
-jointIndex = LeftHandMiddle3 = 60
-jointIndex = RightHandThumb1 = 30
-jointIndex = Neck = 62
-jointIndex = Spine = 11
-jointIndex = RightHandThumb4 = 33
-jointIndex = RightHandMiddle1 = 34
-jointIndex = LeftHandIndex4 = 53
-jointIndex = face = 68
-jointIndex = RightHandRing3 = 24
-jointIndex = LeftHandPinky4 = 45
-jointIndex = LeftHandMiddle2 = 59
-jointIndex = RightHandThumb3 = 32
+bs = EyeBlink_L = blink = 1
 jointIndex = LeftHandPinky3 = 44
-jointIndex = HeadTop_End = 66
-jointIndex = Spine1 = 12
-jointIndex = LeftHandRing3 = 48
-jointIndex = mannequin1 = 67
-jointIndex = RightEye = 65
-jointIndex = RightHandRing4 = 25
-jointIndex = RightHandPinky4 = 21
-jointIndex = LeftHandRing2 = 47
-jointIndex = RightHandIndex3 = 28
-jointIndex = RightUpLeg = 6
-jointIndex = LeftArm = 39
-jointIndex = LeftHandThumb3 = 56
-jointIndex = RightHandIndex2 = 27
-jointIndex = RightForeArm = 16
-jointIndex = RightArm = 15
-jointIndex = RightHandRing2 = 23
-jointIndex = LeftHandMiddle1 = 58
-jointIndex = Spine2 = 13
-jointIndex = LeftHandThumb2 = 55
-jointIndex = RightHandMiddle2 = 35
-jointIndex = RightHandPinky1 = 18
-jointIndex = LeftUpLeg = 1
-jointIndex = RightLeg = 7
-jointIndex = LeftHandIndex2 = 51
+jointIndex = LeftHand = 41
+jointIndex = RightHandMiddle1 = 34
+jointIndex = LeftHandPinky4 = 45
 jointIndex = RightHand = 17
-jointIndex = LeftHandIndex3 = 52
-jointIndex = LeftFoot = 3
 jointIndex = RightHandPinky3 = 20
-jointIndex = RightHandIndex1 = 26
-jointIndex = LeftHandPinky1 = 42
-jointIndex = RightToeBase = 9
-jointIndex = LeftHandIndex1 = 50
-jointIndex = LeftToeBase = 4
-jointIndex = LeftHandPinky2 = 43
-jointIndex = RightHandRing1 = 22
-jointIndex = LeftHandThumb1 = 54
-jointIndex = LeftEye = 64
+jointIndex = LeftFoot = 3
 jointIndex = Head = 63
+jointIndex = Spine1 = 12
+jointIndex = RightHandRing4 = 25
+jointIndex = RightHandPinky1 = 18
+jointIndex = LeftHandIndex1 = 50
+jointIndex = RightHandIndex3 = 28
+jointIndex = LeftHandIndex3 = 52
+jointIndex = LeftToe_End = 5
+jointIndex = RightArm = 15
+jointIndex = RightHandRing3 = 24
+jointIndex = RightHandThumb2 = 31
+jointIndex = Spine2 = 13
+jointIndex = HeadTop_End = 66
+jointIndex = LeftToeBase = 4
+jointIndex = RightUpLeg = 6
+jointIndex = RightForeArm = 16
+jointIndex = LeftHandMiddle1 = 58
+jointIndex = LeftHandRing3 = 48
+jointIndex = RightHandPinky4 = 21
+jointIndex = RightHandIndex1 = 26
+jointIndex = Hips = 0
+jointIndex = RightEye = 65
+jointIndex = RightHandPinky2 = 19
+jointIndex = LeftHandMiddle2 = 59
+jointIndex = LeftHandPinky1 = 42
+jointIndex = LeftHandRing4 = 49
+jointIndex = RightFoot = 8
+jointIndex = RightHandIndex2 = 27
+jointIndex = RightToe_End = 10
+jointIndex = RightHandThumb3 = 32
+jointIndex = LeftHandMiddle3 = 60
+jointIndex = LeftHandThumb4 = 57
+jointIndex = LeftHandMiddle4 = 61
+jointIndex = LeftHandThumb1 = 54
+jointIndex = LeftHandThumb3 = 56
+jointIndex = body = 67
+jointIndex = LeftArm = 39
+jointIndex = RightToeBase = 9
+jointIndex = LeftEye = 64
+jointIndex = RightLeg = 7
+jointIndex = face = 68
+jointIndex = LeftForeArm = 40
+jointIndex = RightHandThumb4 = 33
+jointIndex = RightHandRing1 = 22
+jointIndex = LeftUpLeg = 1
+jointIndex = LeftHandPinky2 = 43
+jointIndex = LeftLeg = 2
+jointIndex = LeftHandIndex4 = 53
+jointIndex = RightHandThumb1 = 30
+jointIndex = LeftHandRing2 = 47
+jointIndex = RightHandMiddle2 = 35
+jointIndex = RightHandMiddle3 = 36
+jointIndex = Spine = 11
+jointIndex = RightHandMiddle4 = 37
+jointIndex = LeftHandIndex2 = 51
+jointIndex = RightHandRing2 = 23
+jointIndex = LeftHandThumb2 = 55
+jointIndex = LeftShoulder = 38
+jointIndex = Neck = 62
+jointIndex = RightHandIndex4 = 29
+jointIndex = LeftHandRing1 = 46
+jointIndex = RightShoulder = 14

libraries/networking/src/udt/PacketHeaders.cpp

@@ -40,7 +40,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::AvatarData:
         case PacketType::BulkAvatarData:
         case PacketType::KillAvatar:
-            return static_cast<PacketVersion>(AvatarMixerPacketVersion::FBXReaderNodeReparenting);
+            return static_cast<PacketVersion>(AvatarMixerPacketVersion::FixMannequinDefaultAvatarFeet);
         case PacketType::MessagesData:
             return static_cast<PacketVersion>(MessageDataVersion::TextOrBinaryData);
         // ICE packets

libraries/networking/src/udt/PacketHeaders.h

@@ -282,7 +282,8 @@ enum class AvatarMixerPacketVersion : PacketVersion {
     AvatarIdentityLookAtSnapping,
     UpdatedMannequinDefaultAvatar,
     AvatarJointDefaultPoseFlags,
-    FBXReaderNodeReparenting
+    FBXReaderNodeReparenting,
+    FixMannequinDefaultAvatarFeet
 };
 
 enum class DomainConnectRequestVersion : PacketVersion {