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

Revert "added functionality to use front mounted vive camera"

Browse Source 
This reverts commit ae7a134f1e8763bf25ecaf894ef3f2136288feda.
This commit is contained in:
Rickard Edén 2017-10-09 07:44:03 +02:00
parent ae7a134f1e
commit 2c044a29c5
1 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
jme3-vr/src/main/java/com/jme3/input/vr/OpenVR.java
View File

@ -18,7 +18,6 @@ import com.jme3.system.jopenvr.OpenVRUtil;
import com.jme3.system.jopenvr.TrackedDevicePose_t; import com.jme3.system.jopenvr.TrackedDevicePose_t;
import com.jme3.system.jopenvr.VR_IVRCompositor_FnTable; import com.jme3.system.jopenvr.VR_IVRCompositor_FnTable;
import com.jme3.system.jopenvr.VR_IVRSystem_FnTable; import com.jme3.system.jopenvr.VR_IVRSystem_FnTable;
import com.jme3.system.jopenvr.VR_IVRTrackedCamera_FnTable;
import com.jme3.util.VRUtil; import com.jme3.util.VRUtil;
import com.sun.jna.Memory; import com.sun.jna.Memory;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
@ -42,20 +41,19 @@ public class OpenVR implements VRAPI {
private static final Logger logger = Logger.getLogger(OpenVR.class.getName()); private static final Logger logger = Logger.getLogger(OpenVR.class.getName());
private static VR_IVRCompositor_FnTable compositorFunctions; private static VR_IVRCompositor_FnTable compositorFunctions;
private static VR_IVRTrackedCamera_FnTable cameraFunctions;
private static VR_IVRSystem_FnTable vrsystemFunctions; private static VR_IVRSystem_FnTable vrsystemFunctions;
private static boolean initSuccess = false; private static boolean initSuccess = false;
private static boolean flipEyes = false; private static boolean flipEyes = false;
private static IntBuffer hmdDisplayFrequency; private IntBuffer hmdDisplayFrequency;
private static TrackedDevicePose_t.ByReference hmdTrackedDevicePoseReference; private TrackedDevicePose_t.ByReference hmdTrackedDevicePoseReference;
protected static TrackedDevicePose_t[] hmdTrackedDevicePoses; protected TrackedDevicePose_t[] hmdTrackedDevicePoses;
protected static IntByReference hmdErrorStore; protected IntByReference hmdErrorStore;
private static final Quaternion rotStore = new Quaternion(); private final Quaternion rotStore = new Quaternion();
private static final Vector3f posStore = new Vector3f(); private final Vector3f posStore = new Vector3f();
private static FloatByReference tlastVsync; private static FloatByReference tlastVsync;
@ -67,20 +65,21 @@ public class OpenVR implements VRAPI {
// for debugging latency // for debugging latency
private int frames = 0; private int frames = 0;
protected static Matrix4f[] poseMatrices; protected Matrix4f[] poseMatrices;
private static final Matrix4f hmdPose = Matrix4f.IDENTITY.clone(); private final Matrix4f hmdPose = Matrix4f.IDENTITY.clone();
private static Matrix4f hmdProjectionLeftEye; private Matrix4f hmdProjectionLeftEye;
private static Matrix4f hmdProjectionRightEye; private Matrix4f hmdProjectionRightEye;
private static Matrix4f hmdPoseLeftEye; private Matrix4f hmdPoseLeftEye;
private static Matrix4f hmdPoseRightEye; private Matrix4f hmdPoseRightEye;
private static Vector3f hmdPoseLeftEyeVec, hmdPoseRightEyeVec, hmdSeatToStand; private Vector3f hmdPoseLeftEyeVec, hmdPoseRightEyeVec, hmdSeatToStand;
private float vsyncToPhotons;
private double timePerFrame, frameCountRun;
private long frameCount;
private OpenVRInput VRinput;
private static float vsyncToPhotons;
private static double timePerFrame, frameCountRun;
private static long frameCount;
private static OpenVRInput VRinput;
private VREnvironment environment = null; private VREnvironment environment = null;
@ -108,10 +107,6 @@ public class OpenVR implements VRAPI {
return compositorFunctions; return compositorFunctions;
} }
public VR_IVRTrackedCamera_FnTable getTrackedCamera(){
return cameraFunctions;
}
@Override @Override
public String getName() { public String getName() {
return "OpenVR"; return "OpenVR";
@ -241,21 +236,6 @@ public class OpenVR implements VRAPI {
return compositorFunctions != null; return compositorFunctions != null;
} }
public void initCamera(boolean allowed) {
hmdErrorStore.setValue(0); // clear the error store
if( allowed && vrsystemFunctions != null ) {
IntByReference intptr = JOpenVRLibrary.VR_GetGenericInterface(JOpenVRLibrary.IVRTrackedCamera_Version, hmdErrorStore);
if (intptr != null){
cameraFunctions = new VR_IVRTrackedCamera_FnTable(intptr.getPointer());
if(cameraFunctions != null && hmdErrorStore.getValue() == 0 ){
cameraFunctions.setAutoSynch(false);
cameraFunctions.read();
logger.config("OpenVR Camera initialized");
}
}
}
}
@Override @Override
public void destroy() { public void destroy() {
JOpenVRLibrary.VR_ShutdownInternal(); JOpenVRLibrary.VR_ShutdownInternal();