luanti-extended-engine-features/leef-math-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected an issue with vec3

Browse Source
This commit is contained in:
Matthew Blanchard 2015-12-19 23:56:56 -05:00
parent 2ce72e3d0c
commit aba6b9b1c1
1 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
modules/vec3.lua
View File

@ -33,7 +33,6 @@ function vec3.mul(out, a, b)
out.z = a.z * b
end
<<<<<<< HEAD
function vec3.div(out, a, b)
out.x = a.x / b
out.y = a.y / b
@ -44,54 +43,6 @@ function vec3.cross(out, a, b)
out.x = a.y*b.z - a.z*b.y
out.y = a.z*b.x - a.x*b.z
out.z = a.x*b.y - a.y*b.x
=======
function vector.__add(a,b)
if type(a) == "number" then
return new(a+b.x, a+b.y, a+b.z)
elseif type(b) == "number" then
return new(a.x+b, a.y+b, a.z+b)
else
assert(isvector(a) and isvector(b), "Add: wrong argument types (<vector> expected)")
return new(a.x+b.x, a.y+b.y, a.z+b.z)
end
end
function vector.__sub(a,b)
if type(a) == "number" then
return new(a-b.x, a-b.y, a-b.z)
elseif type(b) == "number" then
return new(a.x-b, a.y-b, a.z-b)
else
assert(isvector(a) and isvector(b), "Sub: wrong argument types (<vector> expected)")
return new(a.x-b.x, a.y-b.y, a.z-b.z)
end
end
function vector.__mul(a,b)
if type(a) == "number" then
return new(a*b.x, a*b.y, a*b.z)
elseif type(b) == "number" then
return new(b*a.x, b*a.y, b*a.z)
else
assert(isvector(a) and isvector(b), "Mul: wrong argument types (<vector> or <number> expected)")
return new(a.x*b.x, a.y*b.y, a.z*b.z)
end
end
function vector.__div(a,b)
if type(a) == "number" then
return new(a / b.x, a / b.y, a / b.z)
elseif type(b) == "number" then
return new(a.x / b, a.y / b, a.z / b)
else
assert(isvector(a) and isvector(b), "Div: wrong argument types (<vector> or <number> expected)")
return new(a.x/b.x, a.y/b.y, a.z/b.z)
end
end
function vector.__eq(a,b)
return a.x == b.x and a.y == b.y and a.z == b.z
>>>>>>> refs/remotes/excessive/master
end
function vec3.dot(a, b)
@ -173,4 +124,4 @@ function vec3_mt.__div(a, b)
end
ffi.metatype(cpml_vec3, vec3_mt)
return setmetatable({}, vec3_mt)
return setmetatable({}, vec3_mt)