diff --git a/.idea/libraries/Gradle__com_google_guava_guava_18_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_18_0.xml deleted file mode 100644 index 71d7b90..0000000 --- a/.idea/libraries/Gradle__com_google_guava_guava_18_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_sksamuel_koors_koors_0_90_0.xml b/.idea/libraries/Gradle__com_sksamuel_koors_koors_0_90_0.xml deleted file mode 100644 index d8eb3fd..0000000 --- a/.idea/libraries/Gradle__com_sksamuel_koors_koors_0_90_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index a51701c..eafa809 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ group = 'com.github.kotlin-graphics' buildscript { - ext.kotlinVersion = '1.2-M2' + ext.kotlinVersion = '1.2.0-rc-39' repositories { jcenter() // shadow @@ -28,11 +28,11 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - testCompile 'com.github.elect86:kotlintest:43281b7e1b98a12e832397f464a938e97021adde' + testCompile 'io.kotlintest:kotlintest:2.0.7' - compile "com.github.kotlin-graphics:glm:a7098f133c1804969135e93be469a80b35ff0a45" + compile "com.github.kotlin-graphics:glm:dc299f80f3dca9d3e8b793641da03db1702df58c" - compile "net.java.dev.jna:jna:4.4.0" + compile "net.java.dev.jna:jna:4.5.0" } repositories { diff --git a/src/main/kotlin/openvr/EventListener.kt b/src/main/kotlin/openvr/EventListener.kt index 4162a6f..2fe0344 100644 --- a/src/main/kotlin/openvr/EventListener.kt +++ b/src/main/kotlin/openvr/EventListener.kt @@ -47,6 +47,7 @@ open class EventListener(val hmd: IVRSystem) { } private fun process() { + if(event.eventType_internal == 10005) return // bug https://github.com/ValveSoftware/openvr/issues/420 when (event.eventType) { EVREventType.TrackedDeviceActivated -> updateRoles().also { trackedDeviceActivated(event.trackedDeviceIndex == left) } EVREventType.TrackedDeviceDeactivated -> updateRoles().also { trackedDeviceDeactivated(event.trackedDeviceIndex == left) } diff --git a/src/main/kotlin/openvr/lib/openvr.kt b/src/main/kotlin/openvr/lib/openvr.kt index 0fe4444..b9eefb0 100644 --- a/src/main/kotlin/openvr/lib/openvr.kt +++ b/src/main/kotlin/openvr/lib/openvr.kt @@ -42,6 +42,7 @@ open class VkPhysicalDevice_T : Structure { class ByReference : VkPhysicalDevice_T(), Structure.ByReference class ByValue : VkPhysicalDevice_T(), Structure.ByValue } + open class VkInstance_T : Structure { constructor()