From 4e1c73c1f24fac2f1a38274a08abe1f3f001e087 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 24 Oct 2013 17:46:21 -0300 Subject: [PATCH] Removed Quad:flip (resolves issue #770) --- src/modules/graphics/Quad.cpp | 31 ----------------------- src/modules/graphics/Quad.h | 2 -- src/modules/graphics/opengl/wrap_Quad.cpp | 8 ------ src/modules/graphics/opengl/wrap_Quad.h | 1 - 4 files changed, 42 deletions(-) diff --git a/src/modules/graphics/Quad.cpp b/src/modules/graphics/Quad.cpp index cdfe55df5..2b1b04c7b 100644 --- a/src/modules/graphics/Quad.cpp +++ b/src/modules/graphics/Quad.cpp @@ -74,37 +74,6 @@ Quad::Viewport Quad::getViewport() const return viewport; } -void Quad::flip(bool x, bool y) -{ - Vertex temp[NUM_VERTICES]; - - if (x) - { - memcpy(temp, vertices, sizeof(Vertex) * NUM_VERTICES); - vertices[0].s = temp[3].s; - vertices[0].t = temp[3].t; - vertices[1].s = temp[2].s; - vertices[1].t = temp[2].t; - vertices[2].s = temp[1].s; - vertices[2].t = temp[1].t; - vertices[3].s = temp[0].s; - vertices[3].t = temp[0].t; - } - - if (y) - { - memcpy(temp, vertices, sizeof(Vertex) * NUM_VERTICES); - vertices[0].s = temp[1].s; - vertices[0].t = temp[1].t; - vertices[1].s = temp[0].s; - vertices[1].t = temp[0].t; - vertices[2].s = temp[3].s; - vertices[2].t = temp[3].t; - vertices[3].s = temp[2].s; - vertices[3].t = temp[2].t; - } -} - const Vertex *Quad::getVertices() const { return vertices; diff --git a/src/modules/graphics/Quad.h b/src/modules/graphics/Quad.h index ee9cc2048..7fd72c9bd 100644 --- a/src/modules/graphics/Quad.h +++ b/src/modules/graphics/Quad.h @@ -49,8 +49,6 @@ public: void setViewport(const Viewport &v); Viewport getViewport() const; - void flip(bool x, bool y); - const Vertex *getVertices() const; private: diff --git a/src/modules/graphics/opengl/wrap_Quad.cpp b/src/modules/graphics/opengl/wrap_Quad.cpp index be03344f2..32f11e0a9 100644 --- a/src/modules/graphics/opengl/wrap_Quad.cpp +++ b/src/modules/graphics/opengl/wrap_Quad.cpp @@ -33,13 +33,6 @@ Quad *luax_checkquad(lua_State *L, int idx) return luax_checktype(L, idx, "Quad", GRAPHICS_QUAD_T); } -int w_Quad_flip(lua_State *L) -{ - Quad *quad = luax_checkquad(L, 1); - quad->flip(luax_toboolean(L, 2), luax_toboolean(L, 3)); - return 0; -} - int w_Quad_setViewport(lua_State *L) { Quad *quad = luax_checkquad(L, 1); @@ -75,7 +68,6 @@ int w_Quad_getViewport(lua_State *L) static const luaL_Reg functions[] = { - { "flip", w_Quad_flip }, { "setViewport", w_Quad_setViewport }, { "getViewport", w_Quad_getViewport }, { 0, 0 } diff --git a/src/modules/graphics/opengl/wrap_Quad.h b/src/modules/graphics/opengl/wrap_Quad.h index 55a9377f8..f4d3f1822 100644 --- a/src/modules/graphics/opengl/wrap_Quad.h +++ b/src/modules/graphics/opengl/wrap_Quad.h @@ -33,7 +33,6 @@ namespace opengl { Quad *luax_checkquad(lua_State *L, int idx); -int w_Quad_flip(lua_State *L); int w_Quad_setViewport(lua_State *L); int w_Quad_getViewport(lua_State *L); extern "C" int luaopen_quad(lua_State *L);