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

Revert Canvas flipping (commits 9cb824e2fa84, e0234edd0026) in order to fix issue #324.

Browse Source
This commit is contained in:
vrld
2011-11-12 22:09:56 +01:00
parent 7eef68f4ec
commit 983b00c510
4 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Quad.cpp
+27 -17
View File
@@ -1,14 +1,14 @@
/**
* Copyright (c) 2006-2011 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
@@ -36,7 +36,7 @@ namespace opengl
Quad::Quad(const Viewport & v, float sw, float sh)
: sw(sw), sh(sh)
{
memset(vertices, 255, sizeof(vertex)*4);
memset(vertices, 255, sizeof(vertex)*NUM_VERTICES);
refresh(v, sw, sh);
}
@@ -53,22 +53,22 @@ namespace opengl
}
viewport = v;
vertices[0].x = 0;
vertices[0].x = 0;
vertices[0].y = 0;
vertices[1].x = 0;
vertices[1].x = 0;
vertices[1].y = v.h;
vertices[2].x = v.w;
vertices[2].x = v.w;
vertices[2].y = v.h;
vertices[3].x = v.w;
vertices[3].x = v.w;
vertices[3].y = 0;
vertices[0].s = v.x/sw;
vertices[0].s = v.x/sw;
vertices[0].t = v.y/sh;
vertices[1].s = v.x/sw;
vertices[1].s = v.x/sw;
vertices[1].t = (v.y+v.h)/sh;
vertices[2].s = (v.x+v.w)/sw;
vertices[2].s = (v.x+v.w)/sw;
vertices[2].t = (v.y+v.h)/sh;
vertices[3].s = (v.x+v.w)/sw;
vertices[3].s = (v.x+v.w)/sw;
vertices[3].t = v.y/sh;
}
@@ -79,15 +79,15 @@ namespace opengl
Quad::Viewport Quad::getViewport() const
{
return viewport;
return viewport;
}
void Quad::flip(bool x, bool y)
{
vertex temp[4];
if (x)
{
memcpy(temp, vertices, sizeof(vertex)*4);
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;
@@ -95,7 +95,7 @@ namespace opengl
}
if (y)
{
memcpy(temp, vertices, sizeof(vertex)*4);
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;
@@ -103,6 +103,16 @@ namespace opengl
}
}
void Quad::mirror(bool x, bool y)
{
for (size_t i = 0; i < NUM_VERTICES; ++i) {
if (x)
vertices[i].s = 1.0 - vertices[i].s;
if (y)
vertices[i].s = 1.0 - vertices[i].s;
}
}
const vertex * Quad::getVertices() const
{
return vertices;