diff --git a/examples/acScripts/ControlACs.js b/examples/acScripts/ControlACs.js index 0edbde4ad1..4f27a36b9d 100644 --- a/examples/acScripts/ControlACs.js +++ b/examples/acScripts/ControlACs.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; // 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/examples/acScripts/ControlledAC.js b/examples/acScripts/ControlledAC.js index 4e400670e5..78fe3903cd 100644 --- a/examples/acScripts/ControlledAC.js +++ b/examples/acScripts/ControlledAC.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; // Set the following variables to the values needed var filename = HIFI_PUBLIC_BUCKET + "ozan/bartender.rec"; diff --git a/examples/acScripts/botProceduralWayPoints.js b/examples/acScripts/botProceduralWayPoints.js index b7c1fa1fe2..1e00c9f8b8 100644 --- a/examples/acScripts/botProceduralWayPoints.js +++ b/examples/acScripts/botProceduralWayPoints.js @@ -20,7 +20,7 @@ // //For procedural walk animation -Script.include("../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; Script.include(HIFI_PUBLIC_BUCKET + "scripts/proceduralAnimationAPI.js"); var procAnimAPI = new ProcAnimAPI(); diff --git a/examples/acScripts/bot_procedural.js b/examples/acScripts/bot_procedural.js index 8b96ed36c2..518ef8cc22 100644 --- a/examples/acScripts/bot_procedural.js +++ b/examples/acScripts/bot_procedural.js @@ -11,7 +11,7 @@ // //For procedural walk animation -Script.include("../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; Script.include("proceduralAnimationAPI.js"); var procAnimAPI = new ProcAnimAPI(); diff --git a/examples/acScripts/bot_randomExpression.js b/examples/acScripts/bot_randomExpression.js index 32bfb24065..b76e485e4a 100644 --- a/examples/acScripts/bot_randomExpression.js +++ b/examples/acScripts/bot_randomExpression.js @@ -12,7 +12,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; function getRandomFloat(min, max) { return Math.random() * (max - min) + min; diff --git a/examples/clap.js b/examples/clap.js index 2b011404c0..3b333e4345 100644 --- a/examples/clap.js +++ b/examples/clap.js @@ -12,7 +12,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var clapAnimation = HIFI_PUBLIC_BUCKET + "animations/ClapAnimations/ClapHands_Standing.fbx"; var ANIMATION_FRAMES_PER_CLAP = 10.0; diff --git a/examples/controllers/hydra/airGuitar.js b/examples/controllers/hydra/airGuitar.js index 6d3d374f3a..29ab2f9c44 100644 --- a/examples/controllers/hydra/airGuitar.js +++ b/examples/controllers/hydra/airGuitar.js @@ -10,7 +10,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/examples/controllers/hydra/drumStick.js b/examples/controllers/hydra/drumStick.js index 14e1413742..d2a948b98e 100644 --- a/examples/controllers/hydra/drumStick.js +++ b/examples/controllers/hydra/drumStick.js @@ -10,7 +10,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; function length(v) { return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z); diff --git a/examples/controllers/hydra/frisbee.js b/examples/controllers/hydra/frisbee.js index a9fd74910d..461f4691da 100644 --- a/examples/controllers/hydra/frisbee.js +++ b/examples/controllers/hydra/frisbee.js @@ -15,7 +15,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; Script.include("../../libraries/toolBars.js"); const LEFT_PALM = 0; diff --git a/examples/controllers/hydra/gun.js b/examples/controllers/hydra/gun.js index b60a70ca36..1f613adf3b 100644 --- a/examples/controllers/hydra/gun.js +++ b/examples/controllers/hydra/gun.js @@ -14,7 +14,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; function getRandomFloat(min, max) { return Math.random() * (max - min) + min; diff --git a/examples/controllers/hydra/squeezeHands.js b/examples/controllers/hydra/squeezeHands.js index 84e5aefb51..2a4756f017 100644 --- a/examples/controllers/hydra/squeezeHands.js +++ b/examples/controllers/hydra/squeezeHands.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var rightHandAnimation = HIFI_PUBLIC_BUCKET + "animations/RightHandAnimPhilip.fbx"; var leftHandAnimation = HIFI_PUBLIC_BUCKET + "animations/LeftHandAnimPhilip.fbx"; diff --git a/examples/controllers/hydra/toyball.js b/examples/controllers/hydra/toyball.js index 4dc65703b7..b2ce6c1463 100644 --- a/examples/controllers/hydra/toyball.js +++ b/examples/controllers/hydra/toyball.js @@ -15,7 +15,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; // maybe we should make these constants... var LEFT_PALM = 0; diff --git a/examples/controllers/oculus/virtualKeyboard.js b/examples/controllers/oculus/virtualKeyboard.js index dc3c2eb3cc..d17b36ae4f 100644 --- a/examples/controllers/oculus/virtualKeyboard.js +++ b/examples/controllers/oculus/virtualKeyboard.js @@ -15,7 +15,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; const KBD_UPPERCASE_DEFAULT = 0; const KBD_LOWERCASE_DEFAULT = 1; diff --git a/examples/editEntities.js b/examples/editEntities.js index 172089ed62..9c045f0a5b 100644 --- a/examples/editEntities.js +++ b/examples/editEntities.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; Script.include("libraries/stringHelpers.js"); Script.include("libraries/dataviewHelpers.js"); Script.include("libraries/httpMultiPart.js"); diff --git a/examples/example/audio/audioBall.js b/examples/example/audio/audioBall.js index 91ef7c0759..4f352ff1a3 100644 --- a/examples/example/audio/audioBall.js +++ b/examples/example/audio/audioBall.js @@ -13,7 +13,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Animals/mexicanWhipoorwill.raw"); var CHANCE_OF_PLAYING_SOUND = 0.01; diff --git a/examples/example/audio/radio.js b/examples/example/audio/radio.js index 39409df377..7ac33675a1 100644 --- a/examples/example/audio/radio.js +++ b/examples/example/audio/radio.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var modelURL = HIFI_PUBLIC_BUCKET + "models/entities/radio/Speakers.fbx"; var soundURL = HIFI_PUBLIC_BUCKET + "sounds/family.stereo.raw"; diff --git a/examples/example/entities/editModelExample.js b/examples/example/entities/editModelExample.js index 474d9afe26..2a58028521 100644 --- a/examples/example/entities/editModelExample.js +++ b/examples/example/entities/editModelExample.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var count = 0; var moveUntil = 2000; diff --git a/examples/example/entities/entityModelExample.js b/examples/example/entities/entityModelExample.js index d09a349cb0..aab2324496 100644 --- a/examples/example/entities/entityModelExample.js +++ b/examples/example/entities/entityModelExample.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var count = 0; var stopAfter = 1000; diff --git a/examples/example/games/spaceInvadersExample.js b/examples/example/games/spaceInvadersExample.js index 5ad8bbe4f6..80b03354ff 100644 --- a/examples/example/games/spaceInvadersExample.js +++ b/examples/example/games/spaceInvadersExample.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var iteration = 0; diff --git a/examples/example/ui/overlaysExample.js b/examples/example/ui/overlaysExample.js index 4e85512545..e4e8bf463b 100644 --- a/examples/example/ui/overlaysExample.js +++ b/examples/example/ui/overlaysExample.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; // 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/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 40db7b057a..4b931f0c57 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; SPACE_LOCAL = "local"; SPACE_WORLD = "world"; diff --git a/examples/lobby.js b/examples/lobby.js index 15a8aca328..d1cadedf1e 100644 --- a/examples/lobby.js +++ b/examples/lobby.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var panelWall = false; var orbShell = false; diff --git a/examples/utilities/diagnostics/inWorldTestTone.js b/examples/utilities/diagnostics/inWorldTestTone.js index 1fc3cbc2c8..77ec7ba3b2 100644 --- a/examples/utilities/diagnostics/inWorldTestTone.js +++ b/examples/utilities/diagnostics/inWorldTestTone.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/220Sine.wav"); diff --git a/examples/utilities/diagnostics/playSoundLoop.js b/examples/utilities/diagnostics/playSoundLoop.js index b9d35141d1..faf23761b4 100644 --- a/examples/utilities/diagnostics/playSoundLoop.js +++ b/examples/utilities/diagnostics/playSoundLoop.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; // A few sample files you may want to try: diff --git a/examples/utilities/diagnostics/playSoundWave.js b/examples/utilities/diagnostics/playSoundWave.js index 0741b72ef0..e9bf534e35 100644 --- a/examples/utilities/diagnostics/playSoundWave.js +++ b/examples/utilities/diagnostics/playSoundWave.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var soundClip = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail%20Party%20Snippets/Walken1.wav"); diff --git a/examples/utilities/record/recorder.js b/examples/utilities/record/recorder.js index ddfa3e0315..f3f46adf1a 100644 --- a/examples/utilities/record/recorder.js +++ b/examples/utilities/record/recorder.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("libraries/globals.js"); +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; Script.include("libraries/toolBars.js"); var recordingFile = "recording.rec";