From 7e87bfbd5f147224a46987bcaa0d58609ac2b6f0 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Tue, 29 Mar 2016 16:28:21 -0700 Subject: [PATCH 1/3] atp --- .../Home/dressingRoom/wrapper.js | 8 +++---- .../Home/fishTank/entityLocalFish.js | 2 +- .../Home/fishTank/singleSpawner.js | 2 +- .../DomainContent/Home/fishTank/wrapper.js | 20 ++++++++-------- .../Home/pingPongGun/pingPongGun.js | 4 ++-- .../DomainContent/Home/pingPongGun/wrapper.js | 6 ++--- .../DomainContent/Home/reset.js | 16 ++++++------- .../Home/switches/dressingRoomDiscLights.js | 4 +--- .../Home/switches/labDeskLamp.js | 23 +++++++++++-------- .../Home/switches/livingRoomDeskLamp.js | 19 ++++++++------- .../Home/switches/livingRoomDiscLights.js | 6 +---- .../Home/switches/livingRoomFan.js | 2 +- .../DomainContent/Home/tiltMaze/wrapper.js | 7 +++--- 13 files changed, 60 insertions(+), 59 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js b/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js index c5ebdbcaa8..ec5943e349 100644 --- a/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js @@ -1,6 +1,6 @@ - var TRANSFORMER_SCRIPT = Script.resolvePath('transformer.js?' + Math.random()); + var TRANSFORMER_SCRIPT = Script.resolvePath('transformer.js'); - var AVATAR_COLLISION_HULL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/dressingRoom/Avatar-Hull-4.obj'; + var AVATAR_COLLISION_HULL = 'atp:/dressingRoom/Avatar-Hull-4.obj'; TransformerDoll = function(modelURL, spawnPosition, spawnRotation, dimensions) { print('SCRIPT REF AT TRANSFORMER CREATE::' + TRANSFORMER_SCRIPT); @@ -20,7 +20,7 @@ }, visible: true, damping: 0.8, - angularDamping:0.8, + angularDamping: 0.8, userData: JSON.stringify({ 'grabbableKey': { 'grabbable': true @@ -33,7 +33,7 @@ 'reset': true } }), - density:5000, + density: 5000, dimensions: dimensions, script: TRANSFORMER_SCRIPT } diff --git a/unpublishedScripts/DomainContent/Home/fishTank/entityLocalFish.js b/unpublishedScripts/DomainContent/Home/fishTank/entityLocalFish.js index 9d5464d53e..49a64fc3ac 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/entityLocalFish.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/entityLocalFish.js @@ -24,7 +24,7 @@ var SWIMMING_FORCE = 0.025; var SWIMMING_SPEED = 0.5; var VELOCITY_FOLLOW_RATE = 0.25; - var FISH_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/goodfish5.fbx"; + var FISH_MODEL_URL = "atp:/fishTank/goodfish5.fbx"; var fishLoaded = false; var fish = []; diff --git a/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js b/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js index ffd1ccda4e..107665b258 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js @@ -1,4 +1,4 @@ - var fishTankPath = Script.resolvePath('wrapper.js?' + Math.random()); + var fishTankPath = Script.resolvePath('wrapper.js'); Script.include(fishTankPath); var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index a7da4e5960..75ec765bd9 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -10,7 +10,7 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js?' + Math.random()); +var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js'); FishTank = function(spawnPosition, spawnRotation) { var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, anemone, treasure, rocks; @@ -36,11 +36,11 @@ FishTank = function(spawnPosition, spawnRotation) { var TANK_POSITION = spawnPosition; - var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx"; + var TANK_MODEL_URL = "atp:/fishTank/aquariumTank.fbx"; - var TANK_BASE_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumBase.fbx'; + var TANK_BASE_MODEL_URL = 'atp:/fishTank/aquariumBase.fbx'; - var TANK_BASE_COLLISION_HULL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumBase.obj' + var TANK_BASE_COLLISION_HULL = 'atp:/fishTank/aquariumBase.obj' var TANK_BASE_DIMENSIONS = { x: 0.8599, @@ -60,7 +60,7 @@ FishTank = function(spawnPosition, spawnRotation) { z: TANK_DIMENSIONS.z / 8 } - var BUBBLE_SOUND_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/aquarium_small.L.wav"; + var BUBBLE_SOUND_URL = "atp:/fishTank/aquarium_small.L.wav"; var bubbleSound = SoundCache.getSound(BUBBLE_SOUND_URL); @@ -69,8 +69,8 @@ FishTank = function(spawnPosition, spawnRotation) { var ANEMONE_VERTICAL_OFFSET = -0.12; - var ANEMONE_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx'; - var ANEMONE_ANIMATION_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx'; + var ANEMONE_MODEL_URL = 'atp:/fishTank/anemone.fbx'; + var ANEMONE_ANIMATION_URL = 'atp:/fishTank/anemone.fbx'; var ANEMONE_DIMENSIONS = { x: 0.4, y: 0.4, @@ -81,7 +81,7 @@ FishTank = function(spawnPosition, spawnRotation) { var ROCKS_LATERAL_OFFSET = 0.0; var ROCKS_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.25; - var ROCK_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Aquarium-Rocks-2.fbx'; + var ROCK_MODEL_URL = 'atp:/fishTank/Aquarium-Rocks-2.fbx'; var ROCK_DIMENSIONS = { x: 0.707, @@ -93,7 +93,7 @@ FishTank = function(spawnPosition, spawnRotation) { var TREASURE_LATERAL_OFFSET = -0.15; var TREASURE_VERTICAL_OFFSET = -0.23; - var TREASURE_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Treasure-Chest2-SM.fbx'; + var TREASURE_MODEL_URL = 'atp:/fishTank/Treasure-Chest2-SM.fbx'; var TREASURE_DIMENSIONS = { x: 0.1199, @@ -176,7 +176,7 @@ FishTank = function(spawnPosition, spawnRotation) { "alphaStart": 0.3, "alphaFinish": 0, "emitterShouldTrail": 0, - "textures": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/bubble-white.png", + "textures": "atp:/fishTank/bubble-white.png", userData: JSON.stringify({ 'hifiHomeKey': { 'reset': true diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js index a1aed09cc2..e160b67a45 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js @@ -13,8 +13,8 @@ Script.include("../utils.js"); - var SHOOTING_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/ping_pong_gun/pong_sound.wav'; - var PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx'; + var SHOOTING_SOUND_URL = 'atp:/pingPongGun/pong_sound.wav'; + var PING_PONG_BALL_URL = 'atp:/pingPongGun/ping_pong_ball.fbx'; function PingPongGun() { return; diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js index 07ac3e43b4..7e0085f770 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js @@ -11,9 +11,9 @@ Script.include("../utils.js"); var scriptURL = Script.resolvePath('pingPongGun.js'); -var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx' -var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj'; -var COLLISION_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/plastic_impact.L.wav'; +var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx' +var COLLISION_HULL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.obj'; +var COLLISION_SOUND_URL = 'atp:/pingPongGun/plastic_impact.L.wav'; HomePingPongGun = function(spawnPosition, spawnRotation) { var pingPongGun = Entities.addEntity({ diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index d291a37521..3fbaeff3f1 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -22,7 +22,7 @@ var kineticPath = Script.resolvePath("kineticObjects/wrapper.js?" + Math.random()); - var fishTankPath = Script.resolvePath('fishTank/wrapper.js?' + Math.random()); + var fishTankPath = Script.resolvePath('atp:/fishTank/wrapper.js'); var tiltMazePath = Script.resolvePath("atp:/tiltMaze/wrapper.js") @@ -32,11 +32,11 @@ var cuckooClockPath = Script.resolvePath("cuckooClock/wrapper.js?" + Math.random()); - var pingPongGunPath = Script.resolvePath("pingPongGun/wrapper.js?" + Math.random()); + var pingPongGunPath = Script.resolvePath("atp:/pingPongGun/wrapper.js"); var musicBoxPath = Script.resolvePath("musicBox/wrapper.js?" + Math.random()); - var transformerPath = Script.resolvePath("dressingRoom/wrapper.js?" + Math.random()); + var transformerPath = Script.resolvePath("dressingRoom/wrapper.js"); Script.include(utilsPath); @@ -51,11 +51,11 @@ // Script.include(musicBoxPath); Script.include(transformerPath); - var TRANSFORMER_URL_ARTEMIS = 'http://hifi-public.s3.amazonaws.com/ryan/DefaultAvatarFemale2/0314HiFiFemAviHeightChange.fbx'; - var TRANSFORMER_URL_ALBERT = 'https://s3.amazonaws.com/hifi-public/ozan/avatars/albert/albert/albert.fbx'; - var TRANSFORMER_URL_BEING_OF_LIGHT = 'http://hifi-public.s3.amazonaws.com/ryan/0318HiFiBoL/0318HiFiBoL.fbx'; - var TRANSFORMER_URL_KATE = 'https://hifi-public.s3.amazonaws.com/ozan/avatars/kate/kate/kate.fbx'; - var TRANSFORMER_URL_WILL = 'https://s3.amazonaws.com/hifi-public/models/skeletons/Will/Will.fbx'; + var TRANSFORMER_URL_ARTEMIS = 'atp:/dressingRoom/0314HiFiFemAviHeightChange.fbx'; + var TRANSFORMER_URL_ALBERT = 'atp:/dressingRoom/albert.fbx'; + var TRANSFORMER_URL_BEING_OF_LIGHT = 'atp:/dressingRoom/0318HiFiBoL.fbx'; + var TRANSFORMER_URL_KATE = 'atp:/dressingRoom/kate.fbx'; + var TRANSFORMER_URL_WILL = 'atp:/dressingRoom/Will.fbx'; Reset.prototype = { tidying: false, diff --git a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js index c269c27151..ff5eea0455 100644 --- a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js +++ b/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js @@ -2,16 +2,14 @@ var SEARCH_RADIUS = 100; - var EMISSIVE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelitysign_white_emissive.png"; - var DIFFUSE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelity_diffusebaked.png"; var _this; var utilitiesScript = Script.resolvePath('../utils.js'); Script.include(utilitiesScript); Switch = function() { _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); + this.switchSound = SoundCache.getSound("atp:/switches/lamp_switch_2.wav"); }; Switch.prototype = { diff --git a/unpublishedScripts/DomainContent/Home/switches/labDeskLamp.js b/unpublishedScripts/DomainContent/Home/switches/labDeskLamp.js index 958788cc65..e7bcd49423 100644 --- a/unpublishedScripts/DomainContent/Home/switches/labDeskLamp.js +++ b/unpublishedScripts/DomainContent/Home/switches/labDeskLamp.js @@ -1,16 +1,14 @@ (function() { var SEARCH_RADIUS = 10; - - var EMISSIVE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelitysign_white_emissive.png"; - - var DIFFUSE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelity_diffusebaked.png"; - var _this; - var utilitiesScript = Script.resolvePath('../../../../libraries/utils.js'); + + var utilitiesScript = Script.resolvePath('../utils.js'); + Script.include(utilitiesScript); + Switch = function() { _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); + this.switchSound = SoundCache.getSound("atp:/switches/lamp_switch_2.wav"); }; Switch.prototype = { @@ -28,13 +26,20 @@ modelEmitOn: function(discModel) { Entities.editEntity(glowDisc, { - textures: 'emissive:' + EMISSIVE_TEXTURE_URL ',\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' + textures: { + "Tex.Lamp-Bulldog": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx/Lamp-Bulldog-Base.fbm/dog_statue.jpg", + "Texture.001": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx/Lamp-Bulldog-Base.fbm/Emissive-Map.png" + } }) + }, modelEmitOff: function(discModel) { Entities.editEntity(glowDisc, { - textures: 'emissive:"",\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' + textures: { + "Tex.Lamp-Bulldog": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx/Lamp-Bulldog-Base.fbm/dog_statue.jpg", + "Texture.001": "" + } }) }, diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js index 23c9e1e7be..16673594e0 100644 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js +++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js @@ -1,16 +1,12 @@ (function() { var SEARCH_RADIUS = 10; - var EMISSIVE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelitysign_white_emissive.png"; - - var DIFFUSE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelity_diffusebaked.png"; - var _this; - var utilitiesScript = Script.resolvePath('../../../../libraries/utils.js'); + var utilitiesScript = Script.resolvePath('../utils.js'); Script.include(utilitiesScript); Switch = function() { _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); + this.switchSound = SoundCache.getSound("atp:/switches/lamp_switch_2.wav"); }; Switch.prototype = { @@ -28,13 +24,20 @@ modelEmitOn: function(discModel) { Entities.editEntity(glowDisc, { - + textures: { + "Tex.Lamp-Bulldog": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx/Lamp-Bulldog-Base.fbm/dog_statue.jpg", + "Texture.001": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx/Lamp-Bulldog-Base.fbm/Emissive-Map.png" + } }) + }, modelEmitOff: function(discModel) { Entities.editEntity(glowDisc, { - + textures: { + "Tex.Lamp-Bulldog": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx/Lamp-Bulldog-Base.fbm/dog_statue.jpg", + "Texture.001": "" + } }) }, diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js index 167d4672df..f8e9c3a107 100644 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js +++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js @@ -2,16 +2,12 @@ var SEARCH_RADIUS = 100; - var EMISSIVE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelitysign_white_emissive.png"; - - var DIFFUSE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelity_diffusebaked.png"; - var _this; var utilitiesScript = Script.resolvePath('../utils.js'); Script.include(utilitiesScript); Switch = function() { _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); + this.switchSound = SoundCache.getSound("atp:/switches/lamp_switch_2.wav"); }; Switch.prototype = { diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js index 2bc667945d..905cce4be2 100644 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js +++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js @@ -5,7 +5,7 @@ Script.include(utilitiesScript); Switch = function() { _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); + this.switchSound = SoundCache.getSound("atp:/switches/lamp_switch_2.wav"); _this.FAN_VOLUME = 0.1; _this.FAN_SOUND_ENTITY_NAME = "home_sfx _ceiling_fan"; }; diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js index d4959c57e5..95a673a256 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js @@ -16,9 +16,8 @@ TiltMaze = function(spawnPosition, spawnRotation) { var ball, ballSpawningAnchor, ballDetector, tiltMaze, lightAtTheEnd; - var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-4.fbx"; - var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-3.obj"; - + var MAZE_MODEL_URL = "atp:/tiltMaze/newmaze_tex-4.fbx"; + var MAZE_COLLISION_HULL = "atp:/tiltMaze/newmaze_tex-3.obj"; var SCALE = 0.5; @@ -61,7 +60,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var center = spawnPosition; - var CLEANUP = true; + var CLEANUP = false; var BALL_FORWARD_OFFSET = -0.2 * SCALE; var BALL_RIGHT_OFFSET = -0.4 * SCALE; From 2c975f38cf55e4dc023e1cdc556fb2eb48f8761c Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Tue, 29 Mar 2016 17:55:50 -0700 Subject: [PATCH 2/3] atp --- .../cuckooClockMinuteHandEntityScript.js | 4 +- .../DomainContent/Home/cuckooClock/wrapper.js | 12 ++-- .../Home/growingPlant/waterCanEntityScript.js | 3 +- .../Home/kineticObjects/blocks.json | 72 +++++++++---------- .../Home/kineticObjects/books.json | 30 ++++---- .../Home/kineticObjects/deskLamp.json | 10 +-- .../Home/kineticObjects/fruit.json | 16 ++--- .../Home/kineticObjects/postersCell.json | 4 +- .../Home/kineticObjects/postersPlaya.json | 6 +- .../Home/kineticObjects/trashcan.json | 4 +- .../Home/kineticObjects/wrapper.js | 52 ++++---------- .../DomainContent/Home/reset.js | 16 ++--- .../DomainContent/Home/tiltMaze/maze.js | 3 + .../Home/whiteboard/markerEntityScript.js | 2 +- .../DomainContent/Home/whiteboard/wrapper.js | 16 ++--- 15 files changed, 113 insertions(+), 137 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/cuckooClockMinuteHandEntityScript.js b/unpublishedScripts/DomainContent/Home/cuckooClock/cuckooClockMinuteHandEntityScript.js index becf7fadc3..3b6c4519eb 100644 --- a/unpublishedScripts/DomainContent/Home/cuckooClock/cuckooClockMinuteHandEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/cuckooClock/cuckooClockMinuteHandEntityScript.js @@ -1,6 +1,6 @@ (function() { Script.include('../utils.js'); - Script.include('../../../../examples/libraries/virtualBaton.js'); + Script.include('../virtualBaton.js'); var _this; var d = new Date(); @@ -11,7 +11,7 @@ var baton; var iOwn = false; var connected = false; - var CUCKOO_SOUND_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/cuckoo_clock/cuckoo%20mix.wav"; + var CUCKOO_SOUND_URL = "atp:/cuckooClock/cuckoomix.wav"; CuckooClockMinuteHand = function() { _this = this; _this.TIME_CHECK_REFRACTORY_PERIOD = 5000; diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js index 4cd1dd6afa..5b59a854bd 100644 --- a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js @@ -9,12 +9,12 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js?v1" + Math.random()) -var CLOCK_BODY_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/cuckooClock/cuckoo2_BODY.fbx"; -var CLOCK_FACE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cuckooClock2_FACE.fbx"; -var CLOCK_HOUR_HAND_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cuckooClock2_HOUR_HAND.fbx"; -var CLOCK_MINUTE_HAND_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cuckooClock2_MINUTE_HAND.fbx?v5"; -var CLOCK_SECOND_HAND_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/secondHand.fbx"; +var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js" ) +var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx"; +var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx"; +var CLOCK_HOUR_HAND_URL = "atp:/cuckooClock/cuckooClock2_HOUR_HAND.fbx"; +var CLOCK_MINUTE_HAND_URL = "atp:/cuckooClock/cuckooClock2_MINUTE_HAND.fbx"; +var CLOCK_SECOND_HAND_URL = "atp:/cuckooClock/secondHand.fbx"; MyCuckooClock = function(spawnPosition, spawnRotation) { var clockBody, clockFace, clockMinuteHand, clockHourHand, clockSecondHand; diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js index a89e8418f7..21034540cf 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js @@ -197,7 +197,7 @@ alpha: 1.0, alphaFinish: 1.0, emitterShouldTrail: true, - textures: "atp:/images/raindrop.png", + textures: "atp:/growingPlant/raindrop.png", userData: JSON.stringify({ 'hifiHomeKey': { 'reset': true @@ -227,7 +227,6 @@ var entities = Entities.findEntities(_this.position, 2); entities.forEach(function(entity) { var name = Entities.getEntityProperties(entity, "name").name; - print('HOME FOUND AN ENTITY CALLED:: ' + name) if (name === _this.WATER_SPOUT_NAME) { _this.waterSpout = entity; } diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json b/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json index 4a0c2cf8ec..e616d7efc6 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json @@ -1,7 +1,7 @@ { "Entities": [ { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -17,7 +17,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{5371218c-e05b-49da-ac70-81f1f76c55ea}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_natural.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", "name": "hifi-home-model-block", "position": { "x": 0.69732666015625, @@ -41,7 +41,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -57,7 +57,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{ccc1198a-a501-48b8-959a-68297258aea7}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_natural.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", "name": "hifi-home-model-block", "position": { "x": 0.47344970703125, @@ -81,7 +81,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -97,7 +97,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{3aaf5dd5-16d8-4852-880d-8256de68de19}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_red.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", "name": "hifi-home-model-block", "position": { "x": 0.2613525390625, @@ -121,7 +121,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -137,7 +137,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{0474a29f-c45b-4d42-ae95-0c0bd1e6c501}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_yellow.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", "name": "hifi-home-model-block", "position": { "x": 0.30487060546875, @@ -161,7 +161,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -177,7 +177,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{53e06851-8346-45ac-bdb5-0a74c99b5bd5}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_green.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", "name": "hifi-home-model-block", "position": { "x": 0.40277099609375, @@ -201,7 +201,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -217,7 +217,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{38bcb70d-e384-4b60-878a-e34d4830f045}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_yellow.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", "name": "hifi-home-model-block", "position": { "x": 0.54962158203125, @@ -241,7 +241,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -257,7 +257,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{fa8f8bbc-5bd0-4121-985d-75ce2f68eba1}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_red.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", "name": "hifi-home-model-block", "position": { "x": 0.52001953125, @@ -281,7 +281,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -297,7 +297,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{d4b8582b-b707-453c-89c6-65e358da5cd7}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_yellow.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx", "name": "hifi-home-model-block", "position": { "x": 0.66876220703125, @@ -321,7 +321,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -337,7 +337,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{3b5b53fb-7ee5-44eb-9b81-8de8a525c433}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_red.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", "name": "hifi-home-model-block", "position": { "x": 0.83819580078125, @@ -361,7 +361,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -377,7 +377,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{0d1f27e9-7e74-4263-9428-8c8f7aac94a6}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_green.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", "name": "hifi-home-model-block", "position": { "x": 0.61773681640625, @@ -401,7 +401,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -417,7 +417,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{79ea518f-aac3-45ff-b22d-6d295b3c9e87}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_green.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", "name": "hifi-home-model-block", "position": { "x": 0.7188720703125, @@ -441,7 +441,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -457,7 +457,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{ff470ff9-c889-4893-a25f-80895bff0e9a}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_blue.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", "name": "hifi-home-model-block", "position": { "x": 0.74981689453125, @@ -481,7 +481,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -497,7 +497,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{b5319f85-603d-436b-8bbe-fc9f798ca738}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_green.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_green.fbx", "name": "hifi-home-model-block", "position": { "x": 0.8824462890625, @@ -521,7 +521,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -537,7 +537,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{944a4616-8dac-4d6a-a92b-49fa98514416}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_blue.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", "name": "hifi-home-model-block", "position": { "x": 0.963623046875, @@ -561,7 +561,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -577,7 +577,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{ea6a1038-7047-4a1e-bdbd-076d6e41508c}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_blue.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx", "name": "hifi-home-model-block", "position": { "x": 0.49188232421875, @@ -601,7 +601,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -617,7 +617,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{ff65f5dd-2d53-4127-86da-05156a42946d}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_natural.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", "name": "hifi-home-model-block", "position": { "x": 0, @@ -641,7 +641,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -657,7 +657,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{3a9acd14-f754-4c70-b294-9f622c000785}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_red.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", "name": "hifi-home-model-block", "position": { "x": 0.88006591796875, @@ -681,7 +681,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { - "collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav", + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", "collisionsWillMove": 1, "created": "2016-03-23T21:29:36Z", "dimensions": { @@ -697,7 +697,7 @@ }, "velocity": {"x": 0, "y": -0.1, "z": 0}, "id": "{bb014301-247b-44d0-8b09-b830fea4439e}", - "modelURL": "http://s3.amazonaws.com/hifi-public/models/content/planky/planky_natural.fbx", + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", "name": "hifi-home-model-block", "position": { "x": 0.80487060546875, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json index 5761b3d7b3..d6ab52701d 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json @@ -6,7 +6,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-15T21:26:11Z", "dimensions": { "x": 0.25794500112533569, @@ -15,7 +15,7 @@ }, "dynamic": 1, "id": "{896373aa-9ed0-4be5-865b-a474448ea67b}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-SC-NS.fbx", + "modelURL": "atp:/kineticObjects/books/Book-SC-NS.fbx", "name": "home_model_book1", "position": { "x": 0, @@ -43,7 +43,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.25794500112533569, @@ -52,7 +52,7 @@ }, "dynamic": 1, "id": "{e48fd6a5-ff0f-4ba6-92c7-fd972eba53c6}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-RPO-EC.fbx", + "modelURL": "atp:/kineticObjects/books/Book-RPO-EC.fbx", "name": "home_model_book_readyplayerone", "position": { "x": 0.031494140625, @@ -87,7 +87,7 @@ "z": 0.036211937665939331 }, "id": "{e0790afc-6c62-4891-a933-7904b6cbc7cc}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-DADOES-PD.fbx", + "modelURL": "atp:/kineticObjects/books/Book-DADOES-PD.fbx", "name": "home_model_book_DoAndroids", "position": { "x": 0.031005859375, @@ -116,7 +116,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.19239270687103271, @@ -124,7 +124,7 @@ "z": 0.042817402631044388 }, "id": "{5120bfbb-66bf-493c-8c1a-ed883f39c054}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F1-IA.fbx", + "modelURL": "atp:/kineticObjects/books/Book-F1-IA.fbx", "name": "home_model_book_Foundation1", "position": { "x": 0.04150390625, @@ -153,7 +153,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.19239270687103271, @@ -161,7 +161,7 @@ "z": 0.037494994699954987 }, "id": "{f9af3a1e-dbd5-4fb3-ad38-dc818592e4c6}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F2-IA.fbx", + "modelURL": "atp:/kineticObjects/books/Book-F2-IA.fbx", "position": { "x": 0.056884765625, "y": 0.00262451171875, @@ -189,7 +189,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.19239270687103271, @@ -197,7 +197,7 @@ "z": 0.04995863139629364 }, "id": "{6af6bf06-05c9-427c-8ff5-d10072ffc293}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F3-IA.fbx", + "modelURL": "atp:/kineticObjects/books/Book-F3-IA.fbx", "name": "home_model_book_Foundation3", "position": { "x": 0.0919189453125, @@ -226,7 +226,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-15T21:26:11Z", "dimensions": { "x": 0.20406116545200348, @@ -234,7 +234,7 @@ "z": 0.014823859557509422 }, "id": "{4982da58-d573-4582-b627-f08312cc0d07}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-LPP-ASE.fbx", + "modelURL": "atp:/kineticObjects/books/Book-LPP-ASE.fbx", "position": { "x": 0.1171875, "y": 0.01153564453125, @@ -262,7 +262,7 @@ "z": 0 }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "collisionSoundURL": "atp:/kineticObjects/books/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", "dimensions": { "x": 0.23497477173805237, @@ -270,7 +270,7 @@ "z": 0.033324316143989563 }, "id": "{178b1cef-f76b-4cda-b834-42080208d502}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-N-WG.fbx", + "modelURL": "atp:/kineticObjects/books/Book-N-WG.fbx", "position": { "x": 0.1429443359375, "y": 0.00970458984375, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json index 3d36a1f002..f84f902dff 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json @@ -7,7 +7,7 @@ "z": 0.010236549191176891 }, "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Shade.obj", + "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.objj", "created": "2016-03-22T22:55:11Z", "dimensions": { "x": 0.35158795118331909, @@ -21,7 +21,7 @@ "z": 0 }, "id": "{747a8714-3cc5-4336-bac3-de3c8ec1494d}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Shade.fbx", + "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.fbx", "name": "hifi-home-model-bulldog-shade", "position": { "x": 0.085205078125, @@ -57,7 +57,7 @@ "z": -0.0033033043146133423 }, "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.obj", + "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.obj", "created": "2016-03-22T22:50:49Z", "dimensions": { "x": 0.26436957716941833, @@ -71,7 +71,7 @@ "z": 0 }, "id": "{5dcc642f-34a6-44a7-8da8-275cbbbef9d6}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Lamp-Bulldog-Base.fbx", + "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.fbx", "name": "hifi-home-model-bulldog-base", "position": { "x": 0.08642578125, @@ -170,7 +170,7 @@ "y": -1.52587890625e-05, "z": -1.52587890625e-05 }, - "script": "https://rawgit.com/ericrius1/hifi/homereset/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js", + "script": "atp:/switches/livingRoomDeskLamp.js", "scriptTimestamp": 1458860464095, "type": "Box", "userData": "{\"hifiHomeKey\":{\"reset\":true},\"grabbableKey\":{\"wantsTrigger\":true},\"home-switch\":{\"state\":\"on\"}}", diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json b/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json index b73a0199fc..ceb572c522 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json @@ -2,7 +2,7 @@ "Entities": [{ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Bowl.obj", + "compoundShapeURL": "atp:/kineticObjects/fruit/Fruit-Bowl.obj", "created": "2016-03-15T23:11:03Z", "dimensions": { "x": 0.35241550207138062, @@ -16,7 +16,7 @@ "z": 0 }, "id": "{fa981882-c38f-4413-88f2-255a06aacf08}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Bowl.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Bowl.fbx", "position": { "x": 0.1168212890625, "y": 0, @@ -53,7 +53,7 @@ "z": 0 }, "id": "{ed04b516-3c66-42d9-99af-c4425765df27}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Apple-2.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Apple-2.fbx", "position": { "x": 0.1728515625, "y": 0.040313720703125, @@ -91,7 +91,7 @@ "z": 0 }, "id": "{031f883a-6d7f-447a-96b1-c3ea75f938e1}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Apple.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Apple.fbx", "position": { "x": 0.146240234375, "y": 0.083740234375, @@ -129,7 +129,7 @@ "z": 0 }, "id": "{e3d77c1e-1fcf-4dc2-8799-001046934df8}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Apple-2.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Apple-2.fbx", "position": { "x": 0.08203125, "y": 0.042266845703125, @@ -167,7 +167,7 @@ "z": 0 }, "id": "{34c224cf-d5f5-4cf3-9bf6-55857bf08e43}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Apple.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Apple.fbx", "position": { "x": 0, "y": 0.082916259765625, @@ -205,7 +205,7 @@ "z": 0 }, "id": "{0eab5380-2358-4bcd-b53e-a071d50e1475}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Apple-2.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Apple-2.fbx", "position": { "x": 0.0596923828125, "y": 0.04351806640625, @@ -243,7 +243,7 @@ "z": 0 }, "id": "{c8140643-23fb-4827-b708-e87103f9e438}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Fruit-Apple.fbx", + "modelURL": "atp:/kineticObjects/fruit/Fruit-Apple.fbx", "position": { "x": 0.1519775390625, "y": 0.046356201171875, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json b/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json index 83784e2d9c..ec26cf66ac 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json @@ -34,7 +34,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}" }, { "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Poster2.obj", + "compoundShapeURL": "atp:/kineticObjects/posters/Poster2.obj", "created": "2016-03-23T19:05:25Z", "dimensions": { "x": 0.057196967303752899, @@ -48,7 +48,7 @@ "z": 0 }, "id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Cellscience-Poster-2.fbx", + "modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx", "name": "hifi-home-poster-cell", "queryAACube": { "scale": 1.4568163156509399, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json b/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json index 9e578e5833..68594aaf3f 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json @@ -1,7 +1,7 @@ { "Entities": [{ "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Poster2.obj", + "compoundShapeURL": "atp:/kineticObjects/posters/Poster2.obj", "created": "2016-03-23T17:16:12Z", "dimensions": { "x": 0.047816216945648193, @@ -16,7 +16,7 @@ }, "name": "hifi-home-poster-playa", "id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Playa-Poster.fbx", + "modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx", "queryAACube": { "scale": 1.5361770391464233, "x": 1101.1051025390625, @@ -47,7 +47,7 @@ }, "id": "{7f060027-2927-4513-bd92-13a98e6fc06c}", "name": "Poster-Nail", - "position" : { + "position": { "x": -0.07, "y": 0.5, "z": 0.07 diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json index 59daa7c648..c2a74e7e52 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json @@ -2,7 +2,7 @@ "Entities": [ { "collisionsWillMove": 1, - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Trash-Can-4.obj", + "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj", "created": "2016-03-15T23:06:41Z", "name": "hifi-home-model-trashcan", "dimensions": { @@ -17,7 +17,7 @@ "z": 0 }, "id": "{e9693784-4264-4dd5-baa7-fd165b2645c8}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Trach-Can-3.fbx", + "modelURL": "atp:/kineticObjects/trashcan/Trach-Can-3.fbx", "queryAACube": { "scale": 0.78652161359786987, "x": -0.39326080679893494, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index 018186192f..f76ada695d 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -1,19 +1,19 @@ print('KINETIC INCLUDING WRAPPER') -var BOOKS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/books.json' + "?" + Math.random(); -var UPPER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/upperBookShelf.json' + "?" + Math.random(); -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 BOOKS_URL = "atp:/kineticObjects/books.json" +var UPPER_BOOKSHELF_URL = "atp:/kineticObjects/upperBookShelf.json" +var LOWER_BOOKSHELF_URL = "atp:/kineticObjects/lowerBookShelf.json" +var RIGHT_DESK_DRAWER_URL = "atp:/kineticObjects/rightDeskDrawer.json" +var LEFT_DESK_DRAWER_URL = "atp:/kineticObjects/leftDeskDrawer.json" 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(); -var LIVING_ROOM_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/deskLamp.json' + "?" + Math.random(); -var TRASHCAN_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/trashcan.json' + "?" + Math.random(); -var BLOCKS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/blocks.json' + "?" + Math.random(); -var PLAYA_POSTER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/postersPlaya.json' + "?" + Math.random(); -var CELL_POSTER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/postersCell.json' + "?" + Math.random(); + +var FRUIT_BOWL_URL = "atp:/kineticObjects/fruit.json" + +var LIVING_ROOM_LAMP_URL = "atp:/kineticObjects/deskLamp.json" +var TRASHCAN_URL = "atp:/kineticObjects/trashcan.json" +var BLOCKS_URL = "atp:/kineticObjects/blocks.json"; +var PLAYA_POSTER_URL = "atp:/kineticObjects/postersPlaya.json" +var CELL_POSTER_URL = "atp:/kineticObjects/postersCell.json" FruitBowl = function(spawnLocation, spawnRotation) { print('CREATE FRUIT BOWL') @@ -39,32 +39,6 @@ FruitBowl = function(spawnLocation, spawnRotation) { } -LabLamp = function(spawnLocation, spawnRotation) { - - print('CREATE LAB LAMP') - - - var created = []; - - function create() { - var success = Clipboard.importEntities(LAB_LAMP_URL); - if (success === true) { - created = Clipboard.pasteEntities(spawnLocation) - print('created ' + created); - } - }; - - function cleanup() { - created.forEach(function(obj) { - Entities.deleteEntity(obj); - }) - }; - - create(); - - this.cleanup = cleanup; -} - LivingRoomLamp = function(spawnLocation, spawnRotation) { print('CREATE LIVING ROOM LAMP') var created = []; diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 3fbaeff3f1..1c103cdcb7 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -20,23 +20,23 @@ var utilsPath = Script.resolvePath('utils.js'); - var kineticPath = Script.resolvePath("kineticObjects/wrapper.js?" + Math.random()); + var kineticPath = Script.resolvePath("atp:/kineticObjects/wrapper.js"); var fishTankPath = Script.resolvePath('atp:/fishTank/wrapper.js'); var tiltMazePath = Script.resolvePath("atp:/tiltMaze/wrapper.js") - var whiteboardPath = Script.resolvePath("whiteboard/wrapper.js?" + Math.random()); + var whiteboardPath = Script.resolvePath("atp:/whiteboard/wrapper.js"); - var plantPath = Script.resolvePath("growingPlant/wrapper.js"); + var plantPath = Script.resolvePath("atp:/growingPlant/wrapper.js"); - var cuckooClockPath = Script.resolvePath("cuckooClock/wrapper.js?" + Math.random()); + var cuckooClockPath = Script.resolvePath("atp:/cuckooClock/wrapper.js"); var pingPongGunPath = Script.resolvePath("atp:/pingPongGun/wrapper.js"); var musicBoxPath = Script.resolvePath("musicBox/wrapper.js?" + Math.random()); - var transformerPath = Script.resolvePath("dressingRoom/wrapper.js"); + var transformerPath = Script.resolvePath("atp:/dressingRoom/wrapper.js"); Script.include(utilsPath); @@ -124,9 +124,9 @@ createDynamicEntities: function() { var fishTank = new FishTank({ - x: 1098.9254, - y: 460.5814, - z: -79.1103 + x: 1099.2200, + y: 460.5460, + z: -78.2363 }, { x: 0, y: 0, diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js index 0b538dc61c..0265e490a5 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js @@ -179,6 +179,9 @@ this.createBall(); } }, + // mouseDownOnEntity:function(){ + // _this.testBallDistance(); + // } testWinDistance: function() { if (this.ballLocked === true) { diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js b/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js index ec7d7759db..dd86b2a7d3 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js @@ -25,7 +25,7 @@ MarkerTip = function() { _this = this; - _this.MARKER_TEXTURE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/textures/markerStroke.png"; + _this.MARKER_TEXTURE_URL = "atp:/whiteboard/markerStroke.png"; _this.strokeForwardOffset = 0.0001; _this.STROKE_WIDTH_RANGE = { min: 0.002, diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js index 8f0ec36bb3..ede17c0760 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js @@ -10,9 +10,9 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -var ERASER_SCRIPT_URL = Script.resolvePath("eraserEntityScript.js?" + Math.random()); +var ERASER_SCRIPT_URL = Script.resolvePath("eraserEntityScript.js" ); -var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?" + Math.random()); +var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js" ); Whiteboard = function(spawnPosition, spawnRotation) { @@ -25,8 +25,8 @@ Whiteboard = function(spawnPosition, spawnRotation) { }); var whiteboardPosition = spawnPosition; var whiteboardRotation = orientation; - var WHITEBOARD_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/Whiteboard-4.fbx"; - var WHITEBOARD_COLLISION_HULL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/whiteboardCollisionHull.obj"; + var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx"; + var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj"; var whiteboard = Entities.addEntity({ type: "Model", name: "whiteboard", @@ -91,7 +91,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { var WHITEBOARD_RACK_DEPTH = 1.9; - var ERASER_MODEL_URL = "http://hifi-content.s3.amazonaws.com/alan/dev/eraser-2.fbx"; + var ERASER_MODEL_URL = "atp:/whiteboard/eraser-2.fbx"; var eraserPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1)); eraserPosition = Vec3.sum(eraserPosition, Vec3.multiply(-0.5, Quat.getRight(whiteboardRotation))); @@ -157,9 +157,9 @@ Whiteboard = function(spawnPosition, spawnRotation) { function createMarkers() { var modelURLS = [ - "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-blue.fbx", - "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-red.fbx", - "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-black.fbx", + "atp:/whiteboard/marker-blue.fbx", + "atp:/whiteboard/marker-red.fbx", + "atp:/whiteboard/marker-black.fbx", ]; var markerPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1)); From d8d891bfd3ab78e3c42ed05d79f9e4787fa73a17 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Tue, 29 Mar 2016 19:52:03 -0700 Subject: [PATCH 3/3] yo --- .../DomainContent/Home/kineticObjects/deskLamp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json index f84f902dff..162d7a1355 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json @@ -7,7 +7,7 @@ "z": 0.010236549191176891 }, "collisionsWillMove": 1, - "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.objj", + "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.obj", "created": "2016-03-22T22:55:11Z", "dimensions": { "x": 0.35158795118331909,