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

cleanup

Browse source
This commit is contained in:
James B. Pollack 2016-01-25 14:48:15 -08:00
parent 9a49504c56
commit eca75ba66d
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/toybox/bow/bow.js
View file

@ -117,9 +117,7 @@
this.arrowNotchSound = SoundCache.getSound(NOTCH_ARROW_SOUND_URL);
var userData = Entities.getEntityProperties(this.entityID).userData;
this.userData = JSON.parse(userData);
print('THIS USERDATA::: ' + userData)
this.preNotchString = this.userData.bowKey.preNotchString;
print('PRE NOTCH STRING:::' + this.preNotchString)
},
unload: function() {

8
examples/toybox/bow/createBow.js
View file

@ -10,8 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var utilsPath = Script.resolvePath('../../libraries/utils.js')
Script.include(utilsPath)
var utilsPath = Script.resolvePath('../../libraries/utils.js');
Script.include(utilsPath);
var SCRIPT_URL = Script.resolvePath('bow.js');
@ -80,10 +80,12 @@ function makeBow() {
}
}
})
}
};
bow = Entities.addEntity(bowProperties);
createPreNotchString();
}
var preNotchString;
function createPreNotchString() {

1
unpublishedScripts/hiddenEntityReset.js
View file

@ -334,6 +334,7 @@
var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27);
var MODEL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow-deadly.fbx";
var COLLISION_HULL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow_collision_hull.obj";
var BOW_DIMENSIONS = {
x: 0.04,
y: 1.3,

3
unpublishedScripts/masterReset.js
View file

@ -318,6 +318,7 @@ MasterReset = function() {
var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27);
var MODEL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow-deadly.fbx";
var COLLISION_HULL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow_collision_hull.obj";
var BOW_DIMENSIONS = {
x: 0.04,
y: 1.3,
@ -438,7 +439,7 @@ MasterReset = function() {
makeBow();
}
function createFire() {