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

Added a new variant of Shader:send for matrices: Shader:send(uniformname, is_column_major, matrix, ...).

Browse Source 
If is_column_major is true, the table(s) passed as subsequent arguments will be treated as column-major instead of row-major. This matches the 0.10.x behaviour of Shader:send for matrices.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-09-11 20:57:40 -03:00
parent 593f96a08c
commit 4dd1b3a83f
1 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Shader.cpp
+55 -15
View File
@@ -150,6 +150,14 @@ int w_Shader_sendBooleans(lua_State *L, int startidx, Shader *shader, const Shad
int w_Shader_sendMatrices(lua_State *L, int startidx, Shader *shader, const Shader::UniformInfo *info)
{
bool columnmajor = false;
if (lua_isboolean(L, startidx))
{
columnmajor = lua_toboolean(L, startidx);
startidx++;
}
int count = _getCount(L, startidx, info);
int columns = info->matrix.columns;
int rows = info->matrix.rows;
@@ -169,33 +177,65 @@ int w_Shader_sendMatrices(lua_State *L, int startidx, Shader *shader, const Shad
{
int n = i * elements;
for (int row = 0; row < rows; row++)
if (columnmajor)
{
lua_rawgeti(L, startidx + i, row + 1);
for (int column = 0; column < columns; column++)
{
// The table has the matrix elements laid out in row-major
// order, but we need to store them column-major in memory.
lua_rawgeti(L, -(column + 1), column + 1);
values[n + (column * rows + row)] = (float) luaL_checknumber(L, -1);
}
lua_rawgeti(L, startidx + i, column + 1);
lua_pop(L, columns + 1);
for (int row = 0; row < rows; row++)
{
lua_rawgeti(L, -(row + 1), row + 1);
values[n + (column * rows + row)] = (float) luaL_checknumber(L, -1);
}
lua_pop(L, rows + 1);
}
}
else
{
for (int row = 0; row < rows; row++)
{
lua_rawgeti(L, startidx + i, row + 1);
for (int column = 0; column < columns; column++)
{
// The table has the matrix elements laid out in row-major
// order, but we need to store them column-major in memory.
lua_rawgeti(L, -(column + 1), column + 1);
values[n + (column * rows + row)] = (float) luaL_checknumber(L, -1);
}
lua_pop(L, columns + 1);
}
}
}
else
{
int n = i * elements;
for (int column = 0; column < columns; column++)
if (columnmajor)
{
for (int row = 0; row < rows; row++)
for (int column = 0; column < columns; column++)
{
// The table has the matrix elements laid out in row-major
// order, but we need to store them column-major in memory.
lua_rawgeti(L, startidx + i, row * columns + column + 1);
values[n + (column * rows + row)] = (float) luaL_checknumber(L, -1);
for (int row = 0; row < rows; row++)
{
lua_rawgeti(L, startidx + i, column * rows + row + 1);
values[n + (column * rows + row)] = (float) luaL_checknumber(L, -1);
}
}
}
else
{
for (int column = 0; column < columns; column++)
{
for (int row = 0; row < rows; row++)
{
// The table has the matrix elements laid out in row-major
// order, but we need to store them column-major in memory.
lua_rawgeti(L, startidx + i, row * columns + column + 1);
values[n + (column * rows + row)] = (float) luaL_checknumber(L, -1);
}
}
}