From 1dd13046cdc815d766d612e072d9ccdd5ec682f1 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 1 Apr 2016 18:55:59 +0200 Subject: [PATCH] Sdk/LuaAPI: Add Vector2 Former-commit-id: d5f7b8cf7baa7d08562214008155467b9fa888ed --- SDK/include/NDK/LuaAPI.inl | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/SDK/include/NDK/LuaAPI.inl b/SDK/include/NDK/LuaAPI.inl index 703b295c3..7380e38e3 100644 --- a/SDK/include/NDK/LuaAPI.inl +++ b/SDK/include/NDK/LuaAPI.inl @@ -151,11 +151,11 @@ namespace Nz if (index < 0 && index > -3) instance.Error("Vector3 expected, three numbers are required to convert it"); - vec->Set(instance.CheckNumber(index), instance.CheckNumber(index + 1), instance.CheckNumber(index + 2)); + vec->Set(instance.CheckNumber(index), instance.CheckNumber(index + 1), instance.CheckNumber(index + 2, 0.0)); return 3; case Nz::LuaType_Table: - vec->Set(instance.CheckField("x", index), instance.CheckField("y", index), instance.CheckField("z", index)); + vec->Set(instance.CheckField("x", index), instance.CheckField("y", index), instance.CheckField("z", 0.0, index)); return 1; default: @@ -273,6 +273,24 @@ namespace Nz return 1; } + inline int LuaImplReplyVal(const LuaInstance& instance, Vector2d val, TypeTag) + { + instance.PushInstance("Vector2", val); + return 1; + } + + inline int LuaImplReplyVal(const LuaInstance& instance, Vector2f val, TypeTag) + { + instance.PushInstance("Vector2", val); + return 1; + } + + inline int LuaImplReplyVal(const LuaInstance& instance, Vector2ui val, TypeTag) + { + instance.PushInstance("Vector2", val); + return 1; + } + inline int LuaImplReplyVal(const LuaInstance& instance, Vector3d val, TypeTag) { instance.PushInstance("Vector3", val);