diff --git a/cmake/installer/Thumbs.db b/cmake/installer/Thumbs.db new file mode 100644 index 0000000000..86bc943370 Binary files /dev/null and b/cmake/installer/Thumbs.db differ diff --git a/interface/icon/Thumbs.db b/interface/icon/Thumbs.db new file mode 100644 index 0000000000..d107491451 Binary files /dev/null and b/interface/icon/Thumbs.db differ diff --git a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js index f7ea0a2ad2..cdb29363d3 100644 --- a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js +++ b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js @@ -89,7 +89,7 @@ createBigVersion: function() { var smallProps = Entities.getEntityProperties(_this.entityID); - print('transformer should create big version!!') + print('transformer should create big version!!' + smallProps.modelURL); print('transformer has rotatorBlock??' + _this.rotatorBlock); var rotatorProps = Entities.getEntityProperties(_this.rotatorBlock); var bigVersionProps = { diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json new file mode 100644 index 0000000000..09023f2722 --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json @@ -0,0 +1,39 @@ +{ + "Entities": [ + { + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue_hull.obj", + "created": "2016-03-29T17:37:52Z", + "dimensions": { + "x": 0.99695134162902832, + "y": 1.23363196849823, + "z": 1.0726165771484375 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 + }, + "id": "{51a44c3a-ec4a-4c79-8034-aeb5c45660b5}", + "modelURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue.fbx", + "name": "home_model_comfyChair", + "queryAACube": { + "scale": 1.9147497415542603, + "x": -0.95737487077713013, + "y": -0.95737487077713013, + "z": -0.95737487077713013 + }, + "rotation": { + "w": 0.46746015548706055, + "x": -0.0017547607421875, + "y": 0.88400089740753174, + "z": 0.0024261474609375 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}", + } + ], + "Version": 57 +} diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json similarity index 86% rename from unpublishedScripts/DomainContent/Home/kineticObjects/chair.json rename to unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json index 1e48a21827..5b4b4a22c2 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json @@ -2,7 +2,7 @@ "Entities": [{ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "name": "hifi-home-model-chair", - "compoundShapeURL": "atp:/collision-hulls/simple-chair2.obj", + "compoundShapeURL": "atp:/kineticObjects/deskChair/simple-chair2.obj", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.66077238321304321, @@ -16,7 +16,7 @@ "z": 0 }, "id": "{d97c8a4e-9b95-448c-a729-5da9e22b6adc}", - "modelURL": "atp:/models/simple-chair2.fbx", + "modelURL": "atp:/kineticObjects/deskChair/simple-chair2.fbx", "queryAACube": { "scale": 1.439794659614563, "x": -0.71989732980728149, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index cbc3765a46..e2dab15753 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -4,7 +4,8 @@ var BOOKS_URL = "atp:/kineticObjects/books.json" var UPPER_BOOKSHELF_URL = "atp:/kineticObjects/upperBookShelf.json" var LOWER_BOOKSHELF_URL = "atp:/kineticObjects/lowerBookShelf.json" -var CHAIR_URL = 'atp:/kineticObjects/chair.json'; +var CHAIR_URL = 'atp:/kineticObjects/deskChair.json'; +var BLUE_CHAIR_URL = 'atp:/kineticObjects/blueChair.json'; var FRUIT_BOWL_URL = "atp:/kineticObjects/fruit.json" @@ -131,6 +132,29 @@ Chair = function(spawnLocation, spawnRotation) { this.cleanup = cleanup; } +BlueChair = function(spawnLocation, spawnRotation) { + print('CREATE BLUE CHAIR') + var created = []; + + function create() { + var success = Clipboard.importEntities(BLUE_CHAIR_URL); + if (success === true) { + created = Clipboard.pasteEntities(spawnLocation) + print('created ' + created); + } + }; + + function cleanup() { + created.forEach(function(obj) { + Entities.deleteEntity(obj); + }) + }; + + create(); + + this.cleanup = cleanup; +} + Trashcan = function(spawnLocation, spawnRotation) { print('CREATE TRASHCAN') var created = []; diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 8dc6a80155..82acd7f09f 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -240,6 +240,13 @@ z: -79.8097 }); + var comfyChair = new BlueChair({ + x: 1100.4821, + y: 459.8161, + z:-75.9071 + }); + + var trashcan = new Trashcan({ x: 1103.9034, y: 459.4355,