From 7e87bfbd5f147224a46987bcaa0d58609ac2b6f0 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Tue, 29 Mar 2016 16:28:21 -0700 Subject: [PATCH] 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;