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

love.graphics.newParticleSystem now uses a default buffer size of 1000 (issue #598)

Browse Source
This commit is contained in:
Alex Szpakowski
2013-05-08 17:19:25 -03:00
parent 759930164f
commit c7ebb50b70
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Shader.cpp
+1 -1
View File
@@ -593,7 +593,7 @@ std::string Shader::getGLSLVersion()
const char *tmp = 0; const char *tmp = 0;
// GL_SHADING_LANGUAGE_VERSION isn't available in OpenGL < 2.0. // GL_SHADING_LANGUAGE_VERSION isn't available in OpenGL < 2.0.
if (GL_VERSION_2_0) if (GL_VERSION_2_0 || GLEE_ARB_shading_language_100)
tmp = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION); tmp = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
if (tmp == 0) if (tmp == 0)
src/modules/graphics/opengl/wrap_Graphics.cpp
+4 -4
View File
@@ -157,7 +157,7 @@ int w_present(lua_State *)
int w_setIcon(lua_State *L) int w_setIcon(lua_State *L)
{ {
Image *image = luax_checktype<Image>(L, 1, "Image", GRAPHICS_IMAGE_T); Image *image = luax_checkimage(L, 1);
try try
{ {
instance->setIcon(image); instance->setIcon(image);
@@ -543,7 +543,7 @@ int w_newImageFont(lua_State *L)
int w_newSpriteBatch(lua_State *L) int w_newSpriteBatch(lua_State *L)
{ {
Image *image = luax_checktype<Image>(L, 1, "Image", GRAPHICS_IMAGE_T); Image *image = luax_checkimage(L, 1);
int size = luaL_optint(L, 2, 1000); int size = luaL_optint(L, 2, 1000);
SpriteBatch::UsageHint usage = SpriteBatch::USAGE_DYNAMIC; SpriteBatch::UsageHint usage = SpriteBatch::USAGE_DYNAMIC;
if (lua_gettop(L) > 2) if (lua_gettop(L) > 2)
@@ -566,8 +566,8 @@ int w_newSpriteBatch(lua_State *L)
int w_newParticleSystem(lua_State *L) int w_newParticleSystem(lua_State *L)
{ {
Image *image = luax_checktype<Image>(L, 1, "Image", GRAPHICS_IMAGE_T); Image *image = luax_checkimage(L, 1);
int size = luaL_checkint(L, 2); int size = luaL_optint(L, 2, 1000);
ParticleSystem *t = instance->newParticleSystem(image, size); ParticleSystem *t = instance->newParticleSystem(image, size);
luax_newtype(L, "ParticleSystem", GRAPHICS_PARTICLE_SYSTEM_T, (void *)t); luax_newtype(L, "ParticleSystem", GRAPHICS_PARTICLE_SYSTEM_T, (void *)t);
return 1; return 1;