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

Fix making the tablet horizontal

Browse source
This commit is contained in:
David Rowe 2017-05-25 11:48:28 +12:00
parent 6452e92ac9
commit f1dca5019a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/libraries/WebTablet.js
View file

@ -57,9 +57,8 @@ function calcSpawnInfo(hand, tabletHeight) {
}
if (handController && handController.valid) {
// Orient tablet per hand orientation.
// Orient tablet per hand pitch and yaw.
// Angle it back similar to holding it like a book.
// Make it horizontal.
// Move tablet up so that hand is at bottom.
// Move tablet back so that hand is in front.
@ -67,12 +66,13 @@ function calcSpawnInfo(hand, tabletHeight) {
var rotation = handController.rotation;
if (hand === Controller.Standard.LeftHand) {
rotation = Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(-60, 90, 0));
rotation = Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0));
} else {
rotation = Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(-60, -90, 0));
rotation = Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, -90, 0));
}
var eulers = Quat.safeEulerAngles(rotation);
rotation = Quat.fromPitchYawRollDegrees(eulers.x, eulers.y, 0);
var normal = Vec3.multiplyQbyV(rotation, Vec3.UNIT_NEG_Y);
var lookAt = Quat.lookAt({x: 0, y: 0, z: 0}, normal, Vec3.UNIT_Y);
rotation = Quat.multiply(lookAt, Quat.fromPitchYawRollDegrees(30, 0, 0));
position = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x: 0, y: tabletHeight * 0.4, z: tabletHeight * 0.05 }));