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

Merge pull request #6825 from ericrius1/handGrabPositioningTweaks

Browse source 
Adjusted relative hand grab data for gun, ping ponger, and bow to to …
This commit is contained in:
Philip Rosedale 2016-01-13 16:08:09 -08:00
commit ac61a33b63
2 changed files with 54 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
unpublishedScripts/hiddenEntityReset.js
View file

@ -113,7 +113,6 @@
z: 504.5 z: 504.5
}); });
createCombinedArmChair({ createCombinedArmChair({
x: 549.29, x: 549.29,
y: 494.9, y: 494.9,
@ -300,12 +299,17 @@
userData: JSON.stringify({ userData: JSON.stringify({
grabbableKey: { grabbableKey: {
spatialKey: { spatialKey: {
relativePosition: { rightRelativePosition: {
x: 0, x: 0.03,
y: 0, y: 0.0,
z: 0 z: -0.065
}, },
relativeRotation: Quat.fromPitchYawRollDegrees(45, 90, 0) leftRelativePosition: {
x: -0.03,
y: 0.00,
z: -0.065
},
relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0)
}, },
invertSolidWhileHeld: true invertSolidWhileHeld: true
}, },
@ -359,12 +363,17 @@
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true, invertSolidWhileHeld: true,
spatialKey: { spatialKey: {
relativePosition: { rightRelativePosition: {
x: 0, x: 0.03,
y: 0.06, y: 0.08,
z: 0.11 z: 0.11
}, },
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90) leftRelativePosition: {
x: -0.03,
y: 0.08,
z: 0.11
},
relativeRotation: Quat.fromPitchYawRollDegrees(180, 90, 90)
} }
} }
}) })
@ -1151,10 +1160,15 @@
}, },
grabbableKey: { grabbableKey: {
spatialKey: { spatialKey: {
relativePosition: { rightRelativePosition: {
x: -0.05, x: -0.05,
y: 0, y: .06,
z: 0.0 z: 0.05
},
leftRelativePosition: {
x: 0.05,
y: 0.06,
z: 0.05
}, },
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)
}, },
@ -1509,4 +1523,4 @@
}; };
// entity scripts always need to return a newly constructed object of our type // entity scripts always need to return a newly constructed object of our type
return new ResetSwitch(); return new ResetSwitch();
}); });

42
unpublishedScripts/masterReset.js
View file

@ -285,16 +285,16 @@ MasterReset = function() {
grabbableKey: { grabbableKey: {
spatialKey: { spatialKey: {
rightRelativePosition: { rightRelativePosition: {
x: 0.02, x: 0.03,
y: 0, y: 0.0,
z: -0.03 z: -0.065
}, },
leftRelativePosition: { leftRelativePosition: {
x: -0.02, x: -0.03,
y: 0, y: 0.00,
z: -0.03 z: -0.065
}, },
relativeRotation: Quat.fromPitchYawRollDegrees(100, 90, 0) relativeRotation: Quat.fromPitchYawRollDegrees(90, 90, 0)
}, },
invertSolidWhileHeld: true invertSolidWhileHeld: true
}, },
@ -348,12 +348,17 @@ MasterReset = function() {
grabbableKey: { grabbableKey: {
invertSolidWhileHeld: true, invertSolidWhileHeld: true,
spatialKey: { spatialKey: {
relativePosition: { rightRelativePosition: {
x: 0, x: 0.03,
y: 0.06, y: 0.08,
z: 0.11 z: 0.11
}, },
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, 90) leftRelativePosition: {
x: -0.03,
y: 0.08,
z: 0.11
},
relativeRotation: Quat.fromPitchYawRollDegrees(180, 90, 90)
} }
} }
}) })
@ -1141,10 +1146,15 @@ MasterReset = function() {
}, },
grabbableKey: { grabbableKey: {
spatialKey: { spatialKey: {
relativePosition: { rightRelativePosition: {
x: 0, x: -0.05,
y: 0, y: .06,
z: 0.06 z: 0.05
},
leftRelativePosition: {
x: 0.05,
y: 0.06,
z: 0.05
}, },
relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90) relativeRotation: Quat.fromPitchYawRollDegrees(0, -90, -90)
}, },
@ -1494,4 +1504,4 @@ MasterReset = function() {
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
} }
}; };