From 61d12c66413492ded29622b7f79809283370b3a5 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 31 Aug 2020 01:03:24 -0400 Subject: [PATCH] Caps the variables. --- script-archive/acScripts/ControlACs.js | 2 +- script-archive/acScripts/botProceduralWayPoints.js | 2 +- script-archive/acScripts/bot_randomExpression.js | 2 +- script-archive/acScripts/playbackMaster.js | 2 +- script-archive/acScripts/simpleBot.js | 2 +- script-archive/airship/airship.js | 2 +- script-archive/avatarSelector.js | 2 +- script-archive/blockWorld.js | 2 +- script-archive/controllers/hydra/airGuitar.js | 2 +- script-archive/controllers/hydra/drumStick.js | 2 +- script-archive/controllers/hydra/frisbee.js | 2 +- script-archive/controllers/hydra/gun.js | 2 +- script-archive/controllers/hydra/paddleBall.js | 2 +- script-archive/controllers/hydra/toyball.js | 2 +- script-archive/controllers/toybox.js | 2 +- script-archive/entityScripts/recordingMaster.js | 2 +- script-archive/example/audio/audioBall.js | 2 +- script-archive/example/audio/jsstreamplayer.js | 2 +- script-archive/example/audio/radio.js | 2 +- script-archive/example/brownianFun.js | 2 +- script-archive/example/dynamicLandscape.js | 2 +- script-archive/example/entities/editModelExample.js | 2 +- .../example/entities/entityModelExample.js | 2 +- script-archive/example/entities/zoneEntityExample.js | 2 +- script-archive/example/entities/zoneSkyboxExample.js | 2 +- script-archive/example/games/airHockey.js | 2 +- script-archive/example/games/billiards.js | 4 ++-- script-archive/example/games/make-dummy.js | 2 +- script-archive/example/games/spaceInvadersExample.js | 2 +- script-archive/example/soundToys.js | 2 +- script-archive/example/ui/overlaysExample.js | 2 +- script-archive/fireworks.js | 2 +- script-archive/golfclub/golfClub.js | 2 +- script-archive/grenade.js | 2 +- script-archive/libraries/constants.js | 2 +- script-archive/lineRider.js | 2 +- script-archive/lobby.js | 2 +- script-archive/pointer.js | 2 +- script-archive/recorder.js | 2 +- .../utilities/diagnostics/inWorldTestTone.js | 2 +- .../utilities/diagnostics/playSoundLoop.js | 2 +- .../utilities/diagnostics/playSoundWave.js | 2 +- script-archive/utilities/tools/cookies.js | 2 +- scripts/developer/utilities/tools/cookies.js | 2 +- .../simplifiedEmote/emojiApp/simplifiedEmoji.js | 2 +- scripts/system/checkForUpdates.js | 2 +- scripts/system/libraries/globals.js | 2 +- scripts/system/libraries/networkingConstants.js | 12 ++++++------ scripts/system/libraries/progressDialog.js | 2 +- 49 files changed, 55 insertions(+), 55 deletions(-) diff --git a/script-archive/acScripts/ControlACs.js b/script-archive/acScripts/ControlACs.js index a66d62b872..0208aefab6 100644 --- a/script-archive/acScripts/ControlACs.js +++ b/script-archive/acScripts/ControlACs.js @@ -10,7 +10,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // Set the following variables to the right value var NUM_AC = 3; // This is the number of AC. Their ID need to be unique and between 0 (included) and NUM_AC (excluded) diff --git a/script-archive/acScripts/botProceduralWayPoints.js b/script-archive/acScripts/botProceduralWayPoints.js index 097819829d..0b757bebee 100644 --- a/script-archive/acScripts/botProceduralWayPoints.js +++ b/script-archive/acScripts/botProceduralWayPoints.js @@ -21,7 +21,7 @@ //For procedural walk animation var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; Script.include(VIRCADIA_PUBLIC_CDN + "scripts/acScripts/proceduralAnimationAPI.js"); var procAnimAPI = new ProcAnimAPI(); diff --git a/script-archive/acScripts/bot_randomExpression.js b/script-archive/acScripts/bot_randomExpression.js index 6ff1140c6e..30d30b79b5 100644 --- a/script-archive/acScripts/bot_randomExpression.js +++ b/script-archive/acScripts/bot_randomExpression.js @@ -13,7 +13,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -VIRCADIA_PUBLIC_CDN = networkingConstants.contentCDN; +VIRCADIA_PUBLIC_CDN = networkingConstants.CONTENT_CDN_URL; function getRandomFloat(min, max) { return Math.random() * (max - min) + min; diff --git a/script-archive/acScripts/playbackMaster.js b/script-archive/acScripts/playbackMaster.js index e2ce2d8f3b..83b9374d67 100644 --- a/script-archive/acScripts/playbackMaster.js +++ b/script-archive/acScripts/playbackMaster.js @@ -11,7 +11,7 @@ Script.include("./AgentPoolController.js"); var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var masterController = new MasterController(); diff --git a/script-archive/acScripts/simpleBot.js b/script-archive/acScripts/simpleBot.js index abe8894db7..284b92f103 100644 --- a/script-archive/acScripts/simpleBot.js +++ b/script-archive/acScripts/simpleBot.js @@ -10,7 +10,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; function getRandomFloat(min, max) { return Math.random() * (max - min) + min; diff --git a/script-archive/airship/airship.js b/script-archive/airship/airship.js index 38debb9909..ecf15300f0 100644 --- a/script-archive/airship/airship.js +++ b/script-archive/airship/airship.js @@ -30,7 +30,7 @@ audioInjector = null; var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var cannonSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/cannonShot.wav"); var explosionSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/explosion.wav"); diff --git a/script-archive/avatarSelector.js b/script-archive/avatarSelector.js index e7ebfbf73c..6d5460af74 100644 --- a/script-archive/avatarSelector.js +++ b/script-archive/avatarSelector.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var panelWall = false; var orbShell = false; diff --git a/script-archive/blockWorld.js b/script-archive/blockWorld.js index a1a5366939..5f292b4061 100644 --- a/script-archive/blockWorld.js +++ b/script-archive/blockWorld.js @@ -20,7 +20,7 @@ var blocks = []; var blockSpawner; var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var floorPos = Vec3.sum(MyAvatar.position, { diff --git a/script-archive/controllers/hydra/airGuitar.js b/script-archive/controllers/hydra/airGuitar.js index 785136fa65..73520e3694 100644 --- a/script-archive/controllers/hydra/airGuitar.js +++ b/script-archive/controllers/hydra/airGuitar.js @@ -11,7 +11,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/script-archive/controllers/hydra/drumStick.js b/script-archive/controllers/hydra/drumStick.js index c3389e9a05..46036ef824 100644 --- a/script-archive/controllers/hydra/drumStick.js +++ b/script-archive/controllers/hydra/drumStick.js @@ -11,7 +11,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/script-archive/controllers/hydra/frisbee.js b/script-archive/controllers/hydra/frisbee.js index 2b392da992..ba737b5439 100644 --- a/script-archive/controllers/hydra/frisbee.js +++ b/script-archive/controllers/hydra/frisbee.js @@ -16,7 +16,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; Script.include("../../libraries/toolBars.js"); const LEFT_PALM = 0; diff --git a/script-archive/controllers/hydra/gun.js b/script-archive/controllers/hydra/gun.js index 2499bcbc6e..b65910dd1d 100644 --- a/script-archive/controllers/hydra/gun.js +++ b/script-archive/controllers/hydra/gun.js @@ -23,7 +23,7 @@ Script.include("../../libraries/constants.js"); Script.include("../../libraries/toolBars.js"); var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var LASER_WIDTH = 2; var POSE_CONTROLS = [ Controller.Standard.LeftHand, Controller.Standard.RightHand ]; diff --git a/script-archive/controllers/hydra/paddleBall.js b/script-archive/controllers/hydra/paddleBall.js index a8253a8c33..f50a2bd060 100644 --- a/script-archive/controllers/hydra/paddleBall.js +++ b/script-archive/controllers/hydra/paddleBall.js @@ -11,7 +11,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"); var rightHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/RightHandAnimPhilip.fbx"; diff --git a/script-archive/controllers/hydra/toyball.js b/script-archive/controllers/hydra/toyball.js index deb6523fe1..d41c8431e1 100644 --- a/script-archive/controllers/hydra/toyball.js +++ b/script-archive/controllers/hydra/toyball.js @@ -16,7 +16,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // maybe we should make these constants... var LEFT_PALM = 0; diff --git a/script-archive/controllers/toybox.js b/script-archive/controllers/toybox.js index 77895aa8b2..c4fa9e8c27 100644 --- a/script-archive/controllers/toybox.js +++ b/script-archive/controllers/toybox.js @@ -12,7 +12,7 @@ Script.include("http://s3.amazonaws.com/hifi-public/scripts/libraries/toolBars.js"); var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; diff --git a/script-archive/entityScripts/recordingMaster.js b/script-archive/entityScripts/recordingMaster.js index 00a6fcccc1..47b2791105 100644 --- a/script-archive/entityScripts/recordingMaster.js +++ b/script-archive/entityScripts/recordingMaster.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/toolBars.js"); Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/utils.js"); diff --git a/script-archive/example/audio/audioBall.js b/script-archive/example/audio/audioBall.js index af5227ea39..44b0d37157 100644 --- a/script-archive/example/audio/audioBall.js +++ b/script-archive/example/audio/audioBall.js @@ -14,7 +14,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Animals/mexicanWhipoorwill.raw"); var CHANCE_OF_PLAYING_SOUND = 0.01; diff --git a/script-archive/example/audio/jsstreamplayer.js b/script-archive/example/audio/jsstreamplayer.js index 262cb6bb29..93b3cd55b5 100644 --- a/script-archive/example/audio/jsstreamplayer.js +++ b/script-archive/example/audio/jsstreamplayer.js @@ -15,7 +15,7 @@ // Declare HiFi public bucket. var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // Declare variables and set up new WebWindow. var stream; diff --git a/script-archive/example/audio/radio.js b/script-archive/example/audio/radio.js index 791986ad59..fc614a5eb4 100644 --- a/script-archive/example/audio/radio.js +++ b/script-archive/example/audio/radio.js @@ -10,7 +10,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var modelURL = VIRCADIA_PUBLIC_CDN + "models/entities/radio/Speakers.fbx"; var soundURL = VIRCADIA_PUBLIC_CDN + "sounds/family.stereo.raw"; diff --git a/script-archive/example/brownianFun.js b/script-archive/example/brownianFun.js index fd60a36070..5a29b03768 100644 --- a/script-archive/example/brownianFun.js +++ b/script-archive/example/brownianFun.js @@ -1,5 +1,5 @@ var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var SOUND_PATH = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/"; var soundURLS = ["67LCollision01.wav", "67LCollision02.wav", "airhockey_hit1.wav"]; var FLOOR_SIZE = 10; diff --git a/script-archive/example/dynamicLandscape.js b/script-archive/example/dynamicLandscape.js index 81acbde85e..e2ada16612 100644 --- a/script-archive/example/dynamicLandscape.js +++ b/script-archive/example/dynamicLandscape.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; Script.include(VIRCADIA_PUBLIC_CDN + 'scripts/utilities.js') var NUM_ROWS = 10; diff --git a/script-archive/example/entities/editModelExample.js b/script-archive/example/entities/editModelExample.js index 38c7eb8bf5..4caf68e729 100644 --- a/script-archive/example/entities/editModelExample.js +++ b/script-archive/example/entities/editModelExample.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var moveUntil = 2000; diff --git a/script-archive/example/entities/entityModelExample.js b/script-archive/example/entities/entityModelExample.js index b19bc79d9b..0d5991392d 100644 --- a/script-archive/example/entities/entityModelExample.js +++ b/script-archive/example/entities/entityModelExample.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var stopAfter = 1000; diff --git a/script-archive/example/entities/zoneEntityExample.js b/script-archive/example/entities/zoneEntityExample.js index 080dae1216..76e770f9a7 100644 --- a/script-archive/example/entities/zoneEntityExample.js +++ b/script-archive/example/entities/zoneEntityExample.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var stopAfter = 1000; diff --git a/script-archive/example/entities/zoneSkyboxExample.js b/script-archive/example/entities/zoneSkyboxExample.js index bc04c21662..6088307b2f 100644 --- a/script-archive/example/entities/zoneSkyboxExample.js +++ b/script-archive/example/entities/zoneSkyboxExample.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var count = 0; var stopAfter = 600; diff --git a/script-archive/example/games/airHockey.js b/script-archive/example/games/airHockey.js index cb20338c6f..517e5ab28c 100755 --- a/script-archive/example/games/airHockey.js +++ b/script-archive/example/games/airHockey.js @@ -61,7 +61,7 @@ var paddleModel = "https://hifi-public.s3.amazonaws.com/ozan/props/airHockeyTabl var paddleCollisionModel = "http://headache.hungry.com/~seth/hifi/paddle-hull.obj" var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var screenSize = Controller.getViewportDimensions(); var BUTTON_SIZE = 32; var PADDING = 3; diff --git a/script-archive/example/games/billiards.js b/script-archive/example/games/billiards.js index 644463f925..c7782c6cd4 100644 --- a/script-archive/example/games/billiards.js +++ b/script-archive/example/games/billiards.js @@ -11,7 +11,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var tableParts = []; var balls = []; @@ -38,7 +38,7 @@ var hitSound = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billi SoundCache.getSound(hitSound); var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var screenSize = Controller.getViewportDimensions(); var reticle = Overlays.addOverlay("image", { x: screenSize.x / 2 - 16, diff --git a/script-archive/example/games/make-dummy.js b/script-archive/example/games/make-dummy.js index 370ccdfb75..bdb1f347fe 100644 --- a/script-archive/example/games/make-dummy.js +++ b/script-archive/example/games/make-dummy.js @@ -16,7 +16,7 @@ var Overlays, Entities, Controller, Script, MyAvatar, Vec3; // Referenced globals provided by High Fidelity. var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var rezButton = Overlays.addOverlay("image", { x: 100, diff --git a/script-archive/example/games/spaceInvadersExample.js b/script-archive/example/games/spaceInvadersExample.js index 7c2f7c2ab1..ecd24c5eb9 100644 --- a/script-archive/example/games/spaceInvadersExample.js +++ b/script-archive/example/games/spaceInvadersExample.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var iteration = 0; diff --git a/script-archive/example/soundToys.js b/script-archive/example/soundToys.js index c976b656b7..c021599639 100644 --- a/script-archive/example/soundToys.js +++ b/script-archive/example/soundToys.js @@ -9,7 +9,7 @@ var Camera, Vec3, Quat, Entities, Script; // Globals defined by HiFi, var'ed here to keep jslint happy. var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var SOUND_BUCKET = "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/"; var MAX_ANGULAR_SPEED = Math.PI; var N_EACH_OBJECTS = 3; diff --git a/script-archive/example/ui/overlaysExample.js b/script-archive/example/ui/overlaysExample.js index 54b6cd665d..13324fa9f1 100644 --- a/script-archive/example/ui/overlaysExample.js +++ b/script-archive/example/ui/overlaysExample.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // The "Swatches" example of this script will create 9 different image overlays, that use the color feature to // display different colors as color swatches. The overlays can be clicked on, to change the "selectedSwatch" variable diff --git a/script-archive/fireworks.js b/script-archive/fireworks.js index 42aa16cea1..11f50fb478 100644 --- a/script-archive/fireworks.js +++ b/script-archive/fireworks.js @@ -1,5 +1,5 @@ var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var fireSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw"); var audioOptions = { volume: 0.9, diff --git a/script-archive/golfclub/golfClub.js b/script-archive/golfclub/golfClub.js index eb4592e278..0fb13a47ad 100644 --- a/script-archive/golfclub/golfClub.js +++ b/script-archive/golfclub/golfClub.js @@ -14,7 +14,7 @@ (function () { var ball = null; var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var collisionSoundURL = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"; var triggerState = false; var BALL_GRAVITY = -9.8; diff --git a/script-archive/grenade.js b/script-archive/grenade.js index 053f32f099..264c884162 100644 --- a/script-archive/grenade.js +++ b/script-archive/grenade.js @@ -10,7 +10,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var grenadeURL = VIRCADIA_PUBLIC_CDN + "models/props/grenade/grenade.fbx"; var fuseSoundURL = VIRCADIA_PUBLIC_CDN + "sounds/burningFuse.wav"; diff --git a/script-archive/libraries/constants.js b/script-archive/libraries/constants.js index fb724150f1..fa9fe7def9 100644 --- a/script-archive/libraries/constants.js +++ b/script-archive/libraries/constants.js @@ -7,7 +7,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; STICK_URL = VIRCADIA_PUBLIC_CDN + "models/props/geo_stick.fbx"; ZERO_VECTOR = { x: 0, y: 0, z: 0 }; diff --git a/script-archive/lineRider.js b/script-archive/lineRider.js index d5a95bcc84..d2e8b67070 100644 --- a/script-archive/lineRider.js +++ b/script-archive/lineRider.js @@ -12,7 +12,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html LineRider = function() { var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var screenSize = Controller.getViewportDimensions(); var BUTTON_SIZE = 32; diff --git a/script-archive/lobby.js b/script-archive/lobby.js index 017a144d39..714a329f09 100644 --- a/script-archive/lobby.js +++ b/script-archive/lobby.js @@ -10,7 +10,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var panelWall = false; var orbShell = false; diff --git a/script-archive/pointer.js b/script-archive/pointer.js index 9fd45b018a..d7e9ec9914 100644 --- a/script-archive/pointer.js +++ b/script-archive/pointer.js @@ -30,7 +30,7 @@ var buttonOnColor = { }; var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var userCanPoint = false; Script.include(["libraries/toolBars.js"]); diff --git a/script-archive/recorder.js b/script-archive/recorder.js index 35183ed50b..c5f379c0e2 100644 --- a/script-archive/recorder.js +++ b/script-archive/recorder.js @@ -12,7 +12,7 @@ /* globals VIRCADIA_PUBLIC_CDN:true, Tool, ToolBar */ var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; Script.include("/~/system/libraries/toolBars.js"); var recordingFile = "recording.hfr"; diff --git a/script-archive/utilities/diagnostics/inWorldTestTone.js b/script-archive/utilities/diagnostics/inWorldTestTone.js index 433dd3ba7e..43b22f9ca7 100644 --- a/script-archive/utilities/diagnostics/inWorldTestTone.js +++ b/script-archive/utilities/diagnostics/inWorldTestTone.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/220Sine.wav"); diff --git a/script-archive/utilities/diagnostics/playSoundLoop.js b/script-archive/utilities/diagnostics/playSoundLoop.js index 5e2eb73a32..27a01a500f 100644 --- a/script-archive/utilities/diagnostics/playSoundLoop.js +++ b/script-archive/utilities/diagnostics/playSoundLoop.js @@ -12,7 +12,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; // A few sample files you may want to try: diff --git a/script-archive/utilities/diagnostics/playSoundWave.js b/script-archive/utilities/diagnostics/playSoundWave.js index 7e4a34bfd1..00febbeecb 100644 --- a/script-archive/utilities/diagnostics/playSoundWave.js +++ b/script-archive/utilities/diagnostics/playSoundWave.js @@ -10,7 +10,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var soundClip = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Cocktail%20Party%20Snippets/Walken1.wav"); diff --git a/script-archive/utilities/tools/cookies.js b/script-archive/utilities/tools/cookies.js index 99173db03e..8dd6a1d6da 100644 --- a/script-archive/utilities/tools/cookies.js +++ b/script-archive/utilities/tools/cookies.js @@ -11,7 +11,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var SLIDER_RANGE_INCREMENT_SCALE = 1 / 1000; var THUMB_COLOR = { diff --git a/scripts/developer/utilities/tools/cookies.js b/scripts/developer/utilities/tools/cookies.js index 99173db03e..8dd6a1d6da 100644 --- a/scripts/developer/utilities/tools/cookies.js +++ b/scripts/developer/utilities/tools/cookies.js @@ -11,7 +11,7 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var SLIDER_RANGE_INCREMENT_SCALE = 1 / 1000; var THUMB_COLOR = { diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js index 4509cf37ad..0c5eac5126 100644 --- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js +++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js @@ -23,7 +23,7 @@ var emojiList = Script.require("./resources/modules/emojiList.js"); var customEmojiList = Script.require("./resources/modules/customEmojiList.js"); // The contents of this remote folder must always contain all possible emojis for users of `simplifiedEmoji.js` var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var imageURLBase = networkingConstants.contentCDN + "MarketplaceItems/avimoji/appResources/appData/resources/images/emojis/png512/"; +var imageURLBase = networkingConstants.CONTENT_CDN_URL + "MarketplaceItems/avimoji/appResources/appData/resources/images/emojis/png512/"; // Uncomment below for local testing //imageURLBase = Script.resolvePath("./resources/images/emojis/512px/"); diff --git a/scripts/system/checkForUpdates.js b/scripts/system/checkForUpdates.js index 724cd0a68d..f2d12ed759 100644 --- a/scripts/system/checkForUpdates.js +++ b/scripts/system/checkForUpdates.js @@ -21,7 +21,7 @@ var notificationText = "An update is available: "; var notificationColor = { red: 137, green: 63, blue: 255 }; function retrieveMetadata() { - var requireMetadata = Script.require(networkingConstants.interfaceMetadataSource + '?' + Date.now()); + var requireMetadata = Script.require(networkingConstants.INTERFACE_METADATA_SOURCE + '?' + Date.now()); if (requireMetadata) { return requireMetadata; diff --git a/scripts/system/libraries/globals.js b/scripts/system/libraries/globals.js index 64d18548a1..27ccc6f8aa 100644 --- a/scripts/system/libraries/globals.js +++ b/scripts/system/libraries/globals.js @@ -9,6 +9,6 @@ // var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; isInterstitialOverlaysVisible = false; diff --git a/scripts/system/libraries/networkingConstants.js b/scripts/system/libraries/networkingConstants.js index 98cfb67180..5c390eec0b 100644 --- a/scripts/system/libraries/networkingConstants.js +++ b/scripts/system/libraries/networkingConstants.js @@ -7,18 +7,18 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // Interface Metadata Source -var interfaceMetadataSource = "https://cdn.vircadia.com/dist/launcher/vircadiaMeta.json"; +var INTERFACE_METADATA_SOURCE = "https://cdn.vircadia.com/dist/launcher/vircadiaMeta.json"; // Base CDN URLs -var contentCDN = "https://content.highfidelity.com/"; // "https://content.vircadia.com/"; -var publicBucketCDN = "http://s3.amazonaws.com/hifi-public/"; +var CONTENT_CDN_URL = "https://content.highfidelity.com/"; // "https://content.vircadia.com/"; +var PUBLIC_BUCKET_CDN_URL = "http://s3.amazonaws.com/hifi-public/"; var euCDN = "eu-c-1/"; var usCDN = "us-c-1/"; module.exports = { - interfaceMetadataSource: interfaceMetadataSource. - contentCDN: contentCDN, - publicBucketCDN: publicBucketCDN, + INTERFACE_METADATA_SOURCE: INTERFACE_METADATA_SOURCE. + CONTENT_CDN_URL: CONTENT_CDN_URL, + PUBLIC_BUCKET_CDN_URL: PUBLIC_BUCKET_CDN_URL, euCDN: euCDN, usCDN: usCDN } diff --git a/scripts/system/libraries/progressDialog.js b/scripts/system/libraries/progressDialog.js index ede913eb24..e1ec11b4b7 100644 --- a/scripts/system/libraries/progressDialog.js +++ b/scripts/system/libraries/progressDialog.js @@ -9,7 +9,7 @@ // var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js"); -var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN; +var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL; var toolIconUrl = VIRCADIA_PUBLIC_CDN + "images/tools/"; progressDialog = (function () {