separated shaders from startupscene + improved gazecontrol interaction

xurfer/conf.lua

@@ -1,5 +1,7 @@
 -- default argument
-arg[1] = "https://snips.sh/f/_U5-XctEVE?r=1"
+if arg[1] == nil then 
+  arg[1] = "https://snips.sh/f/_U5-XctEVE?r=1"
+end
 
 -- sync lovr/love positional cli arguments
 if arg[0] == nil and arg[1] ~= nil then arg[0] = arg[1] end

xurfer/ext/gazecontrol/main.lua

@@ -6,30 +6,68 @@ local gctl
 gctl = {
 
   name = "gctl",
-  enabled = false,
+  enabled   = true,
+  texture   = {},
+  material  = nil,
   dtmax     = 1,
   dt        = 0,
 
   init = function() 
-    lovr.mouse.setRelativeMode(true)
+    --lovr.mouse.setRelativeMode(true)
+    gctl.initVisor()
+    gctl.extendECS()
+  end,
 
-    camera = {
-      transform = lovr.math.newMat4(),
-      position = vector(),
-      movespeed = 10,
-      pitch = 0,
-      yaw = 0
+
+  load = function()
+    gctl.texture.idle = lovr.graphics.newTexture("ext/gazecontrol/reticle_idle.png")
+  end,
+
+  initVisor = function()
+    -- add visor object 
+    gctl.visor = {
+      rotate = { x = 0, y = 0, z = 0},
+      scale  = 0.1,
+      texture = gctl.texture.idle
     }
   end,
 
-  update = function(dt)
-  end,
-
-  load = function() end,
-
   draw = function(pass,dt) 
+    -- *TODO* render this last (as it needs to be rendered after skybox & floor)
+    local posx, posy, posz = lovr.headset.getPosition('head')
+    local dirx, diry, dirz = lovr.headset.getDirection('head')
+    local distance = 1
+    local x = posx + distance * dirx
+    local y = posy + distance * diry
+    local z = posz + distance * dirz
+    local angle, ax, ay, az = lovr.headset.getOrientation(device)
+    local rot   = gctl.visor.rotate
+    local scale = gctl.visor.scale
+    pass:setMaterial(gctl.texture.idle)
+    pass:setShader() --'unlit')
+    pass:setBlendMode('alpha')
+    pass:setColor(1, 1, 1)
+    pass:setCullMode('back')
+    pass:plane(x, y, z, scale, scale, angle, ax, ay, az)
   end,
 
+  -- ECS API docs: https://bakpakin.github.io/tiny-ecs/doc
+  extendECS = function()
+
+    local visorSystem = ecs.processingSystem({
+      updatethread = true,
+      filter = ecs.requireAll('mycomponent'),
+      onAdd    = function(self,obj) print_r(obj)  end,
+      onRemove = function(self,obj) end,
+      process  = function(self,obj) end,
+    })
+    ecs.addSystem( api.world, visorSystem )
+
+    ecs.add( api.world, { visor = gctl.visor } )
+    --gctl.visor.commit() -- notify other systems to update entitycache
+
+  end
+
 }
 
 return gctl

xurfer/ext/startupscene/main.lua

