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

Canvases can now be used in SpriteBatches, ParticleSystems, and Meshes (resolves issue #782).

Browse Source 
Canvases and Images are now subclasses of the new Texture class.
Added setTexture and getTexture methods for Meshes, ParticleSystems, and SpriteBatches (the old set/getImage methods are deprecated but not removed.)
Canvas texture coordinates are no longer flipped.
This commit is contained in:
Alex Szpakowski
2014-01-03 17:07:12 -04:00
parent 1d3f6e967d
commit aa69a695d3
43 changed files with 1011 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Shader.cpp
+13 -21
View File
@@ -253,23 +253,13 @@ int w_Shader_sendMatrix(lua_State *L)
return 0;
}
int w_Shader_sendImage(lua_State *L)
int w_Shader_sendTexture(lua_State *L)
{
Shader *shader = luax_checkshader(L, 1);
const char *name = luaL_checkstring(L, 2);
Image *img = luax_checkimage(L, 3);
Texture *texture = luax_checktype<Texture>(L, 3, "Texture", GRAPHICS_TEXTURE_T);
EXCEPT_GUARD(shader->sendImage(name, *img);)
return 0;
}
int w_Shader_sendCanvas(lua_State *L)
{
Shader *shader = luax_checkshader(L, 1);
const char *name = luaL_checkstring(L, 2);
Canvas *canvas = luax_checkcanvas(L, 3);
EXCEPT_GUARD(shader->sendCanvas(name, *canvas);)
EXCEPT_GUARD(shader->sendTexture(name, texture);)
return 0;
}
@@ -318,7 +308,7 @@ static void w_convertMatrices(lua_State *L, int idx)
int w_Shader_send(lua_State *L)
{
int ttype = lua_type(L, 3);
Proxy *p = 0;
Proxy *p = nullptr;
switch (ttype)
{
@@ -328,13 +318,11 @@ int w_Shader_send(lua_State *L)
return w_Shader_sendFloat(L);
break;
case LUA_TUSERDATA:
// Image or Canvas.
// Texture (Image or Canvas).
p = (Proxy *) lua_touserdata(L, 3);
if (p->flags[GRAPHICS_IMAGE_ID])
return w_Shader_sendImage(L);
else if (p->flags[GRAPHICS_CANVAS_ID])
return w_Shader_sendCanvas(L);
if (p->flags[GRAPHICS_TEXTURE_ID])
return w_Shader_sendTexture(L);
break;
case LUA_TTABLE:
@@ -366,9 +354,13 @@ static const luaL_Reg functions[] =
{ "sendBoolean", w_Shader_sendInt },
{ "sendFloat", w_Shader_sendFloat },
{ "sendMatrix", w_Shader_sendMatrix },
{ "sendImage", w_Shader_sendImage },
{ "sendCanvas", w_Shader_sendCanvas },
{ "sendTexture", w_Shader_sendTexture },
{ "send", w_Shader_send },
// Deprecated since 0.9.1.
{ "sendImage", w_Shader_sendTexture },
{ "sendCanvas", w_Shader_sendTexture },
{ 0, 0 }
};