aboutsummaryrefslogtreecommitdiff
path: root/src/lua/modules/graphics/je_lua_shader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua/modules/graphics/je_lua_shader.cpp')
-rw-r--r--src/lua/modules/graphics/je_lua_shader.cpp32
1 files changed, 14 insertions, 18 deletions
diff --git a/src/lua/modules/graphics/je_lua_shader.cpp b/src/lua/modules/graphics/je_lua_shader.cpp
index f4a4231..9505444 100644
--- a/src/lua/modules/graphics/je_lua_shader.cpp
+++ b/src/lua/modules/graphics/je_lua_shader.cpp
@@ -16,12 +16,10 @@ namespace JinEngine
const char* Jin_Lua_Shader = "Shader";
- typedef Shared<Shader>& ShaderRef;
-
- static inline ShaderRef checkShader(lua_State* L)
+ static inline Shader* checkShader(lua_State* L)
{
LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Shader);
- return luaObj->getShared<Shader>();
+ return luaObj->getObject<Shader>();
}
/**
@@ -29,36 +27,34 @@ namespace JinEngine
*/
LUA_IMPLEMENT int l_sendNumber(lua_State* L)
{
- ShaderRef shared = checkShader(L);
+ Shader* shader = checkShader(L);
const char* variable = luax_checkstring(L, 2);
float number = luax_checknumber(L, 3);
- shared->sendFloat(variable, number);
+ shader->sendFloat(variable, number);
return 0;
}
LUA_IMPLEMENT int l_sendTexture(lua_State* L)
{
- ShaderRef shared = checkShader(L);
+ Shader* shader = checkShader(L);
const char* variable = luax_checkstring(L, 2);
LuaObject* luaObj = (LuaObject*)luax_checktype(L, 3, Jin_Lua_Texture);
- Shared<Texture>& tex = luaObj->getShared<Texture>();
- shared->sendTexture(variable, tex.getObject());
+ shader->sendTexture(variable, luaObj->getObject<Texture>());
return 0;
}
LUA_IMPLEMENT int l_sendCanvas(lua_State* L)
{
- ShaderRef shared = checkShader(L);
+ Shader* shader = checkShader(L);
const char* variable = luax_checkstring(L, 2);
LuaObject* luaObj = (LuaObject*)luax_checktype(L, 3, Jin_Lua_Canvas);
- Shared<Canvas>& canvas = luaObj->getShared<Canvas>();
- shared->sendCanvas(variable, canvas.getObject());
+ shader->sendCanvas(variable, luaObj->getObject<Canvas>());
return 0;
}
LUA_IMPLEMENT int l_sendVec2(lua_State* L)
{
- ShaderRef shared = checkShader(L);
+ Shader* shader = checkShader(L);
const char* variable = luax_checkstring(L, 2);
if (!luax_istable(L, 3))
{
@@ -67,13 +63,13 @@ namespace JinEngine
}
float x = luax_rawgetnumber(L, 3, 1);
float y = luax_rawgetnumber(L, 3, 2);
- shared->sendVec2(variable, x, y);
+ shader->sendVec2(variable, x, y);
return 0;
}
LUA_IMPLEMENT int l_sendVec3(lua_State* L)
{
- ShaderRef shared = checkShader(L);
+ Shader* shader = checkShader(L);
const char* variable = luax_checkstring(L, 2);
if (!luax_istable(L, 3))
{
@@ -83,13 +79,13 @@ namespace JinEngine
float x = luax_rawgetnumber(L, 3, 1);
float y = luax_rawgetnumber(L, 3, 2);
float z = luax_rawgetnumber(L, 3, 3);
- shared->sendVec3(variable, x, y, z);
+ shader->sendVec3(variable, x, y, z);
return 0;
}
LUA_IMPLEMENT int l_sendVec4(lua_State* L)
{
- ShaderRef shared = checkShader(L);
+ Shader* shader = checkShader(L);
const char* variable = luax_checkstring(L, 2);
if (!luax_istable(L, 3))
{
@@ -100,7 +96,7 @@ namespace JinEngine
float y = luax_rawgetnumber(L, 3, 2);
float z = luax_rawgetnumber(L, 3, 3);
float w = luax_rawgetnumber(L, 3, 4);
- shared->sendVec4(variable, x, y, z, w);
+ shader->sendVec4(variable, x, y, z, w);
return 0;
}