diff --git a/interface/resources/meshes/Jointy3/Jointy3.fbx b/interface/resources/meshes/Jointy3/Jointy3.fbx new file mode 100644 index 0000000000..9df7b17eac Binary files /dev/null and b/interface/resources/meshes/Jointy3/Jointy3.fbx differ diff --git a/interface/resources/meshes/being_of_light/being_of_light.fbx b/interface/resources/meshes/being_of_light/being_of_light.fbx deleted file mode 100644 index 20e71abd6d..0000000000 Binary files a/interface/resources/meshes/being_of_light/being_of_light.fbx and /dev/null differ diff --git a/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_DiffuseMap.png b/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_DiffuseMap.png deleted file mode 100644 index 8fcf588643..0000000000 Binary files a/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_DiffuseMap.png and /dev/null differ diff --git a/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_EmissiveMap.png b/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_EmissiveMap.png deleted file mode 100644 index d836aebde8..0000000000 Binary files a/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_EmissiveMap.png and /dev/null differ diff --git a/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_NormalMap.png b/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_NormalMap.png deleted file mode 100644 index f5000b86e9..0000000000 Binary files a/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_NormalMap.png and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar_full.fst b/interface/resources/meshes/defaultAvatar_full.fst index 7d917318dd..3abbaf9ff7 100644 --- a/interface/resources/meshes/defaultAvatar_full.fst +++ b/interface/resources/meshes/defaultAvatar_full.fst @@ -1,135 +1,85 @@ -name = being_of_light +name = Jointy3 type = body+head scale = 1 -filename = being_of_light/being_of_light.fbx -texdir = being_of_light/textures -joint = jointRoot = Hips +filename = Jointy3/Jointy3.fbx +texdir = Jointy3/textures +joint = jointNeck = Neck joint = jointLeftHand = LeftHand -joint = jointHead = HeadTop_End +joint = jointEyeRight = RightEye +joint = jointHead = Head +joint = jointRightHand = RightHand +joint = jointRoot = Hips joint = jointLean = Spine joint = jointEyeLeft = LeftEye -joint = jointRightHand = RightHand -joint = jointNeck = Head -joint = jointEyeRight = RightEye freeJoint = LeftArm freeJoint = LeftForeArm freeJoint = RightArm freeJoint = RightForeArm -bs = MouthFrown_L = Frown_Left = 1 -bs = MouthLeft = Midmouth_Left = 1 -bs = BrowsU_R = BrowsUp_Right = 1 -bs = ChinUpperRaise = UpperLipUp_Right = 0.5 -bs = ChinUpperRaise = UpperLipUp_Left = 0.5 -bs = MouthSmile_R = Smile_Right = 1 -bs = MouthDimple_L = Smile_Left = 0.25 -bs = EyeBlink_L = Blink_Left = 1 -bs = BrowsD_L = BrowsDown_Left = 1 -bs = MouthFrown_R = Frown_Right = 1 -bs = MouthDimple_R = Smile_Right = 0.25 -bs = Sneer = Squint_Right = 0.5 -bs = Sneer = Squint_Left = 0.5 -bs = Sneer = NoseScrunch_Right = 0.75 -bs = Sneer = NoseScrunch_Left = 0.75 -bs = EyeSquint_L = Squint_Left = 1 -bs = EyeBlink_R = Blink_Right = 1 -bs = JawLeft = JawRotateY_Left = 0.5 -bs = BrowsD_R = BrowsDown_Right = 1 -bs = EyeSquint_R = Squint_Right = 1 -bs = Puff = CheekPuff_Right = 1 -bs = Puff = CheekPuff_Left = 1 -bs = LipsUpperClose = UpperLipIn = 1 -bs = JawOpen = MouthOpen = 0.69999999999999996 -bs = LipsUpperUp = UpperLipUp_Right = 0.69999999999999996 -bs = LipsUpperUp = UpperLipUp_Left = 0.69999999999999996 -bs = LipsLowerDown = LowerLipDown_Right = 0.69999999999999996 -bs = LipsLowerDown = LowerLipDown_Left = 0.69999999999999996 -bs = LipsLowerOpen = LowerLipOut = 1 -bs = EyeOpen_L = EyesWide_Left = 1 -bs = LipsPucker = MouthNarrow_Right = 1 -bs = LipsPucker = MouthNarrow_Left = 1 -bs = EyeOpen_R = EyesWide_Right = 1 -bs = JawRight = Jaw_Right = 1 -bs = MouthRight = Midmouth_Right = 1 -bs = ChinLowerRaise = Jaw_Up = 1 -bs = LipsUpperOpen = UpperLipOut = 1 -bs = BrowsU_C = BrowsUp_Right = 1 -bs = BrowsU_C = BrowsUp_Left = 1 -bs = JawFwd = JawForeward = 1 -bs = BrowsU_L = BrowsUp_Left = 1 -bs = MouthSmile_L = Smile_Left = 1 -bs = LipsLowerClose = LowerLipIn = 1 -bs = LipsFunnel = TongueUp = 1 -bs = LipsFunnel = MouthWhistle_NarrowAdjust_Right = 0.5 -bs = LipsFunnel = MouthWhistle_NarrowAdjust_Left = 0.5 -bs = LipsFunnel = MouthNarrow_Right = 1 -bs = LipsFunnel = MouthNarrow_Left = 1 -bs = LipsFunnel = Jaw_Down = 0.35999999999999999 -bs = LipsFunnel = JawForeward = 0.39000000000000001 -jointIndex = LeftHandIndex1 = 50 -jointIndex = LeftHandIndex2 = 51 -jointIndex = LeftHandIndex3 = 52 -jointIndex = LeftHandIndex4 = 53 -jointIndex = Spine1 = 12 -jointIndex = Spine2 = 13 -jointIndex = RightHandThumb1 = 18 -jointIndex = RightHandThumb2 = 19 -jointIndex = RightHandThumb3 = 20 -jointIndex = RightHandThumb4 = 21 -jointIndex = LeftFoot = 8 -jointIndex = LeftForeArm = 40 -jointIndex = Neck = 62 -jointIndex = Head = 63 -jointIndex = Hips = 0 -jointIndex = RightHandPinky1 = 30 -jointIndex = RightHandPinky2 = 31 -jointIndex = RightHandPinky3 = 32 -jointIndex = RightHandPinky4 = 33 -jointIndex = RightLeg = 2 -jointIndex = RightForeArm = 16 -jointIndex = LeftHandRing1 = 46 -jointIndex = LeftHandRing2 = 47 -jointIndex = LeftHandRing3 = 48 -jointIndex = LeftHandRing4 = 49 -jointIndex = LeftHandThumb1 = 54 -jointIndex = LeftHandThumb2 = 55 -jointIndex = LeftHandThumb3 = 56 -jointIndex = LeftHandThumb4 = 57 -jointIndex = HeadTop_End = 66 -jointIndex = LeftUpLeg = 6 -jointIndex = LeftToeBase = 9 -jointIndex = LeftHandPinky1 = 42 -jointIndex = LeftHandPinky2 = 43 -jointIndex = LeftHandPinky3 = 44 -jointIndex = LeftHandPinky4 = 45 -jointIndex = LeftLeg = 7 -jointIndex = RightEye = 65 jointIndex = RightHand = 17 -jointIndex = RightToeBase = 4 -jointIndex = RightUpLeg = 1 -jointIndex = RightArm = 15 -jointIndex = RightHandRing1 = 26 -jointIndex = RightHandRing2 = 27 -jointIndex = RightHandRing3 = 28 -jointIndex = RightHandRing4 = 29 -jointIndex = RightHandIndex1 = 22 -jointIndex = RightHandIndex2 = 23 -jointIndex = RightHandIndex3 = 24 -jointIndex = RightHandIndex4 = 25 -jointIndex = LeftToe_End = 10 -jointIndex = LeftHandMiddle1 = 58 -jointIndex = LeftHandMiddle2 = 59 -jointIndex = LeftHandMiddle3 = 60 -jointIndex = LeftShoulder = 38 -jointIndex = LeftHandMiddle4 = 61 -jointIndex = RightFoot = 3 -jointIndex = LeftHand = 41 -jointIndex = RightHandMiddle1 = 34 -jointIndex = RightHandMiddle2 = 35 -jointIndex = RightHandMiddle3 = 36 +jointIndex = LeftHandIndex3 = 56 +jointIndex = Hips = 0 +jointIndex = LeftHandRing2 = 47 +jointIndex = LeftHandThumb3 = 60 jointIndex = RightShoulder = 14 -jointIndex = LeftEye = 64 -jointIndex = RightHandMiddle4 = 37 -jointIndex = Body = 67 -jointIndex = LeftArm = 39 +jointIndex = RightHandRing1 = 30 +jointIndex = RightHandRing3 = 32 +jointIndex = LeftHandPinky4 = 45 +jointIndex = LeftHandRing1 = 46 +jointIndex = LeftFoot = 8 +jointIndex = RightHandIndex2 = 23 +jointIndex = RightToeBase = 4 +jointIndex = RightHandMiddle4 = 29 +jointIndex = RightHandPinky4 = 37 +jointIndex = LeftToe_End = 10 +jointIndex = RightEye = 66 +jointIndex = RightHandPinky2 = 35 +jointIndex = RightHandRing2 = 31 +jointIndex = LeftHand = 41 jointIndex = RightToe_End = 5 +jointIndex = LeftEye = 65 +jointIndex = LeftHandThumb2 = 59 +jointIndex = pCylinder73Shape1 = 67 +jointIndex = LeftShoulder = 38 +jointIndex = LeftHandIndex2 = 55 +jointIndex = RightForeArm = 16 +jointIndex = LeftHandMiddle2 = 51 +jointIndex = RightHandRing4 = 33 +jointIndex = LeftLeg = 7 +jointIndex = LeftHandThumb4 = 61 +jointIndex = LeftForeArm = 40 +jointIndex = HeadTop_End = 64 +jointIndex = RightHandPinky1 = 34 +jointIndex = RightHandIndex1 = 22 +jointIndex = LeftHandIndex1 = 54 +jointIndex = RightLeg = 2 +jointIndex = RightHandIndex4 = 25 +jointIndex = Neck = 62 +jointIndex = LeftHandMiddle1 = 50 +jointIndex = RightHandPinky3 = 36 +jointIndex = LeftHandPinky2 = 43 +jointIndex = RightHandMiddle3 = 28 +jointIndex = RightHandThumb4 = 21 +jointIndex = LeftUpLeg = 6 +jointIndex = RightFoot = 3 +jointIndex = LeftHandThumb1 = 58 +jointIndex = LeftArm = 39 +jointIndex = RightHandMiddle1 = 26 +jointIndex = LeftHandRing3 = 48 +jointIndex = LeftHandMiddle4 = 53 +jointIndex = RightUpLeg = 1 +jointIndex = RightHandMiddle2 = 27 +jointIndex = LeftToeBase = 9 +jointIndex = RightHandThumb2 = 19 +jointIndex = Spine2 = 13 jointIndex = Spine = 11 +jointIndex = LeftHandRing4 = 49 +jointIndex = Head = 63 +jointIndex = LeftHandPinky3 = 44 +jointIndex = LeftHandPinky1 = 42 +jointIndex = RightHandThumb1 = 18 +jointIndex = LeftHandIndex4 = 57 +jointIndex = LeftHandMiddle3 = 52 +jointIndex = RightHandIndex3 = 24 +jointIndex = Spine1 = 12 +jointIndex = RightArm = 15 +jointIndex = RightHandThumb3 = 20