Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-06 20:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

First pass at centralizing some URLs.

Browse source
This commit is contained in:
Kalila L 2020-08-31 00:43:30 -04:00
parent b988bd15af
commit 6e39e048be
57 changed files with 251 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/networking/src/NetworkingConstants.h
View file

@ -4,6 +4,7 @@
//
// Created by Stephen Birarda on 2015-03-31.
// Copyright 2015 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

5
script-archive/acScripts/ControlACs.js
View file

@ -9,7 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
// 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)
@ -35,7 +36,7 @@ var LOAD = 6;
var windowDimensions = Controller.getViewportDimensions();
var TOOL_ICON_URL = HIFI_PUBLIC_BUCKET + "images/tools/";
var TOOL_ICON_URL = VIRCADIA_PUBLIC_CDN + "images/tools/";
var ALPHA_ON = 1.0;
var ALPHA_OFF = 0.7;
var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };

15
script-archive/acScripts/botProceduralWayPoints.js
View file

@ -20,8 +20,9 @@
//
//For procedural walk animation
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
Script.include(HIFI_PUBLIC_BUCKET + "scripts/acScripts/proceduralAnimationAPI.js");
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
Script.include(VIRCADIA_PUBLIC_CDN + "scripts/acScripts/proceduralAnimationAPI.js");
var procAnimAPI = new ProcAnimAPI();
@ -121,9 +122,9 @@ var newBodyFilePrefix = "bot" + botNumber;
// set the face model fst using the bot number
// there is no need to change the body model - we're using the default
Avatar.faceModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newFaceFilePrefix + ".fst";
Avatar.skeletonModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newBodyFilePrefix + "_a.fst";
Avatar.billboardURL = HIFI_PUBLIC_BUCKET + "meshes/billboards/bot" + botNumber + ".png";
Avatar.faceModelURL = VIRCADIA_PUBLIC_CDN + "meshes/" + newFaceFilePrefix + ".fst";
Avatar.skeletonModelURL = VIRCADIA_PUBLIC_CDN + "meshes/" + newBodyFilePrefix + "_a.fst";
Avatar.billboardURL = VIRCADIA_PUBLIC_CDN + "meshes/billboards/bot" + botNumber + ".png";
Agent.isAvatar = true;
Agent.isListeningToAudioStream = true;
@ -146,9 +147,9 @@ function loadSounds() {
var footstep_filenames = ["FootstepW2Left-12db.wav", "FootstepW2Right-12db.wav", "FootstepW3Left-12db.wav", "FootstepW3Right-12db.wav",
"FootstepW5Left-12db.wav", "FootstepW5Right-12db.wav"];
var SOUND_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Raws/";
var SOUND_BASE_URL = VIRCADIA_PUBLIC_CDN + "sounds/Cocktail+Party+Snippets/Raws/";
var FOOTSTEP_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Footsteps/";
var FOOTSTEP_BASE_URL = VIRCADIA_PUBLIC_CDN + "sounds/Footsteps/";
for (var i = 0; i < sound_filenames.length; i++) {
sounds.push(SoundCache.getSound(SOUND_BASE_URL + sound_filenames[i]));

9
script-archive/acScripts/bot_randomExpression.js
View file

@ -12,7 +12,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
VIRCADIA_PUBLIC_CDN = networkingConstants.contentCDN;
function getRandomFloat(min, max) {
return Math.random() * (max - min) + min;
@ -44,9 +45,9 @@ newBodyFilePrefix = "bot" + botNumber;
// set the face model fst using the bot number
// there is no need to change the body model - we're using the default
Avatar.faceModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newFaceFilePrefix + ".fst";
Avatar.skeletonModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newBodyFilePrefix + ".fst";
Avatar.billboardURL = HIFI_PUBLIC_BUCKET + "meshes/billboards/bot" + botNumber + ".png";
Avatar.faceModelURL = VIRCADIA_PUBLIC_CDN + "meshes/" + newFaceFilePrefix + ".fst";
Avatar.skeletonModelURL = VIRCADIA_PUBLIC_CDN + "meshes/" + newBodyFilePrefix + ".fst";
Avatar.billboardURL = VIRCADIA_PUBLIC_CDN + "meshes/billboards/bot" + botNumber + ".png";
Agent.isAvatar = true;
Agent.isListeningToAudioStream = true;

7
script-archive/acScripts/playbackMaster.js
View file

@ -10,7 +10,8 @@
//
Script.include("./AgentPoolController.js");
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var masterController = new MasterController();
@ -18,7 +19,7 @@ var input_text = null;
// Script. DO NOT MODIFY BEYOND THIS LINE.
//Script.include("../libraries/toolBars.js");
Script.include(HIFI_PUBLIC_BUCKET + "scripts/libraries/toolBars.js");
Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/toolBars.js");
// We want small icons
Tool.IMAGE_HEIGHT /= 2;
Tool.IMAGE_WIDTH /= 2;
@ -29,7 +30,7 @@ var STOP = 3;
var LOAD = 6;
var windowDimensions = Controller.getViewportDimensions();
var TOOL_ICON_URL = HIFI_PUBLIC_BUCKET + "images/tools/";
var TOOL_ICON_URL = VIRCADIA_PUBLIC_CDN + "images/tools/";
var ALPHA_ON = 1.0;
var ALPHA_OFF = 0.7;
var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };

3
script-archive/acScripts/simpleBot.js
View file

@ -9,7 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
function getRandomFloat(min, max) {
return Math.random() * (max - min) + min;

7
script-archive/airship/airship.js
View file

@ -29,9 +29,10 @@
lightTimeoutID = undefined,
audioInjector = null;
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var cannonSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "philip/cannonShot.wav");
var explosionSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "philip/explosion.wav");
var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var cannonSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/cannonShot.wav");
var explosionSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/explosion.wav");
var NO_SHOOT_COLOR = { red: 100, green: 100, blue: 100 };

15
script-archive/avatarSelector.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var panelWall = false;
var orbShell = false;
@ -47,16 +48,16 @@ var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter);
var ORB_SHIFT = { x: 0, y: -1.4, z: -0.8 };
var LOBBY_PANEL_WALL_URL = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/PanelWallForInterface.fbx";
var LOBBY_BLANK_PANEL_TEXTURE_URL = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/Texture.jpg";
var LOBBY_SHELL_URL = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyShellForInterface.fbx";
var LOBBY_PANEL_WALL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/PanelWallForInterface.fbx";
var LOBBY_BLANK_PANEL_TEXTURE_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/Texture.jpg";
var LOBBY_SHELL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/LobbyShellForInterface.fbx";
var droneSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/drone.stereo.raw")
var droneSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/drone.stereo.raw")
var currentDrone = null;
var latinSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/latin.stereo.raw")
var latinSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/latin.stereo.raw")
var latinInjector = null;
var elevatorSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/elevator.stereo.raw")
var elevatorSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/elevator.stereo.raw")
var elevatorInjector = null;
var currentMuzakInjector = null;
var currentSound = null;

