little emmy math and utils fixes

This commit is contained in:
2019-11-14 03:25:38 +07:00
parent 67603a3c30
commit f78792cb76
16 changed files with 29 additions and 56 deletions

View File

@@ -9,12 +9,12 @@ local aabb = {
---@overload fun(): aabb
---@overload fun(r: aabb): aabb
---@overload fun(w: number, h: number): aabb
---@overload fun(x: number, y: number, w: number, h: number): aabb
---@overload fun(w: number, h: number, l: number): aabb
---@overload fun(x: number, y: number, z: number, w: number, h: number, l: number): aabb
---@overload fun(s: v3f): aabb
---@overload fun(p: v3f, s: v3f): aabb
---@return aabb
function aabb.new() end
function aabb.new(...) end
---@return aabb
function aabb.zero() end
@@ -23,7 +23,7 @@ function aabb.zero() end
function aabb.unit() end
---@overload fun(r: aabb): aabb
---@overload fun(x1: number, y1: number, x2: number, y2: number): aabb
---@overload fun(x1: number, y1: number, z1: number, x2: number, y2: number, z2: number): aabb
---@overload fun(p1: v3f, p2: v3f): aabb
---@param r aabb
---@return aabb

View File

@@ -8,7 +8,7 @@ local degf = {
---@overload fun(v: number): degf
---@overload fun(u: degf): degf
---@return degf
function degf.new() end
function degf.new(...) end
---@return degf
function degf.zero() end

View File

@@ -7,7 +7,7 @@ local m2f = {
---@overload fun(): m2f
---@overload fun(r0: v2f, r1: v2f): m2f
---@return m2f
function m2f.new() end
function m2f.new(...) end
---@return m2f
function m2f.zero() end
@@ -19,10 +19,8 @@ function m2f.identity() end
---@overload fun(xy: v4f): m2f
---@overload fun(xy: v3f): m2f
---@overload fun(xy: v2f): m2f
---@param x number
---@param y number
---@return m2f
function m2f.make_scale(x,y) end
function m2f.make_scale(...) end
---@param a degf | radf
---@return m2f

View File

@@ -7,7 +7,7 @@ local m3f = {
---@overload fun(): m3f
---@overload fun(r0: v3f, r1: v3f, r2: v3f): m3f
---@return m3f
function m3f.new() end
function m3f.new(...) end
---@return m3f
function m3f.zero() end
@@ -19,23 +19,16 @@ function m3f.identity() end
---@overload fun(xyz: v4f): m3f
---@overload fun(xyz: v3f): m3f
---@overload fun(xy: v2f, z: number): m3f
---@param x number
---@param y number
---@param z number
---@return m3f
function m3f.make_scale(x,y,z) end
function m3f.make_scale(...) end
---@overload fun(a: degf | radf, x: number, y: number, z: number): m3f
---@overload fun(a: degf | radf, xyz: v4f): m3f
---@overload fun(a: degf | radf, xyz: v3f): m3f
---@overload fun(a: degf | radf, xy: v2f, z: number): m3f
---@overload fun(q: q4f): m3f
---@param a degf | radf
---@param x number
---@param y number
---@param z number
---@return m3f
function m3f.make_rotation(a,x,y,z) end
function m3f.make_rotation(...) end
---@param l m3f
---@param r m3f

View File

@@ -7,7 +7,7 @@ local m4f = {
---@overload fun(): m4f
---@overload fun(r0: v4f, r1: v4f, r2: v4f, r3: v4f): m4f
---@return m4f
function m4f.new() end
function m4f.new(...) end
---@return m4f
function m4f.zero() end
@@ -19,33 +19,23 @@ function m4f.identity() end
---@overload fun(xyz: v4f): m4f
---@overload fun(xyz: v3f): m4f
---@overload fun(xy: v2f, z: number): m4f
---@param x number
---@param y number
---@param z number
---@return m4f
function m4f.make_scale(x,y,z) end
function m4f.make_scale(...) end
---@overload fun(x: number, y: number, z: number): m4f
---@overload fun(xyz: v4f): m4f
---@overload fun(xyz: v3f): m4f
---@overload fun(xy: v2f, z: number): m4f
---@param x number
---@param y number
---@param z number
---@return m4f
function m4f.make_translation(x,y,z) end
function m4f.make_translation(...) end
---@overload fun(a: degf | radf, x: number, y: number, z: number): m4f
---@overload fun(a: degf | radf, xyz: v4f): m4f
---@overload fun(a: degf | radf, xyz: v3f): m4f
---@overload fun(a: degf | radf, xy: v2f, z: number): m4f
---@overload fun(q: q4f): m4f
---@param a degf | radf
---@param x number
---@param y number
---@param z number
---@return m4f
function m4f.make_rotation(a,x,y,z) end
function m4f.make_rotation(...) end
---@param t t2f | t3f
---@return m4f
@@ -63,23 +53,15 @@ function m4f.make_look_at_lh(eye, at, up) end
---@return m4f
function m4f.make_look_at_rh(eye, at, up) end
---@type fun(width: number, height: number, znear: number, zfar: number): m4f
---@overload fun(width: number, height: number, znear: number, zfar: number): m4f
---@overload fun(size: v2f, znear: number, zfar: number): m4f
---@param width number
---@param height number
---@param znear number
---@param zfar number
---@return m4f
function m4f.make_orthogonal_lh(width, height, znear, zfar) end
function m4f.make_orthogonal_lh(...) end
---@type fun(width: number, height: number, znear: number, zfar: number): m4f
---@overload fun(width: number, height: number, znear: number, zfar: number): m4f
---@overload fun(size: v2f, znear: number, zfar: number): m4f
---@param width number
---@param height number
---@param znear number
---@param zfar number
---@return m4f
function m4f.make_orthogonal_rh(width, height, znear, zfar) end
function m4f.make_orthogonal_rh(...) end
---@param angle degf | radf
---@param aspect number

View File

@@ -18,7 +18,7 @@ local q4f = {
---@overload fun(x: number, y: number, z: number, w: number): q4f
---@overload fun(v: v4f): q4f
---@return q4f
function q4f.new() end
function q4f.new(...) end
---@return q4f
function q4f.zero() end

View File

@@ -8,7 +8,7 @@ local radf = {
---@overload fun(v: number): radf
---@overload fun(u: radf): radf
---@return radf
function radf.new() end
function radf.new(...) end
---@return radf
function radf.zero() end

View File

@@ -14,7 +14,7 @@ local rect = {
---@overload fun(s: v2f): rect
---@overload fun(p: v2f, s: v2f): rect
---@return rect
function rect.new() end
function rect.new(...) end
---@return rect
function rect.zero() end

View File

@@ -14,7 +14,7 @@ local t2f = {
---@overload fun(t: t2f): t2f
---@overload fun(t: v2f, r: degf | radf, s: v2f): t2f
---@return t2f
function t2f.new() end
function t2f.new(...) end
---@return t2f
function t2f.zero() end

View File

@@ -14,7 +14,7 @@ local t3f = {
---@overload fun(t: t3f): t3f
---@overload fun(t: v3f, r: q4f, s: v3f): t3f
---@return t3f
function t3f.new() end
function t3f.new(...) end
---@return t3f
function t3f.zero() end

View File

@@ -14,7 +14,7 @@ local v2f = {
---@overload fun(v: v3f): v2f
---@overload fun(v: v4f): v2f
---@return v2f
function v2f.new() end
function v2f.new(...) end
---@return v2f
function v2f.zero() end

View File

@@ -17,7 +17,7 @@ local v3f = {
---@overload fun(v: v3f): v3f
---@overload fun(v: v4f): v3f
---@return v3f
function v3f.new() end
function v3f.new(...) end
---@return v3f
function v3f.zero() end

View File

@@ -20,7 +20,7 @@ local v4f = {
---@overload fun(v: v3f, w: number): v4f
---@overload fun(v: v4f): v4f
---@return v4f
function v4f.new() end
function v4f.new(...) end
---@return v4f
function v4f.zero() end

View File

@@ -20,7 +20,7 @@ local color = {
---@overload fun(v: v3f, a: number): color
---@overload fun(r: number, g: number, b: number, a: number): color
---@return color
function color.new() end
function color.new(...) end
---@return color
function color.clear() end

View File

@@ -20,7 +20,7 @@ local color32 = {
---@overload fun(v: v3f, a: number): color32
---@overload fun(r: number, g: number, b: number, a: number): color32
---@return color32
function color32.new() end
function color32.new(...) end
---@return color32
function color32.clear() end

View File

@@ -10,7 +10,7 @@ local str_hash = {
---@overload fun(): str_hash
---@overload fun(s: string): str_hash
---@return str_hash
function str_hash.new() end
function str_hash.new(...) end
---@overload fun(s: str_hash)
---@param s str_hash