X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fshader.cpp;fp=src%2Fgraphics%2Fshader.cpp;h=0f372d014915478dda1c2c94a6a0cb4d58193b42;hb=f7fdde845eb7bb84ca83ae8cf7361abce8b2086e;hp=b14da4d1011358922fcf211fbb1d26ca2fb93bae;hpb=56f570e713c42d30109a214e68a2beed96ba1999;p=blobs.git diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp index b14da4d..0f372d0 100644 --- a/src/graphics/shader.cpp +++ b/src/graphics/shader.cpp @@ -648,9 +648,9 @@ PlainColor::PlainColor() GL_FRAGMENT_SHADER, "#version 330 core\n" - "uniform vec3 fg_color;\n" + "uniform vec4 fg_color;\n" - "out vec3 color;\n" + "out vec4 color;\n" "void main() {\n" "color = fg_color;\n" @@ -701,7 +701,8 @@ void PlainColor::Activate() noexcept { glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LESS); glEnable(GL_CULL_FACE); - glDisable(GL_BLEND); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } void PlainColor::SetM(const glm::mat4 &mm) noexcept { @@ -733,7 +734,7 @@ void PlainColor::SetMVP(const glm::mat4 &mm, const glm::mat4 &vv, const glm::mat prog.Uniform(mvp_handle, mvp); } -void PlainColor::SetColor(const glm::vec3 &color) noexcept { +void PlainColor::SetColor(const glm::vec4 &color) noexcept { prog.Uniform(fg_color_handle, color); }