From a94637ef2b918fa36e08b0c80cb616f041a71ac8 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 12 Mar 2014 02:24:21 -0300 Subject: [PATCH] Removed functions that were deprecated in 0.9.1 --HG-- branch : minor --- src/modules/graphics/opengl/wrap_Canvas.cpp | 3 --- src/modules/graphics/opengl/wrap_Graphics.cpp | 18 ------------------ src/modules/graphics/opengl/wrap_Graphics.h | 2 -- src/modules/graphics/opengl/wrap_Mesh.cpp | 5 ----- .../graphics/opengl/wrap_ParticleSystem.cpp | 5 ----- src/modules/graphics/opengl/wrap_Shader.cpp | 5 ----- .../graphics/opengl/wrap_SpriteBatch.cpp | 4 ---- 7 files changed, 42 deletions(-) diff --git a/src/modules/graphics/opengl/wrap_Canvas.cpp b/src/modules/graphics/opengl/wrap_Canvas.cpp index a3c31b7f9..2c8e36a69 100644 --- a/src/modules/graphics/opengl/wrap_Canvas.cpp +++ b/src/modules/graphics/opengl/wrap_Canvas.cpp @@ -146,9 +146,6 @@ static const luaL_Reg functions[] = { "clear", w_Canvas_clear }, { "getFormat", w_Canvas_getFormat }, { "getFSAA", w_Canvas_getFSAA }, - - // Deprecated since 0.9.1. - { "getType", w_Canvas_getFormat }, { 0, 0 } }; diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 816f75a55..31c62345d 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -144,12 +144,6 @@ int w_setInvertedStencil(lua_State *L) return setStencil(L, true); } -int w_getMaxTextureSize(lua_State *L) -{ - lua_pushinteger(L, instance->getSystemLimit(Graphics::LIMIT_TEXTURE_SIZE)); - return 1; -} - int w_newImage(lua_State *L) { love::image::ImageData *data = nullptr; @@ -816,12 +810,6 @@ int w_getPointSize(lua_State *L) return 1; } -int w_getMaxPointSize(lua_State *L) -{ - lua_pushnumber(L, instance->getSystemLimit(Graphics::LIMIT_POINT_SIZE)); - return 1; -} - int w_setWireframe(lua_State *L) { instance->setWireframe(luax_toboolean(L, 1)); @@ -1376,8 +1364,6 @@ static const luaL_Reg functions[] = { "getLineJoin", w_getLineJoin }, { "setPointSize", w_setPointSize }, { "getPointSize", w_getPointSize }, - { "getMaxPointSize", w_getMaxPointSize }, - { "getMaxTextureSize", w_getMaxTextureSize }, { "setWireframe", w_setWireframe }, { "isWireframe", w_isWireframe }, { "newScreenshot", w_newScreenshot }, @@ -1423,10 +1409,6 @@ static const luaL_Reg functions[] = { "shear", w_shear }, { "origin", w_origin }, - // Deprecated since 0.9.1. - { "getMaxImageSize", w_getMaxTextureSize }, - { "getMaxPointSize", w_getMaxPointSize }, - { 0, 0 } }; diff --git a/src/modules/graphics/opengl/wrap_Graphics.h b/src/modules/graphics/opengl/wrap_Graphics.h index 396a8e3dd..461f603f8 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.h +++ b/src/modules/graphics/opengl/wrap_Graphics.h @@ -50,7 +50,6 @@ int w_setScissor(lua_State *L); int w_getScissor(lua_State *L); int w_setStencil(lua_State *L); int w_setInvertedStencil(lua_State *L); -int w_getMaxTextureSize(lua_State *L); int w_newImage(lua_State *L); int w_newQuad(lua_State *L); int w_newFont(lua_State *L); @@ -82,7 +81,6 @@ int w_getLineStyle(lua_State *L); int w_getLineJoin(lua_State *L); int w_setPointSize(lua_State *L); int w_getPointSize(lua_State *L); -int w_getMaxPointSize(lua_State *L); int w_setWireframe(lua_State *L); int w_isWireframe(lua_State *L); int w_newScreenshot(lua_State *L); diff --git a/src/modules/graphics/opengl/wrap_Mesh.cpp b/src/modules/graphics/opengl/wrap_Mesh.cpp index 83e21afd3..c74cbf086 100644 --- a/src/modules/graphics/opengl/wrap_Mesh.cpp +++ b/src/modules/graphics/opengl/wrap_Mesh.cpp @@ -381,11 +381,6 @@ static const luaL_Reg functions[] = { "getDrawRange", w_Mesh_getDrawRange }, { "setVertexColors", w_Mesh_setVertexColors }, { "hasVertexColors", w_Mesh_hasVertexColors }, - - // Deprecated since 0.9.1. - { "setImage", w_Mesh_setTexture }, - { "getImage", w_Mesh_getTexture }, - { 0, 0 } }; diff --git a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp index 6cb3c0416..6026cb230 100644 --- a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp +++ b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp @@ -713,11 +713,6 @@ static const luaL_Reg functions[] = { "isPaused", w_ParticleSystem_isPaused }, { "isStopped", w_ParticleSystem_isStopped }, { "update", w_ParticleSystem_update }, - - // Deprecated since 0.9.1. - { "setImage", w_ParticleSystem_setTexture }, - { "getImage", w_ParticleSystem_getTexture }, - { 0, 0 } }; diff --git a/src/modules/graphics/opengl/wrap_Shader.cpp b/src/modules/graphics/opengl/wrap_Shader.cpp index dde23fde5..c51cfddad 100644 --- a/src/modules/graphics/opengl/wrap_Shader.cpp +++ b/src/modules/graphics/opengl/wrap_Shader.cpp @@ -355,11 +355,6 @@ static const luaL_Reg functions[] = { "sendMatrix", w_Shader_sendMatrix }, { "sendTexture", w_Shader_sendTexture }, { "send", w_Shader_send }, - - // Deprecated since 0.9.1. - { "sendImage", w_Shader_sendTexture }, - { "sendCanvas", w_Shader_sendTexture }, - { 0, 0 } }; diff --git a/src/modules/graphics/opengl/wrap_SpriteBatch.cpp b/src/modules/graphics/opengl/wrap_SpriteBatch.cpp index 68cb07853..3b0a37954 100644 --- a/src/modules/graphics/opengl/wrap_SpriteBatch.cpp +++ b/src/modules/graphics/opengl/wrap_SpriteBatch.cpp @@ -248,10 +248,6 @@ static const luaL_Reg functions[] = { "getCount", w_SpriteBatch_getCount }, { "setBufferSize", w_SpriteBatch_setBufferSize }, { "getBufferSize", w_SpriteBatch_getBufferSize }, - - // Deprecated since 0.9.1. - { "setImage", w_SpriteBatch_setTexture }, - { "getImage", w_SpriteBatch_getTexture }, { 0, 0 } };