mirror of
https://github.com/lubosz/overte.git
synced 2025-08-07 17:01:06 +02:00
Merge pull request #7022 from imgntn/mastertoys
Fix userData for pistol in toybox reset scripts
This commit is contained in:
commit
2af6c08057
2 changed files with 48 additions and 48 deletions
|
@ -299,31 +299,31 @@
|
||||||
},
|
},
|
||||||
dynamic: true,
|
dynamic: true,
|
||||||
userData: JSON.stringify({
|
userData: JSON.stringify({
|
||||||
|
wearable: {
|
||||||
|
joints: {
|
||||||
|
RightHand: [{
|
||||||
|
x: 0.07079616189002991,
|
||||||
|
y: 0.20177987217903137,
|
||||||
|
z: 0.06374628841876984
|
||||||
|
}, {
|
||||||
|
x: -0.5863648653030396,
|
||||||
|
y: -0.46007341146469116,
|
||||||
|
z: 0.46949487924575806,
|
||||||
|
w: -0.4733745753765106
|
||||||
|
}],
|
||||||
|
LeftHand: [{
|
||||||
|
x: 0.1802254319190979,
|
||||||
|
y: 0.13442856073379517,
|
||||||
|
z: 0.08504903316497803
|
||||||
|
}, {
|
||||||
|
x: 0.2198076844215393,
|
||||||
|
y: -0.7377811074256897,
|
||||||
|
z: 0.2780133783817291,
|
||||||
|
w: 0.574519157409668
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
},
|
||||||
grabbableKey: {
|
grabbableKey: {
|
||||||
wearable: {
|
|
||||||
joints: {
|
|
||||||
RightHand: [{
|
|
||||||
x: 0.07079616189002991,
|
|
||||||
y: 0.20177987217903137,
|
|
||||||
z: 0.06374628841876984
|
|
||||||
}, {
|
|
||||||
x: -0.5863648653030396,
|
|
||||||
y: -0.46007341146469116,
|
|
||||||
z: 0.46949487924575806,
|
|
||||||
w: -0.4733745753765106
|
|
||||||
}],
|
|
||||||
LeftHand: [{
|
|
||||||
x: 0.1802254319190979,
|
|
||||||
y: 0.13442856073379517,
|
|
||||||
z: 0.08504903316497803
|
|
||||||
}, {
|
|
||||||
x: 0.2198076844215393,
|
|
||||||
y: -0.7377811074256897,
|
|
||||||
z: 0.2780133783817291,
|
|
||||||
w: 0.574519157409668
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
invertSolidWhileHeld: true
|
invertSolidWhileHeld: true
|
||||||
},
|
},
|
||||||
resetMe: {
|
resetMe: {
|
||||||
|
|
|
@ -283,31 +283,31 @@ MasterReset = function() {
|
||||||
damping: 0.5,
|
damping: 0.5,
|
||||||
collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
|
collisionSoundURL: "http://hifi-content.s3.amazonaws.com/james/pistol/sounds/drop.wav",
|
||||||
userData: JSON.stringify({
|
userData: JSON.stringify({
|
||||||
|
wearable: {
|
||||||
|
joints: {
|
||||||
|
RightHand: [{
|
||||||
|
x: 0.07079616189002991,
|
||||||
|
y: 0.20177987217903137,
|
||||||
|
z: 0.06374628841876984
|
||||||
|
}, {
|
||||||
|
x: -0.5863648653030396,
|
||||||
|
y: -0.46007341146469116,
|
||||||
|
z: 0.46949487924575806,
|
||||||
|
w: -0.4733745753765106
|
||||||
|
}],
|
||||||
|
LeftHand: [{
|
||||||
|
x: 0.1802254319190979,
|
||||||
|
y: 0.13442856073379517,
|
||||||
|
z: 0.08504903316497803
|
||||||
|
}, {
|
||||||
|
x: 0.2198076844215393,
|
||||||
|
y: -0.7377811074256897,
|
||||||
|
z: 0.2780133783817291,
|
||||||
|
w: 0.574519157409668
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
},
|
||||||
grabbableKey: {
|
grabbableKey: {
|
||||||
wearable: {
|
|
||||||
joints: {
|
|
||||||
RightHand: [{
|
|
||||||
x: 0.07079616189002991,
|
|
||||||
y: 0.20177987217903137,
|
|
||||||
z: 0.06374628841876984
|
|
||||||
}, {
|
|
||||||
x: -0.5863648653030396,
|
|
||||||
y: -0.46007341146469116,
|
|
||||||
z: 0.46949487924575806,
|
|
||||||
w: -0.4733745753765106
|
|
||||||
}],
|
|
||||||
LeftHand: [{
|
|
||||||
x: 0.1802254319190979,
|
|
||||||
y: 0.13442856073379517,
|
|
||||||
z: 0.08504903316497803
|
|
||||||
}, {
|
|
||||||
x: 0.2198076844215393,
|
|
||||||
y: -0.7377811074256897,
|
|
||||||
z: 0.2780133783817291,
|
|
||||||
w: 0.574519157409668
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
invertSolidWhileHeld: true
|
invertSolidWhileHeld: true
|
||||||
},
|
},
|
||||||
resetMe: {
|
resetMe: {
|
||||||
|
|
Loading…
Reference in a new issue