aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-07-18 03:50:02 +0200
committerSven Gothel <[email protected]>2015-07-18 03:50:02 +0200
commit53966f92042d44483cb44f6c6b3c95a6a1fdd325 (patch)
tree12e5d23ad9bf6607f97cea59110b003baf356c4f /make
parent07823202e897751e742a9a96d7d683033c5e07d5 (diff)
Bug 1151 - Working OculusVR SDK 0.5.0.1 on GNU/Linux w/ Positional Tracker (DK2)
Note: The ovrd server must run, otherwise no device is being detected. General Stereo API Changes: - EyePose -> ViewerPose - We only use the viewer pose and derive the pupile position via EyeParameter. - Hence we reduce complexity. - A single ViewerPose will be maintained by StereoDeviceRenderer - position is in meter, allowing StereoGLEventListener to scale device independent. - StereoDevice receives knowledge of certain sensors, to be queried and used for start-sensors. OVR: - Simply apply the above general changes - Build: Remove [more] unused API entries for SDK rendering
Diffstat (limited to 'make')
-rw-r--r--make/build-oculusvr.xml4
-rw-r--r--make/config/oculusvr/oculusvr-common.cfg7
-rw-r--r--make/scripts/tests.sh6
3 files changed, 11 insertions, 6 deletions
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index 1090ce565..b89b66fb7 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -170,8 +170,8 @@
config="${config.oculusvr}/oculusvr.cfg"
literalInclude="${stub.includes.gluegen.gg},${stub.includes.all.ovr}"
emitter="com.jogamp.gluegen.JavaEmitter"
- debug="true"
- dumpCPP="true">
+ debug="false"
+ dumpCPP="false">
<classpath refid="gluegen.classpath" />
</gluegen>
<!--
diff --git a/make/config/oculusvr/oculusvr-common.cfg b/make/config/oculusvr/oculusvr-common.cfg
index d42ddae86..cf8419d70 100644
--- a/make/config/oculusvr/oculusvr-common.cfg
+++ b/make/config/oculusvr/oculusvr-common.cfg
@@ -30,10 +30,15 @@ Ignore ovrInitParams.LogCallback
# #define HEADLESS_APP 1
# implying: ovrHmdCap_ExtendDesktop
#
+# SDK rendering disabled
Ignore ovr_InitializeRenderingShim
Ignore ovr_InitializeRenderingShimVersion
-Ignore ovrHmd_RegisterPostDistortionCallback
+Ignore ovrHmd_ConfigureRendering
Ignore ovrHmd_AttachToWindow
+Ignore ovrHmd_BeginFrame
+Ignore ovrHmd_EndFrame
+# misc
+Ignore ovrHmd_RegisterPostDistortionCallback
# HSW = Health and Safety Warning
Ignore ovrHSWDisplayState
Ignore ovrHmd_GetHSWDisplayState
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 083a6d78b..d35cf0cf1 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -310,7 +310,7 @@ function jrun() {
#D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer"
#D_ARGS="-Djogl.debug.GLMediaPlayer.Native"
#D_ARGS="-Djogl.debug.StereoDevice -Djogl.debug.StereoDevice.DumpData"
- #D_ARGS="-Djogl.debug.StereoDevice"
+ 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"
@@ -414,7 +414,7 @@ function testawtswt() {
#
# Stereo
#
-#testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
+testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
#
# HiDPI
@@ -547,7 +547,7 @@ function testawtswt() {
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOMix2DemosES2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOMRTNEWT01 $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLPointsNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLPointsNEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLMesaBug651NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLMesaBug658NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestX11DefaultDisplay $*