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

Begin unification of Canvases and Images.

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-03 23:05:46 -04:00
parent fc0d60a96d
commit 63c5df6aa7
16 changed files with 211 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Canvas.cpp
+9 -9
View File
@@ -37,7 +37,7 @@ int w_Canvas_renderTo(lua_State *L)
int startidx = 2;
if (rt.canvas->getTextureType() != TEXTURE_2D)
if (rt.texture->getTextureType() != TEXTURE_2D)
{
rt.slice = (int) luaL_checkinteger(L, 2) - 1;
startidx++;
@@ -53,10 +53,10 @@ int w_Canvas_renderTo(lua_State *L)
Graphics::RenderTargets oldtargets = graphics->getCanvas();
for (auto c : oldtargets.colors)
c.canvas->retain();
c.texture->retain();
if (oldtargets.depthStencil.canvas != nullptr)
oldtargets.depthStencil.canvas->retain();
if (oldtargets.depthStencil.texture != nullptr)
oldtargets.depthStencil.texture->retain();
luax_catchexcept(L, [&](){ graphics->setCanvas(rt, false); });
@@ -66,10 +66,10 @@ int w_Canvas_renderTo(lua_State *L)
graphics->setCanvas(oldtargets);
for (auto c : oldtargets.colors)
c.canvas->release();
c.texture->release();
if (oldtargets.depthStencil.canvas != nullptr)
oldtargets.depthStencil.canvas->release();
if (oldtargets.depthStencil.texture != nullptr)
oldtargets.depthStencil.texture->release();
if (status != 0)
return lua_error(L);
@@ -119,8 +119,8 @@ int w_Canvas_getMipmapMode(lua_State *L)
{
Canvas *c = luax_checkcanvas(L, 1);
const char *str;
if (!Canvas::getConstant(c->getMipmapMode(), str))
return luax_enumerror(L, "mipmap mode", Canvas::getConstants(Canvas::MIPMAPS_MAX_ENUM), str);
if (!Texture::getConstant(c->getMipmapsMode(), str))
return luax_enumerror(L, "mipmap mode", Texture::getConstants(Texture::MIPMAPS_MAX_ENUM), str);
lua_pushstring(L, str);
return 1;