From cd3d4706da048076375f5899b9f893e108fed7fa Mon Sep 17 00:00:00 2001 From: sanine-a Date: Mon, 27 Mar 2023 14:47:30 -0500 Subject: refactor: move glm classes into single file --- honey/glm.lua | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++ honey/mat4.lua | 159 ----------------------- honey/quaternion.lua | 30 ----- honey/std.lua | 9 +- honey/vec3.lua | 170 ------------------------ 5 files changed, 362 insertions(+), 362 deletions(-) create mode 100644 honey/glm.lua delete mode 100644 honey/mat4.lua delete mode 100644 honey/quaternion.lua delete mode 100644 honey/vec3.lua diff --git a/honey/glm.lua b/honey/glm.lua new file mode 100644 index 0000000..20d4727 --- /dev/null +++ b/honey/glm.lua @@ -0,0 +1,356 @@ +local glm = honey.glm + +local module = {} +setmetatable(module, {__index=_G}) +setfenv(1, module) + + +Vec3 = {} +Mat4 = {} +Quaternion = {} + + +--===== Vec3 =====-- + + +function Vec3.new(_, values) + local self = {} + self.data = glm.vec3_create() + setmetatable(self, Vec3) + if values then + self[1] = values[1] + self[2] = values[2] + self[3] = values[3] + end + return self +end +setmetatable(Vec3, {__call=Vec3.new}) + + +function Vec3.__index(self, key) + if type(key) == 'number' then + return glm.vec3_get(self.data, key-1) + else + return Vec3[key] + end +end + + +function Vec3.__newindex(self, key, value) + glm.vec3_set(self.data, key-1, value) +end + + +function Vec3.__tostring(self) + return string.format("Vec3[%.4f, %.4f, %.4f]", self[1], self[2], self[3]) +end + + +--===== arithmetic =====-- + +local function swapIfNumber(self, other) + if type(self) == "number" and type(other) == "table" then + return other, self + else + return self, other + end +end + + +function Vec3.__add(self, other) + local self, other = swapIfNumber(self, other) + + local dest = Vec3() + if type(other) == "number" then + glm.vec3_adds(self.data, other, dest.data) + elseif type(other) == "table" then + glm.vec3_add(self.data, other.data, dest.data) + else + error(string.format("cannot add %s to Vec3", type(other))) + end + return dest +end + + +function Vec3.__sub(self, other) + local dest = Vec3() + if type(other) == "number" then + glm.vec3_subs(self.data, other, dest.data) + elseif type(other) == "table" then + glm.vec3_sub(self.data, other.data, dest.data) + else + error(string.format("cannot subtract %s from Vec3", type(other))) + end + return dest +end + + +function Vec3.__mul(self, other) + local self, other = swapIfNumber(self, other) + local dest = Vec3() + if type(other) == "number" then + glm.vec3_scale(self.data, other, dest.data) + elseif type(other) == "table" then + glm.vec3_mul(self.data, other.data, dest.data) + else + error(string.format("cannot multiply %s and Vec3", type(other))) + end + return dest +end + + +function Vec3.__div(self, other) + local dest = Vec3() + if type(other) == "number" then + glm.vec3_divs(self.data, other, dest.data) + elseif type(other) == "table" then + glm.vec3_div(self.data, other.data, dest.data) + else + error(string.format("cannot divide Vec3 by %s", type(other))) + end + return dest +end + + + + +function Vec3.copyTo(self, dest) + glm.vec3_copy(self.data, dest.data) +end + + +function Vec3.zero(self) + glm.vec3_zero(self.data) +end + + +function Vec3.zero(self) + glm.vec3_zero(self.data) +end +function Vec3.one(self) + glm.vec3_one(self.data) +end + + +function Vec3.dot(self, other) + return glm.vec3_dot(self.data, other.data) +end + + +function Vec3.crossTo(self, other, dest) + glm.vec3_cross(self.data, other.data, dest.data) +end +function Vec3.cross(self, other) + local dest = Vec3() + self:crossTo(other, dest) + return dest +end + + +function Vec3.crossnTo(self, other, dest) + glm.vec3_crossn(self.data, other.data, dest.data) +end +function Vec3.crossn(self, other) + local dest = Vec3() + self:crossTo(other, dest) + return dest +end + + +function Vec3.norm2(self) + return glm.vec3_norm2(self.data) +end +function Vec3.norm(self) + return glm.vec3_norm(self.data) +end + + +function Vec3.normalize(self) + glm.vec3_normalize(self.data) +end +function Vec3.normalizeTo(self, dest) + glm.vec3_normalize_to(self.data, dest.data) +end + + +---------------------------------------- + +local RowLookup = {} +function RowLookup.new(_, row, data) + local self = { + row=row, + data=data, + } + setmetatable(self, RowLookup) + return self +end +setmetatable(RowLookup, {__call=RowLookup.new}) +function RowLookup.__index(self, col) + return glm.mat4_get(self.data, col-1, self.row-1) +end +function RowLookup.__newindex(self, col, value) + return glm.mat4_set(self.data, col-1, self.row-1, value) +end + + +--===== Mat4 =====-- + + +function Mat4.new(_, self, values) + local self = {} + self.type = "mat4" + self.data = glm.mat4_create() + setmetatable(self, Mat4) + if values then + self[1][1] = values[1] + self[1][2] = values[2] + self[1][3] = values[3] + self[1][4] = values[4] + + self[2][1] = values[5] + self[2][2] = values[6] + self[2][3] = values[7] + self[2][4] = values[8] + + self[3][1] = values[9] + self[3][2] = values[10] + self[3][3] = values[11] + self[3][4] = values[12] + + self[4][1] = values[13] + self[4][2] = values[14] + self[4][3] = values[15] + self[4][4] = values[16] + end + return self +end +setmetatable(Mat4, {__call=Mat4.new}) + + +function Mat4.__index(self, key) + if type(key) == "number" then + return RowLookup(key, self.data) + else + return Mat4[key] + end +end + + +function Mat4.__tostring(self) + return string.format( + "/ %0.4f, %0.4f, %0.4f, %0.4f \\\n" .. + "| %0.4f, %0.4f, %0.4f, %0.4f |\n" .. + "| %0.4f, %0.4f, %0.4f, %0.4f |\n" .. + "\\ %0.4f, %0.4f, %0.4f, %0.4f /", + self[1][1], self[1][2], self[1][3], self[1][4], + self[2][1], self[2][2], self[2][3], self[2][4], + self[3][1], self[3][2], self[3][3], self[3][4], + self[4][1], self[4][2], self[4][3], self[4][4] + ) +end + + +function Mat4.__mul(self, other) + if other.type == "mat4" then + local dest = Mat4() + glm.mat4_mul(self.data, other.data, dest.data) + return dest + elseif other.type == "vec4" then + -- todo + elseif other.type == "vec3" then + local dest = Vec3() + glm.mat4_mulv3(self.data, other.data, 1.0, dest.data) + return dest + else + error(string.format("cannot multiply Mat4 by %s", type(other))) + end +end + + +function Mat4.copyTo(self, dest) + glm.mat4_copy(self.data, dest.data) +end + + +function Mat4.identity(self) + glm.mat4_identity(self.data) + return self +end + + +function Mat4.zero(self) + glm.mat4_zero(self.data) + return self +end + + +function Mat4.mul(self, other) + glm.mat4_mul(self.data, other.data, self.data) + return self +end + + +function Mat4.translate(self, vec) + glm.translate(self.data, vec.data) + return self +end + + +function Mat4.rotateX(self, angle) + glm.rotate_x(self.data, angle, self.data) + return self +end +function Mat4.rotateY(self, angle) + glm.rotate_y(self.data, angle, self.data) + return self +end +function Mat4.rotateZ(self, angle) + glm.rotate_z(self.data, angle, self.data) + return self +end + + +function Mat4.scale(self, vec) + glm.scale(self.data, vec.data) + return self +end + + +function Mat4.perspective(self, fovy, aspect, near, far) + glm.perspective(fovy, aspect, near, far, self.data) + return self +end +function Mat4.perspectiveResize(self, aspect) + glm.perspective_resize(aspect, self.data) + return self +end + + +--===== Quaternion =====-- + + +Quaternion.__index = Quaternion + + +function Quaternion.new(_, tbl) + local tbl = tbl or { 0, 0, 0, 0 } + local self = {} + self.data = glm.quat_create() + glm.quat_init(self.data, unpack(tbl)) + setmetatable(self, Quaternion) + return self +end +setmetatable(Quaternion, {__call=Quaternion.new}) + + +function Quaternion.toMat4(self) + local m = Mat4() + glm.quat_mat4(self.data, m.data) + return m +end + + +--------------------------- + + +return module diff --git a/honey/mat4.lua b/honey/mat4.lua deleted file mode 100644 index cdc5e7d..0000000 --- a/honey/mat4.lua +++ /dev/null @@ -1,159 +0,0 @@ -local glm = honey.glm -local Vec3 = require 'honey.vec3' - -local module = {} -setmetatable(module, {__index=_G}) -setfenv(1, module) - -local RowLookup = {} -function RowLookup.new(_, row, data) - local self = { - row=row, - data=data, - } - setmetatable(self, RowLookup) - return self -end -setmetatable(RowLookup, {__call=RowLookup.new}) -function RowLookup.__index(self, col) - return glm.mat4_get(self.data, col-1, self.row-1) -end -function RowLookup.__newindex(self, col, value) - return glm.mat4_set(self.data, col-1, self.row-1, value) -end - - - -Mat4 = {} - -function Mat4.new(_, self, values) - local self = {} - self.type = "mat4" - self.data = glm.mat4_create() - setmetatable(self, Mat4) - if values then - self[1][1] = values[1] - self[1][2] = values[2] - self[1][3] = values[3] - self[1][4] = values[4] - - self[2][1] = values[5] - self[2][2] = values[6] - self[2][3] = values[7] - self[2][4] = values[8] - - self[3][1] = values[9] - self[3][2] = values[10] - self[3][3] = values[11] - self[3][4] = values[12] - - self[4][1] = values[13] - self[4][2] = values[14] - self[4][3] = values[15] - self[4][4] = values[16] - end - return self -end -setmetatable(Mat4, {__call=Mat4.new}) - - -function Mat4.__index(self, key) - if type(key) == "number" then - return RowLookup(key, self.data) - else - return Mat4[key] - end -end - - -function Mat4.__tostring(self) - return string.format( - "/ %0.4f, %0.4f, %0.4f, %0.4f \\\n" .. - "| %0.4f, %0.4f, %0.4f, %0.4f |\n" .. - "| %0.4f, %0.4f, %0.4f, %0.4f |\n" .. - "\\ %0.4f, %0.4f, %0.4f, %0.4f /", - self[1][1], self[1][2], self[1][3], self[1][4], - self[2][1], self[2][2], self[2][3], self[2][4], - self[3][1], self[3][2], self[3][3], self[3][4], - self[4][1], self[4][2], self[4][3], self[4][4] - ) -end - - -function Mat4.__mul(self, other) - if other.type == "mat4" then - local dest = Mat4() - glm.mat4_mul(self.data, other.data, dest.data) - return dest - elseif other.type == "vec4" then - -- todo - elseif other.type == "vec3" then - local dest = Vec3() - glm.mat4_mulv3(self.data, other.data, 1.0, dest.data) - return dest - else - error(string.format("cannot multiply Mat4 by %s", type(other))) - end -end - - -function Mat4.copyTo(self, dest) - glm.mat4_copy(self.data, dest.data) -end - - -function Mat4.identity(self) - glm.mat4_identity(self.data) - return self -end - - -function Mat4.zero(self) - glm.mat4_zero(self.data) - return self -end - - -function Mat4.mul(self, other) - glm.mat4_mul(self.data, other.data, self.data) - return self -end - - -function Mat4.translate(self, vec) - glm.translate(self.data, vec.data) - return self -end - - -function Mat4.rotateX(self, angle) - glm.rotate_x(self.data, angle, self.data) - return self -end -function Mat4.rotateY(self, angle) - glm.rotate_y(self.data, angle, self.data) - return self -end -function Mat4.rotateZ(self, angle) - glm.rotate_z(self.data, angle, self.data) - return self -end - - -function Mat4.scale(self, vec) - glm.scale(self.data, vec.data) - return self -end - - -function Mat4.perspective(self, fovy, aspect, near, far) - glm.perspective(fovy, aspect, near, far, self.data) - return self -end -function Mat4.perspectiveResize(self, aspect) - glm.perspective_resize(aspect, self.data) - return self -end - - -return module.Mat4 diff --git a/honey/quaternion.lua b/honey/quaternion.lua deleted file mode 100644 index 6fbfdd5..0000000 --- a/honey/quaternion.lua +++ /dev/null @@ -1,30 +0,0 @@ -local glm = honey.glm -local Mat4 = require "honey.mat4" - -local module = {} -setmetatable(module, {__index=_G}) -setfenv(1, module) - -Quaternion = {} -Quaternion.__index = Quaternion - - -function Quaternion.new(_, tbl) - local tbl = tbl or { 0, 0, 0, 0 } - local self = {} - self.data = glm.quat_create() - glm.quat_init(self.data, unpack(tbl)) - setmetatable(self, Quaternion) - return self -end -setmetatable(Quaternion, {__call=Quaternion.new}) - - -function Quaternion.toMat4(self) - local m = Mat4() - glm.quat_mat4(self.data, m.data) - return m -end - - -return module.Quaternion diff --git a/honey/std.lua b/honey/std.lua index 80b071e..a08bf35 100644 --- a/honey/std.lua +++ b/honey/std.lua @@ -6,9 +6,12 @@ honey.terminate = init.terminate honey.ecs = require 'honey.ecs' honey.standardSystems = require 'honey.ecs-systems' -honey.Mat4 = require 'honey.mat4' honey.mesh = require 'honey.mesh' honey.Shader = require 'honey.shader' -honey.Vec3 = require 'honey.vec3' honey.Window = require 'honey.window' -honey.Quaternion = require 'honey.quaternion' + + +local glm = require 'honey.glm' +honey.Vec3 = glm.Vec3 +honey.Mat4 = glm.Mat4 +honey.Quaternion = glm.Quaternion diff --git a/honey/vec3.lua b/honey/vec3.lua deleted file mode 100644 index af9ac4b..0000000 --- a/honey/vec3.lua +++ /dev/null @@ -1,170 +0,0 @@ -local glm = honey.glm - -local vec3 = {} -setmetatable(vec3, {__index=_G}) -setfenv(1, vec3) - - -Vec3 = {} - -function Vec3.new(_, values) - local self = {} - self.data = glm.vec3_create() - setmetatable(self, Vec3) - if values then - self[1] = values[1] - self[2] = values[2] - self[3] = values[3] - end - return self -end -setmetatable(Vec3, {__call=Vec3.new}) - - -function Vec3.__index(self, key) - if type(key) == 'number' then - return glm.vec3_get(self.data, key-1) - else - return Vec3[key] - end -end - - -function Vec3.__newindex(self, key, value) - glm.vec3_set(self.data, key-1, value) -end - - -function Vec3.__tostring(self) - return string.format("[%.4f, %.4f, %.4f]", self[1], self[2], self[3]) -end - - ---===== arithmetic =====-- - -local function swapIfNumber(self, other) - if type(self) == "number" and type(other) == "table" then - return other, self - else - return self, other - end -end - - -function Vec3.__add(self, other) - local self, other = swapIfNumber(self, other) - - local dest = Vec3() - if type(other) == "number" then - glm.vec3_adds(self.data, other, dest.data) - elseif type(other) == "table" then - glm.vec3_add(self.data, other.data, dest.data) - else - error(string.format("cannot add %s to Vec3", type(other))) - end - return dest -end - - -function Vec3.__sub(self, other) - local dest = Vec3() - if type(other) == "number" then - glm.vec3_subs(self.data, other, dest.data) - elseif type(other) == "table" then - glm.vec3_sub(self.data, other.data, dest.data) - else - error(string.format("cannot subtract %s from Vec3", type(other))) - end - return dest -end - - -function Vec3.__mul(self, other) - local self, other = swapIfNumber(self, other) - local dest = Vec3() - if type(other) == "number" then - glm.vec3_scale(self.data, other, dest.data) - elseif type(other) == "table" then - glm.vec3_mul(self.data, other.data, dest.data) - else - error(string.format("cannot multiply %s and Vec3", type(other))) - end - return dest -end - - -function Vec3.__div(self, other) - local dest = Vec3() - if type(other) == "number" then - glm.vec3_divs(self.data, other, dest.data) - elseif type(other) == "table" then - glm.vec3_div(self.data, other.data, dest.data) - else - error(string.format("cannot divide Vec3 by %s", type(other))) - end - return dest -end - - - - -function Vec3.copyTo(self, dest) - glm.vec3_copy(self.data, dest.data) -end - - -function Vec3.zero(self) - glm.vec3_zero(self.data) -end - - -function Vec3.zero(self) - glm.vec3_zero(self.data) -end -function Vec3.one(self) - glm.vec3_one(self.data) -end - - -function Vec3.dot(self, other) - return glm.vec3_dot(self.data, other.data) -end - - -function Vec3.crossTo(self, other, dest) - glm.vec3_cross(self.data, other.data, dest.data) -end -function Vec3.cross(self, other) - local dest = Vec3() - self:crossTo(other, dest) - return dest -end - - -function Vec3.crossnTo(self, other, dest) - glm.vec3_crossn(self.data, other.data, dest.data) -end -function Vec3.crossn(self, other) - local dest = Vec3() - self:crossTo(other, dest) - return dest -end - - -function Vec3.norm2(self) - return glm.vec3_norm2(self.data) -end -function Vec3.norm(self) - return glm.vec3_norm(self.data) -end - - -function Vec3.normalize(self) - glm.vec3_normalize(self.data) -end -function Vec3.normalizeTo(self, dest) - glm.vec3_normalize_to(self.data, dest.data) -end - - -return vec3.Vec3 -- cgit v1.2.1