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

Fix #435 (for real this time). Unfixes #324.

Browse Source 
Add a extern vec2 love_ScreenSize to the pixel effects that will
be (re)set upon PixelEffect::loadVolatile() and is used to flip
the fragment coordinate.

Unfixes #324 because canvases can have different dimensions than
the screen.
This commit is contained in:
vrld
2012-08-05 16:08:22 +02:00
parent 1fd12e4596
commit 87c6646705
7 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+6 -16
View File
@@ -197,13 +197,13 @@ Canvas::Canvas(int width, int height)
// world coordinates
vertices[0].x = 0;
vertices[0].y = 0;
vertices[0].y = h;
vertices[1].x = 0;
vertices[1].y = h;
vertices[1].y = 0;
vertices[2].x = w;
vertices[2].y = h;
vertices[2].y = 0;
vertices[3].x = w;
vertices[3].y = 0;
vertices[3].y = h;
// texture coordinates
vertices[0].s = 0;
@@ -262,7 +262,7 @@ void Canvas::startGrab()
glLoadIdentity();
// Set up orthographic view (no depth)
glOrtho(0.0, width, height, 0.0, -1.0, 1.0);
glOrtho(0.0, width, 0.0, height, -1.0, 1.0);
// Switch back to modelview matrix
glMatrixMode(GL_MODELVIEW);
@@ -312,12 +312,10 @@ void Canvas::draw(float x, float y, float angle, float sx, float sy, float ox, f
void Canvas::drawq(love::graphics::Quad *quad, float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky) const
{
static Matrix t;
quad->mirror(false, true);
const vertex *v = quad->getVertices();
t.setTransformation(x, y, angle, sx, sy, ox, oy, kx, ky);
drawv(t, v);
quad->mirror(false, true);
}
love::image::ImageData *Canvas::getImageData(love::image::Image *image)
@@ -325,7 +323,6 @@ love::image::ImageData *Canvas::getImageData(love::image::Image *image)
int row = 4 * width;
int size = row * height;
GLubyte *pixels = new GLubyte[size];
GLubyte *screenshot = new GLubyte[size];
strategy->bindFBO(fbo);
glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
@@ -334,15 +331,8 @@ love::image::ImageData *Canvas::getImageData(love::image::Image *image)
else
strategy->bindFBO(0);
GLubyte *src = pixels - row; // second line of source image
GLubyte *dst = screenshot + size; // last row of destination image
love::image::ImageData *img = image->newImageData(width, height, (void *)pixels);
for (int i = 0; i < height; ++i)
memcpy(dst -= row, src += row, row);
love::image::ImageData *img = image->newImageData(width, height, (void *)screenshot);
delete[] screenshot;
delete[] pixels;
return img;