mirror/batteries
1
0
Fork 0
mirror of https://github.com/1bardesign/batteries.git synced 2024-11-25 23:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorganised some of vec2, added some missing copying methods

Browse Source
This commit is contained in:
Max Cahill 2021-08-09 19:07:03 +10:00
parent 4bb3da7603
commit fa742beb50
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vec2.lua
View File

@ -147,6 +147,14 @@ function vec2:vector_div_inplace(v)
return self return self
end end
--(a + (b * t))
--useful for integrating physics and adding directional offsets
function vec2:fused_multiply_add_inplace(v, t)
self.x = self.x + (v.x * t)
self.y = self.y + (v.y * t)
return self
end
--scalar --scalar
function vec2:scalar_add_inplace(x, y) function vec2:scalar_add_inplace(x, y)
if not y then y = x end if not y then y = x end
@ -176,14 +184,6 @@ function vec2:scalar_div_inplace(x, y)
return self return self
end end
--(a + (b * t))
--useful for integrating physics and adding directional offsets
function vec2:fused_multiply_add_inplace(v, t)
self.x = self.x + (v.x * t)
self.y = self.y + (v.y * t)
return self
end
----------------------------------------------------------- -----------------------------------------------------------
-- geometric methods -- geometric methods
----------------------------------------------------------- -----------------------------------------------------------
@ -485,11 +485,15 @@ for _, inplace_name in ipairs({
"vector_sub_inplace", "vector_sub_inplace",
"vector_mul_inplace", "vector_mul_inplace",
"vector_div_inplace", "vector_div_inplace",
"fused_multiply_add_inplace",
"add_inplace",
"sub_inplace",
"mul_inplace",
"div_inplace",
"scalar_add_inplace", "scalar_add_inplace",
"scalar_sub_inplace", "scalar_sub_inplace",
"scalar_mul_inplace", "scalar_mul_inplace",
"scalar_div_inplace", "scalar_div_inplace",
"fused_multiply_add_inplace",
"normalise_both_inplace", "normalise_both_inplace",
"normalise_inplace", "normalise_inplace",
"normalise_len_inplace", "normalise_len_inplace",
@ -529,11 +533,11 @@ end
--to understand when you come back, but i also appreciate wanting short code --to understand when you come back, but i also appreciate wanting short code
for _, v in ipairs({ for _, v in ipairs({
{"sset", "scalar_set"}, {"sset", "scalar_set"},
{"vset", "vector_set"},
{"sadd", "scalar_add"}, {"sadd", "scalar_add"},
{"ssub", "scalar_sub"}, {"ssub", "scalar_sub"},
{"smul", "scalar_mul"}, {"smul", "scalar_mul"},
{"sdiv", "scalar_div"}, {"sdiv", "scalar_div"},
{"vset", "vector_set"},
{"vadd", "vector_add"}, {"vadd", "vector_add"},
{"vsub", "vector_sub"}, {"vsub", "vector_sub"},
{"vmul", "vector_mul"}, {"vmul", "vector_mul"},