From e232f7311f62e600189f1397fdd29a65ae186b1f Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 15 Sep 2013 22:47:39 -0400 Subject: [PATCH] Add sanity checks to vector functions --- builtin/vector.lua | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/builtin/vector.lua b/builtin/vector.lua index 7faa2c17d..698309c4a 100644 --- a/builtin/vector.lua +++ b/builtin/vector.lua @@ -2,25 +2,30 @@ vector = {} function vector.new(a, b, c) + assert(a) if type(a) == "table" then return {x=a.x, y=a.y, z=a.z} - elseif a and b and c then + else + assert(b and c) return {x=a, y=b, z=c} end return {x=0, y=0, z=0} end function vector.equals(a, b) + assert(a and b) return a.x == b.x and a.y == b.y and a.z == b.z end function vector.length(v) + assert(v) return math.hypot(v.x, math.hypot(v.y, v.z)) end function vector.normalize(v) + assert(v) local len = vector.length(v) if len == 0 then return vector.new() @@ -30,6 +35,7 @@ function vector.normalize(v) end function vector.round(v) + assert(v) return { x = math.floor(v.x + 0.5), y = math.floor(v.y + 0.5), @@ -38,6 +44,7 @@ function vector.round(v) end function vector.distance(a, b) + assert(a and b) local x = a.x - b.x local y = a.y - b.y local z = a.z - b.z @@ -45,6 +52,7 @@ function vector.distance(a, b) end function vector.direction(pos1, pos2) + assert(pos1 and pos2) local x_raw = pos2.x - pos1.x local y_raw = pos2.y - pos1.y local z_raw = pos2.z - pos1.z @@ -74,6 +82,7 @@ end function vector.add(a, b) + assert(a and b) if type(b) == "table" then return {x = a.x + b.x, y = a.y + b.y, @@ -86,6 +95,7 @@ function vector.add(a, b) end function vector.subtract(a, b) + assert(a and b) if type(b) == "table" then return {x = a.x - b.x, y = a.y - b.y, @@ -98,6 +108,7 @@ function vector.subtract(a, b) end function vector.multiply(a, b) + assert(a and b) if type(b) == "table" then return {x = a.x * b.x, y = a.y * b.y, @@ -110,6 +121,7 @@ function vector.multiply(a, b) end function vector.divide(a, b) + assert(a and b) if type(b) == "table" then return {x = a.x / b.x, y = a.y / b.y, -- 2.25.1