Merge branch 'master' of https://github.com/minetest/minetest

1 files changed, 11 insertions, 5 deletions

diff --git a/builtin/common/vector.lua b/builtin/common/vector.lua
index 02fc1bdee..a08472e32 100644
--- a/builtin/common/vector.lua
+++ b/builtin/common/vector.lua
@@ -6,10 +6,8 @@ Note: The vector.*-functions must be able to accept old vectors that had no meta
 -- localize functions
 local setmetatable = setmetatable
 
-vector = {}
-
-local metatable = {}
-vector.metatable = metatable
+-- vector.metatable is set by C++.
+local metatable = vector.metatable
 
 local xyz = {"x", "y", "z"}
 
@@ -61,7 +59,7 @@ function vector.from_string(s, init)
 	if not (x and y and z) then
 		return nil
 	end
-	return {x = x, y = y, z = z}, np
+	return fast_new(x, y, z), np
 end
 
 function vector.to_string(v)
@@ -112,6 +110,14 @@ function vector.apply(v, func)
 	)
 end
 
+function vector.combine(a, b, func)
+	return fast_new(
+		func(a.x, b.x),
+		func(a.y, b.y),
+		func(a.z, b.z)
+	)
+end
+
 function vector.distance(a, b)
 	local x = a.x - b.x
 	local y = a.y - b.y