History

Update the rest of non /script-archive/ script URLs.

Kalila L committed 6 years ago

Commit d3a97831 parent aeae07852 files · +115 −118Browse files

Showing the changes to scripts/tutorials/entity_scripts (4 of 52 files). Show all

Unified · Split

4 files
  1. scripts/tutorials/entity_scripts/ambientSound.js +1 −1
  2. scripts/tutorials/entity_scripts/flashlight.js +3 −3
  3. scripts/tutorials/entity_scripts/floatingLanternBox.js +1 −1
  4. scripts/tutorials/entity_scripts/sit.js +1 −1
scripts/tutorials/entity_scripts/ambientSound.js+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 (function(){
2525 // This sample clip and range will be used if you don't add userData to the entity (see above)
2626 var DEFAULT_RANGE = 100;
27− var DEFAULT_URL = "http://hifi-content.s3.amazonaws.com/ken/samples/forest_ambiX.wav";
27+ var DEFAULT_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/ken/samples/forest_ambiX.wav");
2828 var DEFAULT_VOLUME = 1.0;
2929
3030 var DEFAULT_USERDATA = {
scripts/tutorials/entity_scripts/flashlight.js+3−3
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 // Copyright 2015 High Fidelity, Inc.
99 //
1010 // This is a toy script that can be added to the Flashlight model entity:
11−// "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx"
11+// ExternalResource.getUrl(ExternalResource.HF_Public, "/models/props/flashlight.fbx")
1212 // that creates a spotlight attached with the flashlight model while the entity is grabbed
1313 //
1414 // Distributed under the Apache License, Version 2.0.
@@ -17,8 +17,8 @@ · 2 unmodified lines
1717
1818 (function() {
1919
20− var ON_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/flashlight_on.wav';
21− var OFF_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/flashlight_off.wav';
20+ var ON_SOUND_URL = ExternalResource.getUrl(ExternalResource.HF_Public, '/sounds/Switches%20and%20sliders/flashlight_on.wav');
21+ var OFF_SOUND_URL = ExternalResource.getUrl(ExternalResource.HF_Public, '/sounds/Switches%20and%20sliders/flashlight_off.wav');
2222
2323 //we are creating lights that we don't want to get stranded so lets make sure that we can get rid of them
2424 //if you're going to be using this in a dungeon or something and holding it for a long time, increase this lifetime value.
scripts/tutorials/entity_scripts/floatingLanternBox.js+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 (function() {
1717
1818 var _this;
19− var LANTERN_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Welcome%20Area/Models/chinaLantern_capsule.fbx";
19+ var LANTERN_MODEL_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/DomainContent/Welcome%20Area/Models/chinaLantern_capsule.fbx");
2020 var LANTERN_SCRIPT_URL = Script.resolvePath("floatingLantern.js?v=" + Date.now());
2121 var LIFETIME = 120;
2222 var RESPAWN_INTERVAL = 1000;
scripts/tutorials/entity_scripts/sit.js+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 }
1919
2020 var SETTING_KEY = "com.highfidelity.avatar.isSitting";
21− var ANIMATION_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/clement/production/animations/sitting_idle.fbx";
21+ var ANIMATION_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/clement/production/animations/sitting_idle.fbx");
2222 var ANIMATION_FPS = 30;
2323 var ANIMATION_FIRST_FRAME = 1;
2424 var ANIMATION_LAST_FRAME = 10;