Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix path issue

Browse source
This commit is contained in:
Thijs Wenker 2017-03-18 00:12:13 +01:00
parent febe25511b
commit bdabc21d57
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
unpublishedScripts/marketplace/boppo/createElBoppo.js
View file

@ -11,11 +11,15 @@
/* globals SCRIPT_IMPORT_PROPERTIES */ /* globals SCRIPT_IMPORT_PROPERTIES */
var MODELS_PATH = 'http://hifi-content.s3.amazonaws.com/DomainContent/Welcome%20Area/production/models/boxingRing/'; var MODELS_PATH = 'http://hifi-content.s3.amazonaws.com/DomainContent/Welcome%20Area/production/models/boxingRing/';
var SCRIPT_PATH = this.isCleanupAndSpawnScript ?
'http://s3-us-west-1.amazonaws.com/hifi-content/thoys/dev/2017/elBoppo/' :
Script.resolvePath('');
var WANT_CLEANUP_ON_SCRIPT_ENDING = false; var WANT_CLEANUP_ON_SCRIPT_ENDING = false;
var getScriptPath = function(localPath) {
if (this.isCleanupAndSpawnScript) {
return 'http://s3-us-west-1.amazonaws.com/hifi-content/thoys/dev/2017/elBoppo/' + localPath;
}
return Script.resolvePath(localPath);
};
var getCreatePosition = function() { var getCreatePosition = function() {
// can either return position defined by resetScript or avatar position // can either return position defined by resetScript or avatar position
if (this.isCleanupAndSpawnScript) { if (this.isCleanupAndSpawnScript) {
@ -40,7 +44,7 @@ var boxingRing = Entities.addEntity({
}, },
position: getCreatePosition(), position: getCreatePosition(),
scriptTimestamp: 1489612158459, scriptTimestamp: 1489612158459,
serverScripts: SCRIPT_PATH + 'boppoServer.js', serverScripts: getScriptPath('boppoServer.js'),
shapeType: 'static-mesh', shapeType: 'static-mesh',
type: 'Model', type: 'Model',
userData: JSON.stringify({ userData: JSON.stringify({
@ -181,7 +185,7 @@ var boppoEntities = [
y: -1.52587890625e-05, y: -1.52587890625e-05,
z: -1.52587890625e-05 z: -1.52587890625e-05
}, },
script: SCRIPT_PATH + 'clownGloveDispenser.js', script: getScriptPath('clownGloveDispenser.js'),
shapeType: 'box', shapeType: 'box',
type: 'Zone', type: 'Zone',
visible: false visible: false