Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update wand to use relative paths, remove some unused position tracking methods, remove cache busting from model file paths

Browse source
This commit is contained in:
James Pollack 2015-09-10 09:58:31 -07:00
parent da90b7ff08
commit 8f77c0b61c
3 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
(function() {
Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examples/utilities.js");
Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examples/libraries/utils.js");
Script.include("../utilities.js");
Script.include("../libraries/utils.js");
var POP_SOUNDS = [
SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop0.wav"),
@ -35,25 +35,20 @@
// var _t = this;
// _t.entityID = entityID;
// properties = Entities.getEntityProperties(entityID);
// checkPositionInterval = Script.setInterval(function() {
// properties = Entities.getEntityProperties(entityID);
// // print('properties AT CHECK::' + JSON.stringify(properties));
// }, 200);
// _t.loadShader(entityID);
// _t.loadShader(entityID);
};
this.loadShader = function(entityID) {
setEntityUserData(entityID, {
"ProceduralEntity": {
"shaderUrl": "http://localhost:8080/shaders/bubble.fs?" + randInt(0, 10000),
"shaderUrl": "http://hifi-public.s3.amazonaws.com/james/bubblewand/shaders/quora.fs",
}
})
};
this.leaveEntity = function(entityID) {
// print('LEAVE ENTITY:' + entityID)
// print('LEAVE ENTITY:' + entityID)
};
this.collisionWithEntity = function(myID, otherID, collision) {
@ -61,14 +56,6 @@
// Entities.deleteEntity(otherID);
};
// this.beforeUnload = function(entityID) {
// print('BEFORE UNLOAD:' + entityID);
// var properties = Entities.getEntityProperties(entityID);
// var position = properties.position;
// print('BEFOREUNLOAD PROPS' + JSON.stringify(position));
// };
this.unload = function(entityID) {
// Script.clearInterval(checkPositionInterval);
// var position = properties.position;

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

@ -10,11 +10,11 @@
Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examples/utilities.js");
Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examples/libraries/utils.js");
Script.include("../utilities.js");
Script.include("../libraries/utils.js");
var wandModel = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx?' + randInt(0, 10000);
var wandCollisionShape = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj?' + randInt(0, 10000);
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);
//for local testing

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

@ -16,8 +16,8 @@ function convertRange(value, r1, r2) {
}
(function() {
Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examples/utilities.js");
Script.include("https://raw.githubusercontent.com/highfidelity/hifi/master/examples/libraries/utils.js");
Script.include("../utilities.js");
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");