diff options
| author | Sven Gothel <[email protected]> | 2015-03-21 04:31:27 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-21 04:31:27 +0100 |
| commit | 32fc8f3a64cfeee8936af98ae49f8e7c8dfe982f (patch) | |
| tree | 9f4a250b235bcf6c41bd5c98f19c7e2666e45e57 /make | |
| parent | 2c88b6dfd4eb7e2cd9a50fa48e08ecafc980931a (diff) | |
Bug 1116 - Add OculusVR DK2 Support - Part-1 (DK2 on DK1 SDK w/o Eye Tracker)
- DK2's screen on X11 (at least) starts in rotated mode,
detect and apply MonitorDevice rotation via NEWT's OpenGL StereoDeviceUtil
- Move StereoDevice.Config -> StereoDeviceConfig
- Expose generic StereoDevice to public: GenericStereoDeviceConfig + GenericStereoDeviceFactory
- GenericStereoDeviceFactory exposes public GenericStereoDeviceConfig creation
for mono, sbs-stereo and lense-sbs-stereo w/ diff. parameters.
- Pass eye surface/texture size for each eye from device to renderer,
instead of assuming unified values.
- Unify GenericStereoDevice.createRenderer(..) and OVRStereoDevice.createRenderer(..) code
Diffstat (limited to 'make')
| -rw-r--r-- | make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java b/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java index 281610a20..691a93a16 100644 --- a/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java +++ b/make/config/oculusvr/oculusvr-ovr-CustomJavaCode.java @@ -10,11 +10,11 @@ } /** No native tool library to load if(!bundle.isToolLibLoaded()) { - System.err.println("Couln't load native OVR/JNI glue library"); + System.err.println("Couldn't load native OVR/JNI glue library"); return null; } */ if(!bundle.isLibComplete()) { - System.err.println("Couln't load native OVR/JNI glue library"); + System.err.println("Couldn't load native OVR/JNI glue library"); return null; } if( !initializeImpl() ) { diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index caa5bfea6..620796960 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -313,7 +313,7 @@ function jrun() { #D_ARGS="-Djogl.debug.StereoDevice" #D_ARGS="-Dnewt.debug.Screen -Djogl.debug.StereoDevice" #D_ARGS="-Dnewt.debug.Screen -Dnewt.test.Screen.disableRandR13" - D_ARGS="-Dnewt.debug.Screen" + #D_ARGS="-Dnewt.debug.Screen" if [ $awton -eq 1 ] ; then export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH @@ -411,7 +411,7 @@ function testawtswt() { # # Stereo # -#testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* +testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* # # HiDPI @@ -623,7 +623,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01bNEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01cNEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01dNEWT $* -testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02aNEWT $* +#testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02aNEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02bNEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.mm.ManualScreenMode03aNEWT $* #testnoawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $* |