Răsfoiți Sursa

Add OpenXR and Leap Motion drivers;

bjorn 6 ani în urmă
părinte
comite
274c458f11
3 a modificat fișierele cu 20 adăugiri și 4 ștergeri
  1. 10 2
      api/init.lua
  2. 1 1
      api/lovr/callbacks/conf.lua
  3. 9 1
      api/lovr/headset/HeadsetDriver.lua

+ 10 - 2
api/init.lua

@@ -153,7 +153,7 @@ return {
       examples = {
         {
           description = "A noop conf.lua that sets all configuration settings to their defaults:",
-          code = "function lovr.conf(t)\n\n  -- Set the project identity\n  t.identity = 'default'\n\n  -- Headset settings\n  t.headset.drivers = { 'openvr', 'webvr', 'fake' }\n  t.headset.msaa = 4\n  t.headset.offset = 1.7\n\n  -- Enable or disable different modules\n  t.modules.audio = true\n  t.modules.data = true\n  t.modules.event = true\n  t.modules.graphics = true\n  t.modules.headset = true\n  t.modules.math = true\n  t.modules.physics = true\n  t.modules.thread = true\n  t.modules.timer = true\n\n  -- Configure gamma correction\n  t.gammacorrect = false\n\n  -- Configure the desktop window\n  t.window.width = 1080\n  t.window.height = 600\n  t.window.fullscreen = false\n  t.window.msaa = 0\n  t.window.title = 'LÖVR'\n  t.window.icon = nil\nend"
+          code = "function lovr.conf(t)\n\n  -- Set the project identity\n  t.identity = 'default'\n\n  -- Headset settings\n  t.headset.drivers = { 'leap', 'openxr', 'oculus', 'oculusmobile', 'openvr', 'webvr', 'desktop' }\n  t.headset.msaa = 4\n  t.headset.offset = 1.7\n\n  -- Enable or disable different modules\n  t.modules.audio = true\n  t.modules.data = true\n  t.modules.event = true\n  t.modules.graphics = true\n  t.modules.headset = true\n  t.modules.math = true\n  t.modules.physics = true\n  t.modules.thread = true\n  t.modules.timer = true\n\n  -- Configure gamma correction\n  t.gammacorrect = false\n\n  -- Configure the desktop window\n  t.window.width = 1080\n  t.window.height = 600\n  t.window.fullscreen = false\n  t.window.msaa = 0\n  t.window.title = 'LÖVR'\n  t.window.icon = nil\nend"
         }
       },
       notes = "Disabling the `headset` module can improve startup time a lot if you aren't intending to use `lovr.headset`.\n\nYou can set `t.window` to nil to avoid creating the window. You can do it yourself later by using `lovr.graphics.createWindow`.\n\nIf the `lovr.graphics` module is disabled or the window isn't created, attempting to use any functionality requiring graphics may cause a crash.\n\nThe `headset.offset` field is a vertical offset applied to the scene for headsets that do not center their tracking origin on the floor.  This can be thought of as a \"default user height\". Setting this offset makes it easier to design experiences that work in both seated and standing VR configurations."
@@ -12209,9 +12209,13 @@ return {
           module = "lovr.headset",
           values = {
             {
-              name = "fake",
+              name = "desktop",
               description = "A VR simulator using keyboard/mouse."
             },
+            {
+              name = "leap",
+              description = "Leap Motion hand tracking driver."
+            },
             {
               name = "oculus",
               description = "Oculus Desktop SDK."
@@ -12224,6 +12228,10 @@ return {
               name = "openvr",
               description = "OpenVR."
             },
+            {
+              name = "openxr",
+              description = "OpenXR."
+            },
             {
               name = "webvr",
               description = "WebVR."

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

@@ -166,7 +166,7 @@ return {
           t.identity = 'default'
 
           -- Headset settings
-          t.headset.drivers = { 'openvr', 'webvr', 'fake' }
+          t.headset.drivers = { 'leap', 'openxr', 'oculus', 'oculusmobile', 'openvr', 'webvr', 'desktop' }
           t.headset.msaa = 4
           t.headset.offset = 1.7
 

+ 9 - 1
api/lovr/headset/HeadsetDriver.lua

@@ -6,9 +6,13 @@ return {
   ]],
   values = {
     {
-      name = 'fake',
+      name = 'desktop',
       description = 'A VR simulator using keyboard/mouse.'
     },
+    {
+      name = 'leap',
+      description = 'Leap Motion hand tracking driver.'
+    },
     {
       name = 'oculus',
       description = 'Oculus Desktop SDK.'
@@ -21,6 +25,10 @@ return {
       name = 'openvr',
       description = 'OpenVR.'
     },
+    {
+      name = 'openxr',
+      description = 'OpenXR.'
+    },
     {
       name = 'webvr',
       description = 'WebVR.'