diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json index a83635e7db..1e48a21827 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json @@ -1,7 +1,8 @@ { "Entities": [{ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.obj", + "name": "hifi-home-model-chair", + "compoundShapeURL": "atp:/collision-hulls/simple-chair2.obj", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.66077238321304321, @@ -15,7 +16,7 @@ "z": 0 }, "id": "{d97c8a4e-9b95-448c-a729-5da9e22b6adc}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.fbx", + "modelURL": "atp:/models/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 acc9cc5f74..018186192f 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -5,7 +5,7 @@ var UPPER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Ho var LOWER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/lowerBookShelf.json' + "?" + Math.random(); var RIGHT_DESK_DRAWER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/rightDeskDrawer.json' + "?" + Math.random(); var LEFT_DESK_DRAWER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/leftDeskDrawer.json' + "?" + Math.random(); -var CHAIR_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/chair.json' + "?" + Math.random(); +var CHAIR_URL = 'atp:/JSON/chair.json'; var DESK_DRAWERS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/deskDrawers.json' + "?" + Math.random(); var FRUIT_BOWL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/fruit.json' + "?" + Math.random() var LAB_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/deskLamp.json' + "?" + Math.random();