lub follow up

Borf · Dec 6, 2023 · be896d8 · be896d8
1 parent 483b183
commit be896d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/browedit/components/LubRenderer.cpp b/browedit/components/LubRenderer.cpp
@@ -70,7 +70,7 @@ void LubRenderer::render()
 	}
 
 	shader->setUniform(LubShader::Uniforms::billboard_off, (bool)lubEffect->billboard_off);
-	shader->setUniform(LubShader::Uniforms::color, lubEffect->color);
+	shader->setUniform(LubShader::Uniforms::color, glm::vec4(lubEffect->color.r, lubEffect->color.g, lubEffect->color.b, 1.0f));
 
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 	if (texture)

diff --git a/data/shaders/lub.fs b/data/shaders/lub.fs
@@ -12,6 +12,6 @@ void main()
 {
 	vec4 outColor = texture2D(s_texture, texCoord);
 	outColor *= color;
-	outColor.a = alpha;
+	outColor.a *= alpha;
 	fragColor = outColor;
 }