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

Can use 'xboxLaser' in third person camera

Browse source
This commit is contained in:
Anthony J. Thibault 2016-11-30 10:01:11 -08:00
parent 78559934a1
commit 7f840d3a08
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/controllers/handControllerPointer.js
View file

@ -489,9 +489,11 @@ function setColoredLaser() { // answer trigger state if lasers supported, else f
var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW; var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW;
if (!HMD.isHandControllerAvailable()) { if (!HMD.isHandControllerAvailable()) {
var position = MyAvatar.getHeadPosition(); // NOTE: keep this offset in sync with scripts/system/librarires/controllers.js:57
var direction = Quat.getUp(Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }))); var VERTICAL_HEAD_LASER_OFFSET = 0.1;
return HMD.setExtraLaser(position, true, color, direction); var position = Vec3.sum(HMD.position, Vec3.multiplyQbyV(HMD.orientation, {x: 0, y: VERTICAL_HEAD_LASER_OFFSET, z: 0}));
var orientation = Quat.multiply(HMD.orientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }));
return HMD.setExtraLaser(position, true, color, Quat.getUp(orientation));
} }
return HMD.setHandLasers(activeHudLaser, true, color, SYSTEM_LASER_DIRECTION) && activeTrigger.state; return HMD.setHandLasers(activeHudLaser, true, color, SYSTEM_LASER_DIRECTION) && activeTrigger.state;

6
scripts/system/libraries/controllers.js
View file

@ -52,8 +52,10 @@ getControllerWorldLocation = function (handController, doOffset) {
} }
} else if (!HMD.isHandControllerAvailable()) { } else if (!HMD.isHandControllerAvailable()) {
position = MyAvatar.getHeadPosition(); // NOTE: keep this offset in sync with scripts/system/controllers/handControllerPointer.js:493
orientation = Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 })); var VERTICAL_HEAD_LASER_OFFSET = 0.1;
position = Vec3.sum(Camera.position, Vec3.multiplyQbyV(Camera.orientation, {x: 0, y: VERTICAL_HEAD_LASER_OFFSET, z: 0}));
orientation = Quat.multiply(Camera.orientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }));
valid = true; valid = true;
} }