Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-04 07:24:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update bubblewand model refs

Browse source
This commit is contained in:
James B. Pollack 2015-11-06 13:11:06 -08:00
parent 29ce1d50ae
commit 1d41ef868b
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/toybox/bubblewand/createWand.js
View file

@ -13,13 +13,18 @@
Script.include("../../utilities.js"); Script.include("../../utilities.js");
Script.include("../../libraries/utils.js"); Script.include("../../libraries/utils.js");
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx'; var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj'; var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/actual_no_top_collision_hull.obj';
var WAND_SCRIPT_URL = Script.resolvePath("wand.js"); var WAND_SCRIPT_URL = Script.resolvePath("wand.js");
//create the wand in front of the avatar //create the wand in front of the avatar
var center = Vec3.sum(Vec3.sum(MyAvatar.position, {x: 0, y: 0.5, z: 0}), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation()))); var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0,
y: 0.5,
z: 0
}), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation())));
var wand = Entities.addEntity({ var wand = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',

2
examples/toybox/bubblewand/wand.js
View file

@ -17,7 +17,7 @@
Script.include("../../utilities.js"); Script.include("../../utilities.js");
Script.include("../../libraries/utils.js"); Script.include("../../libraries/utils.js");
var BUBBLE_MODEL = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/bubble/bubble.fbx"; var BUBBLE_MODEL = "http://hifi-public.s3.amazonaws.com/models/bubblewand/bubble.fbx";
var BUBBLE_INITIAL_DIMENSIONS = { var BUBBLE_INITIAL_DIMENSIONS = {
x: 0.01, x: 0.01,

5
unpublishedScripts/hiddenEntityReset.js
View file

@ -927,9 +927,8 @@
} }
function createWand(position) { function createWand(position) {
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx'; var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/actual_no_top_collision_hull.obj'; var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/actual_no_top_collision_hull.obj';
var entity = Entities.addEntity({ var entity = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',
type: "Model", type: "Model",

4
unpublishedScripts/masterReset.js
View file

@ -909,8 +909,8 @@ MasterReset = function() {
} }
function createWand(position) { function createWand(position) {
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx'; var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/actual_no_top_collision_hull.obj'; var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/actual_no_top_collision_hull.obj';
var entity = Entities.addEntity({ var entity = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',