diff --git a/interface/resources/meshes/being_of_light/being_of_light.fbx b/interface/resources/meshes/being_of_light/being_of_light.fbx new file mode 100644 index 0000000000..57505ca80d Binary files /dev/null and b/interface/resources/meshes/being_of_light/being_of_light.fbx 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 new file mode 100644 index 0000000000..8fcf588643 Binary files /dev/null and b/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_DiffuseMap.png 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 new file mode 100644 index 0000000000..d836aebde8 Binary files /dev/null and b/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_EmissiveMap.png 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 new file mode 100644 index 0000000000..f5000b86e9 Binary files /dev/null and b/interface/resources/meshes/being_of_light/textures/BaseMesh_BeingofLight_NormalMap.png differ diff --git a/interface/resources/meshes/defaultAvatar/body.fbx b/interface/resources/meshes/defaultAvatar/body.fbx deleted file mode 100644 index 238410cbbe..0000000000 Binary files a/interface/resources/meshes/defaultAvatar/body.fbx and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar/body.jpg b/interface/resources/meshes/defaultAvatar/body.jpg deleted file mode 100644 index 376cf87d32..0000000000 Binary files a/interface/resources/meshes/defaultAvatar/body.jpg and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar/head.fbx b/interface/resources/meshes/defaultAvatar/head.fbx deleted file mode 100644 index 30ccca20d3..0000000000 Binary files a/interface/resources/meshes/defaultAvatar/head.fbx and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar/tail.jpg b/interface/resources/meshes/defaultAvatar/tail.jpg deleted file mode 100644 index 1b5bb89750..0000000000 Binary files a/interface/resources/meshes/defaultAvatar/tail.jpg and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar/visor.png b/interface/resources/meshes/defaultAvatar/visor.png deleted file mode 100644 index e4e6292b2c..0000000000 Binary files a/interface/resources/meshes/defaultAvatar/visor.png and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar_body.fst b/interface/resources/meshes/defaultAvatar_body.fst deleted file mode 100644 index f061a87726..0000000000 --- a/interface/resources/meshes/defaultAvatar_body.fst +++ /dev/null @@ -1,20 +0,0 @@ -filename=defaultAvatar/body.fbx -texdir=defaultAvatar -scale=8.666 -joint = jointRoot = jointRoot -joint = jointLean = jointSpine -joint = jointNeck = jointNeck -joint = jointHead = jointHeadtop -joint = joint_L_shoulder = joint_L_shoulder -freeJoint = joint_L_arm -freeJoint = joint_L_elbow -joint = jointLeftHand = joint_L_hand -joint = joint_R_shoulder = joint_R_shoulder -freeJoint = joint_R_arm -freeJoint = joint_R_elbow -joint = jointRightHand = joint_R_hand - - - - - diff --git a/interface/resources/meshes/defaultAvatar_full.fst b/interface/resources/meshes/defaultAvatar_full.fst index 3fa282a819..7d917318dd 100644 --- a/interface/resources/meshes/defaultAvatar_full.fst +++ b/interface/resources/meshes/defaultAvatar_full.fst @@ -1,97 +1,135 @@ -name = defaultAvatar_full +name = being_of_light type = body+head scale = 1 -filename = defaultAvatar_full/defaultAvatar_full.fbx -texdir = defaultAvatar_full/textures -joint = jointRightHand = RightHand -joint = jointNeck = Head +filename = being_of_light/being_of_light.fbx +texdir = being_of_light/textures joint = jointRoot = Hips +joint = jointLeftHand = LeftHand joint = jointHead = HeadTop_End joint = jointLean = Spine -joint = jointLeftHand = LeftHand +joint = jointEyeLeft = LeftEye +joint = jointRightHand = RightHand +joint = jointNeck = Head +joint = jointEyeRight = RightEye freeJoint = LeftArm freeJoint = LeftForeArm freeJoint = RightArm freeJoint = RightForeArm -bs = MouthFrown_R = Mouth.MouthFrown_R = 1 -bs = EyeOpen_L = Leye1.EyeOpen_L = 1 -bs = LipsLowerDown_L = Mouth.LipsLowerDown = 0.5 -bs = LipsStretch_L = Mouth.LipsStretch_L = 1 -bs = MouthLeft = Mouth.MouthLeft = 1 -bs = MouthSmile_L = Mouth.MouthSmile_L = 1 -bs = Sneer_R = Mouth.Sneer = 0.61 -bs = LipsPucker = Mouth.LipsPucker = 1 -bs = EyeOpen_R = Reye1.EyeOut_R = 1 -bs = LipsLowerDown_R = Mouth.LipsLowerDown = 0.43 -bs = LipsStretch_R = Mouth.LipsStretch_R = 1 -bs = MouthSmile_R = Mouth.MouthSmile_R = 1 -bs = LipsFunnel = Mouth.LipsFunnel = 1 -bs = EyeUp_L = Leye1.EyeUp_L = 1 -bs = MouthDimple_L = Mouth.MouthDimple_L = 1 -bs = Puff = Mouth.Puff = 1 -bs = EyeIn_L = Leye1.EyeIn_L = 1 -bs = EyeUp_R = Reye1.EyeUp_R = 0.99 -bs = MouthDimple_R = Mouth.MouthDimple_R = 1 -bs = MouthRight = Mouth.MouthRight = 1 -bs = EyeOut_L = Leye1.EyeOut_L = 1 -bs = JawOpen = Mouth.JawOpen = 1 -bs = EyeIn_R = Reye1.EyeIn_R = 1 -bs = BrowsD_L = Leye1.BrowsD_L = 1 -bs = EyeDown_L = Leye1.EyeDown_L = 1 -bs = EyeBlink_L = Leye1.EyeBlink_L = 1 -bs = EyeOut_R = Reye1.EyeOut_R = 1 -bs = LipsUpperUp_L = Mouth.LipsUpperUp = 0.49 -bs = MouthFrown_L = Mouth.MouthFrown_L = 1 -bs = EyeDown_R = Reye1.EyeDown_R = 1 -bs = BrowsD_R = Reye1.BrowsD_R = 1 -bs = EyeBlink_R = Reye1.EyeBlink_R = 1 -bs = LipsUpperUp_R = Mouth.LipsUpperUp = 0.47 -bs = Sneer_L = Mouth.Sneer = 0.5 -jointIndex = headphone = 7 -jointIndex = LeftUpLeg = 15 -jointIndex = Spine = 20 -jointIndex = LeftArm = 32 -jointIndex = Head = 40 -jointIndex = RightUpLeg = 10 -jointIndex = hair = 5 -jointIndex = Spine1 = 21 -jointIndex = RightHandIndex1 = 27 -jointIndex = Spine2 = 22 -jointIndex = RightHandIndex2 = 28 -jointIndex = RightHandIndex3 = 29 -jointIndex = RightHandIndex4 = 30 -jointIndex = RightToe_End = 14 -jointIndex = shield = 4 -jointIndex = LeftHandIndex1 = 35 -jointIndex = LeftHandIndex2 = 36 -jointIndex = RightHand = 26 -jointIndex = LeftHandIndex3 = 37 -jointIndex = LeftHandIndex4 = 38 -jointIndex = LeftShoulder = 31 -jointIndex = LeftHand = 34 -jointIndex = RightForeArm = 25 -jointIndex = RightLeg = 11 -jointIndex = RightFoot = 12 -jointIndex = mouth = 1 -jointIndex = LeftToe_End = 19 -jointIndex = Reye = 2 -jointIndex = Hips = 9 -jointIndex = RightToeBase = 13 -jointIndex = HeadTop_End = 41 -jointIndex = LeftFoot = 17 -jointIndex = RightShoulder = 23 -jointIndex = LeftLeg = 16 -jointIndex = Leye = 3 -jointIndex = LeftForeArm = 33 -jointIndex = face = 0 -jointIndex = body = 8 -jointIndex = LeftToeBase = 18 -jointIndex = RightArm = 24 -jointIndex = top1 = 6 -jointIndex = Neck = 39 -rx = 0 -ry = 0 -rz = 0 -tx = 0 -ty = 0 -tz = 0 +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 = RightShoulder = 14 +jointIndex = LeftEye = 64 +jointIndex = RightHandMiddle4 = 37 +jointIndex = Body = 67 +jointIndex = LeftArm = 39 +jointIndex = RightToe_End = 5 +jointIndex = Spine = 11 diff --git a/interface/resources/meshes/defaultAvatar_full/defaultAvatar_full.fbx b/interface/resources/meshes/defaultAvatar_full/defaultAvatar_full.fbx deleted file mode 100644 index f6334aaa0e..0000000000 Binary files a/interface/resources/meshes/defaultAvatar_full/defaultAvatar_full.fbx and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar_full/textures/visor.png b/interface/resources/meshes/defaultAvatar_full/textures/visor.png deleted file mode 100644 index e4e6292b2c..0000000000 Binary files a/interface/resources/meshes/defaultAvatar_full/textures/visor.png and /dev/null differ diff --git a/interface/resources/meshes/defaultAvatar_head.fst b/interface/resources/meshes/defaultAvatar_head.fst deleted file mode 100644 index c2478ce7d9..0000000000 --- a/interface/resources/meshes/defaultAvatar_head.fst +++ /dev/null @@ -1,45 +0,0 @@ -# faceshift target mapping file -name= defaultAvatar_head -filename=defaultAvatar/head.fbx -texdir=defaultAvatar -scale=5.333 -rx=0 -ry=0 -rz=0 -tx=0 -ty=0 -tz=0 -joint = jointNeck = jointNeck -bs = BrowsD_L = Leye1.BrowsD_L = 0.97 -bs = BrowsD_R = Reye1.BrowsD_R = 1 -bs = CheekSquint_L = Leye1.CheekSquint_L = 1 -bs = CheekSquint_R = Reye1.CheekSquint_R = 1 -bs = EyeBlink_L = Leye1.EyeBlink_L = 1 -bs = EyeBlink_R = Reye1.EyeBlink_R = 1 -bs = EyeDown_L = Leye1.EyeDown_L = 1 -bs = EyeDown_R = Reye1.EyeDown_R = 0.99 -bs = EyeIn_L = Leye1.EyeIn_L = 0.92 -bs = EyeIn_R = Reye1.EyeIn_R = 1 -bs = EyeOpen_L = Leye1.EyeOpen_L = 1 -bs = EyeOpen_R = Reye1.EyeOpen_R = 1 -bs = EyeOut_L = Leye1.EyeOut_L = 0.99 -bs = EyeOut_R = Reye1.EyeOut_R = 1 -bs = EyeUp_L = Leye1.EyeUp_L = 0.93 -bs = EyeUp_R = Reye1.EyeUp_R = 1 -bs = JawOpen = Mouth.JawOpen = 1 -bs = LipsFunnel = Mouth.LipsFunnel = 1 -bs = LipsLowerDown = Mouth.LipsLowerDown = 1 -bs = LipsPucker = Mouth.LipsPucker = 1 -bs = LipsStretch_L = Mouth.LipsStretch_L = 0.96 -bs = LipsStretch_R = Mouth.LipsStretch_R = 1 -bs = LipsUpperUp = Mouth.LipsUpperUp = 1 -bs = MouthDimple_L = Mouth.MouthDimple_L = 1 -bs = MouthDimple_R = Mouth.MouthDimple_R = 1 -bs = MouthFrown_L = Mouth.MouthFrown_L = 1 -bs = MouthFrown_R = Mouth.MouthFrown_R = 1 -bs = MouthLeft = Mouth.MouthLeft = 1 -bs = MouthRight = Mouth.MouthRight = 1 -bs = MouthSmile_L = Mouth.MouthSmile_L = 1 -bs = MouthSmile_R = Mouth.MouthSmile_R = 1 -bs = Puff = Mouth.Puff = 1 -bs = Sneer = Mouth.Sneer = 1