From e293524c1977b118652fb2de72017c41bf3789dd Mon Sep 17 00:00:00 2001 From: turanszkij Date: Tue, 1 Sep 2015 23:03:29 +0200 Subject: [PATCH] updated lua bindings --- WickedEngine/Matrix_BindLua.cpp | 31 +++++++++++++++-------------- WickedEngine/Matrix_BindLua.h | 22 ++++++++++----------- WickedEngine/Vector_BindLua.cpp | 35 +++++++++++++++++---------------- WickedEngine/Vector_BindLua.h | 18 ++++++++--------- 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/WickedEngine/Matrix_BindLua.cpp b/WickedEngine/Matrix_BindLua.cpp index 8ffea5136..c64f02598 100644 --- a/WickedEngine/Matrix_BindLua.cpp +++ b/WickedEngine/Matrix_BindLua.cpp @@ -8,6 +8,17 @@ const char Matrix_BindLua::className[] = "Matrix"; Luna::FunctionType Matrix_BindLua::methods[] = { lunamethod(Matrix_BindLua, GetRow), + lunamethod(Matrix_BindLua, Translation), + lunamethod(Matrix_BindLua, Rotation), + lunamethod(Matrix_BindLua, RotationX), + lunamethod(Matrix_BindLua, RotationY), + lunamethod(Matrix_BindLua, RotationZ), + lunamethod(Matrix_BindLua, RotationQuaternion), + lunamethod(Matrix_BindLua, Scale), + lunamethod(Matrix_BindLua, Add), + lunamethod(Matrix_BindLua, Multiply), + lunamethod(Matrix_BindLua, Transpose), + lunamethod(Matrix_BindLua, Inverse), { NULL, NULL } }; Luna::PropertyType Matrix_BindLua::properties[] = { @@ -182,7 +193,7 @@ int Matrix_BindLua::Multiply(lua_State* L) return 1; } } - wiLua::SError(L, "MatrixMultiply(Matrix m1,m2) not enough arguments!"); + wiLua::SError(L, "Multiply(Matrix m1,m2) not enough arguments!"); return 0; } int Matrix_BindLua::Add(lua_State* L) @@ -198,7 +209,7 @@ int Matrix_BindLua::Add(lua_State* L) return 1; } } - wiLua::SError(L, "MatrixAdd(Matrix m1,m2) not enough arguments!"); + wiLua::SError(L, "Add(Matrix m1,m2) not enough arguments!"); return 0; } int Matrix_BindLua::Transpose(lua_State* L) @@ -213,7 +224,7 @@ int Matrix_BindLua::Transpose(lua_State* L) return 1; } } - wiLua::SError(L, "MatrixTranspose(Matrix m) not enough arguments!"); + wiLua::SError(L, "Transpose(Matrix m) not enough arguments!"); return 0; } int Matrix_BindLua::Inverse(lua_State* L) @@ -229,7 +240,7 @@ int Matrix_BindLua::Inverse(lua_State* L) return 1; } } - wiLua::SError(L, "MatrixTranspose(Matrix m) not enough arguments!"); + wiLua::SError(L, "Transpose(Matrix m) not enough arguments!"); return 0; } @@ -241,16 +252,6 @@ void Matrix_BindLua::Bind() { initialized = true; Luna::Register(wiLua::GetGlobal()->GetLuaState()); - wiLua::GetGlobal()->RegisterFunc("MatrixTranslation", Translation); - wiLua::GetGlobal()->RegisterFunc("MatrixRotation", Rotation); - wiLua::GetGlobal()->RegisterFunc("MatrixRotationX", RotationX); - wiLua::GetGlobal()->RegisterFunc("MatrixRotationY", RotationY); - wiLua::GetGlobal()->RegisterFunc("MatrixRotationZ", RotationZ); - wiLua::GetGlobal()->RegisterFunc("MatrixRotationQuaternion", RotationQuaternion); - wiLua::GetGlobal()->RegisterFunc("MatrixScale", Scale); - wiLua::GetGlobal()->RegisterFunc("MatrixAdd", Add); - wiLua::GetGlobal()->RegisterFunc("MatrixMultiply", Multiply); - wiLua::GetGlobal()->RegisterFunc("MatrixTranspose", Transpose); - wiLua::GetGlobal()->RegisterFunc("MatrixInverse", Inverse); + wiLua::GetGlobal()->RunText("matrix = Matrix()"); } } diff --git a/WickedEngine/Matrix_BindLua.h b/WickedEngine/Matrix_BindLua.h index 236a41b7a..e1e119179 100644 --- a/WickedEngine/Matrix_BindLua.h +++ b/WickedEngine/Matrix_BindLua.h @@ -18,18 +18,18 @@ public: int GetRow(lua_State* L); - static int Translation(lua_State* L); - static int Rotation(lua_State* L); - static int RotationX(lua_State* L); - static int RotationY(lua_State* L); - static int RotationZ(lua_State* L); - static int RotationQuaternion(lua_State* L); - static int Scale(lua_State* L); + int Translation(lua_State* L); + int Rotation(lua_State* L); + int RotationX(lua_State* L); + int RotationY(lua_State* L); + int RotationZ(lua_State* L); + int RotationQuaternion(lua_State* L); + int Scale(lua_State* L); - static int Multiply(lua_State* L); - static int Add(lua_State* L); - static int Transpose(lua_State* L); - static int Inverse(lua_State* L); + int Multiply(lua_State* L); + int Add(lua_State* L); + int Transpose(lua_State* L); + int Inverse(lua_State* L); static void Bind(); diff --git a/WickedEngine/Vector_BindLua.cpp b/WickedEngine/Vector_BindLua.cpp index 4760be6f3..5f73d1e73 100644 --- a/WickedEngine/Vector_BindLua.cpp +++ b/WickedEngine/Vector_BindLua.cpp @@ -19,6 +19,15 @@ Luna::FunctionType Vector_BindLua::methods[] = { lunamethod(Vector_BindLua, Length), lunamethod(Vector_BindLua, Normalize), lunamethod(Vector_BindLua, QuaternionNormalize), + lunamethod(Vector_BindLua, Add), + lunamethod(Vector_BindLua, Subtract), + lunamethod(Vector_BindLua, Multiply), + lunamethod(Vector_BindLua, Dot), + lunamethod(Vector_BindLua, Cross), + lunamethod(Vector_BindLua, Lerp), + lunamethod(Vector_BindLua, Slerp), + lunamethod(Vector_BindLua, QuaternionMultiply), + lunamethod(Vector_BindLua, QuaternionFromRollPitchYaw), { NULL, NULL } }; Luna::PropertyType Vector_BindLua::properties[] = { @@ -172,7 +181,7 @@ int Vector_BindLua::Dot(lua_State* L) return 1; } } - wiLua::SError(L, "VectorDot(Vector v1,v2) not enough arguments!"); + wiLua::SError(L, "Dot(Vector v1,v2) not enough arguments!"); return 0; } int Vector_BindLua::Cross(lua_State* L) @@ -188,7 +197,7 @@ int Vector_BindLua::Cross(lua_State* L) return 1; } } - wiLua::SError(L, "VectorCross(Vector v1,v2) not enough arguments!"); + wiLua::SError(L, "Cross(Vector v1,v2) not enough arguments!"); return 0; } int Vector_BindLua::Multiply(lua_State* L) @@ -204,7 +213,7 @@ int Vector_BindLua::Multiply(lua_State* L) return 1; } } - wiLua::SError(L, "VectorMultiply(Vector v1,v2) not enough arguments!"); + wiLua::SError(L, "Multiply(Vector v1,v2) not enough arguments!"); return 0; } int Vector_BindLua::Add(lua_State* L) @@ -220,7 +229,7 @@ int Vector_BindLua::Add(lua_State* L) return 1; } } - wiLua::SError(L, "VectorAdd(Vector v1,v2) not enough arguments!"); + wiLua::SError(L, "Add(Vector v1,v2) not enough arguments!"); return 0; } int Vector_BindLua::Subtract(lua_State* L) @@ -236,7 +245,7 @@ int Vector_BindLua::Subtract(lua_State* L) return 1; } } - wiLua::SError(L, "VectorSubtract(Vector v1,v2) not enough arguments!"); + wiLua::SError(L, "Subtract(Vector v1,v2) not enough arguments!"); return 0; } int Vector_BindLua::Lerp(lua_State* L) @@ -253,12 +262,12 @@ int Vector_BindLua::Lerp(lua_State* L) return 1; } } - wiLua::SError(L, "VectorLerp(Vector v1,v2, float t) not enough arguments!"); + wiLua::SError(L, "Lerp(Vector v1,v2, float t) not enough arguments!"); return 0; } -int Vector_BindLua::QMultiply(lua_State* L) +int Vector_BindLua::QuaternionMultiply(lua_State* L) { int argc = wiLua::SGetArgCount(L); if (argc > 1) @@ -274,7 +283,7 @@ int Vector_BindLua::QMultiply(lua_State* L) wiLua::SError(L, "QuaternionMultiply(Vector v1,v2) not enough arguments!"); return 0; } -int Vector_BindLua::QuaternionFromAxis(lua_State* L) +int Vector_BindLua::QuaternionFromRollPitchYaw(lua_State* L) { int argc = wiLua::SGetArgCount(L); if (argc > 0) @@ -314,15 +323,7 @@ void Vector_BindLua::Bind() { initialized = true; Luna::Register(wiLua::GetGlobal()->GetLuaState()); - wiLua::GetGlobal()->RegisterFunc("VectorAdd", Add); - wiLua::GetGlobal()->RegisterFunc("VectorSubtract", Subtract); - wiLua::GetGlobal()->RegisterFunc("VectorMultiply", Multiply); - wiLua::GetGlobal()->RegisterFunc("VectorDot", Dot); - wiLua::GetGlobal()->RegisterFunc("VectorCross", Cross); - wiLua::GetGlobal()->RegisterFunc("VectorLerp", Lerp); - wiLua::GetGlobal()->RegisterFunc("QuaternionMultiply", QMultiply); - wiLua::GetGlobal()->RegisterFunc("QuaternionFromAxis", QuaternionFromAxis); - wiLua::GetGlobal()->RegisterFunc("QuaternionSlerp", Slerp); + wiLua::GetGlobal()->RunText("vector = Vector()"); } } diff --git a/WickedEngine/Vector_BindLua.h b/WickedEngine/Vector_BindLua.h index efcadd3b2..3f82ccd27 100644 --- a/WickedEngine/Vector_BindLua.h +++ b/WickedEngine/Vector_BindLua.h @@ -32,17 +32,17 @@ public: int Normalize(lua_State* L); int QuaternionNormalize(lua_State* L); - static int Dot(lua_State* L); - static int Cross(lua_State* L); - static int Multiply(lua_State* L); - static int Add(lua_State* L); - static int Subtract(lua_State* L); - static int Lerp(lua_State* L); + int Dot(lua_State* L); + int Cross(lua_State* L); + int Multiply(lua_State* L); + int Add(lua_State* L); + int Subtract(lua_State* L); + int Lerp(lua_State* L); - static int QMultiply(lua_State* L); - static int QuaternionFromAxis(lua_State* L); - static int Slerp(lua_State* L); + int QuaternionMultiply(lua_State* L); + int QuaternionFromRollPitchYaw(lua_State* L); + int Slerp(lua_State* L); static void Bind();