Skip to content

Commit

Permalink
updating to OpenVR 0.9.9
Browse files Browse the repository at this point in the history
  • Loading branch information
phr00t committed Sep 15, 2015
1 parent c4da593 commit fdfa285
Show file tree
Hide file tree
Showing 14 changed files with 336 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .gitignore
@@ -0,0 +1,3 @@
/nbproject/private/
/dist/
/build/
Binary file modified JMonkeyVR.jar
Binary file not shown.
Binary file modified src/darwin/libopenvr_api.dylib
Binary file not shown.
Binary file not shown.
6 changes: 4 additions & 2 deletions src/jmevr/util/OpenVRViewManager.java
Expand Up @@ -87,9 +87,11 @@ public void postRender() {
if( OpenVR.getVRCompositorInstance() != null ) {
// using the compositor...
JOpenVRLibrary.VR_IVRCompositor_Submit(OpenVR.getVRCompositorInstance(), JOpenVRLibrary.Hmd_Eye.Hmd_Eye_Eye_Left,
JOpenVRLibrary.GraphicsAPIConvention.GraphicsAPIConvention_API_OpenGL, getLeftTexId(), null);
JOpenVRLibrary.GraphicsAPIConvention.GraphicsAPIConvention_API_OpenGL, getLeftTexId(), null,
JOpenVRLibrary.VRSubmitFlags_t.VRSubmitFlags_t_Submit_Default);
JOpenVRLibrary.VR_IVRCompositor_Submit(OpenVR.getVRCompositorInstance(), JOpenVRLibrary.Hmd_Eye.Hmd_Eye_Eye_Right,
JOpenVRLibrary.GraphicsAPIConvention.GraphicsAPIConvention_API_OpenGL, getRightTexId(), null);
JOpenVRLibrary.GraphicsAPIConvention.GraphicsAPIConvention_API_OpenGL, getRightTexId(), null,
JOpenVRLibrary.VRSubmitFlags_t.VRSubmitFlags_t_Submit_Default);
// mirroring?
if( mirrorEnabled ) {
// mirror once every 3 frames, to prioritize performance for the VR headset
Expand Down
38 changes: 38 additions & 0 deletions src/jopenvr/HmdColor_t.java
@@ -0,0 +1,38 @@
package jopenvr;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
import java.util.Arrays;
import java.util.List;
/**
* This file was autogenerated by <a href="http://jnaerator.googlecode.com/">JNAerator</a>,<br>
* a tool written by <a href="http://ochafik.com/">Olivier Chafik</a> that <a href="http://code.google.com/p/jnaerator/wiki/CreditsAndLicense">uses a few opensource projects.</a>.<br>
* For help, please visit <a href="http://nativelibs4java.googlecode.com/">NativeLibs4Java</a> , <a href="http://rococoa.dev.java.net/">Rococoa</a>, or <a href="http://jna.dev.java.net/">JNA</a>.
*/
public class HmdColor_t extends Structure {
public float r;
public float g;
public float b;
public float a;
public HmdColor_t() {
super();
}
protected List<? > getFieldOrder() {
return Arrays.asList("r", "g", "b", "a");
}
public HmdColor_t(float r, float g, float b, float a) {
super();
this.r = r;
this.g = g;
this.b = b;
this.a = a;
}
public HmdColor_t(Pointer peer) {
super(peer);
}
public static class ByReference extends HmdColor_t implements Structure.ByReference {

};
public static class ByValue extends HmdColor_t implements Structure.ByValue {

};
}
42 changes: 42 additions & 0 deletions src/jopenvr/HmdVector4_t.java
@@ -0,0 +1,42 @@
package jopenvr;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
import java.util.Arrays;
import java.util.List;
/**
* This file was autogenerated by <a href="http://jnaerator.googlecode.com/">JNAerator</a>,<br>
* a tool written by <a href="http://ochafik.com/">Olivier Chafik</a> that <a href="http://code.google.com/p/jnaerator/wiki/CreditsAndLicense">uses a few opensource projects.</a>.<br>
* For help, please visit <a href="http://nativelibs4java.googlecode.com/">NativeLibs4Java</a> , <a href="http://rococoa.dev.java.net/">Rococoa</a>, or <a href="http://jna.dev.java.net/">JNA</a>.
*/
public class HmdVector4_t extends Structure {
/**
* float[4]<br>
* C type : float[4]
*/
public float[] v = new float[4];
public HmdVector4_t() {
super();
}
protected List<? > getFieldOrder() {
return Arrays.asList("v");
}
/**
* @param v float[4]<br>
* C type : float[4]
*/
public HmdVector4_t(float v[]) {
super();
if ((v.length != this.v.length))
throw new IllegalArgumentException("Wrong array size !");
this.v = v;
}
public HmdVector4_t(Pointer peer) {
super(peer);
}
public static class ByReference extends HmdVector4_t implements Structure.ByReference {

};
public static class ByValue extends HmdVector4_t implements Structure.ByValue {

};
}
273 changes: 249 additions & 24 deletions src/jopenvr/JOpenVRLibrary.java

Large diffs are not rendered by default.

Binary file modified src/linux-x86-64/libopenvr_api.so
Binary file not shown.
Binary file modified src/linux-x86/libopenvr_api.so
Binary file not shown.
Binary file modified src/win32-x86-64/openvr_api.dll
Binary file not shown.
Binary file modified src/win32-x86-64/openvr_api.pdb
Binary file not shown.
Binary file modified src/win32-x86/openvr_api.dll
Binary file not shown.
Binary file modified src/win32-x86/openvr_api.pdb
Binary file not shown.

0 comments on commit fdfa285

Please sign in to comment.