From 46ddde0bd6384cf5eaa3982b64be39b190f69739 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 7 Oct 2020 19:42:51 -0400 Subject: [PATCH] hifi-production tutorials -> vircadia-content --- scripts/developer/tests/scriptableResource/lib.js | 2 +- scripts/tutorials/butterflies.js | 4 ++-- scripts/tutorials/createCow.js | 6 +++--- scripts/tutorials/createDice.js | 12 ++++++------ scripts/tutorials/createFlashlight.js | 4 ++-- scripts/tutorials/createGolfClub.js | 6 +++--- scripts/tutorials/createPictureFrame.js | 4 ++-- scripts/tutorials/createPingPongGun.js | 6 +++--- scripts/tutorials/createPistol.js | 6 +++--- scripts/tutorials/createSoundMaker.js | 4 ++-- scripts/tutorials/entity_scripts/cow.js | 2 +- scripts/tutorials/entity_scripts/golfClub.js | 2 +- scripts/tutorials/entity_scripts/pingPongGun.js | 2 +- scripts/tutorials/entity_scripts/pistol.js | 10 +++++----- scripts/tutorials/entity_scripts/soundMaker.js | 2 +- scripts/tutorials/giveAvatarMagicFingers.js | 2 +- scripts/tutorials/makeAvatarClap.js | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/scripts/developer/tests/scriptableResource/lib.js b/scripts/developer/tests/scriptableResource/lib.js index a8773bbabb..b874ce4e07 100644 --- a/scripts/developer/tests/scriptableResource/lib.js +++ b/scripts/developer/tests/scriptableResource/lib.js @@ -16,7 +16,7 @@ var FRAME_RATE = 30; // 30 default function getFrame(callback) { // A model exported from blender with a texture named 'Picture' on one face. - var FRAME_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pictureFrame/finalFrame.fbx"; + var FRAME_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pictureFrame/finalFrame.fbx"; var model = ModelCache.prefetch(FRAME_URL); if (model.state === Resource.State.FINISHED) { diff --git a/scripts/tutorials/butterflies.js b/scripts/tutorials/butterflies.js index 9d8d1de52c..5876b04240 100644 --- a/scripts/tutorials/butterflies.js +++ b/scripts/tutorials/butterflies.js @@ -86,13 +86,13 @@ function addButterfly() { dimensions: dimensions, color: color, animation: { - url: "http://hifi-production.s3.amazonaws.com/tutorials/butterflies/butterfly.fbx", + url: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/butterflies/butterfly.fbx", fps: newFrameRate, loop: true, running: true, startAutomatically:false }, - modelURL: "http://hifi-production.s3.amazonaws.com/tutorials/butterflies/butterfly.fbx" + modelURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/butterflies/butterfly.fbx" }; butterflies.push(Entities.addEntity(properties)); } diff --git a/scripts/tutorials/createCow.js b/scripts/tutorials/createCow.js index 0f034ecefa..c23e2eab1f 100644 --- a/scripts/tutorials/createCow.js +++ b/scripts/tutorials/createCow.js @@ -9,9 +9,9 @@ // // references to our assets. entity scripts need to be served from somewhere that is publically accessible -- so http(s) or atp -var SCRIPT_URL ="http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/cow.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/cow/cow.fbx"; -var ANIMATION_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/cow/cow.fbx'; +var SCRIPT_URL ="https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/cow.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/cow.fbx"; +var ANIMATION_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/cow.fbx'; // this part of the code describes how to center the entity in front of your avatar when it is created. var orientation = MyAvatar.orientation; diff --git a/scripts/tutorials/createDice.js b/scripts/tutorials/createDice.js index 46ad0172aa..7b88686c91 100644 --- a/scripts/tutorials/createDice.js +++ b/scripts/tutorials/createDice.js @@ -23,7 +23,7 @@ var DIE_SIZE = 0.20; var madeSound = true; // Set false at start of throw to look for collision -SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/dice/diceCollide.wav"); +SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/diceCollide.wav"); var INSUFFICIENT_PERMISSIONS_ERROR_MSG = "You do not have the necessary permissions to create new objects." @@ -45,7 +45,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.toolbars-dice" var offButton = toolBar.addOverlay("image", { width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/close.png", + imageURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/close.png", alpha: 1 }); @@ -54,11 +54,11 @@ var deleteButton = toolBar.addOverlay("image", { y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING, width: BUTTON_SIZE, height: BUTTON_SIZE, - imageURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/delete.png", + imageURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/delete.png", alpha: 1 }); -var diceIconURL = "http://hifi-production.s3.amazonaws.com/tutorials/dice/dice.png" +var diceIconURL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/dice.png" var diceButton = toolBar.addOverlay("image", { x: screenSize.x / 2 + PADDING, y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING, @@ -82,7 +82,7 @@ function shootDice(position, velocity) { for (var i = 0; i < NUMBER_OF_DICE; i++) { dice.push(Entities.addEntity({ type: "Model", - modelURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/goldDie.fbx", + modelURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/goldDie.fbx", position: position, velocity: velocity, rotation: Quat.fromPitchYawRollDegrees(Math.random() * 360, Math.random() * 360, Math.random() * 360), @@ -99,7 +99,7 @@ function shootDice(position, velocity) { lifetime: LIFETIME, shapeType: "box", dynamic: true, - collisionSoundURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/diceCollide.wav" + collisionSoundURL: "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/dice/diceCollide.wav" })); position = Vec3.sum(position, Vec3.multiply(DIE_SIZE, Vec3.normalize(Quat.getRight(Camera.getOrientation())))); } diff --git a/scripts/tutorials/createFlashlight.js b/scripts/tutorials/createFlashlight.js index 329be56af7..5bbbc52f24 100644 --- a/scripts/tutorials/createFlashlight.js +++ b/scripts/tutorials/createFlashlight.js @@ -9,8 +9,8 @@ // -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/flashlight.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/flashlight/flashlight2.fbx"; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/flashlight.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/flashlight/flashlight2.fbx"; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, diff --git a/scripts/tutorials/createGolfClub.js b/scripts/tutorials/createGolfClub.js index 4135b6680d..fb2466e0f4 100644 --- a/scripts/tutorials/createGolfClub.js +++ b/scripts/tutorials/createGolfClub.js @@ -17,8 +17,8 @@ orientation.x = 0; orientation = Quat.fromVec3Degrees(orientation); var center = Vec3.sum(MyAvatar.getHeadPosition(), Vec3.multiply(2, Quat.getForward(orientation))); -var CLUB_MODEL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/putter_VR.fbx"; -var CLUB_COLLISION_HULL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/club_collision_hull.obj"; +var CLUB_MODEL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/putter_VR.fbx"; +var CLUB_COLLISION_HULL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/club_collision_hull.obj"; var CLUB_DIMENSIONS = { "x": 0.043093059211969376, @@ -34,7 +34,7 @@ var CLUB_ROTATION = { }; -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/golfClub.js"; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/golfClub.js"; var golfClubProperties = { position: center, lifetime: 3600, diff --git a/scripts/tutorials/createPictureFrame.js b/scripts/tutorials/createPictureFrame.js index 873b604bfa..ea1e5ae7de 100644 --- a/scripts/tutorials/createPictureFrame.js +++ b/scripts/tutorials/createPictureFrame.js @@ -17,7 +17,7 @@ var center = Vec3.sum(Vec3.sum(MyAvatar.position, { }), Vec3.multiply(1, Quat.getForward(Camera.getOrientation()))); // this is just a model exported from blender with a texture named 'Picture' on one face. also made it emissive so it doesn't require lighting. -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pictureFrame/finalFrame.fbx"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pictureFrame/finalFrame.fbx"; //this is where we are going to get our image from. the stuff at the end is our API key. var NASA_API_ENDPOINT = "https://api.nasa.gov/planetary/apod?api_key=XNmgPJvVK8hGroZHB19PaQtlqKZk4q8GorWViuND"; @@ -59,7 +59,7 @@ function makePictureFrame() { } var pictureFrame = Entities.addEntity(pictureFrameProperties); - var OUTER_FRAME_MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pictureFrame/outer_frame.fbx"; + var OUTER_FRAME_MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pictureFrame/outer_frame.fbx"; var outerFrameProps = { name: "Tutorial Outer Frame", type: "Model", diff --git a/scripts/tutorials/createPingPongGun.js b/scripts/tutorials/createPingPongGun.js index 927738f29e..b5e397d5ed 100644 --- a/scripts/tutorials/createPingPongGun.js +++ b/scripts/tutorials/createPingPongGun.js @@ -7,9 +7,9 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/pingPongGun.js"; -var MODEL_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/Pingpong-Gun-New.fbx'; -var COLLISION_HULL_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/Pingpong-Gun-New.obj'; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/pingPongGun.js"; +var MODEL_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/Pingpong-Gun-New.fbx'; +var COLLISION_HULL_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/Pingpong-Gun-New.obj'; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, y: 0.5, diff --git a/scripts/tutorials/createPistol.js b/scripts/tutorials/createPistol.js index 0912645c35..d54621a633 100644 --- a/scripts/tutorials/createPistol.js +++ b/scripts/tutorials/createPistol.js @@ -7,9 +7,9 @@ // var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getForward(Camera.getOrientation()))); -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/pistol.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/pistol/gun.fbx"; -var COLLISION_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pistol/drop.wav' +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/pistol.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/gun.fbx"; +var COLLISION_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/drop.wav' var pistolProperties = { type: 'Model', diff --git a/scripts/tutorials/createSoundMaker.js b/scripts/tutorials/createSoundMaker.js index 2d86864982..365dd266fd 100644 --- a/scripts/tutorials/createSoundMaker.js +++ b/scripts/tutorials/createSoundMaker.js @@ -6,8 +6,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var SCRIPT_URL = "http://hifi-production.s3.amazonaws.com/tutorials/entity_scripts/soundMaker.js"; -var MODEL_URL = "http://hifi-production.s3.amazonaws.com/tutorials/soundMaker/Front-Desk-Bell.fbx"; +var SCRIPT_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/entity_scripts/soundMaker.js"; +var MODEL_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/soundMaker/Front-Desk-Bell.fbx"; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, diff --git a/scripts/tutorials/entity_scripts/cow.js b/scripts/tutorials/entity_scripts/cow.js index 117864beb6..992ad3c9d1 100644 --- a/scripts/tutorials/entity_scripts/cow.js +++ b/scripts/tutorials/entity_scripts/cow.js @@ -19,7 +19,7 @@ //set our id so other methods can get it. _this.entityID = entityID; //load the mooing sound - _this.mooSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/cow/moo.wav") + _this.mooSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/moo.wav") _this.mooSoundOptions = { volume: 0.7, loop: false diff --git a/scripts/tutorials/entity_scripts/golfClub.js b/scripts/tutorials/entity_scripts/golfClub.js index 6342838aa4..0d0426c87b 100644 --- a/scripts/tutorials/entity_scripts/golfClub.js +++ b/scripts/tutorials/entity_scripts/golfClub.js @@ -13,7 +13,7 @@ (function() { var ball = null; - var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/collision1.wav"; + var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/collision1.wav"; var triggerState = false; var BALL_GRAVITY = -9.8; var BALL_START_VELOCITY = 0.1; diff --git a/scripts/tutorials/entity_scripts/pingPongGun.js b/scripts/tutorials/entity_scripts/pingPongGun.js index 5ba4b15ea7..084e3287ed 100644 --- a/scripts/tutorials/entity_scripts/pingPongGun.js +++ b/scripts/tutorials/entity_scripts/pingPongGun.js @@ -12,7 +12,7 @@ (function() { var _this = this; - var SHOOTING_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/pong_sound.wav'; + var SHOOTING_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/pong_sound.wav'; function PingPongGun() { return; diff --git a/scripts/tutorials/entity_scripts/pistol.js b/scripts/tutorials/entity_scripts/pistol.js index 62517f486d..52985bb116 100644 --- a/scripts/tutorials/entity_scripts/pistol.js +++ b/scripts/tutorials/entity_scripts/pistol.js @@ -30,8 +30,8 @@ this.forceMultiplier = 1; this.laserLength = 100; - this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/GUN-SHOT2.raw"); - this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/Ricochet.L.wav"); + this.fireSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/GUN-SHOT2.raw"); + this.ricochetSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/Ricochet.L.wav"); this.playRichochetSoundChance = 0.1; this.fireVolume = 0.2; this.bulletForce = 10; @@ -220,7 +220,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": true, - "textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/star.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/star.png" }); Script.setTimeout(function() { @@ -270,7 +270,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": 0, - "textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/smoke.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/smoke.png" }); Script.setTimeout(function() { Entities.editEntity(smoke, { @@ -333,7 +333,7 @@ "alphaStart": 0, "alphaFinish": 0, "additiveBlending": true, - "textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/star.png" + "textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/star.png" }); Script.setTimeout(function() { Entities.editEntity(flash, { diff --git a/scripts/tutorials/entity_scripts/soundMaker.js b/scripts/tutorials/entity_scripts/soundMaker.js index 950334aee6..f4fb745b7a 100644 --- a/scripts/tutorials/entity_scripts/soundMaker.js +++ b/scripts/tutorials/entity_scripts/soundMaker.js @@ -8,7 +8,7 @@ (function(){ - var soundURL ='http://hifi-production.s3.amazonaws.com/tutorials/soundMaker/bell.wav'; + var soundURL ='https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/soundMaker/bell.wav'; var ringSound; this.preload = function(entityID) { diff --git a/scripts/tutorials/giveAvatarMagicFingers.js b/scripts/tutorials/giveAvatarMagicFingers.js index 23902bdd94..e6fc8ebb0a 100644 --- a/scripts/tutorials/giveAvatarMagicFingers.js +++ b/scripts/tutorials/giveAvatarMagicFingers.js @@ -76,7 +76,7 @@ var particleProperties = { alphaStart: 1, alphaFinish: 0, emitterShouldTrail: true, - textures: 'http://hifi-production.s3.amazonaws.com/tutorials/particleFingers/smoke.png', + textures: 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/particleFingers/smoke.png', lifetime: 3600 }; diff --git a/scripts/tutorials/makeAvatarClap.js b/scripts/tutorials/makeAvatarClap.js index c51e7a8d3a..2a593ed3c2 100644 --- a/scripts/tutorials/makeAvatarClap.js +++ b/scripts/tutorials/makeAvatarClap.js @@ -8,7 +8,7 @@ // // An animation of the avatar clapping its hands while standing -var ANIM_URL = "http://hifi-production.s3.amazonaws.com/tutorials/avatarAnimation/clap.fbx"; +var ANIM_URL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/avatarAnimation/clap.fbx"; // overrideRoleAnimation only replaces a single animation at a time. the rest of the motion is driven normally // @animationRole - name of animation