Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove localhost refs

Browse source
This commit is contained in:
James Pollack 2015-09-10 11:49:12 -07:00
parent 5df483b35f
commit ee7e25a137
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/toys/bubblewand/bubble.js
View file

@ -35,12 +35,13 @@
this.preload = function(entityID) {
// print('bubble preload')
_t.entityID = entityID;
//properties = Entities.getEntityProperties(entityID);
properties = Entities.getEntityProperties(entityID);
// _t.loadShader(entityID);
Script.update.connect(_t.internalUpdate);
};
this.internalUpdate = function() {
// we want the position at unload but for some reason it keeps getting set to 0,0,0 -- so i just exclude that location. sorry origin bubbles.
var tmpProperties = Entities.getEntityProperties(_t.entityID);
if (tmpProperties.position.x !== 0 && tmpProperties.position.y !== 0 && tmpProperties.position.z !== 0) {
properties = tmpProperties;
@ -62,7 +63,6 @@
this.collisionWithEntity = function(myID, otherID, collision) {
//Entities.deleteEntity(myID);
// Entities.deleteEntity(otherID);
};
this.unload = function(entityID) {

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

@ -15,10 +15,10 @@ Script.include("../../libraries/utils.js");
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/james/bubblewand/scripts/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);
//var scriptURL = "http://localhost:8080/wand.js?" + randInt(0, 10000);
//create the wand in front of the avatar
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(Camera.getOrientation())));

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

@ -20,9 +20,9 @@ function convertRange(value, r1, r2) {
Script.include("../../libraries/utils.js");
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/james/bubblewand/scripts/bubble.js?' + randInt(1, 10000);
var bubbleScript = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/bubble.js?' + randInt(1, 10000);
//for local testing
var bubbleScript = 'http://localhost:8080/bubble.js?' + randInt(1, 10000);
//var bubbleScript = 'http://localhost:8080/bubble.js?' + randInt(1, 10000);
var POP_SOUNDS = [
SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop0.wav"),