Browse Source

Update headset drivers;

bjorn 4 years ago
parent
commit
4a345e627d

+ 1 - 1
api/lovr/callbacks/conf.lua

@@ -191,7 +191,7 @@ return {
           t.hotkeys = true
 
           -- Headset settings
-          t.headset.drivers = { 'leap', 'openxr', 'oculus', 'oculusmobile', 'openvr', 'webvr', 'desktop' }
+          t.headset.drivers = { 'openxr', 'oculus', 'vrapi', 'openvr', 'webxr', 'desktop' }
           t.headset.msaa = 4
           t.headset.offset = 1.7
 

+ 10 - 10
api/lovr/headset/HeadsetDriver.lua

@@ -16,18 +16,10 @@ return {
       name = 'desktop',
       description = 'A VR simulator using keyboard/mouse.'
     },
-    {
-      name = 'leap',
-      description = 'Leap Motion hand tracking driver.'
-    },
     {
       name = 'oculus',
       description = 'Oculus Desktop SDK.'
     },
-    {
-      name = 'oculusmobile',
-      description = 'Oculus Mobile SDK.'
-    },
     {
       name = 'openvr',
       description = 'OpenVR.'
@@ -37,8 +29,16 @@ return {
       description = 'OpenXR.'
     },
     {
-      name = 'webvr',
-      description = 'WebVR.'
+      name = 'vrapi',
+      description = 'Oculus Mobile SDK.'
+    },
+    {
+      name = 'pico',
+      description = 'Pico.'
+    },
+    {
+      name = 'webxr',
+      description = 'WebXR.'
     }
   }
 }

+ 3 - 1
api/lovr/headset/getClipDistance.lua

@@ -19,6 +19,8 @@ return {
     }
   },
   notes = [[
-    This is not currently supported by the `oculusmobile` headset driver.
+    The default near and far clipping planes are 0.1 meters and 100.0 meters.
+
+    This is not currently supported by the `vrapi` headset driver.
   ]]
 }

+ 1 - 1
api/lovr/headset/getMirrorTexture.lua

@@ -6,7 +6,7 @@ return {
 
     Sometimes this can be `nil` if the current headset driver doesn't have a mirror texture, which
     can happen if the driver renders directly to the display.  Currently the `desktop`, `webvr`, and
-    `oculusmobile` drivers do not have a mirror texture.
+    `vrapi` drivers do not have a mirror texture.
 
     It also isn't guaranteed that the same Texture will be returned by subsequent calls to this
     function.  Currently, the `oculus` driver exhibits this behavior.

+ 1 - 1
examples/Hud/main.lua

@@ -7,7 +7,7 @@ local shader = require 'shader'
 
 -- In order for lovr.mouse to work, and therefore for this example to work,
 -- we must be using LuaJIT and we must be using GLFW (ie: we can't be on Oculus Mobile)
-if type(jit) == 'table' and lovr.headset.getDriver() ~= "oculusmobile" then
+if type(jit) == 'table' and lovr.headset.getDriver() ~= "vrapi" then
 	lovr.mouse = require 'mouse'
 end