diff --git a/interface/resources/avatar/bookmarks/avatarbookmarks.json b/interface/resources/avatar/bookmarks/avatarbookmarks.json index 9976036f8e..02f90bba52 100644 --- a/interface/resources/avatar/bookmarks/avatarbookmarks.json +++ b/interface/resources/avatar/bookmarks/avatarbookmarks.json @@ -1,861 +1,71 @@ { - "Anime boy": { - "attachments": [ - ], - "avatarEntites": [ - { - "properties": { - "acceleration": { - "x": 0, - "y": 0, - "z": 0 - }, - "actionData": "", - "age": 6.915350914001465, - "ageAsText": "0 hours 0 minutes 6 seconds", - "angularDamping": 0.39346998929977417, - "angularVelocity": { - "x": 0, - "y": 0, - "z": 0 - }, - "animation": { - "allowTranslation": true, - "currentFrame": 0, - "firstFrame": 0, - "fps": 30, - "hold": false, - "lastFrame": 100000, - "loop": true, - "running": false, - "url": "" - }, - "boundingBox": { - "brn": { - "x": -0.10961885005235672, - "y": -0.19444090127944946, - "z": -0.15760529041290283 - }, - "center": { - "x": 2.6226043701171875e-06, - "y": -0.13999652862548828, - "z": -0.04999971389770508 - }, - "dimensions": { - "x": 0.21924294531345367, - "y": 0.10888873785734177, - "z": 0.2152111530303955 - }, - "tfl": { - "x": 0.10962409526109695, - "y": -0.0855521634221077, - "z": 0.057605862617492676 - } - }, - "canCastShadow": true, - "certificateID": "", - "clientOnly": true, - "cloneAvatarEntity": false, - "cloneDynamic": false, - "cloneLifetime": 300, - "cloneLimit": 0, - "cloneOriginID": "{00000000-0000-0000-0000-000000000000}", - "cloneable": false, - "collidesWith": "", - "collisionMask": 0, - "collisionSoundURL": "", - "collisionless": false, - "collisionsWillMove": false, - "compoundShapeURL": "", - "created": "2018-06-06T17:27:53Z", - "damping": 0.39346998929977417, - "density": 1000, - "description": "", - "dimensions": { - "x": 0.21924294531345367, - "y": 0.07768379896879196, - "z": 0.2055898904800415 - }, - "dynamic": false, - "editionNumber": 15, - "entityInstanceNumber": 0, - "friction": 0.5, - "gravity": { - "x": 0, - "y": 0, - "z": 0 - }, - "href": "", - "id": "{5d20c775-a0d7-4163-b158-4e0a784a4625}", - "ignoreForCollisions": false, - "itemArtist": "jyoum", - "itemCategories": "Wearables", - "itemDescription": "Wear these, and others will respect your authoritah.", - "itemLicense": "", - "itemName": "Aviators", - "jointRotations": [ - ], - "jointRotationsSet": [ - ], - "jointTranslations": [ - ], - "jointTranslationsSet": [ - ], - "lastEdited": 1528306178314655, - "lastEditedBy": "{439a2669-4626-487f-9dcf-2d15e77c69a2}", - "lifetime": -1, - "limitedRun": 4294967295, - "localPosition": { - "x": 2.6226043701171875e-06, - "y": -0.13999652862548828, - "z": -0.04999971389770508 - }, - "localRotation": { - "w": 0.9969173073768616, - "x": -0.07845909893512726, - "y": 0, - "z": 0 - }, - "locked": false, - "marketplaceID": "40d879ec-93f0-4b4a-8c58-dd6349bdb058", - "modelURL": "http://mpassets.highfidelity.com/40d879ec-93f0-4b4a-8c58-dd6349bdb058-v1/Aviator.fbx", - "name": "", - "naturalDimensions": { - "x": 0.1660931408405304, - "y": 0.05885136127471924, - "z": 0.15574991703033447 - }, - "naturalPosition": { - "x": 0, - "y": 1.6633577346801758, - "z": 0.048884183168411255 - }, - "originalTextures": "{\n \"aviator:Eyewear2F\": \"http://mpassets.highfidelity.com/40d879ec-93f0-4b4a-8c58-dd6349bdb058-v1/Aviator.fbx/Aviator.fbm/aviator_Eyewear_Diffuse.png\",\n \"aviator:Eyewear2F1\": \"http://mpassets.highfidelity.com/40d879ec-93f0-4b4a-8c58-dd6349bdb058-v1/Aviator.fbx/Aviator.fbm/aviator_Eyewear_Specular.png\"\n}\n", - "owningAvatarID": "{439a2669-4626-487f-9dcf-2d15e77c69a2}", - "parentID": "{439a2669-4626-487f-9dcf-2d15e77c69a2}", - "parentJointIndex": 66, - "position": { - "x": 2.6226043701171875e-06, - "y": -0.13999652862548828, - "z": -0.04999971389770508 - }, - "queryAACube": { - "scale": 0.9313028454780579, - "x": -1.4091639518737793, - "y": -10.133878707885742, - "z": 1.9983724355697632 - }, - "registrationPoint": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "relayParentJoints": false, - "renderInfo": { - "drawCalls": 1, - "hasTransparent": false, - "texturesCount": 2, - "texturesSize": 1310720, - "verticesCount": 982 - }, - "restitution": 0.5, - "rotation": { - "w": 0.9969173073768616, - "x": -0.07845909893512726, - "y": 0, - "z": 0 - }, - "script": "", - "scriptTimestamp": 0, - "serverScripts": "", - "shapeType": "box", - "staticCertificateVersion": 0, - "textures": "", - "type": "Model", - "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"HeadTop_End\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}", - "velocity": { - "x": 0, - "y": 0, - "z": 0 - }, - "visible": true - } - } - ], - "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/46e0fd52-3cff-462f-ba97-927338d88295-v1/AnimeBoy2.fst", - "version": 3 - }, - "Anime girl": { - "attachments": [ - ], - "avatarEntites": [ - { - "properties": { - "acceleration": { - "x": 0, - "y": 0, - "z": 0 - }, - "actionData": "", - "age": 19.66267967224121, - "ageAsText": "0 hours 0 minutes 19 seconds", - "angularDamping": 0.39346998929977417, - "angularVelocity": { - "x": 0, - "y": 0, - "z": 0 - }, - "animation": { - "allowTranslation": true, - "currentFrame": 0, - "firstFrame": 0, - "fps": 30, - "hold": false, - "lastFrame": 100000, - "loop": true, - "running": false, - "url": "" - }, - "boundingBox": { - "brn": { - "x": -0.10536206513643265, - "y": -0.16647332906723022, - "z": -0.12632352113723755 - }, - "center": { - "x": 0, - "y": -0.12999999523162842, - "z": -0.030000001192092896 - }, - "dimensions": { - "x": 0.2107241302728653, - "y": 0.07294666767120361, - "z": 0.1926470398902893 - }, - "tfl": { - "x": 0.10536206513643265, - "y": -0.09352666139602661, - "z": 0.06632351875305176 - } - }, - "canCastShadow": true, - "certificateID": "", - "clientOnly": true, - "cloneAvatarEntity": false, - "cloneDynamic": false, - "cloneLifetime": 300, - "cloneLimit": 0, - "cloneOriginID": "{00000000-0000-0000-0000-000000000000}", - "cloneable": false, - "collidesWith": "", - "collisionMask": 0, - "collisionSoundURL": "", - "collisionless": false, - "collisionsWillMove": false, - "compoundShapeURL": "", - "created": "2018-06-05T00:10:37Z", - "damping": 0.39346998929977417, - "density": 1000, - "description": "", - "dimensions": { - "x": 0.2107241302728653, - "y": 0.07294666767120361, - "z": 0.1926470398902893 - }, - "dynamic": false, - "editionNumber": 5, - "entityInstanceNumber": 0, - "friction": 0.5, - "gravity": { - "x": 0, - "y": 0, - "z": 0 - }, - "href": "", - "id": "{1586b83a-2af7-4532-9bfb-82fe3f5d5ce9}", - "ignoreForCollisions": false, - "itemArtist": "moam_00", - "itemCategories": "Wearables", - "itemDescription": "Perfect for side-glancin'.", - "itemLicense": "", - "itemName": "Blacker Fem Glasses", - "jointRotations": [ - ], - "jointRotationsSet": [ - ], - "jointTranslations": [ - ], - "jointTranslationsSet": [ - ], - "lastEdited": 1528157470041658, - "lastEditedBy": "{425df1a8-289b-42fc-819c-c3b2a12d7165}", - "lifetime": -1, - "limitedRun": 4294967295, - "localPosition": { - "x": 0, - "y": -0.12999999523162842, - "z": -0.029999999329447746 - }, - "localRotation": { - "w": 1, - "x": -2.2351741790771484e-08, - "y": 3.4924596548080444e-10, - "z": 3.725290298461914e-09 - }, - "locked": false, - "marketplaceID": "06781d12-9139-48f4-ac2a-417dde090981", - "modelURL": "http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx", - "name": "Female Glasses 3 by Mario Andrade", - "naturalDimensions": { - "x": 0.16209548711776733, - "y": 0.05611282214522362, - "z": 0.14819003641605377 - }, - "naturalPosition": { - "x": 0, - "y": -7.636845111846924e-08, - "z": 0 - }, - "originalTextures": "{\n \"file49\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Mixed_AO.jpg\",\n \"file81\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Metallic.jpg\",\n \"file84\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Roughness.jpg\",\n \"file86\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Base_Color.jpg\",\n \"file87\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Normal_DirectX.jpg\"\n}\n", - "owningAvatarID": "{1277f725-fbb4-478b-ae79-1241fd90e508}", - "parentID": "{1277f725-fbb4-478b-ae79-1241fd90e508}", - "parentJointIndex": 66, - "position": { - "x": 0, - "y": -0.12999999523162842, - "z": -0.029999999329447746 - }, - "queryAACube": { - "scale": 0.8840523958206177, - "x": -2.6587564945220947, - "y": -10.162277221679688, - "z": -0.9548344016075134 - }, - "registrationPoint": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "relayParentJoints": false, - "renderInfo": { - "drawCalls": 1, - "hasTransparent": false, - "texturesCount": 5, - "texturesSize": 0, - "verticesCount": 1156 - }, - "restitution": 0.5, - "rotation": { - "w": 1, - "x": -2.2351741790771484e-08, - "y": 3.4924596548080444e-10, - "z": 3.725290298461914e-09 - }, - "script": "", - "scriptTimestamp": 0, - "serverScripts": "", - "shapeType": "box", - "staticCertificateVersion": 0, - "textures": "", - "type": "Model", - "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"HeadTop_End\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}", - "velocity": { - "x": 0, - "y": 0, - "z": 0 - }, - "visible": true - } - } - ], - "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/0dce3426-55c8-4641-8dd5-d76eb575b64a-v1/Anime_F_Outfit.fst", - "version": 3 - }, - "Last Legends: Male": { - "attachments": [ - ], - "avatarEntites": [ - { - "properties": { - "acceleration": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "actionData": "", - "age": 321.8835144042969, - "ageAsText": "0 hours 5 minutes 21 seconds", - "angularDamping": 0.39346998929977417, - "angularVelocity": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "animation": { - "allowTranslation": true, - "currentFrame": 0, - "firstFrame": 0, - "fps": 30, - "hold": false, - "lastFrame": 100000, - "loop": true, - "running": false, - "url": "" - }, - "boundingBox": { - "brn": { - "blue": -0.03950843587517738, - "green": 0.20785385370254517, - "red": -0.04381325840950012, - "x": -0.04381325840950012, - "y": 0.20785385370254517, - "z": -0.03950843587517738 - }, - "center": { - "blue": 0, - "green": 0.23000000417232513, - "red": 0, - "x": 0, - "y": 0.23000000417232513, - "z": 0 - }, - "dimensions": { - "blue": 0.07901687175035477, - "green": 0.044292300939559937, - "red": 0.08762651681900024, - "x": 0.08762651681900024, - "y": 0.044292300939559937, - "z": 0.07901687175035477 - }, - "tfl": { - "blue": 0.03950843587517738, - "green": 0.2521461546421051, - "red": 0.04381325840950012, - "x": 0.04381325840950012, - "y": 0.2521461546421051, - "z": 0.03950843587517738 - } - }, - "canCastShadow": true, - "certificateID": "", - "clientOnly": true, - "cloneAvatarEntity": false, - "cloneDynamic": false, - "cloneLifetime": 300, - "cloneLimit": 0, - "cloneOriginID": "{00000000-0000-0000-0000-000000000000}", - "cloneable": false, - "collidesWith": "", - "collisionMask": 0, - "collisionSoundURL": "", - "collisionless": false, - "collisionsWillMove": false, - "compoundShapeURL": "", - "created": "2018-07-26T23:56:46Z", - "damping": 0.39346998929977417, - "density": 1000, - "description": "", - "dimensions": { - "blue": 0.07229919731616974, - "green": 0.06644226610660553, - "red": 0.03022606298327446, - "x": 0.03022606298327446, - "y": 0.06644226610660553, - "z": 0.07229919731616974 - }, - "dynamic": false, - "editionNumber": 58, - "entityInstanceNumber": 0, - "friction": 0.5, - "gravity": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "href": "", - "id": "{03053239-bb37-4c51-a013-a1772baaeed5}", - "ignoreForCollisions": false, - "itemArtist": "jyoum", - "itemCategories": "Wearables", - "itemDescription": "A cool scifi watch for your avatar!", - "itemLicense": "", - "itemName": "Scifi Watch", - "jointRotations": [ - ], - "jointRotationsSet": [ - ], - "jointTranslations": [ - ], - "jointTranslationsSet": [ - ], - "lastEdited": 1532649569894305, - "lastEditedBy": "{042ac463-7879-40f0-8126-e2e56c4345ca}", - "lifetime": -1, - "limitedRun": 4294967295, - "localPosition": { - "blue": 0, - "green": 0.23000000417232513, - "red": 0, - "x": 0, - "y": 0.23000000417232513, - "z": 0 - }, - "localRotation": { - "w": 0.5910986065864563, - "x": -0.48726415634155273, - "y": -0.4088630974292755, - "z": 0.49599072337150574 - }, - "locked": false, - "marketplaceID": "0685794d-fddb-4bad-a608-6d7789ceda90", - "modelURL": "http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx", - "name": "Scifi Watch by Jimi", - "naturalDimensions": { - "blue": 0.055614765733480453, - "green": 0.0511094331741333, - "red": 0.023250818252563477, - "x": 0.023250818252563477, - "y": 0.0511094331741333, - "z": 0.055614765733480453 - }, - "naturalPosition": { - "blue": -0.06031447649002075, - "green": 1.4500460624694824, - "red": 0.6493338942527771, - "x": 0.6493338942527771, - "y": 1.4500460624694824, - "z": -0.06031447649002075 - }, - "originalTextures": "{\n \"file4\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Base_Color.png\",\n \"file5\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Normal_OpenGL.png\",\n \"file6\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Metallic.png\",\n \"file7\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Roughness.png\",\n \"file8\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Emissive.png\"\n}\n", - "owningAvatarID": "{042ac463-7879-40f0-8126-e2e56c4345ca}", - "parentID": "{042ac463-7879-40f0-8126-e2e56c4345ca}", - "parentJointIndex": 16, - "position": { - "blue": 0, - "green": 0.23000000417232513, - "red": 0, - "x": 0, - "y": 0.23000000417232513, - "z": 0 - }, - "queryAACube": { - "scale": 0.3082179129123688, - "x": 495.7716979980469, - "y": 498.345703125, - "z": 498.52044677734375 - }, - "registrationPoint": { - "blue": 0.5, - "green": 0.5, - "red": 0.5, - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "relayParentJoints": false, - "renderInfo": { - "drawCalls": 1, - "hasTransparent": false, - "texturesCount": 5, - "texturesSize": 786432, - "verticesCount": 273 - }, - "restitution": 0.5, - "rotation": { - "w": 0.5910986065864563, - "x": -0.48726415634155273, - "y": -0.4088630974292755, - "z": 0.49599072337150574 - }, - "script": "", - "scriptTimestamp": 0, - "serverScripts": "", - "shapeType": "box", - "staticCertificateVersion": 0, - "textures": "", - "type": "Model", - "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"[LR]ForeArm\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}", - "velocity": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "visible": true - } - }, - { - "properties": { - "acceleration": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "actionData": "", - "age": 308.8044128417969, - "ageAsText": "0 hours 5 minutes 8 seconds", - "angularDamping": 0.39346998929977417, - "angularVelocity": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "animation": { - "allowTranslation": true, - "currentFrame": 0, - "firstFrame": 0, - "fps": 30, - "hold": false, - "lastFrame": 100000, - "loop": true, - "running": false, - "url": "" - }, - "boundingBox": { - "brn": { - "blue": -0.2340194433927536, - "green": -0.07067721337080002, - "red": -0.17002610862255096, - "x": -0.17002610862255096, - "y": -0.07067721337080002, - "z": -0.2340194433927536 - }, - "center": { - "blue": -0.039825439453125, - "green": 0.02001953125, - "red": 0.0001678466796875, - "x": 0.0001678466796875, - "y": 0.02001953125, - "z": -0.039825439453125 - }, - "dimensions": { - "blue": 0.3883880078792572, - "green": 0.18139348924160004, - "red": 0.34038791060447693, - "x": 0.34038791060447693, - "y": 0.18139348924160004, - "z": 0.3883880078792572 - }, - "tfl": { - "blue": 0.1543685644865036, - "green": 0.11071627587080002, - "red": 0.17036180198192596, - "x": 0.17036180198192596, - "y": 0.11071627587080002, - "z": 0.1543685644865036 - } - }, - "canCastShadow": true, - "certificateID": "", - "clientOnly": true, - "cloneAvatarEntity": false, - "cloneDynamic": false, - "cloneLifetime": 300, - "cloneLimit": 0, - "cloneOriginID": "{00000000-0000-0000-0000-000000000000}", - "cloneable": false, - "collidesWith": "", - "collisionMask": 0, - "collisionSoundURL": "", - "collisionless": false, - "collisionsWillMove": false, - "compoundShapeURL": "", - "created": "2018-07-26T23:56:46Z", - "damping": 0.39346998929977417, - "density": 1000, - "description": "", - "dimensions": { - "blue": 0.38838762044906616, - "green": 0.16981728374958038, - "red": 0.33466479182243347, - "x": 0.33466479182243347, - "y": 0.16981728374958038, - "z": 0.38838762044906616 - }, - "dynamic": false, - "editionNumber": 18, - "entityInstanceNumber": 0, - "friction": 0.5, - "gravity": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "href": "", - "id": "{1bf231ce-3913-4c53-be3c-b1f4094dac51}", - "ignoreForCollisions": false, - "itemArtist": "jyoum", - "itemCategories": "Wearables", - "itemDescription": "A stylish and classic piece of headwear for your avatar.", - "itemLicense": "", - "itemName": "Fedora", - "jointRotations": [ - ], - "jointRotationsSet": [ - ], - "jointTranslations": [ - ], - "jointTranslationsSet": [ - ], - "lastEdited": 1532649698129709, - "lastEditedBy": "{042ac463-7879-40f0-8126-e2e56c4345ca}", - "lifetime": -1, - "limitedRun": 4294967295, - "localPosition": { - "blue": -0.039825439453125, - "green": 0.02001953125, - "red": 0.0001678466796875, - "x": 0.0001678466796875, - "y": 0.02001953125, - "z": -0.039825439453125 - }, - "localRotation": { - "w": 0.9998477101325989, - "x": -9.898545982878204e-09, - "y": 5.670873406415922e-07, - "z": 0.017452405765652657 - }, - "locked": false, - "marketplaceID": "11c4208d-15d7-4449-9758-a08da6dbd3dc", - "modelURL": "http://mpassets.highfidelity.com/11c4208d-15d7-4449-9758-a08da6dbd3dc-v1/Fedora.fbx", - "name": "", - "naturalDimensions": { - "blue": 0.320981502532959, - "green": 0.14034485816955566, - "red": 0.2765824794769287, - "x": 0.2765824794769287, - "y": 0.14034485816955566, - "z": 0.320981502532959 - }, - "naturalPosition": { - "blue": 0.022502630949020386, - "green": 1.7460365295410156, - "red": 0.000143393874168396, - "x": 0.000143393874168396, - "y": 1.7460365295410156, - "z": 0.022502630949020386 - }, - "originalTextures": "{\n \"file5\": \"http://mpassets.highfidelity.com/11c4208d-15d7-4449-9758-a08da6dbd3dc-v1/Fedora.fbx/Texture/Fedora_Hat1_Base_Color.png\",\n \"file7\": \"http://mpassets.highfidelity.com/11c4208d-15d7-4449-9758-a08da6dbd3dc-v1/Fedora.fbx/Texture/Fedora_Hat1_Roughness.png\"\n}\n", - "owningAvatarID": "{042ac463-7879-40f0-8126-e2e56c4345ca}", - "parentID": "{042ac463-7879-40f0-8126-e2e56c4345ca}", - "parentJointIndex": 66, - "position": { - "blue": -0.039825439453125, - "green": 0.02001953125, - "red": 0.0001678466796875, - "x": 0.0001678466796875, - "y": 0.02001953125, - "z": -0.039825439453125 - }, - "queryAACube": { - "scale": 1.6202316284179688, - "x": 495.21051025390625, - "y": 498.5577697753906, - "z": 497.6370849609375 - }, - "registrationPoint": { - "blue": 0.5, - "green": 0.5, - "red": 0.5, - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "relayParentJoints": false, - "renderInfo": { - "drawCalls": 1, - "hasTransparent": false, - "texturesCount": 2, - "texturesSize": 327680, - "verticesCount": 719 - }, - "restitution": 0.5, - "rotation": { - "w": 0.9998477101325989, - "x": -9.898545982878204e-09, - "y": 5.670873406415922e-07, - "z": 0.017452405765652657 - }, - "script": "", - "scriptTimestamp": 0, - "serverScripts": "", - "shapeType": "box", - "staticCertificateVersion": 0, - "textures": "", - "type": "Model", - "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"HeadTop_End\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}", - "velocity": { - "blue": 0, - "green": 0, - "red": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "visible": true - } - } - ], - "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/28569047-6f1a-4100-af67-8054ec397cc3-v1/LLMale2.fst", - "version": 3 - }, - "Last legends Female": { - "attachments": [ - ], - "avatarEntites": [ - ], - "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/8d823be5-6197-4418-b984-eb94160ed956-v1/LLFemale_Clothes.fst", - "version": 3 - }, - "Matthew": { - "attachments": [ - ], - "avatarEntites": [ - ], - "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/b652081b-a199-425e-ae5c-7815721bdc09-v1/matthew.fst", - "version": 3 - }, - "Priscilla": { - "attachments": [ - ], - "avatarEntites": [ - ], - "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/e7565f93-8bc5-47c2-b6eb-b3b31d4a1339-v1/priscilla.fst", - "version": 3 - }, "Woody": { "attachments": [ ], "avatarEntites": [ ], "avatarScale": 1, - "avatarUrl": "http://mpassets.highfidelity.com/ad348528-de38-420c-82bb-054cb22163f5-v1/mannequin.fst", + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Woody/mannequin.fst", + "version": 3 + }, + "Kim": { + "attachments": [ + ], + "avatarEntites": [ + ], + "avatarScale": 1, + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Kim/fbx/Kim.fst", + "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Kim/img/icon.png", + "version": 3 + }, + "Mason": { + "attachments": [ + ], + "avatarEntites": [ + ], + "avatarScale": 1, + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mason/fbx/Mason.fst", + "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mason/img/icon.png", + "version": 3 + }, + "Mike": { + "attachments": [ + ], + "avatarEntites": [ + ], + "avatarScale": 1, + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mike/fbx/Mike.fst", + "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mike/img/icon.png", + "version": 3 + }, + "Sean": { + "attachments": [ + ], + "avatarEntites": [ + ], + "avatarScale": 1, + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Sean/fbx/Sean.fst", + "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Sean/img/icon.png", + "version": 3 + }, + "Summer": { + "attachments": [ + ], + "avatarEntites": [ + ], + "avatarScale": 1, + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Summer/fbx/Summer.fst", + "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Summer/img/icon.png", + "version": 3 + }, + "Tanya": { + "attachments": [ + ], + "avatarEntites": [ + ], + "avatarScale": 1, + "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Tanya/fbx/Tanya.fst", + "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Tanya/img/icon.png", "version": 3 } -} +} \ No newline at end of file diff --git a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml index 731ee214ec..a9bfcb7bb7 100644 --- a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml +++ b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml @@ -49,7 +49,13 @@ ListModel { } function makeAvatarObject(avatar, avatarName) { - var avatarThumbnailUrl = makeThumbnailUrl(avatar.avatarUrl); + var avatarThumbnailUrl; + + if (!avatar.avatarIcon) { + makeThumbnailUrl(avatar.avatarUrl); + } else { + avatarThumbnailUrl = avatar.avatarIcon; + } return { 'name' : avatarName, diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp index 9204cd7514..9aa1d91a0f 100644 --- a/interface/src/AvatarBookmarks.cpp +++ b/interface/src/AvatarBookmarks.cpp @@ -4,6 +4,7 @@ // // Created by Triplelexx on 23/03/17. // Copyright 2017 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -282,12 +283,14 @@ QVariantMap AvatarBookmarks::getAvatarDataToBookmark() { auto myAvatar = DependencyManager::get()->getMyAvatar(); const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString(); + const QString& avatarIcon = QString(""); const QVariant& avatarScale = myAvatar->getAvatarScale(); // If Avatar attachments ever change, this is where to update them, when saving remember to also append to AVATAR_BOOKMARK_VERSION QVariantMap bookmark; bookmark.insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION); bookmark.insert(ENTRY_AVATAR_URL, avatarUrl); + bookmark.insert(ENTRY_AVATAR_ICON, avatarIcon); bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale); QVariantList wearableEntities; diff --git a/interface/src/AvatarBookmarks.h b/interface/src/AvatarBookmarks.h index 646d06456a..82db23a7f7 100644 --- a/interface/src/AvatarBookmarks.h +++ b/interface/src/AvatarBookmarks.h @@ -4,6 +4,7 @@ // // Created by Triplelexx on 23/03/17. // Copyright 2017 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -148,6 +149,7 @@ protected slots: private: const QString AVATARBOOKMARKS_FILENAME = "avatarbookmarks.json"; const QString ENTRY_AVATAR_URL = "avatarUrl"; + const QString ENTRY_AVATAR_ICON = "avatarIcon"; const QString ENTRY_AVATAR_ATTACHMENTS = "attachments"; const QString ENTRY_AVATAR_ENTITIES = "avatarEntites"; const QString ENTRY_AVATAR_SCALE = "avatarScale";