From a75afb85ca6338da847172bbed3cc776d3aced20 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 7 Jul 2013 12:02:11 -0400 Subject: Move math.hypot() to misc_helpers.lua and fix zero-division error --- builtin/misc.lua | 10 ---------- builtin/misc_helpers.lua | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'builtin') diff --git a/builtin/misc.lua b/builtin/misc.lua index 4be03c38a..f4e7dbca6 100644 --- a/builtin/misc.lua +++ b/builtin/misc.lua @@ -106,13 +106,3 @@ function minetest.formspec_escape(str) return str 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) - t = t / x - return x * math.sqrt(1 + t * t) -end - diff --git a/builtin/misc_helpers.lua b/builtin/misc_helpers.lua index 743a9cfd3..0439415b1 100644 --- a/builtin/misc_helpers.lua +++ b/builtin/misc_helpers.lua @@ -91,4 +91,14 @@ function minetest.pos_to_string(pos) return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")" 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) +end -- cgit v1.2.3