refactor Matrix.lua

1 files changed, 41 insertions, 71 deletions

diff --git a/demo/FPSCamera.lua b/demo/FPSCamera.lua
index 5e21117..1ec5097 100644
--- a/demo/FPSCamera.lua
+++ b/demo/FPSCamera.lua
@@ -1,29 +1,5 @@
 local Vector = require('Vector')
-local Mat3, Mat4 = require('Matrix')()
-
-local Basis = function(M)
-    local m = Mat3.new()
-    honey.cglm.mat4.pick3(M, m)
-
-    local x0 = honey.cglm.get_value(m, Mat3.index(1,1))
-    local x1 = honey.cglm.get_value(m, Mat3.index(2,1))
-    local x2 = honey.cglm.get_value(m, Mat3.index(3,1))
-
-    local y0 = honey.cglm.get_value(m, Mat3.index(1,2))
-    local y1 = honey.cglm.get_value(m, Mat3.index(2,2))
-    local y2 = honey.cglm.get_value(m, Mat3.index(3,2))
-
-    local z0 = honey.cglm.get_value(m, Mat3.index(1,3))
-    local z1 = honey.cglm.get_value(m, Mat3.index(2,3))
-    local z2 = honey.cglm.get_value(m, Mat3.index(3,3))
-    
-    local b = {}
-    b.x = Vector.Vec3.new{x0, x1, x2}
-    b.y = Vector.Vec3.new{y0, y1, y2}
-    b.z = Vector.Vec3.new{z0, z1, z2}
-
-    return b
-end
+local Matrix = require('Matrix')
 
 local camera = {}
 
@@ -36,46 +12,40 @@ camera.movement_speed = 1
 
 camera.position = Vector.Vec3.new{0,0,-1}
 
-camera.view = Mat4.new()
-honey.cglm.mat4.identity(camera.view)
-
-camera.basis = Basis(camera.view)
+camera.view = Matrix.Mat4.eye()
+camera.basis = camera.view:basis()
 
-camera.projection = Mat4.new()
-honey.cglm.camera.perspective(
-    camera.projection,
-    math.rad(90),
-    640/480,
-    0.1,
-    8192)
+camera.projection = Matrix.Mat4.perspective(math.rad(90),
+					    640/480,
+					    0.1,
+					    8192)
 
 function camera:update()
-    local M = Mat4.new()
-    honey.cglm.mat4.identity(M)
-    honey.cglm.affine.rotate(M, Vector.Vec3.ZERO.array, self.basis.x.array, math.rad(self.pitch))
-    honey.cglm.affine.rotate(M, Vector.Vec3.ZERO.array, Vector.Vec3.Y_UNIT.array, math.rad(self.yaw))
-    self.basis = Basis(M)
-
-    movement = Vector.Vec3.new()
-    if honey.input.key.is_down(honey.input.key.w) then
-       movement:add(self.basis.z, movement)
-    end
-    if honey.input.key.is_down(honey.input.key.a) then
-       movement:add(self.basis.x, movement)
-    end
-    if honey.input.key.is_down(honey.input.key.s) then
-       movement:sub(self.basis.z, movement)
-    end
-    if honey.input.key.is_down(honey.input.key.d) then
-       movement:sub(self.basis.x, movement)
-    end
-    
-    movement:setAt(1, 0)
-    movement:normalize()
-    movement:muls(self.movement_speed, movement)
-    self.position:add(movement, self.position)
-    
-    honey.cglm.camera.look(self.position.array, self.basis.z.array, Vector.Vec3.Y_UNIT.array, self.view)
+   local M = Matrix.Mat4.eye()
+   M:rotate(Vector.Vec3.ZERO, self.basis.x, math.rad(self.pitch))
+   M:rotate(Vector.Vec3.ZERO, Vector.Vec3.Y_UNIT, math.rad(self.yaw))
+   self.basis = M:basis()
+
+   movement = Vector.Vec3.new()
+   if honey.input.key.is_down(honey.input.key.w) then
+      movement:add(self.basis.z, movement)
+   end
+   if honey.input.key.is_down(honey.input.key.a) then
+      movement:add(self.basis.x, movement)
+   end
+   if honey.input.key.is_down(honey.input.key.s) then
+      movement:sub(self.basis.z, movement)
+   end
+   if honey.input.key.is_down(honey.input.key.d) then
+      movement:sub(self.basis.x, movement)
+   end
+   
+   movement:setAt(1, 0)
+   movement:normalize()
+   movement:muls(self.movement_speed, movement)
+   self.position:add(movement, self.position)
+
+   Matrix.Mat4.look(self.position, self.basis.z, Vector.Vec3.Y_UNIT, self.view)
 end
 
 camera.mouse_pos = {}
@@ -83,18 +53,18 @@ camera.mouse_pos.x = 0
 camera.mouse_pos.y = 0
 
 honey.input.mouse.bind_movement(
-    function(xpos, ypos)
-        local dx = xpos - camera.mouse_pos.x
-        local dy = ypos - camera.mouse_pos.y
+   function(xpos, ypos)
+      local dx = xpos - camera.mouse_pos.x
+      local dy = ypos - camera.mouse_pos.y
 
-        camera.mouse_pos = { x=xpos, y=ypos }
+      camera.mouse_pos = { x=xpos, y=ypos }
 
-        camera.pitch = camera.pitch + camera.sensitivity * dy
-        camera.yaw = camera.yaw - camera.sensitivity * dx
+      camera.pitch = camera.pitch + camera.sensitivity * dy
+      camera.yaw = camera.yaw - camera.sensitivity * dx
 
-        if camera.pitch > 89 then camera.pitch = 89 end
-        if camera.pitch < -89 then camera.pitch = -89 end
-    end
+      if camera.pitch > 89 then camera.pitch = 89 end
+      if camera.pitch < -89 then camera.pitch = -89 end
+   end
 )
 
 honey.input.mouse.set_mode(honey.input.mouse.mode.disabled)