@@ -45,6 +45,8 @@ return {
         -- skybox
         pass:setCullMode('back')
         pass:setBlendMode()
+        pass:setShader()
+        pass:setColor(1,1,1,1)
         pass:skybox(api.world.skybox)
 
         pass:setColor(1, 1, 1)
@@ -53,6 +55,7 @@ return {
 
         -- floor
         --pass:setMaterial()
+        pass:setShader()
         pass:setCullMode('front')
         pass:setBlendMode('alpha')
         pass:setMaterial()
@@ -61,9 +64,9 @@ return {
         pass:setColor( 0, 0, 0, 0.75 )
         pass:plane(0, 0.01, 0, 500, 500, math.pi * 0.5, 1, 0, 0, "line", 100, 100)
  
-        pass:setShader( lovr.shader.pbr ) 
-        pass:send('cubemap', api.world.environmentMap)
-        pass:send('sphericalHarmonics', api.world.sphericalHarmonics)
+        --pass:setShader( lovr.shader.pbr ) 
+        --pass:send('cubemap', api.world.environmentMap)
+        --pass:send('sphericalHarmonics', api.world.sphericalHarmonics)
 
     end
   end

xurfer/main.lua

@@ -33,7 +33,8 @@ api = {
   protocol = {},
   ext      = { -- all extensions are loaded here from disk at runtime
     exec   = function(...) util.exec(api.ext,...) end -- util function to call func on each extension 
-  }
+  },
+  i = 1
 }
 
 api = util.merge( api, runtime.api ) -- overlay api onto lovr/love-compatible runtime api

xurfer/runtime/lovr/main.lua

@@ -5,6 +5,8 @@ end
 local util   = require "util"
 local launch = require "launch"
 
+require('shaders').create(api)
+
 local iui = require "lib.iui"
 local backend = require "lib.lovr-iui"
 
@@ -92,7 +94,7 @@ function lovr.draw(pass)
         iui.draw()
     end
     if api.iui.idiom == "vr" then
-      pass:setClear(0.5, 0.5, 0.5)
+      pass:setClear(0.2, 0.2, 0.2)
     end
 
     api.ext.exec("draw",pass)
@@ -104,11 +106,14 @@ function lovr.draw(pass)
       pass:sphere( interactionsUpdater.hitpoint, .01)
     end
     
-    -- Laser pointer
-    local hand = vec3(lovr.headset.getPosition('hand/left/point'))
-    local direction = quat(lovr.headset.getOrientation('hand/left/point')):direction()
-    pass:setColor(1, 1, 1)
-    pass:line(hand, interactionsUpdater.selectedBox and interactionsUpdater.hitpoint or (hand + direction * 50))
+    -- Laser pointers
+    local hands = {"left","right"}
+    foreach( hands, function(k,side)
+      local hand = vec3(lovr.headset.getPosition('hand/' .. side .. '/point'))
+      local direction = quat(lovr.headset.getOrientation('hand/' .. side .. '/point')):direction()
+      pass:setColor(1, 1, 1)
+      pass:line(hand, interactionsUpdater.selectedBox and interactionsUpdater.hitpoint or (hand + direction * 50))
+    end)
 
     if api.mainWindow then
       api.mainWindow:draw(pass)
@@ -177,9 +182,12 @@ function initInteractions(ecs)
   function interactionsUpdater:process(obj, dt)
     ecs.worldPhysics:update(dt)
 
-    local ox, oy, oz = lovr.headset.getPosition('hand/left/point')
+    local castsrc = 'hand/left/point'
+    local castsrc = 'head'
 
-    local direction  = quat(lovr.headset.getOrientation('hand/left/point')):direction()
+    local ox, oy, oz = lovr.headset.getPosition(castsrc)
+
+    local direction  = quat(lovr.headset.getOrientation(castsrc)):direction()
     if direction ~= nil then 
       local dx, dy, dz = direction:mul(50):unpack()
       local collider, shape, x, y, z = ecs.worldPhysics:raycast(ox, oy, oz, ox + dx, oy + dy, oz + dz)
@@ -190,6 +198,7 @@ function initInteractions(ecs)
             print("buttondown")
           end
           if lovr.headset.wasReleased(hand, 'trigger') or interactionsUpdater['mouse']['released'] then
+            print("cast: mousedown!")
             local node = collider:getUserData()
             interactionsUpdater.selectedBox = collider
             interactionsUpdater.hitpoint:set(x, y, z)

xurfer/runtime/lovr/render/model.lua

@@ -7,8 +7,6 @@ modelRenderer = {
   init = function(api)
     local ecs = api.ecs
     api.world.shader = { pbr = false }
-    lovr.shader = lovr.shader or {}
-    lovr.shader['pbr'] = modelRenderer.initShaderPBR()
 
     renderer = ecs.processingSystem()
     renderer.filter        = ecs.requireAll('model') 
@@ -36,38 +34,6 @@ modelRenderer = {
       end
     end
     ecs.addSystem( api.world, renderer )
-  end,
-
-  initShaderPBR = function()
-    return lovr.graphics.newShader([[
-      vec4 lovrmain() {
-          return DefaultPosition;
-        }
-      ]], [[
-        uniform textureCube cubemap;
-        uniform sphericalHarmonics { vec3 sh[9]; };
-
-        vec4 lovrmain() {
-          Surface surface;
-          initSurface(surface);
-
-          vec3 color = vec3(0);
-          vec3 lightDirection = vec3(-1, -1, -1);
-          vec4 lightColorAndBrightness = vec4(1, 1, 1, 3);
-          float visibility = 1.;
-          color += getLighting(surface, lightDirection, lightColorAndBrightness, visibility);
-          color += getIndirectLighting(surface, cubemap, sh);
-
-          return vec4(color, 1);
-        }
-      ]], {
-        flags = {
-          glow = true,
-          normalMap = true,
-          vertexTangents = false, -- DamagedHelmet doesn't have vertex tangents
-          tonemap = true
-        }
-    })
   end
 
 }

xurfer/runtime/lovr/shaders.lua

@@ -0,0 +1,34 @@
+return {
+  create = function(api)
+    lovr.shader = {}
+    lovr.shader.pbr = lovr.graphics.newShader([[
+      vec4 lovrmain() {
+          return DefaultPosition;
+        }
+      ]], [[
+        uniform textureCube cubemap;
+        uniform sphericalHarmonics { vec3 sh[9]; };
+
+        vec4 lovrmain() {
+          Surface surface;
+          initSurface(surface);
+
+          vec3 color = vec3(0);
+          vec3 lightDirection = vec3(-1, -1, -1);
+          vec4 lightColorAndBrightness = vec4(1, 1, 1, 3);
+          float visibility = 1.;
+          color += getLighting(surface, lightDirection, lightColorAndBrightness, visibility);
+          color += getIndirectLighting(surface, cubemap, sh);
+
+          return vec4(color, 1);
+        }
+      ]], {
+        flags = {
+          glow = true,
+          normalMap = true,
+          vertexTangents = false, -- DamagedHelmet doesn't have vertex tangents
+          tonemap = true
+        }
+    })
+  end
+}