Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 01:16:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix file paths

Browse source
This commit is contained in:
James Pollack 2015-09-10 17:10:55 -07:00
parent 1cec61ebba
commit c3ed2d9064
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/toys/bubblewand/createWand.js
View file

@ -18,7 +18,7 @@ Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examp
var wandModel = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx'; var wandModel = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
var wandCollisionShape = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj'; var wandCollisionShape = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj';
var scriptURL = 'http://hifi-public.s3.amazonaws.com/scripts/bubblewand/wand.js?' + randInt(0, 10000); var scriptURL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/wand.js?' + randInt(0, 10000);
//for local testing //for local testing
//var scriptURL = "http://localhost:8080/wand.js?" + randInt(0, 10000); //var scriptURL = "http://localhost:8080/wand.js?" + randInt(0, 10000);

15
examples/toys/bubblewand/wand.js
View file

@ -27,7 +27,7 @@ function convertRange(value, r1, r2) {
var bubbleModel = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/bubble/bubble.fbx"; var bubbleModel = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/bubble/bubble.fbx";
var popSound = SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop.wav"); var popSound = SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop.wav");
var bubbleScript = 'http://hifi-public.s3.amazonaws.com/scripts/toys/bubblewand/bubble.js?' + randInt(1, 10000); var bubbleScript = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/bubble.js?' + randInt(1, 10000);
// var bubbleScript = 'http://localhost:8080/bubble.js?' + randInt(1, 10000); //for local testing // var bubbleScript = 'http://localhost:8080/bubble.js?' + randInt(1, 10000); //for local testing
@ -306,19 +306,6 @@ function convertRange(value, r1, r2) {
}); });
}, },
checkForEntitiesNearBubble: function() {
var _t = this;
var arrayFound = Entities.findEntities(_t.wandTipPosition, 1);
var foundLength = arrayFound.length;
print('found length:::' + foundLength);
},
enableCollisionsForBubble: function(bubble) {
print('enable bubble collisions:' + bubble)
Entities.editEntity(bubble, {
collisionsWillMove: true,
ignoreForCollisions: false,
})
},
spawnBubble: function() { spawnBubble: function() {
var _t = this; var _t = this;
//create a new bubble at the tip of the wand //create a new bubble at the tip of the wand