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

Adjusted relative hand grab data for gun, ping ponger, and bow to to optimize for owen grabbing

Browse source
This commit is contained in:
ericrius1 2016-01-13 11:06:29 -08:00
parent 6f85ee135f
commit 0a371e4b75
2 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
unpublishedScripts/hiddenEntityReset.js
View file

@ -300,12 +300,17 @@
userData: JSON.stringify({
grabbableKey: {
spatialKey: {
relativePosition: {
x: 0,
rightRelativePosition: {
x: 0.03,
y: 0,
z: 0
z: -0.085
},
relativeRotation: Quat.fromPitchYawRollDegrees(45, 90, 0)
leftRelativePosition: {
x: -0.03,
y: 0,
z: -0.085
},
relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0)
},
invertSolidWhileHeld: true
},
@ -359,9 +364,14 @@
grabbableKey: {
invertSolidWhileHeld: true,
spatialKey: {
relativePosition: {
x: 0,
y: 0.06,
rightRelativePosition: {
x: -0.03,
y: 0,
z: 0.11
},
leftRelativePosition: {
x: 0.03,
y: 0,
z: 0.11
},
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90)
@ -1152,9 +1162,9 @@
grabbableKey: {
spatialKey: {
relativePosition: {
x: -0.05,
x: 0.01,
y: 0,
z: 0.0
z: 0.1
},
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)
},
@ -1509,4 +1519,4 @@
};
// entity scripts always need to return a newly constructed object of our type
return new ResetSwitch();
});
});

25
unpublishedScripts/masterReset.js
View file

@ -285,14 +285,14 @@ MasterReset = function() {
grabbableKey: {
spatialKey: {
rightRelativePosition: {
x: 0.02,
x: 0.03,
y: 0,
z: -0.03
z: -0.085
},
leftRelativePosition: {
x: -0.02,
x: -0.03,
y: 0,
z: -0.03
z: -0.085
},
relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0)
},
@ -348,9 +348,14 @@ MasterReset = function() {
grabbableKey: {
invertSolidWhileHeld: true,
spatialKey: {
relativePosition: {
x: 0,
y: 0.06,
rightRelativePosition: {
x: -0.03,
y: 0,
z: 0.11
},
leftRelativePosition: {
x: 0.03,
y: 0,
z: 0.11
},
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90)
@ -1142,9 +1147,9 @@ MasterReset = function() {
grabbableKey: {
spatialKey: {
relativePosition: {
x: 0,
x: 0.01,
y: 0,
z: 0.06
z: 0.1
},
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)
},
@ -1494,4 +1499,4 @@ MasterReset = function() {
Script.scriptEnding.connect(cleanup);
}
};
};