diff options
| -rw-r--r-- | builtin/common/misc_helpers.lua | 9 | ||||
| -rw-r--r-- | builtin/common/vector.lua | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua index 64c8c9a67..c2452fe00 100644 --- a/builtin/common/misc_helpers.lua +++ b/builtin/common/misc_helpers.lua @@ -209,14 +209,7 @@ end -------------------------------------------------------------------------------- function math.hypot(x, y) - local t - x = math.abs(x) - y = math.abs(y) - t = math.min(x, y) - x = math.max(x, y) - if x == 0 then return 0 end - t = t / x - return x * math.sqrt(1 + t * t) + return math.sqrt(x * x + y * y) end -------------------------------------------------------------------------------- diff --git a/builtin/common/vector.lua b/builtin/common/vector.lua index cbaa872dc..752167a63 100644 --- a/builtin/common/vector.lua +++ b/builtin/common/vector.lua @@ -67,7 +67,7 @@ metatable.__eq = vector.equals -- unary operations function vector.length(v) - return math.hypot(v.x, math.hypot(v.y, v.z)) + return math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z) end -- Note: we can not use __len because it is already used for primitive table length @@ -104,7 +104,7 @@ function vector.distance(a, b) local x = a.x - b.x local y = a.y - b.y local z = a.z - b.z - return math.hypot(x, math.hypot(y, z)) + return math.sqrt(x * x + y * y + z * z) end function vector.direction(pos1, pos2) |