diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-oculusvr.xml | 8 | ||||
| -rw-r--r-- | make/config/nativewindow/jawt-common.cfg | 5 | ||||
| -rw-r--r-- | make/config/oculusvr/oculusvr-common.cfg | 22 | ||||
| -rw-r--r-- | make/config/oculusvr/oculusvr.c | 4 |
4 files changed, 29 insertions, 10 deletions
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index 7258c8ea0..e0e5c4c12 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -16,9 +16,9 @@ --> <target name="partitioning.setup" depends="common.init"> <property name="java.part.oculusvr" - value="com/jogamp/oculusvr/** jogamp/oculusvr/**"/> + value="com/jogamp/oculusvr/* jogamp/oculusvr/*"/> <property name="java.part.oculusvr.exclude" - value="" /> + value="com/jogamp/oculusvr/renderer/*" /> </target> <!-- ================================================================== --> @@ -163,6 +163,7 @@ <target name="java.compile" depends="java.generate"> <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. --> <javac destdir="${classes}" + excludes="${java.part.oculusvr.exclude}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" @@ -171,7 +172,8 @@ target="${target.targetlevel}" bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> - <classpath refid="nativewindow_gluegen.classpath"/> + <!-- classpath refid="nativewindow_gluegen.classpath"/ --> + <classpath refid="jogl_nativewindow_gluegen.classpath"/> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> diff --git a/make/config/nativewindow/jawt-common.cfg b/make/config/nativewindow/jawt-common.cfg index 55f3f368b..41129e630 100644 --- a/make/config/nativewindow/jawt-common.cfg +++ b/make/config/nativewindow/jawt-common.cfg @@ -10,10 +10,11 @@ HierarchicalNativeOutput false Opaque boolean jboolean Opaque long struct jawt_DrawingSurface* -ReturnValueCapacity GetDrawingSurface sizeof(JAWT_DrawingSurface) -ReturnValueCapacity GetDrawingSurfaceInfo sizeof(JAWT_DrawingSurfaceInfo) +ReturnValueCapacity JAWT.GetDrawingSurface sizeof(JAWT_DrawingSurface) +ReturnValueCapacity JAWT_DrawingSurface.GetDrawingSurfaceInfo sizeof(JAWT_DrawingSurfaceInfo) IgnoreField JAWT GetComponent +IgnoreField JAWT_DrawingSurface target IgnoreField JAWT_DrawingSurfaceInfo platformInfo IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java diff --git a/make/config/oculusvr/oculusvr-common.cfg b/make/config/oculusvr/oculusvr-common.cfg index 4baa35f0b..c1e4d9cfd 100644 --- a/make/config/oculusvr/oculusvr-common.cfg +++ b/make/config/oculusvr/oculusvr-common.cfg @@ -8,11 +8,11 @@ NativeOutputDir gensrc/native/oculusvr # Raise OVRException instead of RuntimeException in glue code RuntimeExceptionType OVRException -# We also have to hack its return type for now because we can't make -# just that void* opaque -Opaque long ovrHmd - -#ReturnValueCapacity alcOpenDevice 0 +# We utilize OvrHmdContext as specified below as a 'typesafe' opaque instance, +# which is typedefed to ovrHmd - hence no type-unsafe opaque 'long' is required. +# typedef struct ovrHmdStruct { +# } OvrHmdContext; +#Opaque long ovrHmd # Mappings for data types Opaque boolean ovrBool @@ -25,6 +25,18 @@ ReturnsString ovrHmd_GetLastError ReturnsString ovrHmd_GetLatencyTestResult ReturnsString ovrHmd_GetString +ReturnsString ovrHmdDesc.ProductName +ReturnsString ovrHmdDesc.Manufacturer +ReturnsString ovrHmdDesc.DisplayDeviceName +ReturnsString ovrSensorDesc.SerialNumber + +ReturnedArrayLength ovrHmdDesc.Handle 1 +ReturnedArrayLength ovrDistortionMesh.pVertexData getVertexCount() +ReturnedArrayLength ovrDistortionMesh.pIndexData getIndexCount() + +ReturnValueCapacity ovrHmd_Create sizeof(ovrHmd) +ReturnValueCapacity ovrHmd_CreateDebug sizeof(ovrHmd) + ArgumentIsString ovrHmd_GetFloat 1 ArgumentIsString ovrHmd_SetFloat 1 ArgumentIsString ovrHmd_GetFloatArray 1 diff --git a/make/config/oculusvr/oculusvr.c b/make/config/oculusvr/oculusvr.c index 6d850a380..7486ce35d 100644 --- a/make/config/oculusvr/oculusvr.c +++ b/make/config/oculusvr/oculusvr.c @@ -1 +1,5 @@ + +typedef struct ovrHmdStruct { +} OvrHmdContext; + #include "OVR_CAPI.h" |