summaryrefslogtreecommitdiff
path: root/Runtime/Lua/LuaHelper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Runtime/Lua/LuaHelper.cpp')
-rw-r--r--Runtime/Lua/LuaHelper.cpp25
1 files changed, 11 insertions, 14 deletions
diff --git a/Runtime/Lua/LuaHelper.cpp b/Runtime/Lua/LuaHelper.cpp
index 2c95043..951f2fe 100644
--- a/Runtime/Lua/LuaHelper.cpp
+++ b/Runtime/Lua/LuaHelper.cpp
@@ -1,17 +1,14 @@
#include "LuaHelper.h"
-#include "Runtime/Math/Vector2.h"
-#include "Runtime/Math/Vector3.h"
-#include "Runtime/Math/Vector4.h"
-#include "Runtime/Math/Matrix44.h"
+#include "Runtime/Math/Math.h"
#include "Runtime/GUI/Font.h"
using namespace LuaBind;
template <>
-Internal::Rect State::GetValue < Internal::Rect >(int idx, const Internal::Rect value)
+Rect State::GetValue < Rect >(int idx, const Rect value)
{
- Internal::Rect rect = value;
+ Rect rect = value;
if (LuaHelper::IsType(*this, "GameLab.Engine.Math.Rect", idx))
{
rect.x = GetField<float>(idx, "x", 0);
@@ -30,9 +27,9 @@ Internal::Rect State::GetValue < Internal::Rect >(int idx, const Internal::Rect
}
template <>
-Internal::Vector2 State::GetValue < Internal::Vector2 >(int idx, const Internal::Vector2 value)
+Vector2 State::GetValue < Vector2 >(int idx, const Vector2 value)
{
- Internal::Vector2 v2 = value;
+ Vector2 v2 = value;
if (LuaHelper::IsType(*this, "GameLab.Engine.Math.Vector2", idx))
{
v2.x = GetField<float>(idx, "x", 0);
@@ -47,9 +44,9 @@ Internal::Vector2 State::GetValue < Internal::Vector2 >(int idx, const Internal:
}
template <>
-Internal::Vector3 State::GetValue < Internal::Vector3 >(int idx, const Internal::Vector3 value)
+Vector3 State::GetValue < Vector3 >(int idx, const Vector3 value)
{
- Internal::Vector3 v3 = value;
+ Vector3 v3 = value;
if (LuaHelper::IsType(*this, "GameLab.Engine.Math.Vector3", idx))
{
v3.x = GetField<float>(idx, "x", 0);
@@ -66,9 +63,9 @@ Internal::Vector3 State::GetValue < Internal::Vector3 >(int idx, const Internal:
}
template <>
-Internal::Vector4 State::GetValue < Internal::Vector4 >(int idx, const Internal::Vector4 value)
+Vector4 State::GetValue < Vector4 >(int idx, const Vector4 value)
{
- Internal::Vector4 v4 = value;
+ Vector4 v4 = value;
if (LuaHelper::IsType(*this, "GameLab.Engine.Math.Vector4", idx))
{
v4.x = GetField<float>(idx, "x", 0);
@@ -87,9 +84,9 @@ Internal::Vector4 State::GetValue < Internal::Vector4 >(int idx, const Internal:
}
template <>
-Internal::Matrix44 State::GetValue < Internal::Matrix44 >(int idx, const Internal::Matrix44 value)
+Matrix44 State::GetValue < Matrix44 >(int idx, const Matrix44 value)
{
- Internal::Matrix44 m4 = value;
+ Matrix44 m4 = value;
if (LuaHelper::IsType(*this, "GameLab.Engine.Math.Matrix44", idx))
{
m4.m[0][0] = GetField<float>(idx, "m00", 0);