diff options
Diffstat (limited to 'Source/Asura.Engine/Graphics')
| -rw-r--r-- | Source/Asura.Engine/Graphics/Image.h | 3 | ||||
| -rw-r--r-- | Source/Asura.Engine/Graphics/Port/Shader.cpp | 28 |
2 files changed, 15 insertions, 16 deletions
diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h index 6d12303..66c7ae1 100644 --- a/Source/Asura.Engine/Graphics/Image.h +++ b/Source/Asura.Engine/Graphics/Image.h @@ -2,6 +2,7 @@ #define __ASURA_ENGINE_IMAGE_H__ #include "Math/Vector2.hpp" +#include "Scripting/Portable.h" #include "FileSystem/Reloadable.h" #include "StringMap.hpp" #include "Manager.hpp" @@ -61,7 +62,7 @@ namespace AsuraEngine //---------------------------------------------------------------------------------------------------------- LUAX_DECL_FACTORY(SimImage); - + LUAX_DECL_METHOD(l_Load); LUAX_DECL_METHOD(l_GetWidth); LUAX_DECL_METHOD(l_GetHeight); diff --git a/Source/Asura.Engine/Graphics/Port/Shader.cpp b/Source/Asura.Engine/Graphics/Port/Shader.cpp index 2253a56..35fa86d 100644 --- a/Source/Asura.Engine/Graphics/Port/Shader.cpp +++ b/Source/Asura.Engine/Graphics/Port/Shader.cpp @@ -12,7 +12,7 @@ namespace AsuraEngine /// int Shader::l_Use(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } @@ -21,7 +21,7 @@ namespace AsuraEngine /// int Shader::l_Unuse(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } @@ -30,7 +30,7 @@ namespace AsuraEngine /// int Shader::l_Load(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } @@ -39,7 +39,7 @@ namespace AsuraEngine /// int Shader::l_HasUniform(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } @@ -48,56 +48,54 @@ namespace AsuraEngine /// int Shader::l_GetUniformLocation(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetBuiltInUniforms(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetUniformFloat(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetUniformTexture(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetUniformVector2(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetUniformVector3(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetUniformVector4(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } int Shader::l_SetUniformColor(lua_State* L) { - LuaxState state(L); + LUAX_STATE(L); } - //עluaijԱ - int Shader::RegisterLuaClass(lua_State* L) + void Shader::RegisterLuaxClass(LuaxState& state) { - LuaxState state(L); } |