diff --git a/scripts/system/assets/images/Bokeh-Particle.png b/scripts/system/assets/images/Bokeh-Particle.png new file mode 100644 index 0000000000..93277e3069 Binary files /dev/null and b/scripts/system/assets/images/Bokeh-Particle.png differ diff --git a/scripts/system/assets/models/equip-Fresnel-3.fbx b/scripts/system/assets/models/equip-Fresnel-3.fbx new file mode 100644 index 0000000000..b90e797e1e Binary files /dev/null and b/scripts/system/assets/models/equip-Fresnel-3.fbx differ diff --git a/scripts/system/assets/sounds/3rdbeat_success_bell.wav b/scripts/system/assets/sounds/3rdbeat_success_bell.wav new file mode 100644 index 0000000000..ee5a132f2d Binary files /dev/null and b/scripts/system/assets/sounds/3rdbeat_success_bell.wav differ diff --git a/scripts/system/assets/sounds/4beat_sweep.wav b/scripts/system/assets/sounds/4beat_sweep.wav new file mode 100644 index 0000000000..8497588702 Binary files /dev/null and b/scripts/system/assets/sounds/4beat_sweep.wav differ diff --git a/scripts/system/controllers/controllerModules/equipEntity.js b/scripts/system/controllers/controllerModules/equipEntity.js index e5d712d448..773d2852b7 100644 --- a/scripts/system/controllers/controllerModules/equipEntity.js +++ b/scripts/system/controllers/controllerModules/equipEntity.js @@ -24,7 +24,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); Script.include("/~/system/libraries/utils.js"); -var DEFAULT_SPHERE_MODEL_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/equip-Fresnel-3.fbx"); +var DEFAULT_SPHERE_MODEL_URL = Script.resolvePath("../../assets/models/equip-Fresnel-3.fbx"); var EQUIP_SPHERE_SCALE_FACTOR = 0.65; diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js index f66810914d..cecc17e705 100644 --- a/scripts/system/makeUserConnection.js +++ b/scripts/system/makeUserConnection.js @@ -35,8 +35,9 @@ var CONNECTING_TIME = 100; // ms One interval. var PARTICLE_RADIUS = 0.15; // m var PARTICLE_ANGLE_INCREMENT = 360 / 45; // 1hz - var HANDSHAKE_SOUND_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/davidkelly/production/audio/4beat_sweep.wav"); - var SUCCESSFUL_HANDSHAKE_SOUND_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/davidkelly/production/audio/3rdbeat_success_bell.wav"); + var HANDSHAKE_SOUND_URL = Script.resolvePath("assets/sounds/4beat_sweep.wav"); + var SUCCESSFUL_HANDSHAKE_SOUND_URL = Script.resolvePath("assets/sounds/3rdbeat_success_bell.wav"); + var PARTICLE_TEXTURE = Script.resolvePath("assets/images/Bokeh-Particle.png"); var PREFERRER_HAND_JOINT_POSTFIX_ORDER = ['Middle1', 'Index1', '']; var HAPTIC_DATA = { initial: { duration: 20, strength: 0.6 }, // duration is in ms @@ -60,7 +61,7 @@ "radiusStart": 0.0025, "emitSpeed": 0.02, "speedSpread": 0.015, - "textures": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/Particles/Bokeh-Particle.png"), + "textures": PARTICLE_TEXTURE, "color": {"red": 255, "green": 255, "blue": 255}, "colorFinish": {"red": 0, "green": 164, "blue": 255}, "colorStart": {"red": 255, "green": 255, "blue": 255}, @@ -92,7 +93,7 @@ "radiusStart": 0.04, "speedSpread": 0.00, "radiusSpread": 0.0, - "textures": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/Particles/Bokeh-Particle.png"), + "textures": PARTICLE_TEXTURE, "color": {"red": 200, "green": 170, "blue": 255}, "colorFinish": {"red": 0, "green": 134, "blue": 255}, "colorStart": {"red": 185, "green": 222, "blue": 255},