aboutsummaryrefslogtreecommitdiffstats
path: root/make/build-oculusvr.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-07-01 21:02:21 +0200
committerSven Gothel <[email protected]>2014-07-01 21:02:21 +0200
commit36327e24cf586b50bf18e87d7d13d53eb41cf1d9 (patch)
treeb34c88274eebce4839ee18b5958a2019de565b87 /make/build-oculusvr.xml
parenta0498e240b9dfde345a704ec6de1d6abcee7b318 (diff)
Bug 1021: Add OculusVR distortion renderer (single FBO and dual FBO); Add GLEventListener2 (WIP); Refine FloatUtil
- GLEventListener2 extends GLEventListener adds refined control: - display w/ flags, i.e. repeat, don't clear - setProjectionModelview(..) - FloatUtil.* Add return value for chaining, where missing +++ - jogamp.opengl.oculusvr.OVRDistortion - Handles all OVR related data and maps it to shader + GL buffers - display method - com.jogamp.opengl.oculusvr.OVRSBSRendererSingleFBO implements GLEventListener - Simple OVRDistortion renderer using single FBO - Using upstream GLEventListener2 (the content) - com.jogamp.opengl.oculusvr.OVRSBSRendererDualFBO implements GLEventListener - Simple OVRDistortion renderer using two FBOs - Using upstream GLEventListener2 (the content) Manual Test: com.jogamp.opengl.test.junit.jogl.stereo.ovr.OVRDemo01
Diffstat (limited to 'make/build-oculusvr.xml')
-rw-r--r--make/build-oculusvr.xml38
1 files changed, 32 insertions, 6 deletions
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index c9370c547..15ed6bde4 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -16,9 +16,15 @@
-->
<target name="partitioning.setup" depends="common.init">
<property name="java.part.oculusvr"
- value="com/jogamp/oculusvr/* jogamp/oculusvr/*"/>
+ value="com/jogamp/oculusvr/**"/>
+ <property name="java.part.opengl.oculusvr"
+ value="com/jogamp/opengl/oculusvr/** jogamp/opengl/oculusvr/**"/>
<property name="java.part.oculusvr.exclude"
- value="com/jogamp/oculusvr/renderer/*" />
+ value="" />
+ <property name="java.part.oculusvr.shadercode"
+ value="jogamp/opengl/oculusvr/shader/**"/>
+ <property name="java.part.nonjava"
+ value="${java.part.oculusvr.shadercode}"/>
</target>
<!-- ================================================================== -->
@@ -127,7 +133,7 @@
<!-- Now check for the presence of one well-known file -->
<uptodate property="java.generate.skip.ovr"
- targetfile="${src.generated.java}/com/jogamp/oculusvr/OVR.java">
+ targetfile="${src.generated.java}/com/jogamp/opengl/oculusvr/OVR.java">
<srcfiles refid="stub.includes.dependencies.fileset.1" />
<srcfiles refid="stub.includes.dependencies.fileset.2" />
<srcfiles refid="stub.includes.dependencies.fileset.3" />
@@ -161,7 +167,22 @@
<!-- ================================================================== -->
<target name="java.compile" depends="java.generate">
- <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
+ <!-- Pure non JOGL OculusVR part -->
+ <javac destdir="${classes}"
+ excludes="${java.part.oculusvr.exclude} ${java.part.opengl.oculusvr}"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="nativewindow_gluegen.classpath"/>
+ <src path="${src.java}" />
+ <src path="${src.generated.java}" />
+ </javac>
+ <!-- Add JOGL OculusVR part -->
<javac destdir="${classes}"
excludes="${java.part.oculusvr.exclude}"
fork="yes"
@@ -172,11 +193,16 @@
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <!-- classpath refid="nativewindow_gluegen.classpath"/ -->
<classpath refid="jogl_nativewindow_gluegen.classpath"/>
<src path="${src.java}" />
<src path="${src.generated.java}" />
</javac>
+ <!-- make shadercode and fonts available in classpath -->
+ <copy todir="${classes}">
+ <fileset dir="${src.java}"
+ includes="${java.part.nonjava}"
+ excludes="**/*.java"/>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -616,7 +642,7 @@
<target name="build-jars-javase" depends="setup-manifestfile">
<jar manifest="${build.oculusvr}/manifest.mf" destfile="${build.oculusvr}/oculusvr.jar" filesonly="true">
<fileset dir="${classes}"
- includes="${java.part.oculusvr}"
+ includes="${java.part.oculusvr} ${java.part.opengl.oculusvr}"
excludes="${java.part.oculusvr.exclude}"/>
</jar>
<jar manifest="${build.oculusvr}/manifest.mf" destfile="${build.oculusvr}/oculusvr-natives-${os.and.arch}.jar" filesonly="true">