diff --git a/examples/toys/bubblewand/createWand.js b/examples/toys/bubblewand/createWand.js index 24db08d2c1..158bcb3b99 100644 --- a/examples/toys/bubblewand/createWand.js +++ b/examples/toys/bubblewand/createWand.js @@ -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 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 //var scriptURL = "http://localhost:8080/wand.js?" + randInt(0, 10000); diff --git a/examples/toys/bubblewand/wand.js b/examples/toys/bubblewand/wand.js index 87bdfc6648..020fba9b15 100644 --- a/examples/toys/bubblewand/wand.js +++ b/examples/toys/bubblewand/wand.js @@ -27,7 +27,7 @@ function convertRange(value, r1, r2) { 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 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 @@ -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() { var _t = this; //create a new bubble at the tip of the wand