diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Blue.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Blue.png similarity index 100% rename from interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Blue.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Blue.png diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Cyan.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Cyan.png similarity index 100% rename from interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Cyan.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Cyan.png diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Green.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Green.png similarity index 100% rename from interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Green.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Green.png diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Magenta.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Magenta.png similarity index 100% rename from interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Magenta.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Magenta.png diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Red.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Red.png similarity index 100% rename from interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Red.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Red.png diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Yellow.png b/interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Yellow.png similarity index 100% rename from interface/resources/qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_Yellow.png rename to interface/resources/qml/hifi/simplifiedUI/avatarApp/images/simplifiedAvatar_Yellow.png diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml index 6747608de9..2f6456de28 100644 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml @@ -54,7 +54,7 @@ Rectangle { if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) && topBarInventoryModel.count > 0) { - Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true); + Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", true); MyAvatar.useFullAvatarURL(topBarInventoryModel.get(0).download_url); } } @@ -71,7 +71,7 @@ Rectangle { if (isLoggedIn) { Commerce.getWalletStatus(); } else { - console.log('WARNING: SimplifiedTopBar.qml Error getting wallet status.'); + // Show some error to the user in the UI? } } @@ -115,17 +115,15 @@ Rectangle { inventoryFullyReceived = true; var scriptExecutionCount = Settings.getValue("simplifiedUI/SUIScriptExecutionCount"); var currentAvatarURL = MyAvatar.skeletonModelURL; - var userIsWearingDefaultAvatar = currentAvatarURL.indexOf("DefaultAvatar") > -1; - var currentAvatarIsValid = MyAvatar.skeletonModelURL.indexOf("fst") === -1; - var avatarHasBeenAutoSelectedBefore = Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false); + var currentAvatarURLContainsDefaultAvatar = currentAvatarURL.indexOf("defaultAvatar") > -1; + var currentAvatarURLContainsFST = currentAvatarURL.indexOf("fst") > -1; + var currentAvatarURLContainsSimplifiedAvatar = currentAvatarURL.indexOf("simplifiedAvatar") > -1; + var alreadyAutoSelectedAvatarFromInventory = Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", false); var userHasValidAvatarInInventory = topBarInventoryModel.count > 0 && - topBarInventoryModel.get(0).download_url.indexOf(".fst") > -1 && - topBarInventoryModel.get(0).download_url.indexOf("mannequin.fst") === -1; - var userHasOldDefaultAvatar = MyAvatar.skeletonModelURL.indexOf("mannequin.fst") === -1; - var defaultAvatarURLPrefixPart1 = "http://hifi-content.s3-us-west-1.amazonaws.com/Experiences/Releases/simplifiedUI/simplifiedFTUE/avatarModels/DefaultAvatar_"; - var defaultAvatarURLPrefixPart2 = "/avatar.fst"; - var defaultAvatarColors = ["Blue", "Cyan", "Green", "Pink", "Red", "Yellow"]; - var avatarColor; + topBarInventoryModel.get(0).download_url.indexOf(".fst") > -1; + var simplifiedAvatarPrefix = resourceDirectoryUrl + "qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_"; + var simplifiedAvatarColors = ["Blue", "Cyan", "Green", "Pink", "Red", "Yellow"]; + var simplifiedAvatarSuffix = "/avatar.fst"; // If we have never auto-selected and the user is still using a default avatar or if the current avatar is not valid (fst), or if // the current avatar is the old default (Woody), use top avatar from inventory or one of the new defaults. @@ -133,45 +131,29 @@ Rectangle { // FOR TESTING__________REMOVE userHasValidAvatarInInventory = false; - if (!currentAvatarIsValid || userHasOldDefaultAvatar || (!avatarHasBeenAutoSelectedBefore && userIsWearingDefaultAvatar)) { + // If the current avatar URL is invalid, OR the user is using the "default avatar" (Woody)... + if (!currentAvatarURLContainsFST || currentAvatarURLContainsDefaultAvatar) { + // If the user has a valid avatar in their inventory... if (userHasValidAvatarInInventory) { + // ...use the first avatar in the user's inventory. MyAvatar.useFullAvatarURL(topBarInventoryModel.get(0).download_url); - userIsWearingDefaultAvatar = false; - } else { - if (!userIsWearingDefaultAvatar) { // assign a random color default avatar - avatarColor = defaultAvatarColors[Math.floor(Math.random() * defaultAvatarColors.length)]; - var avatarModelURL = defaultAvatarURLPrefixPart1 + avatarColor + defaultAvatarURLPrefixPart2; - MyAvatar.useFullAvatarURL(avatarModelURL); - userIsWearingDefaultAvatar = true; - } + Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", true); + // Else if the user isn't wearing a "Simplified Avatar" + } else if (!currentAvatarURLContainsSimplifiedAvatar) { + // ...assign to the user a new "Simplified Avatar" (i.e. a simple avatar of random color) + var avatarColor = simplifiedAvatarColors[Math.floor(Math.random() * simplifiedAvatarColors.length)]; + var simplifiedAvatarModelURL = simplifiedAvatarPrefix + avatarColor + simplifiedAvatarSuffix; + MyAvatar.useFullAvatarURL(simplifiedAvatarModelURL); + currentAvatarURLContainsSimplifiedAvatar = true; } } - // If the user is not wearing a default avatar at this point, we do not need to check inventory again. This check ensures the setting is changed if the - // user came in on their first run using a valid non-wolf avatar (in this case we will never auto-select) or if we selected the top inventory item for them. - if (!userIsWearingDefaultAvatar) { - Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true); - avatarHasBeenAutoSelectedBefore = true; - } - if (scriptExecutionCount === 1) { - if (userIsWearingDefaultAvatar) { - if (!avatarColor) { // get the color of the default avatar they are using - var indexOfDefaultAvatarColor = 123; - var numberCharsAfterDefaultColorName = 11; - avatarColor = currentAvatarURL.substring(indexOfDefaultAvatarColor , MyAvatar.skeletonModelURL.length - numberCharsAfterDefaultColorName) - } - - // We can send the page we want to display instead of reading the setting to avoid this. - sendToScript({ - "source": "SimplifiedTopBar.qml", - "method": "displayInitialLaunchWindow", - "data": { - "avatarColor": avatarColor - } - }); - } - } else if (scriptExecutionCount === 2 && userIsWearingDefaultAvatar) { + sendToScript({ + "source": "SimplifiedTopBar.qml", + "method": "displayInitialLaunchWindow" + }); + } else if (scriptExecutionCount === 2 && currentAvatarURLContainsSimplifiedAvatar) { sendToScript({ "source": "SimplifiedTopBar.qml", "method": "displaySecondLaunchWindow" @@ -207,6 +189,7 @@ Rectangle { } } + Item { id: avatarButtonContainer anchors.verticalCenter: parent.verticalCenter diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Blue/avatar.fst b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Blue/avatar.fst new file mode 100644 index 0000000000..4a9ab21392 --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Blue/avatar.fst @@ -0,0 +1,88 @@ +name = Default-Color-DBlue +scale = 1 +filename = default-DBlue.fbx +marketplaceID = {00000000-0000-0000-0000-000000000000} +texdir = textures +joint = jointRoot = Hips +joint = jointRightHand = RightHand +joint = jointEyeRight = RightEye +joint = jointLean = Spine +joint = jointNeck = Neck +joint = jointEyeLeft = LeftEye +joint = jointLeftHand = LeftHand +joint = jointHead = Head +bs = BrowsU_L = browUp = 1 +bs = BrowsU_C = browUp = 1 +bs = JawOpen = aA = 1 +bs = LipsFunnel = oO = 1 +bs = EyeBlink_R = blink = 1 +bs = MouthSmile_R = mM = 1 +jointIndex = LeftHandPinky1 = 20 +jointIndex = RightHandMiddle3 = 54 +jointIndex = RightFoot = 5 +jointIndex = LeftToeBase = 11 +jointIndex = RightHandMiddle1 = 52 +jointIndex = RightToeBase = 6 +jointIndex = HeadShape1 = 1 +jointIndex = RightHandThumb1 = 60 +jointIndex = LeftHand = 19 +jointIndex = Head = 65 +jointIndex = LeftArm = 17 +jointIndex = RightHandThumb2 = 61 +jointIndex = RightUpLeg = 3 +jointIndex = RightHandIndex1 = 56 +jointIndex = LeftToe_End = 12 +jointIndex = HeadTop_End = 68 +jointIndex = LeftHandThumb1 = 36 +jointIndex = LeftHandIndex4 = 35 +jointIndex = LeftHandRing3 = 26 +jointIndex = RightHandPinky2 = 45 +jointIndex = RightToe_End = 7 +jointIndex = Face1 = 0 +jointIndex = RightHandIndex3 = 58 +jointIndex = LeftHandThumb2 = 37 +jointIndex = LeftHandPinky2 = 21 +jointIndex = RightHandRing3 = 50 +jointIndex = LeftHandMiddle1 = 28 +jointIndex = LeftHandPinky4 = 23 +jointIndex = LeftLeg = 9 +jointIndex = RightHandPinky3 = 46 +jointIndex = Spine = 13 +jointIndex = RightHandRing4 = 51 +jointIndex = LeftHandMiddle3 = 30 +jointIndex = RightEye = 66 +jointIndex = Neck = 64 +jointIndex = RightHandIndex4 = 59 +jointIndex = LeftHandRing1 = 24 +jointIndex = LeftHandThumb3 = 38 +jointIndex = RightHandThumb3 = 62 +jointIndex = LeftHandIndex3 = 34 +jointIndex = RightHand = 43 +jointIndex = RightHandRing2 = 49 +jointIndex = LeftShoulder = 16 +jointIndex = LeftHandPinky3 = 22 +jointIndex = eftHandThumb4 = 39 +jointIndex = LeftHandRing2 = 25 +jointIndex = RightForeArm = 42 +jointIndex = RightLeg = 4 +jointIndex = Spine1 = 14 +jointIndex = LeftHandRing4 = 27 +jointIndex = RightHandThumb4 = 63 +jointIndex = RightHandMiddle2 = 53 +jointIndex = RightHandRing1 = 48 +jointIndex = LeftHandMiddle4 = 31 +jointIndex = RightHandMiddle4 = 55 +jointIndex = Hips = 2 +jointIndex = RightHandPinky1 = 44 +jointIndex = RightShoulder = 40 +jointIndex = LeftHandIndex2 = 33 +jointIndex = RightHandIndex2 = 57 +jointIndex = LeftHandIndex1 = 32 +jointIndex = LeftForeArm = 18 +jointIndex = RightArm = 41 +jointIndex = Spine2 = 15 +jointIndex = LeftHandMiddle2 = 29 +jointIndex = LeftEye = 67 +jointIndex = RightHandPinky4 = 47 +jointIndex = LeftUpLeg = 8 +jointIndex = LeftFoot = 10 diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Blue/default-DBlue.fbx b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Blue/default-DBlue.fbx new file mode 100644 index 0000000000..23d08c298c Binary files /dev/null and b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Blue/default-DBlue.fbx differ diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Cyan/avatar.fst b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Cyan/avatar.fst new file mode 100644 index 0000000000..a70e084e63 --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Cyan/avatar.fst @@ -0,0 +1,88 @@ +name = Default-Color-LBlue +scale = 1 +filename = default-LBlue.fbx +marketplaceID = {00000000-0000-0000-0000-000000000000} +texdir = textures +joint = jointRoot = Hips +joint = jointRightHand = RightHand +joint = jointEyeRight = RightEye +joint = jointLean = Spine +joint = jointNeck = Neck +joint = jointEyeLeft = LeftEye +joint = jointLeftHand = LeftHand +joint = jointHead = Head +bs = BrowsU_L = browUp = 1 +bs = BrowsU_C = browUp = 1 +bs = JawOpen = aA = 1 +bs = LipsFunnel = oO = 1 +bs = EyeBlink_R = blink = 1 +bs = MouthSmile_R = mM = 1 +jointIndex = LeftHandPinky1 = 20 +jointIndex = RightHandMiddle3 = 54 +jointIndex = RightFoot = 5 +jointIndex = LeftToeBase = 11 +jointIndex = RightHandMiddle1 = 52 +jointIndex = RightToeBase = 6 +jointIndex = HeadShape1 = 1 +jointIndex = RightHandThumb1 = 60 +jointIndex = LeftHand = 19 +jointIndex = Head = 65 +jointIndex = LeftArm = 17 +jointIndex = RightHandThumb2 = 61 +jointIndex = RightUpLeg = 3 +jointIndex = RightHandIndex1 = 56 +jointIndex = LeftToe_End = 12 +jointIndex = HeadTop_End = 68 +jointIndex = LeftHandThumb1 = 36 +jointIndex = LeftHandIndex4 = 35 +jointIndex = LeftHandRing3 = 26 +jointIndex = RightHandPinky2 = 45 +jointIndex = RightToe_End = 7 +jointIndex = Face1 = 0 +jointIndex = RightHandIndex3 = 58 +jointIndex = LeftHandThumb2 = 37 +jointIndex = LeftHandPinky2 = 21 +jointIndex = RightHandRing3 = 50 +jointIndex = LeftHandMiddle1 = 28 +jointIndex = LeftHandPinky4 = 23 +jointIndex = LeftLeg = 9 +jointIndex = RightHandPinky3 = 46 +jointIndex = Spine = 13 +jointIndex = RightHandRing4 = 51 +jointIndex = LeftHandMiddle3 = 30 +jointIndex = RightEye = 66 +jointIndex = Neck = 64 +jointIndex = RightHandIndex4 = 59 +jointIndex = LeftHandRing1 = 24 +jointIndex = LeftHandThumb3 = 38 +jointIndex = RightHandThumb3 = 62 +jointIndex = LeftHandIndex3 = 34 +jointIndex = RightHand = 43 +jointIndex = RightHandRing2 = 49 +jointIndex = LeftShoulder = 16 +jointIndex = LeftHandPinky3 = 22 +jointIndex = eftHandThumb4 = 39 +jointIndex = LeftHandRing2 = 25 +jointIndex = RightForeArm = 42 +jointIndex = RightLeg = 4 +jointIndex = Spine1 = 14 +jointIndex = LeftHandRing4 = 27 +jointIndex = RightHandThumb4 = 63 +jointIndex = RightHandMiddle2 = 53 +jointIndex = RightHandRing1 = 48 +jointIndex = LeftHandMiddle4 = 31 +jointIndex = RightHandMiddle4 = 55 +jointIndex = Hips = 2 +jointIndex = RightHandPinky1 = 44 +jointIndex = RightShoulder = 40 +jointIndex = LeftHandIndex2 = 33 +jointIndex = RightHandIndex2 = 57 +jointIndex = LeftHandIndex1 = 32 +jointIndex = LeftForeArm = 18 +jointIndex = RightArm = 41 +jointIndex = Spine2 = 15 +jointIndex = LeftHandMiddle2 = 29 +jointIndex = LeftEye = 67 +jointIndex = RightHandPinky4 = 47 +jointIndex = LeftUpLeg = 8 +jointIndex = LeftFoot = 10 diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Cyan/default-LBlue.fbx b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Cyan/default-LBlue.fbx new file mode 100644 index 0000000000..08e768b96d Binary files /dev/null and b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Cyan/default-LBlue.fbx differ diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Green/avatar.fst b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Green/avatar.fst new file mode 100644 index 0000000000..f729b1b240 --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Green/avatar.fst @@ -0,0 +1,88 @@ +name = Default-Color-Green +scale = 1 +filename = default-Green.fbx +marketplaceID = {00000000-0000-0000-0000-000000000000} +texdir = textures +joint = jointRoot = Hips +joint = jointRightHand = RightHand +joint = jointEyeRight = RightEye +joint = jointLean = Spine +joint = jointNeck = Neck +joint = jointEyeLeft = LeftEye +joint = jointLeftHand = LeftHand +joint = jointHead = Head +bs = BrowsU_L = browUp = 1 +bs = BrowsU_C = browUp = 1 +bs = JawOpen = aA = 1 +bs = LipsFunnel = oO = 1 +bs = EyeBlink_R = blink = 1 +bs = MouthSmile_R = mM = 1 +jointIndex = LeftHandPinky1 = 20 +jointIndex = RightHandMiddle3 = 54 +jointIndex = RightFoot = 5 +jointIndex = LeftToeBase = 11 +jointIndex = RightHandMiddle1 = 52 +jointIndex = RightToeBase = 6 +jointIndex = HeadShape1 = 1 +jointIndex = RightHandThumb1 = 60 +jointIndex = LeftHand = 19 +jointIndex = Head = 65 +jointIndex = LeftArm = 17 +jointIndex = RightHandThumb2 = 61 +jointIndex = RightUpLeg = 3 +jointIndex = RightHandIndex1 = 56 +jointIndex = LeftToe_End = 12 +jointIndex = HeadTop_End = 68 +jointIndex = LeftHandThumb1 = 36 +jointIndex = LeftHandIndex4 = 35 +jointIndex = LeftHandRing3 = 26 +jointIndex = RightHandPinky2 = 45 +jointIndex = RightToe_End = 7 +jointIndex = Face1 = 0 +jointIndex = RightHandIndex3 = 58 +jointIndex = LeftHandThumb2 = 37 +jointIndex = LeftHandPinky2 = 21 +jointIndex = RightHandRing3 = 50 +jointIndex = LeftHandMiddle1 = 28 +jointIndex = LeftHandPinky4 = 23 +jointIndex = LeftLeg = 9 +jointIndex = RightHandPinky3 = 46 +jointIndex = Spine = 13 +jointIndex = RightHandRing4 = 51 +jointIndex = LeftHandMiddle3 = 30 +jointIndex = RightEye = 66 +jointIndex = Neck = 64 +jointIndex = RightHandIndex4 = 59 +jointIndex = LeftHandRing1 = 24 +jointIndex = LeftHandThumb3 = 38 +jointIndex = RightHandThumb3 = 62 +jointIndex = LeftHandIndex3 = 34 +jointIndex = RightHand = 43 +jointIndex = RightHandRing2 = 49 +jointIndex = LeftShoulder = 16 +jointIndex = LeftHandPinky3 = 22 +jointIndex = eftHandThumb4 = 39 +jointIndex = LeftHandRing2 = 25 +jointIndex = RightForeArm = 42 +jointIndex = RightLeg = 4 +jointIndex = Spine1 = 14 +jointIndex = LeftHandRing4 = 27 +jointIndex = RightHandThumb4 = 63 +jointIndex = RightHandMiddle2 = 53 +jointIndex = RightHandRing1 = 48 +jointIndex = LeftHandMiddle4 = 31 +jointIndex = RightHandMiddle4 = 55 +jointIndex = Hips = 2 +jointIndex = RightHandPinky1 = 44 +jointIndex = RightShoulder = 40 +jointIndex = LeftHandIndex2 = 33 +jointIndex = RightHandIndex2 = 57 +jointIndex = LeftHandIndex1 = 32 +jointIndex = LeftForeArm = 18 +jointIndex = RightArm = 41 +jointIndex = Spine2 = 15 +jointIndex = LeftHandMiddle2 = 29 +jointIndex = LeftEye = 67 +jointIndex = RightHandPinky4 = 47 +jointIndex = LeftUpLeg = 8 +jointIndex = LeftFoot = 10 diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Green/default-Green.fbx b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Green/default-Green.fbx new file mode 100644 index 0000000000..a320a46d19 Binary files /dev/null and b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Green/default-Green.fbx differ diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Magenta/avatar.fst b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Magenta/avatar.fst new file mode 100644 index 0000000000..8abc68d97e --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Magenta/avatar.fst @@ -0,0 +1,88 @@ +name = Default-Color-Pink +scale = 1 +filename = default-Pink.fbx +marketplaceID = {00000000-0000-0000-0000-000000000000} +texdir = textures +joint = jointRoot = Hips +joint = jointRightHand = RightHand +joint = jointEyeRight = RightEye +joint = jointLean = Spine +joint = jointNeck = Neck +joint = jointEyeLeft = LeftEye +joint = jointLeftHand = LeftHand +joint = jointHead = Head +bs = BrowsU_L = browUp = 1 +bs = BrowsU_C = browUp = 1 +bs = JawOpen = aA = 1 +bs = LipsFunnel = oO = 1 +bs = EyeBlink_R = blink = 1 +bs = MouthSmile_R = mM = 1 +jointIndex = LeftHandPinky1 = 20 +jointIndex = RightHandMiddle3 = 54 +jointIndex = RightFoot = 5 +jointIndex = LeftToeBase = 11 +jointIndex = RightHandMiddle1 = 52 +jointIndex = RightToeBase = 6 +jointIndex = HeadShape1 = 1 +jointIndex = RightHandThumb1 = 60 +jointIndex = LeftHand = 19 +jointIndex = Head = 65 +jointIndex = LeftArm = 17 +jointIndex = RightHandThumb2 = 61 +jointIndex = RightUpLeg = 3 +jointIndex = RightHandIndex1 = 56 +jointIndex = LeftToe_End = 12 +jointIndex = HeadTop_End = 68 +jointIndex = LeftHandThumb1 = 36 +jointIndex = LeftHandIndex4 = 35 +jointIndex = LeftHandRing3 = 26 +jointIndex = RightHandPinky2 = 45 +jointIndex = RightToe_End = 7 +jointIndex = Face1 = 0 +jointIndex = RightHandIndex3 = 58 +jointIndex = LeftHandThumb2 = 37 +jointIndex = LeftHandPinky2 = 21 +jointIndex = RightHandRing3 = 50 +jointIndex = LeftHandMiddle1 = 28 +jointIndex = LeftHandPinky4 = 23 +jointIndex = LeftLeg = 9 +jointIndex = RightHandPinky3 = 46 +jointIndex = Spine = 13 +jointIndex = RightHandRing4 = 51 +jointIndex = LeftHandMiddle3 = 30 +jointIndex = RightEye = 66 +jointIndex = Neck = 64 +jointIndex = RightHandIndex4 = 59 +jointIndex = LeftHandRing1 = 24 +jointIndex = LeftHandThumb3 = 38 +jointIndex = RightHandThumb3 = 62 +jointIndex = LeftHandIndex3 = 34 +jointIndex = RightHand = 43 +jointIndex = RightHandRing2 = 49 +jointIndex = LeftShoulder = 16 +jointIndex = LeftHandPinky3 = 22 +jointIndex = eftHandThumb4 = 39 +jointIndex = LeftHandRing2 = 25 +jointIndex = RightForeArm = 42 +jointIndex = RightLeg = 4 +jointIndex = Spine1 = 14 +jointIndex = LeftHandRing4 = 27 +jointIndex = RightHandThumb4 = 63 +jointIndex = RightHandMiddle2 = 53 +jointIndex = RightHandRing1 = 48 +jointIndex = LeftHandMiddle4 = 31 +jointIndex = RightHandMiddle4 = 55 +jointIndex = Hips = 2 +jointIndex = RightHandPinky1 = 44 +jointIndex = RightShoulder = 40 +jointIndex = LeftHandIndex2 = 33 +jointIndex = RightHandIndex2 = 57 +jointIndex = LeftHandIndex1 = 32 +jointIndex = LeftForeArm = 18 +jointIndex = RightArm = 41 +jointIndex = Spine2 = 15 +jointIndex = LeftHandMiddle2 = 29 +jointIndex = LeftEye = 67 +jointIndex = RightHandPinky4 = 47 +jointIndex = LeftUpLeg = 8 +jointIndex = LeftFoot = 10 diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Magenta/default-Pink.fbx b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Magenta/default-Pink.fbx new file mode 100644 index 0000000000..ce0612cbb7 Binary files /dev/null and b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Magenta/default-Pink.fbx differ diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Red/avatar.fst b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Red/avatar.fst new file mode 100644 index 0000000000..e8c093a17f --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Red/avatar.fst @@ -0,0 +1,88 @@ +name = Default-Color-Red +scale = 1 +filename = default-Red.fbx +marketplaceID = {00000000-0000-0000-0000-000000000000} +texdir = textures +joint = jointRoot = Hips +joint = jointRightHand = RightHand +joint = jointEyeRight = RightEye +joint = jointLean = Spine +joint = jointNeck = Neck +joint = jointEyeLeft = LeftEye +joint = jointLeftHand = LeftHand +joint = jointHead = Head +bs = BrowsU_L = browUp = 1 +bs = BrowsU_C = browUp = 1 +bs = JawOpen = aA = 1 +bs = LipsFunnel = oO = 1 +bs = EyeBlink_R = blink = 1 +bs = MouthSmile_R = mM = 1 +jointIndex = LeftHandPinky1 = 20 +jointIndex = RightHandMiddle3 = 54 +jointIndex = RightFoot = 5 +jointIndex = LeftToeBase = 11 +jointIndex = RightHandMiddle1 = 52 +jointIndex = RightToeBase = 6 +jointIndex = HeadShape1 = 1 +jointIndex = RightHandThumb1 = 60 +jointIndex = LeftHand = 19 +jointIndex = Head = 65 +jointIndex = LeftArm = 17 +jointIndex = RightHandThumb2 = 61 +jointIndex = RightUpLeg = 3 +jointIndex = RightHandIndex1 = 56 +jointIndex = LeftToe_End = 12 +jointIndex = HeadTop_End = 68 +jointIndex = LeftHandThumb1 = 36 +jointIndex = LeftHandIndex4 = 35 +jointIndex = LeftHandRing3 = 26 +jointIndex = RightHandPinky2 = 45 +jointIndex = RightToe_End = 7 +jointIndex = Face1 = 0 +jointIndex = RightHandIndex3 = 58 +jointIndex = LeftHandThumb2 = 37 +jointIndex = LeftHandPinky2 = 21 +jointIndex = RightHandRing3 = 50 +jointIndex = LeftHandMiddle1 = 28 +jointIndex = LeftHandPinky4 = 23 +jointIndex = LeftLeg = 9 +jointIndex = RightHandPinky3 = 46 +jointIndex = Spine = 13 +jointIndex = RightHandRing4 = 51 +jointIndex = LeftHandMiddle3 = 30 +jointIndex = RightEye = 66 +jointIndex = Neck = 64 +jointIndex = RightHandIndex4 = 59 +jointIndex = LeftHandRing1 = 24 +jointIndex = LeftHandThumb3 = 38 +jointIndex = RightHandThumb3 = 62 +jointIndex = LeftHandIndex3 = 34 +jointIndex = RightHand = 43 +jointIndex = RightHandRing2 = 49 +jointIndex = LeftShoulder = 16 +jointIndex = LeftHandPinky3 = 22 +jointIndex = eftHandThumb4 = 39 +jointIndex = LeftHandRing2 = 25 +jointIndex = RightForeArm = 42 +jointIndex = RightLeg = 4 +jointIndex = Spine1 = 14 +jointIndex = LeftHandRing4 = 27 +jointIndex = RightHandThumb4 = 63 +jointIndex = RightHandMiddle2 = 53 +jointIndex = RightHandRing1 = 48 +jointIndex = LeftHandMiddle4 = 31 +jointIndex = RightHandMiddle4 = 55 +jointIndex = Hips = 2 +jointIndex = RightHandPinky1 = 44 +jointIndex = RightShoulder = 40 +jointIndex = LeftHandIndex2 = 33 +jointIndex = RightHandIndex2 = 57 +jointIndex = LeftHandIndex1 = 32 +jointIndex = LeftForeArm = 18 +jointIndex = RightArm = 41 +jointIndex = Spine2 = 15 +jointIndex = LeftHandMiddle2 = 29 +jointIndex = LeftEye = 67 +jointIndex = RightHandPinky4 = 47 +jointIndex = LeftUpLeg = 8 +jointIndex = LeftFoot = 10 diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Red/default-Red.fbx b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Red/default-Red.fbx new file mode 100644 index 0000000000..69684a8997 Binary files /dev/null and b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Red/default-Red.fbx differ diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Yellow/avatar.fst b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Yellow/avatar.fst new file mode 100644 index 0000000000..aede2e51da --- /dev/null +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Yellow/avatar.fst @@ -0,0 +1,88 @@ +name = Default-Color-Yellow +scale = 1 +filename = default-Yellow.fbx +marketplaceID = {00000000-0000-0000-0000-000000000000} +texdir = textures +joint = jointRoot = Hips +joint = jointRightHand = RightHand +joint = jointEyeRight = RightEye +joint = jointLean = Spine +joint = jointNeck = Neck +joint = jointEyeLeft = LeftEye +joint = jointLeftHand = LeftHand +joint = jointHead = Head +bs = BrowsU_L = browUp = 1 +bs = BrowsU_C = browUp = 1 +bs = JawOpen = aA = 1 +bs = LipsFunnel = oO = 1 +bs = EyeBlink_R = blink = 1 +bs = MouthSmile_R = mM = 1 +jointIndex = LeftHandPinky1 = 20 +jointIndex = RightHandMiddle3 = 54 +jointIndex = RightFoot = 5 +jointIndex = LeftToeBase = 11 +jointIndex = RightHandMiddle1 = 52 +jointIndex = RightToeBase = 6 +jointIndex = HeadShape1 = 1 +jointIndex = RightHandThumb1 = 60 +jointIndex = LeftHand = 19 +jointIndex = Head = 65 +jointIndex = LeftArm = 17 +jointIndex = RightHandThumb2 = 61 +jointIndex = RightUpLeg = 3 +jointIndex = RightHandIndex1 = 56 +jointIndex = LeftToe_End = 12 +jointIndex = HeadTop_End = 68 +jointIndex = LeftHandThumb1 = 36 +jointIndex = LeftHandIndex4 = 35 +jointIndex = LeftHandRing3 = 26 +jointIndex = RightHandPinky2 = 45 +jointIndex = RightToe_End = 7 +jointIndex = Face1 = 0 +jointIndex = RightHandIndex3 = 58 +jointIndex = LeftHandThumb2 = 37 +jointIndex = LeftHandPinky2 = 21 +jointIndex = RightHandRing3 = 50 +jointIndex = LeftHandMiddle1 = 28 +jointIndex = LeftHandPinky4 = 23 +jointIndex = LeftLeg = 9 +jointIndex = RightHandPinky3 = 46 +jointIndex = Spine = 13 +jointIndex = RightHandRing4 = 51 +jointIndex = LeftHandMiddle3 = 30 +jointIndex = RightEye = 66 +jointIndex = Neck = 64 +jointIndex = RightHandIndex4 = 59 +jointIndex = LeftHandRing1 = 24 +jointIndex = LeftHandThumb3 = 38 +jointIndex = RightHandThumb3 = 62 +jointIndex = LeftHandIndex3 = 34 +jointIndex = RightHand = 43 +jointIndex = RightHandRing2 = 49 +jointIndex = LeftShoulder = 16 +jointIndex = LeftHandPinky3 = 22 +jointIndex = eftHandThumb4 = 39 +jointIndex = LeftHandRing2 = 25 +jointIndex = RightForeArm = 42 +jointIndex = RightLeg = 4 +jointIndex = Spine1 = 14 +jointIndex = LeftHandRing4 = 27 +jointIndex = RightHandThumb4 = 63 +jointIndex = RightHandMiddle2 = 53 +jointIndex = RightHandRing1 = 48 +jointIndex = LeftHandMiddle4 = 31 +jointIndex = RightHandMiddle4 = 55 +jointIndex = Hips = 2 +jointIndex = RightHandPinky1 = 44 +jointIndex = RightShoulder = 40 +jointIndex = LeftHandIndex2 = 33 +jointIndex = RightHandIndex2 = 57 +jointIndex = LeftHandIndex1 = 32 +jointIndex = LeftForeArm = 18 +jointIndex = RightArm = 41 +jointIndex = Spine2 = 15 +jointIndex = LeftHandMiddle2 = 29 +jointIndex = LeftEye = 67 +jointIndex = RightHandPinky4 = 47 +jointIndex = LeftUpLeg = 8 +jointIndex = LeftFoot = 10 diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Yellow/default-Yellow.fbx b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Yellow/default-Yellow.fbx new file mode 100644 index 0000000000..164ebebf9e Binary files /dev/null and b/interface/resources/qml/hifi/simplifiedUI/topBar/avatars/simplifiedAvatar_Yellow/default-Yellow.fbx differ diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml index 935ad83997..6f087f1513 100644 --- a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml +++ b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml @@ -26,7 +26,7 @@ Rectangle { } Component.onCompleted: { - if (Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false)) { + if (Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", false)) { tempAvatarPageContainer.visible = false; controlsContainer.visible = true; } @@ -174,8 +174,8 @@ Rectangle { id: tempAvatarImage width: root.width > root.height ? 428 : 320 height: root.width > root.height ? 800 : 598 - source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/DefaultAvatar_" + - MyAvatar.skeletonModelURL.substring(123, MyAvatar.skeletonModelURL.length - 11) + ".png" + source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" + + MyAvatar.skeletonModelURL.substring(MyAvatar.skeletonModelURL.indexOf("simplifiedAvatar"), MyAvatar.skeletonModelURL.lastIndexOf("/")) + ".png" } // TODO move this to be above the rest of the grid layout stuff in landscape mode }