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

More renaming of "fragment" to "pixel"

Browse Source
This commit is contained in:
Alex Szpakowski
2013-03-18 04:07:18 -03:00
parent 07ba81f060
commit 991b15d670
3 changed files with 131 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+5 -5
View File
@@ -510,7 +510,7 @@ int w_newShader(lua_State *L)
luax_getfunction(L, "graphics", "_shaderCodeToGLSL");
// push vertcode and fragcode strings to the top of the stack so they become arguments for the function
// push vertexcode and pixelcode strings to the top of the stack so they become arguments for the function
lua_pushvalue(L, 1);
lua_pushvalue(L, 2);
@@ -522,15 +522,15 @@ int w_newShader(lua_State *L)
// vertex shader code
if (lua_isstring(L, -2))
{
std::string vertcode(luaL_checkstring(L, -2));
sources[Shader::TYPE_VERTEX] = vertcode;
std::string vertexcode(luaL_checkstring(L, -2));
sources[Shader::TYPE_VERTEX] = vertexcode;
}
// pixel shader code
if (lua_isstring(L, -1))
{
std::string fragcode(luaL_checkstring(L, -1));
sources[Shader::TYPE_PIXEL] = fragcode;
std::string pixelcode(luaL_checkstring(L, -1));
sources[Shader::TYPE_PIXEL] = pixelcode;
}
if (sources.empty())