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

love.graphics.newShader can accept File and FileData arguments (resolves issue #1308).

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-01 18:35:35 -03:00
parent 02aa7937a1
commit 217552b5ff
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Graphics.cpp
+16 -2
View File
@@ -1189,22 +1189,36 @@ int w_newCanvas(lua_State *L)
static int w_getShaderSource(lua_State *L, int startidx, bool gles, Shader::ShaderSource &source)
{
using namespace love::filesystem;
luax_checkgraphicscreated(L);
auto fs = Module::getInstance<filesystem::Filesystem>(Module::M_FILESYSTEM);
auto fs = Module::getInstance<Filesystem>(Module::M_FILESYSTEM);
// read any filepath arguments
for (int i = startidx; i < startidx + 2; i++)
{
if (!lua_isstring(L, i))
{
if (luax_cangetfiledata(L, i))
{
FileData *fd = luax_getfiledata(L, i);
lua_pushlstring(L, (const char *) fd->getData(), fd->getSize());
fd->release();
lua_replace(L, i);
}
continue;
}
size_t slen = 0;
const char *str = lua_tolstring(L, i, &slen);
if (fs != nullptr && fs->isFile(str))
{
filesystem::FileData *fd = nullptr;
FileData *fd = nullptr;
luax_catchexcept(L, [&](){ fd = fs->read(str); });
lua_pushlstring(L, (const char *) fd->getData(), fd->getSize());