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

Changed shader source list from a vector of sources to a map of shader types to source codes

Browse Source
This commit is contained in:
Alexander Szpakowski
2013-01-07 19:13:19 -04:00
parent b6088115c9
commit 808a09f786
5 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+6 -10
View File
@@ -452,27 +452,23 @@ int w_newShaderEffect(lua_State *L)
// call effectCodeToGLSL, returned values will be at the top of the stack
lua_pcall(L, 2, 2, 0);
std::vector<ShaderEffect::ShaderSource> shaderlist;
ShaderEffect::ShaderSources shadersources;
// 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);
std::string vertcode(luaL_checkstring(L, -2));
shadersources[ShaderEffect::TYPE_VERTEX] = vertcode;
}
// 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);
std::string fragcode(luaL_checkstring(L, -1));
shadersources[ShaderEffect::TYPE_FRAGMENT] = fragcode;
}
ShaderEffect *effect = instance->newShaderEffect(shaderlist);
ShaderEffect *effect = instance->newShaderEffect(shadersources);
luax_newtype(L, "ShaderEffect", GRAPHICS_SHADEREFFECT_T, (void *)effect);
}
catch(const love::Exception &e)