diff --git a/interface/resources/meshes/defaultAvatar_full.fst b/interface/resources/meshes/defaultAvatar_full.fst index eb8e356196..aa1c17fc40 100644 --- a/interface/resources/meshes/defaultAvatar_full.fst +++ b/interface/resources/meshes/defaultAvatar_full.fst @@ -2,14 +2,14 @@ name = mannequin type = body+head scale = 1 filename = mannequin/mannequin.baked.fbx -joint = jointEyeLeft = LeftEye -joint = jointRightHand = RightHand -joint = jointHead = Head -joint = jointEyeRight = RightEye -joint = jointLean = Spine -joint = jointNeck = Neck -joint = jointLeftHand = LeftHand joint = jointRoot = Hips +joint = jointLean = Spine +joint = jointLeftHand = LeftHand +joint = jointHead = Head +joint = jointEyeLeft = LeftEye +joint = jointEyeRight = RightEye +joint = jointRightHand = RightHand +joint = jointNeck = Neck freeJoint = LeftArm freeJoint = LeftForeArm freeJoint = RightArm @@ -18,72 +18,72 @@ bs = EyeBlink_L = blink = 1 bs = JawOpen = mouth_Open = 1 bs = LipsFunnel = Oo = 1 bs = BrowsU_L = brow_Up = 1 -jointIndex = RightHandIndex2 = 27 -jointIndex = LeftHandIndex2 = 51 -jointIndex = RightUpLeg = 6 -jointIndex = RightToe_End = 10 -jointIndex = RightEye = 65 -jointIndex = LeftHandPinky1 = 42 -jointIndex = RightHandRing1 = 22 -jointIndex = face = 67 -jointIndex = LeftUpLeg = 1 -jointIndex = LeftHand = 41 -jointIndex = LeftHandMiddle1 = 58 -jointIndex = LeftHandIndex1 = 50 -jointIndex = LeftEye = 64 -jointIndex = RightHandIndex1 = 26 -jointIndex = LeftHandPinky4 = 45 -jointIndex = RightArm = 15 -jointIndex = LeftShoulder = 38 jointIndex = RightHandPinky2 = 19 -jointIndex = RightHandThumb1 = 30 -jointIndex = RightForeArm = 16 -jointIndex = LeftHandMiddle3 = 60 -jointIndex = Neck = 62 -jointIndex = LeftHandThumb1 = 54 -jointIndex = RightHandMiddle2 = 35 jointIndex = LeftHandMiddle4 = 61 -jointIndex = mannequin = 68 -jointIndex = Spine1 = 12 +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 +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 = RightHand = 17 jointIndex = LeftHandIndex3 = 52 -jointIndex = RightHandIndex3 = 28 -jointIndex = RightHandMiddle4 = 37 -jointIndex = LeftLeg = 2 -jointIndex = RightHandMiddle1 = 34 -jointIndex = Spine2 = 13 -jointIndex = LeftHandMiddle2 = 59 -jointIndex = LeftHandPinky3 = 44 -jointIndex = LeftHandThumb3 = 56 -jointIndex = LeftHandRing4 = 49 -jointIndex = RightHandThumb2 = 31 -jointIndex = LeftHandRing3 = 48 -jointIndex = HeadTop_End = 66 -jointIndex = LeftHandThumb4 = 57 -jointIndex = RightHandThumb3 = 32 -jointIndex = RightHandPinky1 = 18 -jointIndex = RightLeg = 7 -jointIndex = RightHandMiddle3 = 36 -jointIndex = RightHandPinky3 = 20 -jointIndex = LeftToeBase = 4 -jointIndex = LeftForeArm = 40 -jointIndex = RightShoulder = 14 -jointIndex = LeftHandRing2 = 47 -jointIndex = LeftHandThumb2 = 55 -jointIndex = Head = 63 -jointIndex = RightHandRing4 = 25 -jointIndex = LeftHandRing1 = 46 jointIndex = LeftFoot = 3 -jointIndex = RightHandRing3 = 24 -jointIndex = RightHandThumb4 = 33 -jointIndex = LeftArm = 39 -jointIndex = LeftToe_End = 5 +jointIndex = RightHandPinky3 = 20 +jointIndex = RightHandIndex1 = 26 +jointIndex = LeftHandPinky1 = 42 jointIndex = RightToeBase = 9 -jointIndex = RightHandPinky4 = 21 -jointIndex = Spine = 11 -jointIndex = LeftHandIndex4 = 53 +jointIndex = LeftHandIndex1 = 50 +jointIndex = LeftToeBase = 4 jointIndex = LeftHandPinky2 = 43 -jointIndex = RightHandIndex4 = 29 -jointIndex = Hips = 0 -jointIndex = RightHandRing2 = 23 +jointIndex = RightHandRing1 = 22 +jointIndex = LeftHandThumb1 = 54 +jointIndex = LeftEye = 64 +jointIndex = Head = 63 diff --git a/interface/resources/meshes/mannequin/Eyes.ktx b/interface/resources/meshes/mannequin/Eyes.ktx old mode 100755 new mode 100644 index 4da922936b..ada45776a0 Binary files a/interface/resources/meshes/mannequin/Eyes.ktx and b/interface/resources/meshes/mannequin/Eyes.ktx differ diff --git a/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx b/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx old mode 100755 new mode 100644 index fcca382445..f151352592 Binary files a/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx and b/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx differ diff --git a/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx b/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx old mode 100755 new mode 100644 index 3ae717c5d7..fb738063ae Binary files a/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx and b/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx differ diff --git a/interface/resources/meshes/mannequin/lambert1_Roughness.ktx b/interface/resources/meshes/mannequin/lambert1_Roughness.ktx old mode 100755 new mode 100644 index fe9b42a54b..afe96d1631 Binary files a/interface/resources/meshes/mannequin/lambert1_Roughness.ktx and b/interface/resources/meshes/mannequin/lambert1_Roughness.ktx differ diff --git a/interface/resources/meshes/mannequin/mannequin.baked.fbx b/interface/resources/meshes/mannequin/mannequin.baked.fbx old mode 100755 new mode 100644 index b405b4cfbb..2b0e1cf04b Binary files a/interface/resources/meshes/mannequin/mannequin.baked.fbx and b/interface/resources/meshes/mannequin/mannequin.baked.fbx differ diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp index 2f3f65c90b..7c21652ba2 100644 --- a/libraries/networking/src/udt/PacketHeaders.cpp +++ b/libraries/networking/src/udt/PacketHeaders.cpp @@ -37,7 +37,7 @@ PacketVersion versionForPacketType(PacketType packetType) { case PacketType::AvatarData: case PacketType::BulkAvatarData: case PacketType::KillAvatar: - return static_cast(AvatarMixerPacketVersion::AvatarIdentityLookAtSnapping); + return static_cast(AvatarMixerPacketVersion::UpdatedMannequinDefaultAvatar); case PacketType::MessagesData: return static_cast(MessageDataVersion::TextOrBinaryData); case PacketType::ICEServerHeartbeat: diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index 122be60870..e514c27f7d 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -300,6 +300,7 @@ enum class AvatarMixerPacketVersion : PacketVersion { AvatarIdentitySequenceFront, IsReplicatedInAvatarIdentity, AvatarIdentityLookAtSnapping, + UpdatedMannequinDefaultAvatar }; enum class DomainConnectRequestVersion : PacketVersion {