Update PBR Materials example for v0.16.0;

examples/Lighting/PBR_Materials/conf.lua

@@ -1,3 +0,0 @@
-function lovr.conf(t)
-  t.window.msaa = 4
-end

examples/Lighting/PBR_Materials/env/sphericalHarmonics.lua

@@ -1,11 +0,0 @@
-return {
-  { 0.375931705762083,  0.358656319030575,  0.308453761543167},
-  { 0.354636762547562,  0.351933427534857,  0.346643193593808},
-  { 0.213680467209818,  0.208764154253828,  0.185992646424045},
-  { 0.094452764555327,  0.087423796528460,  0.078299527458197},
-  { 0.129722100892800,  0.126512402478568,  0.121503396241859},
-  { 0.236712791137010,  0.233931621210715,  0.222236168254197},
-  {-0.020735133497873, -0.020241604203896, -0.018707677741929},
-  {-0.073279787762454, -0.073091939150411, -0.068554941014884},
-  {-0.102740171078351, -0.099605437423063, -0.094746265045717}
-}

examples/Lighting/PBR_Materials/main.lua

@@ -1,48 +1,73 @@
+-- Skybox is "industrial_pipe_and_valve_01" from PolyHaven (CC0)
+-- Assets were generated from the skybox using cmgen from filament:
+-- $ ./cmgen --format=png --extract=skybox -s 512 industrial_pipe_and_valve_01_4k.hdr
+-- $ ./cmgen --format=ktx -x out industrial_pipe_and_valve_01_4k.hdr
+
 function lovr.load()
-  model = lovr.graphics.newModel('helmet/DamagedHelmet.glb')
+  model = lovr.graphics.newModel('DamagedHelmet.glb')
+
+  shader = lovr.graphics.newShader([[
+    vec4 lovrmain() {
+      return DefaultPosition;
+    }
+  ]], [[
+    var(0) uniform textureCube cubemap;
+    var(1) uniform sphericalHarmonics { vec3 sh[9]; };
 
-  shader = lovr.graphics.newShader('standard', {
+    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 = {
-      normalMap = false,
-      indirectLighting = true,
-      occlusion = true,
-      emissive = true,
-      skipTonemap = false
+      glow = true,
+      normalMap = true,
+      vertexTangents = false, -- DamagedHelmet doesn't have vertex tangents
+      tonemap = true
     }
   })
 
   skybox = lovr.graphics.newTexture({
-    left = 'env/nx.png',
-    right = 'env/px.png',
-    top = 'env/py.png',
-    bottom = 'env/ny.png',
-    back = 'env/pz.png',
-    front = 'env/nz.png'
-  }, { linear = true })
-
-  environmentMap = lovr.graphics.newTexture(256, 256, { type = 'cube' })
-  for mipmap = 1, environmentMap:getMipmapCount() do
-    for face, dir in ipairs({ 'px', 'nx', 'py', 'ny', 'pz', 'nz' }) do
-      local filename = ('env/m%d_%s.png'):format(mipmap - 1, dir)
-      local image = lovr.data.newImage(filename, false)
-      environmentMap:replacePixels(image, 0, 0, face, mipmap)
-    end
-  end
-
-  shader:send('lovrLightDirection', { -1, -1, -1 })
-  shader:send('lovrLightColor', { .9, .9, .8, 1.0 })
-  shader:send('lovrExposure', 2)
-  shader:send('lovrSphericalHarmonics', require('env/sphericalHarmonics'))
-  shader:send('lovrEnvironmentMap', environmentMap)
-
-  lovr.graphics.setBackgroundColor(.18, .18, .20)
-  lovr.graphics.setCullingEnabled(true)
-  lovr.graphics.setBlendMode()
+    px = 'skybox/px.png',
+    nx = 'skybox/nx.png',
+    py = 'skybox/py.png',
+    ny = 'skybox/ny.png',
+    pz = 'skybox/pz.png',
+    nz = 'skybox/nz.png'
+  })
+
+  environmentMap = lovr.graphics.newTexture('ibl.ktx')
+
+  sphericalHarmonics = lovr.graphics.newBuffer({
+    {  0.611764907836914,  0.599504590034485,  0.479980736970901 },
+    {  0.659514904022217,  0.665349841117859,  0.567680120468140 },
+    {  0.451633930206299,  0.450751245021820,  0.355226665735245 },
+    { -0.044383134692907, -0.053154513239861, -0.019974749535322 },
+    { -0.053045745939016, -0.057957146316767, -0.011247659102082 },
+    {  0.485697060823441,  0.490428507328033,  0.397530466318130 },
+    { -0.023690477013588, -0.024272611364722, -0.021886156871915 },
+    { -0.179465517401695, -0.181243389844894, -0.141314014792442 },
+    { -0.144527092576027, -0.143508568406105, -0.122757166624069 }
+  }, { 'vec3', layout = 'std140' })
 end
 
-function lovr.draw()
-  lovr.graphics.skybox(skybox)
-  lovr.graphics.setShader(shader)
-  model:draw(0, 1.5, -3, 1, lovr.timer.getTime() * .15 - 1)
-  lovr.graphics.setShader()
+function lovr.draw(pass)
+  pass:setCullMode('back')
+  pass:setBlendMode()
+
+  pass:skybox(skybox)
+
+  pass:setShader(shader)
+  pass:send('cubemap', skybox)
+  pass:send('sphericalHarmonics', sphericalHarmonics)
+  pass:draw(model, 0, 1.5, -1.5, .5)
 end