omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add clear_mark to clear only selected channels in the framebuffer

Browse Source
This commit is contained in:
omigamedev
2019-07-20 14:37:59 +02:00
parent 4b73647c98
commit 02fda636ab
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/rtt.cpp
View File

@@ -98,16 +98,18 @@ void RTT::copy(const RTT & source)
{ {
App::I->render_task([&] App::I->render_task([&]
{ {
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &oldDFboID); GLint old_draw = 0;
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &oldRFboID); GLint old_read = 0;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &old_draw);
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboID); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboID);
glBindFramebuffer(GL_READ_FRAMEBUFFER, source.fboID); glBindFramebuffer(GL_READ_FRAMEBUFFER, source.fboID);
glBlitFramebuffer(0, 0, source.w, source.h, 0, 0, w, h, glBlitFramebuffer(0, 0, source.w, source.h, 0, 0, w, h,
GL_COLOR_BUFFER_BIT, GL_LINEAR); GL_COLOR_BUFFER_BIT, GL_LINEAR);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, oldDFboID); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, old_draw);
glBindFramebuffer(GL_READ_FRAMEBUFFER, oldRFboID); glBindFramebuffer(GL_READ_FRAMEBUFFER, old_read);
}); });
} }
@@ -117,16 +119,18 @@ void RTT::copy(const RTT& source, const glm::vec4& rect)
{ {
auto r = rect_intersection(rect, { 0, 0, w, h }); auto r = rect_intersection(rect, { 0, 0, w, h });
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &oldDFboID); GLint old_draw = 0;
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &oldRFboID); GLint old_read = 0;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &old_draw);
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboID); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboID);
glBindFramebuffer(GL_READ_FRAMEBUFFER, source.fboID); glBindFramebuffer(GL_READ_FRAMEBUFFER, source.fboID);
glBlitFramebuffer(r.x, r.y, r.z, r.w, r.x, r.y, r.z, r.w, glBlitFramebuffer(r.x, r.y, r.z, r.w, r.x, r.y, r.z, r.w,
GL_COLOR_BUFFER_BIT, GL_NEAREST); GL_COLOR_BUFFER_BIT, GL_NEAREST);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, oldDFboID); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, old_draw);
glBindFramebuffer(GL_READ_FRAMEBUFFER, oldRFboID); glBindFramebuffer(GL_READ_FRAMEBUFFER, old_read);
}); });
} }
@@ -251,6 +255,21 @@ void RTT::clear(glm::vec4 color)
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
} }
void RTT::clear_mask(glm::bool4 mask, glm::vec4 color)
{
// save old state
std::array<GLboolean, 4> old_mask;
glGetBooleanv(GL_COLOR_WRITEMASK, std::data(old_mask));
// clear with mask
glColorMask(mask.r, mask.g, mask.b, mask.a);
glClearColor(color.r, color.g, color.b, color.a);
glClear(GL_COLOR_BUFFER_BIT);
// restore old state
glColorMask(old_mask[0], old_mask[1], old_mask[2], old_mask[3]);
}
glm::ivec4 RTT::calc_bounds() glm::ivec4 RTT::calc_bounds()
{ {
auto data = std::unique_ptr<glm::u8vec4[]>(reinterpret_cast<glm::u8vec4*>(readTextureData())); auto data = std::unique_ptr<glm::u8vec4[]>(reinterpret_cast<glm::u8vec4*>(readTextureData()));

1
src/rtt.h
View File

@@ -27,6 +27,7 @@ public:
bool create(int width, int height, int tex = -1, GLint internal_format = GL_RGBA8, bool depth_buffer = false); bool create(int width, int height, int tex = -1, GLint internal_format = GL_RGBA8, bool depth_buffer = false);
bool recreate() { return create(w, h); } bool recreate() { return create(w, h); }
void clear(glm::vec4 color = glm::vec4(0)); void clear(glm::vec4 color = glm::vec4(0));
void clear_mask(glm::bool4 mask, glm::vec4 color = glm::vec4(0));
glm::ivec4 calc_bounds(); glm::ivec4 calc_bounds();
uint8_t* readTextureData(uint8_t* buffer = nullptr); uint8_t* readTextureData(uint8_t* buffer = nullptr);
float* readTextureDataFloat(float* buffer = nullptr); float* readTextureDataFloat(float* buffer = nullptr);