sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request from neph1/osvr_viewmanager

Browse Source 
reverting orientation changes.
This commit is contained in:
Rickard Edén 2017-10-15 11:59:00 +02:00 committed by GitHub
commit 29726ccb88
1 changed files with 4 additions and 4 deletions

8
jme3-vr/src/main/java/com/jme3/input/vr/OSVR.java

@ -331,9 +331,9 @@ public class OSVR implements VRAPI {
@Override
public Quaternion getOrientation() {
storeRot.set((float)hmdPose.rotation.data[1],
storeRot.set((float)-hmdPose.rotation.data[1],
(float)hmdPose.rotation.data[2],
(float)hmdPose.rotation.data[3],
(float)-hmdPose.rotation.data[3],
(float)hmdPose.rotation.data[0]);
if( storeRot.equals(Quaternion.ZERO) ) storeRot.set(Quaternion.DIRECTION_Z);
return storeRot;
@ -352,9 +352,9 @@ public class OSVR implements VRAPI {
storePos.x = (float)-hmdPose.translation.data[0];
storePos.y = (float)hmdPose.translation.data[1];
storePos.z = (float)-hmdPose.translation.data[2];
storeRot.set((float)hmdPose.rotation.data[1],
storeRot.set((float)-hmdPose.rotation.data[1],
(float)hmdPose.rotation.data[2],
(float)hmdPose.rotation.data[3],
(float)-hmdPose.rotation.data[3],
(float)hmdPose.rotation.data[0]);
if( storeRot.equals(Quaternion.ZERO) ) storeRot.set(Quaternion.DIRECTION_Z);
}