Commit e94e9427 authored by Philip Trettner's avatar Philip Trettner

Introduced ACGL_RIFT_SDK_VERSION define to disable SimpleRiftController for new rift sdk

parent c283639f
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <ACGL/ACGL.hh> #include <ACGL/ACGL.hh>
#ifdef ACGL_USE_OCULUS_RIFT #ifdef ACGL_USE_OCULUS_RIFT
#if ACGL_RIFT_SDK_VERSION < 32
#include <ACGL/Math/Math.hh> #include <ACGL/Math/Math.hh>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
...@@ -220,4 +221,5 @@ ACGL_SMARTPOINTER_TYPEDEFS(SimpleRiftController) ...@@ -220,4 +221,5 @@ ACGL_SMARTPOINTER_TYPEDEFS(SimpleRiftController)
} }
} }
#endif // ACGL_USE_OCULUS_RIFT #endif // RIFT_VERSION
#endif // ACGL_USE_OCULUS_RIFT
\ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <ACGL/OpenGL/Creator/ShaderProgramCreator.hh> #include <ACGL/OpenGL/Creator/ShaderProgramCreator.hh>
#ifdef ACGL_USE_OCULUS_RIFT #ifdef ACGL_USE_OCULUS_RIFT
#if ACGL_RIFT_SDK_VERSION < 32
using namespace OVR; using namespace OVR;
using namespace ACGL; using namespace ACGL;
...@@ -736,3 +737,4 @@ void SimpleRiftController::renderDistortedP( ACGL::OpenGL::ConstSharedShaderProg ...@@ -736,3 +737,4 @@ void SimpleRiftController::renderDistortedP( ACGL::OpenGL::ConstSharedShaderProg
} }
#endif #endif
#endif
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment