summaryrefslogtreecommitdiff
path: root/demo
diff options
context:
space:
mode:
authorsanine-a <sanine.not@pm.me>2020-12-05 16:59:28 -0600
committersanine-a <sanine.not@pm.me>2020-12-05 16:59:28 -0600
commit09a96abe4d6933eb473b0dd8a7027cc0cb04ac63 (patch)
treefd60e3080694689f336351cab4bb269a21869606 /demo
parentbbebc8d2582f639ecac1c4551411949eeacfc7ee (diff)
change textures to use metamethods
Diffstat (limited to 'demo')
-rw-r--r--demo/ScreenQuad.lua4
-rw-r--r--demo/SpatialShader.lua2
-rw-r--r--demo/main.lua2
3 files changed, 4 insertions, 4 deletions
diff --git a/demo/ScreenQuad.lua b/demo/ScreenQuad.lua
index 4cc247f..73cce46 100644
--- a/demo/ScreenQuad.lua
+++ b/demo/ScreenQuad.lua
@@ -35,8 +35,8 @@ ScreenQuad.shader = honey.shader(vertexShader, fragmentShader)
ScreenQuad.tex = honey.texture.new()
ScreenQuad.depth = honey.texture.new()
-honey.texture.create(ScreenQuad.tex, 'rgb', 640, 480);
-honey.texture.create(ScreenQuad.depth, 'depth', 640, 480);
+ScreenQuad.tex:create('rgb', 640, 480)
+ScreenQuad.depth:create('depth', 640, 480)
--honey.texture.load(ScreenQuad.texture, 'checkerboard.png', false)
ScreenQuad.fb = honey.texture.new_framebuffer(ScreenQuad.tex, ScreenQuad.depth, 640, 480)
diff --git a/demo/SpatialShader.lua b/demo/SpatialShader.lua
index 5f83e59..699cff2 100644
--- a/demo/SpatialShader.lua
+++ b/demo/SpatialShader.lua
@@ -76,7 +76,7 @@ end
SpatialShader.prototype.drawMesh = function(self, mesh)
self.shader:setMat4('model', mesh.transform)
- honey.texture.use(self.albedo, 0)
+ self.albedo:use(0)
honey.mesh.draw(mesh.mesh, self.shader)
end
diff --git a/demo/main.lua b/demo/main.lua
index 231af10..5b19166 100644
--- a/demo/main.lua
+++ b/demo/main.lua
@@ -11,7 +11,7 @@ local buffer = false
honey.input.key.bind(honey.input.key.f, function(action) if action == 1 then buffer = not buffer end end)
local tex = honey.texture.new()
-honey.texture.load(tex, 'checkerboard.png', false)
+tex:load('checkerboard.png', false)
local sceneRoot = Node.new()