mirror of
https://github.com/overte-org/overte.git
synced 2025-04-26 07:16:25 +02:00
Update masterReset.js
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:
parent
2b34c5a917
commit
b06fd3876b
1 changed files with 5 additions and 44 deletions
|
@ -245,7 +245,7 @@ MasterReset = function() {
|
||||||
resetMe: true
|
resetMe: true
|
||||||
},
|
},
|
||||||
grabbableKey: {
|
grabbableKey: {
|
||||||
grabbable: true
|
grabbable: false
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
@ -844,47 +844,8 @@ MasterReset = function() {
|
||||||
function createGates() {
|
function createGates() {
|
||||||
var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
|
var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
|
||||||
|
|
||||||
var rotation1 = Quat.fromPitchYawRollDegrees(0, 36, 0);
|
var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
|
||||||
|
var gate = Entities.addEntity({
|
||||||
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({
|
|
||||||
name: 'Front Door Fence',
|
name: 'Front Door Fence',
|
||||||
type: 'Model',
|
type: 'Model',
|
||||||
modelURL: MODEL_URL,
|
modelURL: MODEL_URL,
|
||||||
|
@ -899,7 +860,7 @@ MasterReset = function() {
|
||||||
y: 1.13,
|
y: 1.13,
|
||||||
z: 0.2
|
z: 0.2
|
||||||
},
|
},
|
||||||
rotation: rotation2,
|
rotation: rotation,
|
||||||
collisionsWillMove: true,
|
collisionsWillMove: true,
|
||||||
gravity: {
|
gravity: {
|
||||||
x: 0,
|
x: 0,
|
||||||
|
|
Loading…
Reference in a new issue