better bridj sugar, filling in some preliminary functionality, fixing…

… hmdError function to be more clean
phr00t · May 7, 2015 · ba08774 · ba08774
1 parent 2db6467
commit ba08774
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -126,7 +126,6 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
-                <available file="${src.resources.dir}"/>
                 <available file="${src.test.dir}"/>
                 <available file="${src.dir}"/>
             </or>
@@ -224,7 +223,6 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.resources.dir">Must set src.resources.dir</fail>
         <fail unless="src.test.dir">Must set src.test.dir</fail>
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -247,7 +245,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.resources.dir}:${src.test.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.test.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -288,7 +286,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.resources.dir}:${src.test.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.test.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -321,7 +319,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.resources.dir}:${src.test.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.test.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -909,12 +907,11 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.resources.dir}:${src.test.dir}:${src.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.test.dir}:${src.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
-            <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -937,7 +934,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.resources.dir}:${src.test.dir}:${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.test.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1203,9 +1200,6 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.resources.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${src.test.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1219,9 +1213,6 @@ is divided into following sections:
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
             <fileset dir="${src.test.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=79a29eb7
 build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=8de14d53
-nbproject/build-impl.xml.script.CRC32=125537a9
+nbproject/build-impl.xml.data.CRC32=5fa6bc9e
+nbproject/build-impl.xml.script.CRC32=3c0e51df
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -113,5 +113,4 @@ run.test.classpath=\
     ${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=src
-src.resources.dir=resources
 src.test.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -10,7 +10,6 @@
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>JMonkeyVR</name>
             <source-roots>
-                <root id="src.resources.dir" name="Resources"/>
                 <root id="src.test.dir"/>
                 <root id="src.dir"/>
             </source-roots>

diff --git a/src/jmevr/input/OpenVR.java b/src/jmevr/input/OpenVR.java
@@ -10,8 +10,6 @@
 import openvr_api.IVRSystem;
 import openvr_api.Openvr_apiLibrary;
 import org.bridj.Pointer;
-import org.bridj.Pointer.StringType;
-import org.bridj.PointerIO;
 
 /**
  *
@@ -23,23 +21,27 @@ public class OpenVR implements VRHMD {
     private static IVRSystem vrsystem;
     private static boolean forceInitialize = false;
 
+    private static Pointer hmdDeviceIndex;
+    private static Pointer hmdErrorStore;
+
     @Override
     public String getName() {
         return "OpenVR";
     }
 
     @Override
     public boolean initialize() {
-        Pointer l = Pointer.allocateLong();
-        Pointer<IVRSystem> pvr = openvr.vRInit(l);
-        if( pvr != null ) vrsystem = pvr.get();        
-        long res = l.getLong();
-        if( res != 0 ) {
-            Pointer str = Pointer.pointerToAddress(openvr.vRGetStringForHmdError(res), (PointerIO)null);
-            System.out.println("OpenVR Initialize Result: " + str.getString(StringType.C));
+        hmdErrorStore = Pointer.allocateLong();
+        Pointer pvr = openvr.vRInit(hmdErrorStore);
+        if( pvr != null ) vrsystem = (IVRSystem)pvr.get();
+        if( hmdErrorStore.getLong() != 0 ) {
+            String errstr = openvr.vRGetStringForHmdError(hmdErrorStore);
+            System.out.println("OpenVR Initialize Result: " + errstr);
             return false;
         } else {
             System.out.println("OpenVR initialized & VR connected.");
+            hmdDeviceIndex = Pointer.allocateLong();
+            hmdDeviceIndex.setLong(Openvr_apiLibrary.k_unTrackedDeviceIndex_Hmd);
             return true;
         }
     }
@@ -87,7 +89,8 @@ public int getHResolution() {
 
     @Override
     public float getFOV() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        if( vrsystem == null ) return 130f;
+        return vrsystem.getFloatTrackedDeviceProperty(hmdDeviceIndex, Openvr_apiLibrary.TrackedDeviceProperty.Prop_FieldOfViewBottomDegrees_Float, hmdErrorStore);
     }
 
     @Override
@@ -97,7 +100,8 @@ public int getVResolution() {
 
     @Override
     public float getInterpupillaryDistance() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        if( vrsystem == null ) return 0.064f;
+        return vrsystem.getFloatTrackedDeviceProperty(hmdDeviceIndex, Openvr_apiLibrary.TrackedDeviceProperty.Prop_UserIpdMeters_Float, hmdErrorStore);
     }
 
     @Override

diff --git a/src/openvr_api/Openvr_apiLibrary.java b/src/openvr_api/Openvr_apiLibrary.java
@@ -2,6 +2,7 @@
 import org.bridj.BridJ;
 import org.bridj.IntValuedEnum;
 import org.bridj.Pointer;
+import org.bridj.Pointer.StringType;
 import org.bridj.PointerIO;
 import org.bridj.ann.Library;
 import org.bridj.ann.Name;
@@ -56,8 +57,8 @@ public Pointer<IVRSystem > vRInit(Pointer<IOpenvr_api.HmdError > peError) {
 	 * <i>native declaration : /usr/include/stdint.h:1357</i>
 	 */
 	@Name("VR_GetStringForHmdError") 
-	public Pointer<Byte > vRGetStringForHmdError(Pointer<IOpenvr_api.HmdError> error) {
-		return (Pointer)Pointer.pointerToAddress(vRGetStringForHmdError(Pointer.getPeer(error)), Byte.class, null);
+	public String vRGetStringForHmdError(Pointer error) {
+		return ((Pointer)Pointer.pointerToAddress(vRGetStringForHmdError(error.getLong()), Byte.class, null)).getString(StringType.C);
 	}
 	@Name("VR_GetStringForHmdError") 
 	@Ptr