From c3b77e0a92fec3324108cedb9b561f2d790ae742 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 4 Feb 2020 20:09:46 -0400 Subject: [PATCH] Remove wrap_Canvas and wrap_Image files --- CMakeLists.txt | 4 -- .../xcode/liblove.xcodeproj/project.pbxproj | 20 --------- src/modules/graphics/wrap_Canvas.cpp | 45 ------------------- src/modules/graphics/wrap_Canvas.h | 38 ---------------- src/modules/graphics/wrap_Graphics.cpp | 10 ++--- src/modules/graphics/wrap_Graphics.h | 3 +- src/modules/graphics/wrap_Image.cpp | 45 ------------------- src/modules/graphics/wrap_Image.h | 37 --------------- 8 files changed, 5 insertions(+), 197 deletions(-) delete mode 100644 src/modules/graphics/wrap_Canvas.cpp delete mode 100644 src/modules/graphics/wrap_Canvas.h delete mode 100644 src/modules/graphics/wrap_Image.cpp delete mode 100644 src/modules/graphics/wrap_Image.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 72953c5e4..52d259cb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,14 +559,10 @@ set(LOVE_SRC_MODULE_GRAPHICS_ROOT src/modules/graphics/Video.h src/modules/graphics/Volatile.cpp src/modules/graphics/Volatile.h - src/modules/graphics/wrap_Canvas.cpp - src/modules/graphics/wrap_Canvas.h src/modules/graphics/wrap_Font.cpp src/modules/graphics/wrap_Font.h src/modules/graphics/wrap_Graphics.cpp src/modules/graphics/wrap_Graphics.h - src/modules/graphics/wrap_Image.cpp - src/modules/graphics/wrap_Image.h src/modules/graphics/wrap_Mesh.cpp src/modules/graphics/wrap_Mesh.h src/modules/graphics/wrap_ParticleSystem.cpp diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 79bc992f1..44419670b 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -790,9 +790,6 @@ FA1BA0A71E16F20600AA2803 /* Canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0A51E16F20600AA2803 /* Canvas.cpp */; }; FA1BA0A81E16F20600AA2803 /* Canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0A51E16F20600AA2803 /* Canvas.cpp */; }; FA1BA0A91E16F20600AA2803 /* Canvas.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1BA0A61E16F20600AA2803 /* Canvas.h */; }; - FA1BA0AC1E16F9EE00AA2803 /* wrap_Canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0AA1E16F9EE00AA2803 /* wrap_Canvas.cpp */; }; - FA1BA0AD1E16F9EE00AA2803 /* wrap_Canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0AA1E16F9EE00AA2803 /* wrap_Canvas.cpp */; }; - FA1BA0AE1E16F9EE00AA2803 /* wrap_Canvas.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1BA0AB1E16F9EE00AA2803 /* wrap_Canvas.h */; }; FA1BA0B11E16FD0800AA2803 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0AF1E16FD0800AA2803 /* Shader.cpp */; }; FA1BA0B21E16FD0800AA2803 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0AF1E16FD0800AA2803 /* Shader.cpp */; }; FA1BA0B31E16FD0800AA2803 /* Shader.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1BA0B01E16FD0800AA2803 /* Shader.h */; }; @@ -1063,9 +1060,6 @@ FADF54161E3DA08E00012CC0 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADF54141E3DA08E00012CC0 /* Image.cpp */; }; FADF54171E3DA08E00012CC0 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADF54141E3DA08E00012CC0 /* Image.cpp */; }; FADF54181E3DA08E00012CC0 /* Image.h in Headers */ = {isa = PBXBuildFile; fileRef = FADF54151E3DA08E00012CC0 /* Image.h */; }; - FADF541B1E3DA46C00012CC0 /* wrap_Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADF54191E3DA46C00012CC0 /* wrap_Image.cpp */; }; - FADF541C1E3DA46C00012CC0 /* wrap_Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADF54191E3DA46C00012CC0 /* wrap_Image.cpp */; }; - FADF541D1E3DA46C00012CC0 /* wrap_Image.h in Headers */ = {isa = PBXBuildFile; fileRef = FADF541A1E3DA46C00012CC0 /* wrap_Image.h */; }; FADF54201E3DA52C00012CC0 /* wrap_ParticleSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADF541E1E3DA52C00012CC0 /* wrap_ParticleSystem.cpp */; }; FADF54211E3DA52C00012CC0 /* wrap_ParticleSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADF541E1E3DA52C00012CC0 /* wrap_ParticleSystem.cpp */; }; FADF54221E3DA52C00012CC0 /* wrap_ParticleSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = FADF541F1E3DA52C00012CC0 /* wrap_ParticleSystem.h */; }; @@ -1807,8 +1801,6 @@ FA1BA0A11E16D97500AA2803 /* wrap_Font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Font.h; sourceTree = ""; }; FA1BA0A51E16F20600AA2803 /* Canvas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = Canvas.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; FA1BA0A61E16F20600AA2803 /* Canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Canvas.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - FA1BA0AA1E16F9EE00AA2803 /* wrap_Canvas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = wrap_Canvas.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - FA1BA0AB1E16F9EE00AA2803 /* wrap_Canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Canvas.h; sourceTree = ""; }; FA1BA0AF1E16FD0800AA2803 /* Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shader.cpp; sourceTree = ""; }; FA1BA0B01E16FD0800AA2803 /* Shader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shader.h; sourceTree = ""; }; FA1BA0B51E17043400AA2803 /* wrap_Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Shader.cpp; sourceTree = ""; }; @@ -2011,8 +2003,6 @@ FADF540C1E3D7CDD00012CC0 /* wrap_Video.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wrap_Video.lua; sourceTree = ""; }; FADF54141E3DA08E00012CC0 /* Image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Image.cpp; sourceTree = ""; }; FADF54151E3DA08E00012CC0 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = ""; }; - FADF54191E3DA46C00012CC0 /* wrap_Image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Image.cpp; sourceTree = ""; }; - FADF541A1E3DA46C00012CC0 /* wrap_Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Image.h; sourceTree = ""; }; FADF541E1E3DA52C00012CC0 /* wrap_ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_ParticleSystem.cpp; sourceTree = ""; }; FADF541F1E3DA52C00012CC0 /* wrap_ParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_ParticleSystem.h; sourceTree = ""; }; FADF54231E3DA5BA00012CC0 /* Mesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mesh.cpp; sourceTree = ""; }; @@ -2879,16 +2869,12 @@ FADF54061E3D78F700012CC0 /* Video.h */, FA0B7BC01A95902C000E1D17 /* Volatile.cpp */, FA0B7BC11A95902C000E1D17 /* Volatile.h */, - FA1BA0AA1E16F9EE00AA2803 /* wrap_Canvas.cpp */, - FA1BA0AB1E16F9EE00AA2803 /* wrap_Canvas.h */, FA1BA0A01E16D97500AA2803 /* wrap_Font.cpp */, FA1BA0A11E16D97500AA2803 /* wrap_Font.h */, FADF54391E3DAFF700012CC0 /* wrap_Graphics.cpp */, FADF543A1E3DAFF700012CC0 /* wrap_Graphics.h */, FADF54371E3DAFBA00012CC0 /* wrap_Graphics.lua */, FA665DC321C34C900074BBD6 /* wrap_GraphicsShader.lua */, - FADF54191E3DA46C00012CC0 /* wrap_Image.cpp */, - FADF541A1E3DA46C00012CC0 /* wrap_Image.h */, FADF54281E3DAADA00012CC0 /* wrap_Mesh.cpp */, FADF54291E3DAADA00012CC0 /* wrap_Mesh.h */, FADF541E1E3DA52C00012CC0 /* wrap_ParticleSystem.cpp */, @@ -3936,7 +3922,6 @@ FAF140A51E20934C00F898D2 /* Scan.h in Headers */, FA0B7CE11A95902C000E1D17 /* Source.h in Headers */, FA24348621D401CB00B8918A /* attribute.h in Headers */, - FA1BA0AE1E16F9EE00AA2803 /* wrap_Canvas.h in Headers */, FAF140901E20934C00F898D2 /* PpContext.h in Headers */, FA0B7E621A95902C000E1D17 /* wrap_Physics.h in Headers */, FA0B7DF01A95902C000E1D17 /* Mouse.h in Headers */, @@ -3974,7 +3959,6 @@ FAB17BE81ABFAA9000F9BA27 /* lz4.h in Headers */, FA0B7E6B1A95902C000E1D17 /* wrap_PulleyJoint.h in Headers */, FA0B7E051A95902C000E1D17 /* Contact.h in Headers */, - FADF541D1E3DA46C00012CC0 /* wrap_Image.h in Headers */, FA1BA0A91E16F20600AA2803 /* Canvas.h in Headers */, FA0B7A691A958EA3000E1D17 /* b2Island.h in Headers */, FA4F2BE41DE6650600CA37D7 /* Transform.h in Headers */, @@ -4349,7 +4333,6 @@ FA0B7ECC1A95902C000E1D17 /* wrap_Channel.cpp in Sources */, FA0B7E6D1A95902C000E1D17 /* wrap_RevoluteJoint.cpp in Sources */, FA0B7A5F1A958EA3000E1D17 /* b2Body.cpp in Sources */, - FADF541C1E3DA46C00012CC0 /* wrap_Image.cpp in Sources */, FACA02FA1F5E397B0084B28F /* DataModule.cpp in Sources */, FA0B7E641A95902C000E1D17 /* wrap_PolygonShape.cpp in Sources */, FA4F2C031DE936C200CA37D7 /* auxiliar.c in Sources */, @@ -4641,7 +4624,6 @@ FA0B7DBF1A95902C000E1D17 /* JoystickModule.cpp in Sources */, FAB2D5AB1AABDD8A008224A4 /* TrueTypeRasterizer.cpp in Sources */, FA0B7A9F1A958EA3000E1D17 /* b2PrismaticJoint.cpp in Sources */, - FA1BA0AD1E16F9EE00AA2803 /* wrap_Canvas.cpp in Sources */, FAF6C9FB23C2DE2900D7B5BC /* disassemble.cpp in Sources */, FAE64A822071363100BC7981 /* physfs_archiver_grp.c in Sources */, FAF6C9F323C2DE2900D7B5BC /* SPVRemapper.cpp in Sources */, @@ -4750,7 +4732,6 @@ FA0B7E6C1A95902C000E1D17 /* wrap_RevoluteJoint.cpp in Sources */, FA0B7A5E1A958EA3000E1D17 /* b2Body.cpp in Sources */, FA0B7E631A95902C000E1D17 /* wrap_PolygonShape.cpp in Sources */, - FADF541B1E3DA46C00012CC0 /* wrap_Image.cpp in Sources */, FAC7CD7B1FE35E95006A60C7 /* physfs_platform_unix.c in Sources */, FACA02F01F5E396B0084B28F /* DataModule.cpp in Sources */, FA0B7E721A95902C000E1D17 /* wrap_Shape.cpp in Sources */, @@ -5043,7 +5024,6 @@ FA0B7E5A1A95902C000E1D17 /* wrap_MotorJoint.cpp in Sources */, FA0B7AA71A958EA3000E1D17 /* b2RopeJoint.cpp in Sources */, FA0B7DD61A95902C000E1D17 /* MathModule.cpp in Sources */, - FA1BA0AC1E16F9EE00AA2803 /* wrap_Canvas.cpp in Sources */, FAC7CD8A1FE35E95006A60C7 /* physfs_byteorder.c in Sources */, FA0B7D0F1A95902C000E1D17 /* BMFontRasterizer.cpp in Sources */, FA0B7E9A1A95902C000E1D17 /* VorbisDecoder.cpp in Sources */, diff --git a/src/modules/graphics/wrap_Canvas.cpp b/src/modules/graphics/wrap_Canvas.cpp deleted file mode 100644 index 5aad53644..000000000 --- a/src/modules/graphics/wrap_Canvas.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (c) 2006-2020 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - **/ - -#include "wrap_Canvas.h" -#include "Graphics.h" - -namespace love -{ -namespace graphics -{ - -Canvas *luax_checkcanvas(lua_State *L, int idx) -{ - return luax_checktype(L, idx); -} - -static const luaL_Reg w_Canvas_functions[] = -{ - { 0, 0 } -}; - -extern "C" int luaopen_canvas(lua_State *L) -{ - return luax_register_type(L, &Canvas::type, w_Texture_functions, w_Canvas_functions, nullptr); -} - -} // graphics -} // love diff --git a/src/modules/graphics/wrap_Canvas.h b/src/modules/graphics/wrap_Canvas.h deleted file mode 100644 index a56eb083c..000000000 --- a/src/modules/graphics/wrap_Canvas.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (c) 2006-2020 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - **/ - -#pragma once - -// LOVE -#include "common/runtime.h" -#include "Canvas.h" -#include "wrap_Texture.h" - -namespace love -{ -namespace graphics -{ - -//see Canvas.h -Canvas *luax_checkcanvas(lua_State *L, int idx); -extern "C" int luaopen_canvas(lua_State *L); - -} // graphics -} // love diff --git a/src/modules/graphics/wrap_Graphics.cpp b/src/modules/graphics/wrap_Graphics.cpp index 4b11756d5..d6c979061 100644 --- a/src/modules/graphics/wrap_Graphics.cpp +++ b/src/modules/graphics/wrap_Graphics.cpp @@ -249,7 +249,7 @@ int w_getDPIScale(lua_State *L) static Graphics::RenderTarget checkRenderTarget(lua_State *L, int idx) { lua_rawgeti(L, idx, 1); - Graphics::RenderTarget target(luax_checkcanvas(L, -1), 0); + Graphics::RenderTarget target(luax_checktexture(L, -1), 0); lua_pop(L, 1); TextureType type = target.texture->getTextureType(); @@ -292,7 +292,7 @@ int w_setCanvas(lua_State *L) targets.colors.push_back(checkRenderTarget(L, -1)); else { - targets.colors.emplace_back(luax_checkcanvas(L, -1), 0); + targets.colors.emplace_back(luax_checktexture(L, -1), 0); if (targets.colors.back().texture->getTextureType() != TEXTURE_2D) return luaL_error(L, "Non-2D canvases must use the table-of-tables variant of setCanvas."); @@ -311,7 +311,7 @@ int w_setCanvas(lua_State *L) else if (dstype == LUA_TBOOLEAN) targets.temporaryRTFlags |= luax_toboolean(L, -1) ? (tempdepthflag | tempstencilflag) : 0; else if (dstype != LUA_TNONE && dstype != LUA_TNIL) - targets.depthStencil.texture = luax_checkcanvas(L, -1); + targets.depthStencil.texture = luax_checktexture(L, -1); lua_pop(L, 1); if (targets.depthStencil.texture == nullptr && (targets.temporaryRTFlags & tempdepthflag) == 0) @@ -324,7 +324,7 @@ int w_setCanvas(lua_State *L) { for (int i = 1; i <= lua_gettop(L); i++) { - Graphics::RenderTarget target(luax_checkcanvas(L, i), 0); + Graphics::RenderTarget target(luax_checktexture(L, i), 0); TextureType type = target.texture->getTextureType(); if (i == 1 && type != TEXTURE_2D) @@ -3123,11 +3123,9 @@ static const lua_CFunction types[] = luaopen_drawable, luaopen_texture, luaopen_font, - luaopen_image, luaopen_quad, luaopen_spritebatch, luaopen_particlesystem, - luaopen_canvas, luaopen_shader, luaopen_mesh, luaopen_text, diff --git a/src/modules/graphics/wrap_Graphics.h b/src/modules/graphics/wrap_Graphics.h index 7359ef652..afd4240ec 100644 --- a/src/modules/graphics/wrap_Graphics.h +++ b/src/modules/graphics/wrap_Graphics.h @@ -23,11 +23,10 @@ // LOVE #include "common/config.h" #include "wrap_Font.h" -#include "wrap_Image.h" +#include "wrap_Texture.h" #include "wrap_Quad.h" #include "wrap_SpriteBatch.h" #include "wrap_ParticleSystem.h" -#include "wrap_Canvas.h" #include "wrap_Shader.h" #include "wrap_Mesh.h" #include "wrap_Text.h" diff --git a/src/modules/graphics/wrap_Image.cpp b/src/modules/graphics/wrap_Image.cpp deleted file mode 100644 index 177a2866d..000000000 --- a/src/modules/graphics/wrap_Image.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (c) 2006-2020 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - **/ - -// LOVE -#include "wrap_Image.h" - -namespace love -{ -namespace graphics -{ - -Image *luax_checkimage(lua_State *L, int idx) -{ - return luax_checktype(L, idx); -} - -static const luaL_Reg w_Image_functions[] = -{ - { 0, 0 } -}; - -extern "C" int luaopen_image(lua_State *L) -{ - return luax_register_type(L, &Image::type, w_Texture_functions, w_Image_functions, nullptr); -} - -} // graphics -} // love diff --git a/src/modules/graphics/wrap_Image.h b/src/modules/graphics/wrap_Image.h deleted file mode 100644 index ed3697bdd..000000000 --- a/src/modules/graphics/wrap_Image.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (c) 2006-2020 LOVE Development Team - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - **/ - -#pragma once - -// LOVE -#include "common/runtime.h" -#include "Image.h" -#include "wrap_Texture.h" - -namespace love -{ -namespace graphics -{ - -Image *luax_checkimage(lua_State *L, int idx); -extern "C" int luaopen_image(lua_State *L); - -} // graphics -} // love