diff options
| author | ShadowNinja <noreply@gmail.com> | 2013-07-07 12:02:11 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-07-07 21:47:38 -0400 |
| commit | a75afb85ca6338da847172bbed3cc776d3aced20 (patch) | |
| tree | 2f02ef8ea34c6ea30df1ddbc391c792f1c59cbd6 | |
| parent | 9dcd21911a438fbec5b5aa8cc1f5bb1975a1b98f (diff) | |
| download | minetest-a75afb85ca6338da847172bbed3cc776d3aced20.tar.gz minetest-a75afb85ca6338da847172bbed3cc776d3aced20.tar.bz2 minetest-a75afb85ca6338da847172bbed3cc776d3aced20.zip | |
Move math.hypot() to misc_helpers.lua and fix zero-division error
| -rw-r--r-- | builtin/misc.lua | 10 | ||||
| -rw-r--r-- | builtin/misc_helpers.lua | 10 |
2 files changed, 10 insertions, 10 deletions
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 |