Browse Source

Update examples for new changes;

bjorn 6 years ago
parent
commit
a471ed172e
2 changed files with 4 additions and 4 deletions
  1. 2 2
      examples/Instancing/main.lua
  2. 2 2
      examples/Mesh/main.lua

+ 2 - 2
examples/Instancing/main.lua

@@ -11,7 +11,7 @@ function lovr.load()
   -- Write some random transforms to the block
   -- Write some random transforms to the block
   local transforms = {}
   local transforms = {}
   for i = 1, MONKEYS do
   for i = 1, MONKEYS do
-    local transform = lovr.math.newTransform()
+    local transform = lovr.math.mat4()
     local random, randomNormal = lovr.math.random, lovr.math.randomNormal
     local random, randomNormal = lovr.math.random, lovr.math.randomNormal
     transform:translate(randomNormal(8), randomNormal(8), randomNormal(8))
     transform:translate(randomNormal(8), randomNormal(8), randomNormal(8))
     transform:rotate(random(2 * math.pi), random(), random(), random())
     transform:rotate(random(2 * math.pi), random(), random(), random())
@@ -43,6 +43,6 @@ end
 function lovr.draw()
 function lovr.draw()
   lovr.graphics.setCullingEnabled(true)
   lovr.graphics.setCullingEnabled(true)
   lovr.graphics.setShader(shader)
   lovr.graphics.setShader(shader)
-  model:drawInstanced(MONKEYS)
+  model:draw(lovr.math.mat4(), MONKEYS)
   lovr.graphics.setShader()
   lovr.graphics.setShader()
 end
 end

+ 2 - 2
examples/Mesh/main.lua

@@ -166,7 +166,7 @@ function lovr.draw(eye)
   lovr.graphics.translate(0, 0, -2)
   lovr.graphics.translate(0, 0, -2)
   lovr.graphics.scale(1/gridSize)
   lovr.graphics.scale(1/gridSize)
   mesh3Program:send("animate", animate)
   mesh3Program:send("animate", animate)
-  mesh2:drawInstanced(gridSizeCubed, 0,0,0)
+  mesh2:draw(lovr.math.mat4(), gridSizeCubed)
   lovr.graphics.pop()
   lovr.graphics.pop()
 
 
   lovr.graphics.setShader(mesh4Program)
   lovr.graphics.setShader(mesh4Program)
@@ -175,6 +175,6 @@ function lovr.draw(eye)
   lovr.graphics.rotate(3 * math.pi/2, 0, 1, 0)
   lovr.graphics.rotate(3 * math.pi/2, 0, 1, 0)
   lovr.graphics.translate(0, 0, -2)
   lovr.graphics.translate(0, 0, -2)
   lovr.graphics.scale(1/gridSize)
   lovr.graphics.scale(1/gridSize)
-  mesh4:drawInstanced(gridSizeCubed, 0,0,0)
+  mesh4:draw(lovr.math.mat4(), gridSizeCubed)
   lovr.graphics.pop()
   lovr.graphics.pop()
 end
 end