zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust GL1 and GL3 ReadFrame to take pixel ratio into account. 

Currently, on HiDPI screens the Export Image command would return
a cropped screenshot.
pull/420/head
whitequark 2019-05-20 19:09:28 +00:00
parent 11c5cdc7b0
commit f43954cc29
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/render/rendergl1.cpp
View File

@ -814,9 +814,12 @@ void OpenGl1Renderer::FlushFrame() {
} }
std::shared_ptr<Pixmap> OpenGl1Renderer::ReadFrame() { std::shared_ptr<Pixmap> OpenGl1Renderer::ReadFrame() {
int width = camera.width * camera.pixelRatio;
int height = camera.height * camera.pixelRatio;
std::shared_ptr<Pixmap> pixmap = std::shared_ptr<Pixmap> pixmap =
Pixmap::Create(Pixmap::Format::RGB, (size_t)camera.width, (size_t)camera.height); Pixmap::Create(Pixmap::Format::RGB, (size_t)width, (size_t)height);
glReadPixels(0, 0, camera.width, camera.height, GL_RGB, GL_UNSIGNED_BYTE, &pixmap->data[0]); glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, &pixmap->data[0]);
ssassert(glGetError() == GL_NO_ERROR, "Unexpected glReadPixels error");
return pixmap; return pixmap;
} }

7
src/render/rendergl3.cpp
View File

@ -679,10 +679,11 @@ void OpenGl3Renderer::Clear() {
} }
std::shared_ptr<Pixmap> OpenGl3Renderer::ReadFrame() { std::shared_ptr<Pixmap> OpenGl3Renderer::ReadFrame() {
int width = camera.width * camera.pixelRatio;
int height = camera.height * camera.pixelRatio;
std::shared_ptr<Pixmap> pixmap = std::shared_ptr<Pixmap> pixmap =
Pixmap::Create(Pixmap::Format::RGBA, (size_t)camera.width, (size_t)camera.height); Pixmap::Create(Pixmap::Format::RGBA, (size_t)width, (size_t)height);
glReadPixels(0, 0, (int)camera.width, (int)camera.height, glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, &pixmap->data[0]);
GL_RGBA, GL_UNSIGNED_BYTE, &pixmap->data[0]);
ssassert(glGetError() == GL_NO_ERROR, "Unexpected glReadPixels error"); ssassert(glGetError() == GL_NO_ERROR, "Unexpected glReadPixels error");
return pixmap; return pixmap;
} }