7
script-archive/blockWorld.js
View file

@ -19,7 +19,8 @@ var floorTiles = [];
var blocks = [];
var blockSpawner;
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var floorPos = Vec3.sum(MyAvatar.position, {
@ -61,7 +62,7 @@ var offButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/close.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png",
color: {
red: 255,
green: 255,
@ -75,7 +76,7 @@ var deleteButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/delete.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/delete.png",
color: {
red: 255,
green: 255,

10
script-archive/controlPanel.js
View file

@ -16,11 +16,11 @@ Script.include([
"libraries/overlayManager.js",
]);
var BG_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/card-bg.svg";
var CLOSE_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/tools/close.svg";
var MIC_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/tools/mic-toggle.svg";
var FACE_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/tools/face-toggle.svg";
var ADDRESS_BAR_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/tools/address-bar-toggle.svg";
var BG_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/card-bg.svg";
var CLOSE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/close.svg";
var MIC_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/mic-toggle.svg";
var FACE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/face-toggle.svg";
var ADDRESS_BAR_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/tools/address-bar-toggle.svg";
var panel = new OverlayPanel({
anchorPositionBinding: { avatar: "MyAvatar" },

29
script-archive/controllers/hydra/airGuitar.js
View file

@ -10,7 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
function length(v) {
return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
@ -28,7 +29,7 @@ function vMinus(a, b) {
}
// The model file to be used for the guitar
var guitarModel = HIFI_PUBLIC_BUCKET + "models/attachments/guitar.fst";
var guitarModel = VIRCADIA_PUBLIC_CDN + "models/attachments/guitar.fst";
// Load sounds that will be played
@ -36,22 +37,22 @@ var heyManWave = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sound
var chords = new Array();
// Nylon string guitar
chords[1] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+A.raw");
chords[2] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+B.raw");
chords[3] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+E.raw");
chords[4] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+G.raw");
chords[1] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+A.raw");
chords[2] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+B.raw");
chords[3] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+E.raw");
chords[4] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+G.raw");
// Electric guitar
chords[5] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+A+short.raw");
chords[6] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+B+short.raw");
chords[7] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+E+short.raw");
chords[8] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+G+short.raw");
chords[5] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+A+short.raw");
chords[6] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+B+short.raw");
chords[7] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+E+short.raw");
chords[8] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Metal+G+short.raw");
// Steel Guitar
chords[9] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+A.raw");
chords[10] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+B.raw");
chords[11] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+E.raw");
chords[12] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+G.raw");
chords[9] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+A.raw");
chords[10] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+B.raw");
chords[11] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+E.raw");
chords[12] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Steel+G.raw");
var NUM_CHORDS = 4;
var NUM_GUITARS = 3;

7
script-archive/controllers/hydra/drumStick.js
View file

@ -10,7 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
function length(v) {
return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
@ -28,8 +29,8 @@ function vMinus(a, b) {
// First, load two percussion sounds to be used on the sticks
var drum1 = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Drums/RackTomHi.raw");
var drum2 = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Drums/RackTomLo.raw");
var drum1 = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Drums/RackTomHi.raw");
var drum2 = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Drums/RackTomLo.raw");
// State Machine:
// 0 = not triggered

5
script-archive/controllers/hydra/frisbee.js
View file

@ -15,7 +15,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
Script.include("../../libraries/toolBars.js");
const LEFT_PALM = 0;
@ -171,7 +172,7 @@ var currentMouseControl = false;
var newSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw");
var catchSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw");
var throwSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
var throwSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
var simulatedFrisbees = [];

21
script-archive/controllers/hydra/gun.js
View file

@ -22,7 +22,8 @@ Script.include("../../libraries/utils.js");
Script.include("../../libraries/constants.js");
Script.include("../../libraries/toolBars.js");
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var LASER_WIDTH = 2;
var POSE_CONTROLS = [ Controller.Standard.LeftHand, Controller.Standard.RightHand ];
@ -30,7 +31,7 @@ var TRIGGER_CONTROLS = [ Controller.Standard.LT, Controller.Standard.RT ];
var MIN_THROWER_DELAY = 1000;
var MAX_THROWER_DELAY = 1000;
var RELOAD_INTERVAL = 5;
var GUN_MODEL = HIFI_PUBLIC_BUCKET + "cozza13/gun/m1911-handgun+1.fbx?v=4";
var GUN_MODEL = VIRCADIA_PUBLIC_CDN + "cozza13/gun/m1911-handgun+1.fbx?v=4";
var BULLET_VELOCITY = 10.0;
var GUN_OFFSETS = [ {
x: -0.04,
@ -84,11 +85,11 @@ function getRandomFloat(min, max) {
var showScore = false;
// Load some sound to use for loading and firing
var fireSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guns/GUN-SHOT2.raw");
var loadSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guns/Gun_Reload_Weapon22.raw");
var impactSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guns/BulletImpact2.raw");
var targetHitSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/hit.raw");
var targetLaunchSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/shoot.raw");
var fireSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw");
var loadSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/Gun_Reload_Weapon22.raw");
var impactSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/BulletImpact2.raw");
var targetHitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw");
var targetLaunchSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw");
var audioOptions = {
volume: 0.9
@ -118,7 +119,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.gun.toolbar",
var offButton = toolBar.addOverlay("image", {
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/gun/close.svg",
imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/close.svg",
alpha: 1
});
@ -128,7 +129,7 @@ var platformButton = toolBar.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/gun/platform-targets.svg",
imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/platform-targets.svg",
alpha: 1
});
@ -138,7 +139,7 @@ var gridButton = toolBar.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/gun/floating-targets.svg",
imageURL: VIRCADIA_PUBLIC_CDN + "images/gun/floating-targets.svg",
alpha: 1
});

11
script-archive/controllers/hydra/paddleBall.js
View file

@ -10,11 +10,12 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
hitSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav");
var rightHandAnimation = HIFI_PUBLIC_BUCKET + "animations/RightHandAnimPhilip.fbx";
var leftHandAnimation = HIFI_PUBLIC_BUCKET + "animations/LeftHandAnimPhilip.fbx";
hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav");
var rightHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/RightHandAnimPhilip.fbx";
var leftHandAnimation = VIRCADIA_PUBLIC_CDN + "animations/LeftHandAnimPhilip.fbx";
var BALL_SIZE = 0.08;
var PADDLE_SIZE = 0.20;
@ -43,7 +44,7 @@ var offButton = Overlays.addOverlay("image", {
y: 96,
width: 32,
height: 32,
imageURL: HIFI_PUBLIC_BUCKET + "images/close.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});

5
script-archive/controllers/hydra/toyball.js
View file

@ -15,7 +15,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
// maybe we should make these constants...
var LEFT_PALM = 0;
@ -40,7 +41,7 @@ var rightHandEntity = false;
var newSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw");
var catchSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw");
var throwSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
var throwSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
var targetRadius = 0.25;

4
script-archive/controllers/oculus/goTo.js
View file

@ -72,7 +72,7 @@ function Instructions(imageURL, originalWidth, originalHeight) {
this.rescale();
};
var theInstruction = new Instructions(HIFI_PUBLIC_BUCKET + "images/tutorial-goTo.svg", 457, 284.1);
var theInstruction = new Instructions(VIRCADIA_PUBLIC_CDN + "images/tutorial-goTo.svg", 457, 284.1);
var firstControllerPlugged = false;
@ -86,7 +86,7 @@ var locationURL = "";
var randomSounds = new SoundArray({}, true);
var numberOfSounds = 7;
for (var i = 1; i <= numberOfSounds; i++) {
randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/virtualKeyboard-press" + i + ".raw");
randomSounds.addSound(VIRCADIA_PUBLIC_CDN + "sounds/UI/virtualKeyboard-press" + i + ".raw");
}
function appendChar(char) {

2
script-archive/controllers/oculus/virtualKeyboardTextEntityExample.js
View file

@ -38,7 +38,7 @@ var textSizeMeasureOverlay = Overlays.addOverlay("text3d", {visible: false});
var randomSounds = new SoundArray({}, true);
var numberOfSounds = 7;
for (var i = 1; i <= numberOfSounds; i++) {
randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/virtualKeyboard-press" + i + ".raw");
randomSounds.addSound(VIRCADIA_PUBLIC_CDN + "sounds/UI/virtualKeyboard-press" + i + ".raw");
}
function appendChar(char) {

5
script-archive/controllers/toybox.js
View file

@ -11,7 +11,8 @@
//
Script.include("http://s3.amazonaws.com/hifi-public/scripts/libraries/toolBars.js");
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
@ -139,7 +140,7 @@ function createTable() {
dimensions: TABLE_DIMENSIONS,
rotation: MyAvatar.orientation,
// color: { red: 102, green: 51, blue: 0 },
modelURL: HIFI_PUBLIC_BUCKET + 'eric/models/woodFloor.fbx',
modelURL: VIRCADIA_PUBLIC_CDN + 'eric/models/woodFloor.fbx',
collisionSoundURL: "http://public.highfidelity.io/sounds/dice/diceCollide.wav"
});

9
script-archive/entityScripts/recordingMaster.js
View file

@ -10,15 +10,16 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
Script.include(HIFI_PUBLIC_BUCKET + "scripts/libraries/toolBars.js");
Script.include(HIFI_PUBLIC_BUCKET + "scripts/libraries/utils.js");
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/toolBars.js");
Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/utils.js");
var rotation = Quat.safeEulerAngles(Camera.getOrientation());
rotation = Quat.fromPitchYawRollDegrees(0, rotation.y, 0);
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(rotation)));
var TOOL_ICON_URL = HIFI_PUBLIC_BUCKET + "images/tools/";
var TOOL_ICON_URL = VIRCADIA_PUBLIC_CDN + "images/tools/";
var ALPHA_ON = 1.0;
var ALPHA_OFF = 0.7;
var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };

5
script-archive/example/audio/audioBall.js
View file

@ -13,9 +13,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Animals/mexicanWhipoorwill.raw");
var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Animals/mexicanWhipoorwill.raw");
var CHANCE_OF_PLAYING_SOUND = 0.01;
var FACTOR = 0.05;

5
script-archive/example/audio/jsstreamplayer.js
View file

@ -14,12 +14,13 @@
// Declare HiFi public bucket.
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
// Declare variables and set up new WebWindow.
var stream;
var volume = 1;
var streamWindow = new WebWindow('Stream', HIFI_PUBLIC_BUCKET + "examples/html/jsstreamplayer.html", 0, 0, false);
var streamWindow = new WebWindow('Stream', VIRCADIA_PUBLIC_CDN + "examples/html/jsstreamplayer.html", 0, 0, false);
// Set up toggleStreamURLButton overlay.
var toggleStreamURLButton = Overlays.addOverlay("text", {

7
script-archive/example/audio/radio.js
View file

@ -9,10 +9,11 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var modelURL = HIFI_PUBLIC_BUCKET + "models/entities/radio/Speakers.fbx";
var soundURL = HIFI_PUBLIC_BUCKET + "sounds/family.stereo.raw";
var modelURL = VIRCADIA_PUBLIC_CDN + "models/entities/radio/Speakers.fbx";
var soundURL = VIRCADIA_PUBLIC_CDN + "sounds/family.stereo.raw";
var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
var audioOptions = {

7
script-archive/example/brownianFun.js
View file

@ -1,5 +1,6 @@
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var SOUND_PATH = HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/";
var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var SOUND_PATH = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/";
var soundURLS = ["67LCollision01.wav", "67LCollision02.wav", "airhockey_hit1.wav"];
var FLOOR_SIZE = 10;
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(FLOOR_SIZE * 1.5, Quat.getFront(Camera.getOrientation())));
@ -43,7 +44,7 @@ var brownianButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/blocks.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/blocks.png",
color: buttonOffColor,
alpha: 1
});

5
script-archive/example/dynamicLandscape.js
View file

@ -10,8 +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
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
Script.include(HIFI_PUBLIC_BUCKET + 'scripts/utilities.js')
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
Script.include(VIRCADIA_PUBLIC_CDN + 'scripts/utilities.js')
var NUM_ROWS = 10;
var CUBE_SIZE = 1;

5
script-archive/example/entities/editModelExample.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var count = 0;
var moveUntil = 2000;
@ -37,7 +38,7 @@ type: "Model",
green: 255,
blue: 0 },
modelURL: HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX",
rotation: rotation

5
script-archive/example/entities/entityModelExample.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var count = 0;
var stopAfter = 1000;
@ -26,7 +27,7 @@ var modelPropertiesA = {
y: 3.34,
z: 0.54
},
modelURL: HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX",
lifetime: 20
};

3
script-archive/example/entities/zoneEntityExample.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var count = 0;
var stopAfter = 1000;

3
script-archive/example/entities/zoneSkyboxExample.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var count = 0;
var stopAfter = 600;

7
script-archive/example/games/airHockey.js
View file

@ -60,7 +60,8 @@ var puckCollisionModel = "http://headache.hungry.com/~seth/hifi/airHockeyPuck-hu
var paddleModel = "https://hifi-public.s3.amazonaws.com/ozan/props/airHockeyTable/airHockeyPaddle.obj"
var paddleCollisionModel = "http://headache.hungry.com/~seth/hifi/paddle-hull.obj"
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var screenSize = Controller.getViewportDimensions();
var BUTTON_SIZE = 32;
var PADDING = 3;
@ -113,7 +114,7 @@ var deleteButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE * 2 + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/delete.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/delete.png",
color: {
red: 255,
green: 255,
@ -127,7 +128,7 @@ var spawnButton = Overlays.addOverlay("image", {
y: screenSize.y - (BUTTON_SIZE * 2 + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/puck.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/puck.png",
color: {
red: 255,
green: 255,

10
script-archive/example/games/billiards.js
View file

@ -10,7 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var tableParts = [];
var balls = [];
@ -33,17 +34,18 @@ var cuePosition;
var startStroke = 0;
// Sounds to use
var hitSound = HIFI_PUBLIC_BUCKET + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav";
var hitSound = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav";
SoundCache.getSound(hitSound);
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var screenSize = Controller.getViewportDimensions();
var reticle = Overlays.addOverlay("image", {
x: screenSize.x / 2 - 16,
y: screenSize.y / 2 - 16,
width: 32,
height: 32,
imageURL: HIFI_PUBLIC_BUCKET + "images/billiardsReticle.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/billiardsReticle.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});

5
script-archive/example/games/make-dummy.js
View file

@ -15,14 +15,15 @@
/*jslint vars: true*/
var Overlays, Entities, Controller, Script, MyAvatar, Vec3; // Referenced globals provided by High Fidelity.
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var rezButton = Overlays.addOverlay("image", {
x: 100,
y: 350,
width: 32,
height: 32,
imageURL: HIFI_PUBLIC_BUCKET + "images/close.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/close.png",
color: {
red: 255,
green: 255,

10
script-archive/example/games/planky.js
View file

@ -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
//
HIFI_PUBLIC_BUCKET = 'http://s3.amazonaws.com/hifi-public/';
VIRCADIA_PUBLIC_CDN = 'http://s3.amazonaws.com/hifi-public/';
Script.include('/~/system/libraries/toolBars.js');
@ -190,7 +190,7 @@ PlankyStack = function() {
if (!_this.ground) {
_this.ground = Entities.addEntity({
type: 'Model',
modelURL: HIFI_PUBLIC_BUCKET + 'eric/models/woodFloor.fbx',
modelURL: VIRCADIA_PUBLIC_CDN + 'eric/models/woodFloor.fbx',
dimensions: _this.options.baseDimension,
position: Vec3.sum(_this.basePosition, {y: -(_this.options.baseDimension.y / 2)}),
rotation: _this.baseRotation,
@ -247,7 +247,7 @@ PlankyStack = function() {
});
var newProperties = {
type: 'Model',
modelURL: HIFI_PUBLIC_BUCKET + 'marketplace/hificontent/Games/blocks/block.fbx',
modelURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/block.fbx',
shapeType: 'box',
name: 'PlankyBlock' + layer + '-' + row,
dimensions: Vec3.sum(_this.options.blockSize, {x: 0, y: -((_this.options.blockSize.y * (_this.options.blockHeightVariation / MAXIMUM_PERCENTAGE)) * Math.random()), z: 0}),
@ -334,7 +334,7 @@ toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.games.planky", fun
button = toolBar.addTool({
width: BUTTON_DIMENSIONS.width,
height: BUTTON_DIMENSIONS.height,
imageURL: HIFI_PUBLIC_BUCKET + 'marketplace/hificontent/Games/blocks/planky_button.svg',
imageURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/planky_button.svg',
alpha: 0.8,
visible: true
});
@ -342,7 +342,7 @@ button = toolBar.addTool({
cogButton = toolBar.addTool({
width: BUTTON_DIMENSIONS.width,
height: BUTTON_DIMENSIONS.height,
imageURL: HIFI_PUBLIC_BUCKET + 'marketplace/hificontent/Games/blocks/cog.svg',
imageURL: VIRCADIA_PUBLIC_CDN + 'marketplace/hificontent/Games/blocks/cog.svg',
subImage: { x: 0, y: BUTTON_DIMENSIONS.height, width: BUTTON_DIMENSIONS.width, height: BUTTON_DIMENSIONS.height },
alpha: 0.8,
visible: true

33
script-archive/example/games/spaceInvadersExample.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var iteration = 0;
@ -93,13 +94,13 @@ var maxInvaderRowOffset=stepsToGround;
var myMissile;
// sounds
var hitSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/hit.raw");
var shootSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/shoot.raw");
var hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/hit.raw");
var shootSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/shoot.raw");
var moveSounds = new Array();
moveSounds[0] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo1.raw");
moveSounds[1] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo2.raw");
moveSounds[2] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo3.raw");
moveSounds[3] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo4.raw");
moveSounds[0] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo1.raw");
moveSounds[1] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo2.raw");
moveSounds[2] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo3.raw");
moveSounds[3] = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Space%20Invaders/Lo4.raw");
var currentMoveSound = 0;
var numberOfSounds = 4;
var stepsPerSound = invaderStepsPerCycle / numberOfSounds;
@ -110,36 +111,36 @@ var soundInMyHead = true;
// models...
var invaderModels = new Array();
invaderModels[0] = {
modelURL: HIFI_PUBLIC_BUCKET + "meshes/space_invader.fbx",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[1] = {
modelURL: HIFI_PUBLIC_BUCKET + "meshes/space_invader.fbx",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[2] = {
modelURL: HIFI_PUBLIC_BUCKET + "meshes/space_invader.fbx",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[3] = {
modelURL: HIFI_PUBLIC_BUCKET + "meshes/space_invader.fbx",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[4] = {
modelURL: HIFI_PUBLIC_BUCKET + "meshes/space_invader.fbx",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
//modelURL: HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
//modelURL: HIFI_PUBLIC_BUCKET + "meshes/invader.svo",
// HIFI_PUBLIC_BUCKET + "meshes/spaceInvader3.fbx"
//modelURL: VIRCADIA_PUBLIC_CDN + "meshes/Feisar_Ship.FBX",
//modelURL: VIRCADIA_PUBLIC_CDN + "meshes/invader.svo",
// VIRCADIA_PUBLIC_CDN + "meshes/spaceInvader3.fbx"
function initializeMyShip() {
myShipProperties = {
@ -150,7 +151,7 @@ function initializeMyShip() {
damping: 0,
dimensions: { x: shipSize * 2, y: shipSize * 2, z: shipSize * 2 },
color: { red: 0, green: 255, blue: 0 },
modelURL: HIFI_PUBLIC_BUCKET + "meshes/space_invader.fbx",
modelURL: VIRCADIA_PUBLIC_CDN + "meshes/space_invader.fbx",
lifetime: itemLifetimes
};
myShip = Entities.addEntity(myShipProperties);

9
script-archive/example/soundToys.js
View file

@ -8,7 +8,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
var Camera, Vec3, Quat, Entities, Script; // Globals defined by HiFi, var'ed here to keep jslint happy.
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var SOUND_BUCKET = "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/";
var MAX_ANGULAR_SPEED = Math.PI;
var N_EACH_OBJECTS = 3;
@ -22,8 +23,8 @@ function makeAll() {
right = Vec3.multiply(0.6, Quat.getRight(Camera.getOrientation())),
currentDimensions,
data = [
["models/props/Dice/goldDie.fbx", HIFI_PUBLIC_BUCKET + "sounds/dice/diceCollide.wav"],
["models/props/Pool/ball_8.fbx", HIFI_PUBLIC_BUCKET + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"],
["models/props/Dice/goldDie.fbx", VIRCADIA_PUBLIC_CDN + "sounds/dice/diceCollide.wav"],
["models/props/Pool/ball_8.fbx", VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav"],
["eric/models/woodFloor.fbx", SOUND_BUCKET + "67LCollision05.wav"]
];
currentPosition = Vec3.sum(currentPosition, Vec3.multiply(-1 * data.length * N_EACH_OBJECTS / 2, right));
@ -35,7 +36,7 @@ function makeAll() {
}
thisEntity = Entities.addEntity({
type: "Model",
modelURL: HIFI_PUBLIC_BUCKET + model,
modelURL: VIRCADIA_PUBLIC_CDN + model,
collisionSoundURL: sound,
dynamic: true,
shapeType: "box",

6
script-archive/example/ui/overlayPanelExample.js
View file

@ -14,9 +14,9 @@ Script.include([
"../../libraries/overlayManager.js",
]);
var BG_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/card-bg.svg";
var RED_DOT_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/red-dot.svg";
var BLUE_SQUARE_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/blue-square.svg";
var BG_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/card-bg.svg";
var RED_DOT_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/red-dot.svg";
var BLUE_SQUARE_IMAGE_URL = VIRCADIA_PUBLIC_CDN + "images/blue-square.svg";
var mainPanel = new OverlayPanel({
anchorPositionBinding: { avatar: "MyAvatar" },

15
script-archive/example/ui/overlaysExample.js
View file

@ -11,7 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
// 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
@ -52,7 +53,7 @@ for (s = 0; s < numberOfSwatches; s++) {
width: 31,
height: 54,
subImage: { x: imageFromX, y: imageFromY, width: 30, height: 54 },
imageURL: HIFI_PUBLIC_BUCKET + "images/testing-swatches.svg",
imageURL: VIRCADIA_PUBLIC_CDN + "images/testing-swatches.svg",
color: swatchColors[s],
alpha: 1
});
@ -80,7 +81,7 @@ var toolA = Overlays.addOverlay("image", {
width: 62,
height: 40,
subImage: { x: 0, y: 0, width: 62, height: 40 },
imageURL: HIFI_PUBLIC_BUCKET + "images/hifi-interface-tools.svg",
imageURL: VIRCADIA_PUBLIC_CDN + "images/hifi-interface-tools.svg",
color: { red: 255, green: 255, blue: 255},
visible: false
});
@ -90,7 +91,7 @@ var toolA = Overlays.addOverlay("image", {
var slider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: 300, width: 158, height: 35},
imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@ -104,7 +105,7 @@ var thumb = Overlays.addOverlay("image", {
y: 309,
width: 18,
height: 17,
imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/thumb.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@ -200,8 +201,8 @@ print("Cube overlay color =\n"
// This model overlay example causes intermittent crashes in NetworkGeometry::setTextureWithNameToURL()
//var modelOverlayProperties = {
// textures: {
// filename1: HIFI_PUBLIC_BUCKET + "images/testing-swatches.svg",
// filename2: HIFI_PUBLIC_BUCKET + "images/hifi-interface-tools.svg"
// filename1: VIRCADIA_PUBLIC_CDN + "images/testing-swatches.svg",
// filename2: VIRCADIA_PUBLIC_CDN + "images/hifi-interface-tools.svg"
// }
//}
//var modelOverlay = Overlays.addOverlay("model", modelOverlayProperties);

5
script-archive/fireworks.js
View file

@ -1,5 +1,6 @@
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var fireSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guns/GUN-SHOT2.raw");
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var fireSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guns/GUN-SHOT2.raw");
var audioOptions = {
volume: 0.9,
position: Vec3.sum(Camera.getPosition(), Quat.getFront(Camera.getOrientation()))

5
script-archive/golfclub/golfClub.js
View file

@ -13,8 +13,9 @@
(function () {
var ball = null;
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var collisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav";
var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var collisionSoundURL = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav";
var triggerState = false;
var BALL_GRAVITY = -9.8;
var BALL_START_VELOCITY = 0.1;

9
script-archive/grenade.js
View file

@ -9,11 +9,12 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var grenadeURL = HIFI_PUBLIC_BUCKET + "models/props/grenade/grenade.fbx";
var fuseSoundURL = HIFI_PUBLIC_BUCKET + "sounds/burningFuse.wav";
var boomSoundURL = HIFI_PUBLIC_BUCKET + "sounds/explosion.wav";
var grenadeURL = VIRCADIA_PUBLIC_CDN + "models/props/grenade/grenade.fbx";
var fuseSoundURL = VIRCADIA_PUBLIC_CDN + "sounds/burningFuse.wav";
var boomSoundURL = VIRCADIA_PUBLIC_CDN + "sounds/explosion.wav";
var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
var audioOptions = {

5
script-archive/libraries/constants.js
View file

@ -6,8 +6,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
STICK_URL = HIFI_PUBLIC_BUCKET + "models/props/geo_stick.fbx";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
STICK_URL = VIRCADIA_PUBLIC_CDN + "models/props/geo_stick.fbx";
ZERO_VECTOR = { x: 0, y: 0, z: 0 };

4
script-archive/libraries/virtualKeyboard.js
View file

@ -22,8 +22,8 @@ KBD_UPPERCASE_HOVER = 2;
KBD_LOWERCASE_HOVER = 3;
KBD_BACKGROUND = 4;
KEYBOARD_URL = HIFI_PUBLIC_BUCKET + "images/keyboard.svg";
CURSOR_URL = HIFI_PUBLIC_BUCKET + "images/cursor.svg";
KEYBOARD_URL = VIRCADIA_PUBLIC_CDN + "images/keyboard.svg";
CURSOR_URL = VIRCADIA_PUBLIC_CDN + "images/cursor.svg";
RETURN_CHARCODE = 0x01000004;
ENTER_CHARCODE = 0x01000005;

5
script-archive/lineRider.js
View file

@ -11,7 +11,8 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
LineRider = function() {
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var screenSize = Controller.getViewportDimensions();
var BUTTON_SIZE = 32;
@ -34,7 +35,7 @@ LineRider = function() {
y: screenSize.y - (BUTTON_SIZE + PADDING),
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/coaster.png?v2",
imageURL: VIRCADIA_PUBLIC_CDN + "images/coaster.png?v2",
color: this.buttonOffColor,
alpha: 1
});

15
script-archive/lobby.js
View file

@ -9,7 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var panelWall = false;
var orbShell = false;
@ -45,16 +46,16 @@ var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter);
var ORB_SHIFT = { x: 0, y: -1.4, z: -0.8};
var LOBBY_PANEL_WALL_URL = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/PanelWallForInterface.fbx";
var LOBBY_BLANK_PANEL_TEXTURE_URL = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/Texture.jpg";
var LOBBY_SHELL_URL = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyShellForInterface.fbx";
var LOBBY_PANEL_WALL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/PanelWallForInterface.fbx";
var LOBBY_BLANK_PANEL_TEXTURE_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/Texture.jpg";
var LOBBY_SHELL_URL = VIRCADIA_PUBLIC_CDN + "models/sets/Lobby/LobbyShellForInterface.fbx";
var droneSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/drone.stereo.raw")
var droneSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/drone.stereo.raw")
var currentDrone = null;
var latinSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/latin.stereo.raw")
var latinSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/latin.stereo.raw")
var latinInjector = null;
var elevatorSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Lobby/elevator.stereo.raw")
var elevatorSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Lobby/elevator.stereo.raw")
var elevatorInjector = null;
var currentMuzakInjector = null;
var currentSound = null;

5
script-archive/pointer.js
View file

@ -29,7 +29,8 @@ var buttonOnColor = {
blue: 100
};
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var userCanPoint = false;
Script.include(["libraries/toolBars.js"]);
@ -39,7 +40,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.pointer.toolba
var pointerButton = toolBar.addOverlay("image", {
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: HIFI_PUBLIC_BUCKET + "images/laser.png",
imageURL: VIRCADIA_PUBLIC_CDN + "images/laser.png",
color: buttonOffColor,
alpha: 1
});

7
script-archive/recorder.js
View file

@ -9,9 +9,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
/* globals HIFI_PUBLIC_BUCKET:true, Tool, ToolBar */
/* globals VIRCADIA_PUBLIC_CDN:true, Tool, ToolBar */
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
Script.include("/~/system/libraries/toolBars.js");
var recordingFile = "recording.hfr";
@ -25,7 +26,7 @@ function setDefaultPlayerOptions() {
}
var windowDimensions = Controller.getViewportDimensions();
var TOOL_ICON_URL = HIFI_PUBLIC_BUCKET + "images/tools/";
var TOOL_ICON_URL = VIRCADIA_PUBLIC_CDN + "images/tools/";
var ALPHA_ON = 1.0;
var ALPHA_OFF = 0.7;
var COLOR_ON = { red: 128, green: 0, blue: 0 };

5
script-archive/utilities/diagnostics/inWorldTestTone.js
View file

@ -11,9 +11,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/220Sine.wav");
var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/220Sine.wav");
var soundPlaying = false;

2
script-archive/utilities/diagnostics/moveJoints.js
View file

@ -11,7 +11,7 @@
Script.include("../../libraries/globals.js");
var testAnimation = HIFI_PUBLIC_BUCKET + "ozan/animations/forStephen/sniperJump.fbx";
var testAnimation = VIRCADIA_PUBLIC_CDN + "ozan/animations/forStephen/sniperJump.fbx";
var FRAME_RATE = 24.0; // frames per second
var isAnimating = false;

9
script-archive/utilities/diagnostics/playSoundLoop.js
View file

@ -11,13 +11,14 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
// A few sample files you may want to try:
var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+A.raw");
//var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/220Sine.wav");
//var sound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Bandcamp.wav");
var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Guitars/Guitar+-+Nylon+A.raw");
//var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/220Sine.wav");
//var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Cocktail+Party+Snippets/Bandcamp.wav");
var soundPlaying = false;
var options = {

5
script-archive/utilities/diagnostics/playSoundWave.js
View file

@ -9,9 +9,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var soundClip = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail%20Party%20Snippets/Walken1.wav");
var soundClip = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Cocktail%20Party%20Snippets/Walken1.wav");
function playSound() {
Audio.playSound(soundClip, {

9
script-archive/utilities/tools/cookies.js
View file

@ -10,7 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var SLIDER_RANGE_INCREMENT_SCALE = 1 / 1000;
var THUMB_COLOR = {
@ -784,7 +785,7 @@ var CHECK_MARK_COLOR = {
green: 255,
blue: 255
},
imageURL: HIFI_PUBLIC_BUCKET + 'images/tools/expand-ui.svg',
imageURL: VIRCADIA_PUBLIC_CDN + 'images/tools/expand-ui.svg',
x: x,
y: y,
width: rawHeight,
@ -1147,13 +1148,13 @@ var CHECK_MARK_COLOR = {
if (!item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
Overlays.editOverlay(item.thumb, {
imageURL: HIFI_PUBLIC_BUCKET + 'images/tools/expand-right.svg'
imageURL: VIRCADIA_PUBLIC_CDN + 'images/tools/expand-right.svg'
});
this.collapse(clickedOverlay);
item.isCollapsed = true;
} else if (item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
Overlays.editOverlay(item.thumb, {
imageURL: HIFI_PUBLIC_BUCKET + 'images/tools/expand-ui.svg'
imageURL: VIRCADIA_PUBLIC_CDN + 'images/tools/expand-ui.svg'
});
this.expand(clickedOverlay);
item.isCollapsed = false;

4
script-archive/walk.js
View file

@ -14,8 +14,8 @@
//
// animations, reach poses, reach pose parameters, transitions, transition parameters, sounds, image/s and reference files
const HIFI_PUBLIC_BUCKET = "https://hifi-public.s3.amazonaws.com/";
var pathToAssets = HIFI_PUBLIC_BUCKET + "procedural-animator/assets/";
const VIRCADIA_PUBLIC_CDN = "https://hifi-public.s3.amazonaws.com/";
var pathToAssets = VIRCADIA_PUBLIC_CDN + "procedural-animator/assets/";
Script.include([
"./libraries/walkConstants.js",

9
scripts/developer/utilities/tools/cookies.js
View file

@ -10,7 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var SLIDER_RANGE_INCREMENT_SCALE = 1 / 1000;
var THUMB_COLOR = {
@ -784,7 +785,7 @@ var CHECK_MARK_COLOR = {
green: 255,
blue: 255
},
imageURL: HIFI_PUBLIC_BUCKET + 'images/tools/expand-ui.svg',
imageURL: VIRCADIA_PUBLIC_CDN + 'images/tools/expand-ui.svg',
x: x,
y: y,
width: rawHeight,
@ -1147,13 +1148,13 @@ var CHECK_MARK_COLOR = {
if (!item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
Overlays.editOverlay(item.thumb, {
imageURL: HIFI_PUBLIC_BUCKET + 'images/tools/expand-right.svg'
imageURL: VIRCADIA_PUBLIC_CDN + 'images/tools/expand-right.svg'
});
this.collapse(clickedOverlay);
item.isCollapsed = true;
} else if (item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
Overlays.editOverlay(item.thumb, {
imageURL: HIFI_PUBLIC_BUCKET + 'images/tools/expand-ui.svg'
imageURL: VIRCADIA_PUBLIC_CDN + 'images/tools/expand-ui.svg'
});
this.expand(clickedOverlay);
item.isCollapsed = false;

3
scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
View file

@ -22,7 +22,8 @@ var EasingFunctions = Script.require("./resources/modules/easing.js");
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 imageURLBase = "https://content.highfidelity.com/Experiences/Releases/simplifiedUI/simplifiedEmote/emojiApp/resources/images/emojis/512px/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var imageURLBase = networkingConstants.contentCDN + "MarketplaceItems/avimoji/appResources/appData/resources/images/emojis/png512/";
// Uncomment below for local testing
//imageURLBase = Script.resolvePath("./resources/images/emojis/512px/");

3
scripts/system/libraries/globals.js
View file

@ -8,6 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
isInterstitialOverlaysVisible = false;

12
scripts/system/libraries/networkingConstants.js
View file

@ -9,6 +9,16 @@
// Interface Metadata Source
var interfaceMetadataSource = "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 euCDN = "eu-c-1/";
var usCDN = "us-c-1/";
module.exports = {
interfaceMetadataSource: interfaceMetadataSource
interfaceMetadataSource: interfaceMetadataSource.
contentCDN: contentCDN,
publicBucketCDN: publicBucketCDN,
euCDN: euCDN,
usCDN: usCDN
}

5
scripts/system/libraries/progressDialog.js
View file

@ -8,8 +8,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
var VIRCADIA_PUBLIC_CDN = networkingConstants.publicBucketCDN;
var toolIconUrl = VIRCADIA_PUBLIC_CDN + "images/tools/";
progressDialog = (function () {
var that = {},