LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ShaderEffects now take a dynamically sized list of source codes instead of one vertex and one fragment shader string

Browse Source
This commit is contained in:
Alexander Szpakowski
2012-12-22 22:47:07 -04:00
parent b55de47fb9
commit 83204c5dc5
5 changed files with 108 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+21 -5
View File
@@ -449,14 +449,30 @@ int w_newShaderEffect(lua_State *L)
lua_pushvalue(L, 1);
lua_pushvalue(L, 2);
// call effectCodeToGLSL
// call effectCodeToGLSL, returned values will be at the top of the stack
lua_pcall(L, 2, 2, 0);
// get returned values from the top of the stack
const char *vertcode = luaL_optstring(L, -2, "");
const char *fragcode = luaL_optstring(L, -1, "");
std::vector<ShaderEffect::ShaderSource> shaderlist;
ShaderEffect *effect = instance->newShaderEffect(vertcode, fragcode);
// vertex shader code
if (lua_isstring(L, -2))
{
ShaderEffect::ShaderSource vertshader;
vertshader.type = ShaderEffect::TYPE_VERTEX;
vertshader.code = luaL_checkstring(L, -2);
shaderlist.push_back(vertshader);
}
// fragment shader code
if (lua_isstring(L, -1))
{
ShaderEffect::ShaderSource fragshader;
fragshader.type = ShaderEffect::TYPE_FRAGMENT;
fragshader.code = luaL_checkstring(L, -1);
shaderlist.push_back(fragshader);
}
ShaderEffect *effect = instance->newShaderEffect(shaderlist);
luax_newtype(L, "ShaderEffect", GRAPHICS_SHADEREFFECT_T, (void *)effect);
}
catch(const love::Exception &e)