lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 20:43:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix C defines;

Browse source
This commit is contained in:
bjorn 2018-05-05 15:59:13 -07:00 committed by bjornbytes
parent fd5ae4d124
commit 32668fc231
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/resources/lovr.js
View file

@ -1,10 +1,12 @@
var LibraryLOVR = { var LibraryLOVR = {
$lovr: { $lovr: {
WebVR: { WebVR: {
C: {
ORIGIN_HEAD: 0, ORIGIN_HEAD: 0,
ORIGIN_FLOOR: 1, ORIGIN_FLOOR: 1,
EYE_LEFT: 0, EYE_LEFT: 0,
EYE_RIGHT: 1, EYE_RIGHT: 1,
}
initialized: false, initialized: false,
mirrored: true, mirrored: true,
@ -101,7 +103,7 @@ var LibraryLOVR = {
}, },
webvrGetOriginType: function() { webvrGetOriginType: function() {
return WebVR.display && WebVR.display.stageParameters ? ORIGIN_FLOOR : ORIGIN_HEAD; return WebVR.display && WebVR.display.stageParameters ? lovr.WebVR.C.ORIGIN_FLOOR : lovr.WebVR.C.ORIGIN_HEAD;
}, },
webvrIsMirrored: function() { webvrIsMirrored: function() {
@ -166,17 +168,18 @@ var LibraryLOVR = {
}, },
webvrGetEyePose: function(eye, x, y, z, angle, ax, ay, az) { webvrGetEyePose: function(eye, x, y, z, angle, ax, ay, az) {
var isLeft = eye === lovr.WebVR.C.EYE_LEFT;
var sittingToStanding = lovr.WebVR.display && lovr.WebVR.display.stageParameters && lovr.WebVR.display.stageParameters.sittingToStandingTransform; var sittingToStanding = lovr.WebVR.display && lovr.WebVR.display.stageParameters && lovr.WebVR.display.stageParameters.sittingToStandingTransform;
var eyeParameters = lovr.WebVR.display && lovr.WebVR.display.getEyeParameters(eye == EYE_LEFT ? 'left' : 'right'); var eyeParameters = lovr.WebVR.display && lovr.WebVR.display.getEyeParameters(isLeft ? 'left' : 'right');
if (sittingToStanding) { if (sittingToStanding) {
Module._mat4_set(lovr.WebVR.tempMatA, sittingToStanding); Module._mat4_set(lovr.WebVR.tempMatA, sittingToStanding);
Module._mat4_set(lovr.WebVR.tempMatB, eye == EYE_LEFT ? lovr.WebVR.frameData.leftViewMatrix : lovr.WebVR.frameData.rightViewMatrix); Module._mat4_set(lovr.WebVR.tempMatB, isLeft ? lovr.WebVR.frameData.leftViewMatrix : lovr.WebVR.frameData.rightViewMatrix);
Module._mat4_invert(lovr.WebVR.tempMatB); Module._mat4_invert(lovr.WebVR.tempMatB);
Module._mat4_multiply(lovr.WebVR.tempMatA, lovr.WebVR.tempMatB); Module._mat4_multiply(lovr.WebVR.tempMatA, lovr.WebVR.tempMatB);
Module._mat4_translate(lovr.WebVR.tempMatA, eyeParameters.offset[0], eyeParameters.offset[1], eyeParameters.offset[2]); Module._mat4_translate(lovr.WebVR.tempMatA, eyeParameters.offset[0], eyeParameters.offset[1], eyeParameters.offset[2]);
} else { } else {
Module._mat4_set(lovr.WebVR.tempMatA, eye == EYE_LEFT ? lovr.WebVR.frameData.leftViewMatrix : lovr.WebVR.frameData.rightViewMatrix); Module._mat4_set(lovr.WebVR.tempMatA, isLeft ? lovr.WebVR.frameData.leftViewMatrix : lovr.WebVR.frameData.rightViewMatrix);
Module._mat4_invert(lovr.WebVR.tempMatA); Module._mat4_invert(lovr.WebVR.tempMatA);
Module._mat4_multiply(lovr.WebVR.tempMatA, lovr.WebVR.tempMatB); Module._mat4_multiply(lovr.WebVR.tempMatA, lovr.WebVR.tempMatB);
Module._mat4_translate(lovr.WebVR.tempMatA, eyeParameters.offset[0], eyeParameters.offset[1], eyeParameters.offset[2]); Module._mat4_translate(lovr.WebVR.tempMatA, eyeParameters.offset[0], eyeParameters.offset[1], eyeParameters.offset[2]);