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

Un-break VR mouse support for OpenVR

Browse Source
This commit is contained in:
Campbell Suter 2017-10-07 22:36:32 +13:00
parent 63dd46b8a3
commit 42fd964a22
No known key found for this signature in database
GPG Key ID: 754A66CCF3F73C0F
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-vr/src/main/java/com/jme3/app/VRAppState.java
View File

@ -35,6 +35,7 @@ import com.jme3.app.Application;
import com.jme3.app.state.AbstractAppState; import com.jme3.app.state.AbstractAppState;
import com.jme3.app.state.AppStateManager; import com.jme3.app.state.AppStateManager;
import com.jme3.input.vr.OculusVR; import com.jme3.input.vr.OculusVR;
import com.jme3.input.vr.OpenVR;
import com.jme3.input.vr.VRAPI; import com.jme3.input.vr.VRAPI;
import com.jme3.input.vr.VRInputAPI; import com.jme3.input.vr.VRInputAPI;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
@ -420,7 +421,10 @@ public class VRAppState extends AbstractAppState {
} }
// use the analog control on the first tracked controller to push around the mouse // use the analog control on the first tracked controller to push around the mouse
// environment.getVRMouseManager().updateAnalogAsMouse(0, null, null, null, tpf); // FIXME crashes on Rift/Touch (and probably OSVR), as it assumes the presence of the Vive touchpads
if(getVRHardware() instanceof OpenVR) {
environment.getVRMouseManager().updateAnalogAsMouse(0, null, null, null, tpf);
}
} }
@Override @Override

1
jme3-vr/src/main/java/com/jme3/util/VRMouseManager.java
View File

@ -182,6 +182,7 @@ public class VRMouseManager {
} }
Vector2f tpDelta; Vector2f tpDelta;
// TODO option to use Touch joysticks
if( thumbstickMode ) { if( thumbstickMode ) {
tpDelta = environment.getVRinput().getAxis(inputIndex, VRInputType.ViveTrackpadAxis); tpDelta = environment.getVRinput().getAxis(inputIndex, VRInputType.ViveTrackpadAxis);
} else { } else {