Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 09:02:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update masterReset.js

Browse source 
The basketball rack should not be grabbable; this got changed in the last commit.  Also we're removing the back gate.
This commit is contained in:
James B. Pollack 2015-10-09 10:33:47 -07:00
parent 2b34c5a917
commit b06fd3876b
1 changed files with 5 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
unpublishedScripts/masterReset.js
View file

@ -245,7 +245,7 @@ MasterReset = function() {
resetMe: true
},
grabbableKey: {
grabbable: true
grabbable: false
}
})
@ -844,47 +844,8 @@ MasterReset = function() {
function createGates() {
var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
var rotation1 = Quat.fromPitchYawRollDegrees(0, 36, 0);
var gate1 = Entities.addEntity({
name: 'Back Door Gate',
type: 'Model',
shapeType: 'box',
modelURL: MODEL_URL,
position: {
x: 546.52,
y: 494.76,
z: 498.87
},
dimensions: {
x: 1.42,
y: 1.13,
z: 0.25
},
rotation: rotation1,
collisionsWillMove: true,
gravity: {
x: 0,
y: -50,
z: 0
},
linearDamping: 1,
angularDamping: 10,
mass: 10,
userData: JSON.stringify({
resetMe: {
resetMe: true,
},
grabbableKey: {
grabbable: false
}
})
});
var rotation2 = Quat.fromPitchYawRollDegrees(0, -16, 0);
var gate2 = Entities.addEntity({
var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
var gate = Entities.addEntity({
name: 'Front Door Fence',
type: 'Model',
modelURL: MODEL_URL,
@ -899,7 +860,7 @@ MasterReset = function() {
y: 1.13,
z: 0.2
},
rotation: rotation2,
rotation: rotation,
collisionsWillMove: true,
gravity: {
x: 0,
@ -1315,4 +1276,4 @@ MasterReset = function() {
Script.scriptEnding.connect(cleanup);
}
};
};