Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6504 from imgntn/bubblemaster

Browse source 
Update master reset scripts for Toybox to have parity with bubble wand
This commit is contained in:
James B. Pollack 2015-11-30 17:36:40 -08:00
commit ea831238e6
2 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
unpublishedScripts/hiddenEntityReset.js
View file

@ -991,17 +991,19 @@
} }
function createWand(position) { function createWand(position) {
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx'; var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/actual_no_top_collision_hull.obj'; var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
var entity = Entities.addEntity({
var wand = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',
type: "Model", type: "Model",
modelURL: WAND_MODEL, modelURL: WAND_MODEL,
shapeType: 'compound',
position: position, position: position,
gravity: { gravity: {
x: 0, x: 0,
y: -9.8, y: -9.8,
z: 0 z: 0,
}, },
dimensions: { dimensions: {
x: 0.05, x: 0.05,
@ -1009,24 +1011,27 @@
z: 0.05 z: 0.05
}, },
//must be enabled to be grabbable in the physics engine //must be enabled to be grabbable in the physics engine
shapeType: 'compound',
collisionsWillMove: true, collisionsWillMove: true,
compoundShapeURL: WAND_COLLISION_SHAPE, compoundShapeURL: WAND_COLLISION_SHAPE,
//Look into why bubble wand is going through table when gravity is enabled
// gravity: {x: 0, y: -3.5, z: 0},
// velocity: {x: 0, y: -0.01, z:0},
script: wandScriptURL, script: wandScriptURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
}, },
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true invertSolidWhileHeld: true,
spatialKey: {
relativePosition: {
x: 0,
y: 0.1,
z: 0
},
relativeRotation: Quat.fromPitchYawRollDegrees(0, 0, 90)
}
} }
}) })
}); });
} }
function createBasketBall(position) { function createBasketBall(position) {

24
unpublishedScripts/masterReset.js
View file

@ -971,18 +971,19 @@ MasterReset = function() {
} }
function createWand(position) { function createWand(position) {
var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx'; var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/actual_no_top_collision_hull.obj'; var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
var entity = Entities.addEntity({ var wand = Entities.addEntity({
name: 'Bubble Wand', name: 'Bubble Wand',
type: "Model", type: "Model",
modelURL: WAND_MODEL, modelURL: WAND_MODEL,
shapeType: 'compound',
position: position, position: position,
gravity: { gravity: {
x: 0, x: 0,
y: -9.8, y: -9.8,
z: 0 z: 0,
}, },
dimensions: { dimensions: {
x: 0.05, x: 0.05,
@ -990,24 +991,27 @@ MasterReset = function() {
z: 0.05 z: 0.05
}, },
//must be enabled to be grabbable in the physics engine //must be enabled to be grabbable in the physics engine
shapeType: 'compound',
collisionsWillMove: true, collisionsWillMove: true,
compoundShapeURL: WAND_COLLISION_SHAPE, compoundShapeURL: WAND_COLLISION_SHAPE,
//Look into why bubble wand is going through table when gravity is enabled
// gravity: {x: 0, y: -3.5, z: 0},
// velocity: {x: 0, y: -0.01, z:0},
script: wandScriptURL, script: wandScriptURL,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
}, },
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true invertSolidWhileHeld: true,
spatialKey: {
relativePosition: {
x: 0,
y: 0.1,
z: 0
},
relativeRotation: Quat.fromPitchYawRollDegrees(0, 0, 90)
}
} }
}) })
}); });
} }
function createBasketBall(position) { function createBasketBall(position) {