From 1a392a79b0491c5acc766705698191ed2ed6c2e6 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 12 Mar 2015 13:48:10 -0400 Subject: Added death to my game --- src/renderer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/renderer.cpp') diff --git a/src/renderer.cpp b/src/renderer.cpp index f01d72a..64c9fd0 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -613,7 +613,7 @@ void Texture::fill(Rectangle dstrect, int r, int g, int b) glDeleteBuffers(1, &vertexbuffer); } -void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect) +void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect, double alpha) { if (!rendererInitialized) { @@ -621,6 +621,8 @@ void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect) exit(-1); } + alpha = glm::clamp(alpha, 0.0, 1.0); + // Target the framebuffer glBindFramebuffer(GL_FRAMEBUFFER, generic_framebuffer); glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texID, 0); @@ -670,6 +672,7 @@ void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, srctex.texID); glUniform1i(glGetUniformLocation(blitShader, "srctex"), 0); + glUniform1f(glGetUniformLocation(blitShader, "alpha"), alpha); // Blit! glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); -- cgit 1.4.1