mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-04-08 07:37:07 +00:00
Code Issues Releases Wiki Activity

fix taking screenshots

Browse source
This commit is contained in:
fgenesis 2022-04-29 10:26:25 +02:00
parent 988c8c79e4
commit 9290acd379
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
BBGE/Core.cpp
View file

@ -2210,10 +2210,11 @@ bool Core::canChangeState()
// Take a screenshot of the specified region of the screen and store it // Take a screenshot of the specified region of the screen and store it
// in a 32bpp pixel buffer. delete[] the returned buffer when it's no // in a 32bpp pixel buffer. delete[] the returned buffer when it's no
// longer needed. // longer needed.
unsigned char *Core::grabScreenshot(int x, int y, int w, int h) unsigned char *Core::grabScreenshot(size_t x, size_t y, size_t w, size_t h)
{ {
unsigned int size = sizeof(unsigned char) * w * h * 4; const size_t N = w * h;
unsigned char *imageData = new unsigned char[size]; const size_t size = sizeof(unsigned char) * N * 4;
unsigned char * const imageData = new unsigned char[size];
glPushAttrib(GL_ALL_ATTRIB_BITS); glPushAttrib(GL_ALL_ATTRIB_BITS);
glDisable(GL_BLEND); glDisable(GL_BLEND);
@ -2232,12 +2233,20 @@ unsigned char *Core::grabScreenshot(int x, int y, int w, int h)
// Force all alpha values to 255. // Force all alpha values to 255.
unsigned char *c = imageData; unsigned char *c = imageData;
for (int x = 0; x < w; x++) for (size_t i = 0; i < N; ++i, c += 4)
{ {
for (int y = 0; y < h; y++, c += 4) c[3] = 255;
{ }
c[3] = 255;
} // OpenGL outputs the image upside down -> flip pixel rows
const ptrdiff_t rowOffs = 4 * w;
unsigned char * row0 = imageData;
unsigned char * row1 = imageData + size - rowOffs;
while(row0 < row1)
{
std::swap_ranges(row0, row0 + rowOffs, row1);
row0 += rowOffs;
row1 -= rowOffs;
} }
return imageData; return imageData;
@ -2245,7 +2254,7 @@ unsigned char *Core::grabScreenshot(int x, int y, int w, int h)
} }
// Like grabScreenshot(), but grab from the center of the screen. // Like grabScreenshot(), but grab from the center of the screen.
unsigned char *Core::grabCenteredScreenshot(int w, int h) unsigned char *Core::grabCenteredScreenshot(size_t w, size_t h)
{ {
return grabScreenshot(core->width/2 - w/2, core->height/2 - h/2, w, h); return grabScreenshot(core->width/2 - w/2, core->height/2 - h/2, w, h);
} }
@ -2253,7 +2262,7 @@ unsigned char *Core::grabCenteredScreenshot(int w, int h)
// takes a screen shot and saves it to a TGA or PNG image // takes a screen shot and saves it to a TGA or PNG image
bool Core::saveScreenshot(const std::string &filename, bool png) bool Core::saveScreenshot(const std::string &filename, bool png)
{ {
int w = getWindowWidth(), h = getWindowHeight(); size_t w = getWindowWidth(), h = getWindowHeight();
unsigned char *imageData = grabCenteredScreenshot(w, h); unsigned char *imageData = grabCenteredScreenshot(w, h);
bool ok = png bool ok = png
? pngSaveRGBA(filename.c_str(), w, h, imageData) ? pngSaveRGBA(filename.c_str(), w, h, imageData)

4
BBGE/Core.h
View file

@ -354,8 +354,8 @@ public:
return virtualHeight; return virtualHeight;
} }
unsigned char *grabScreenshot(int x, int y, int w, int h); unsigned char *grabScreenshot(size_t x, size_t y, size_t w, size_t h);
unsigned char *grabCenteredScreenshot(int w, int h); unsigned char *grabCenteredScreenshot(size_t w, size_t h);
bool saveScreenshot(const std::string &filename, bool png); bool saveScreenshot(const std::string &filename, bool png);
bool minimized; bool minimized;

1
ExternalLibs/tinylibs.cpp
View file

@ -19,6 +19,7 @@ static unsigned char * miniz_stbi_compress(unsigned char *data, int data_len, in
return NULL; return NULL;
} }
} }
*out_len = (int)maxsz;
return packed; return packed;
} }