summaryrefslogtreecommitdiff
path: root/resources/shaders/particles.frag
diff options
context:
space:
mode:
authorjjesswan <90643397+jjesswan@users.noreply.github.com>2024-05-10 04:26:01 -0400
committerGitHub <noreply@github.com>2024-05-10 04:26:01 -0400
commit2cff8e109965307a4265f43d01f4c365f09977e7 (patch)
tree4915de3e338ee965502289f05f12dc07ef3a717f /resources/shaders/particles.frag
parentd158de5abe6ddbc8546a7fafd797e9f7c74fe768 (diff)
parent690670c920549828733fddc12e45bae34271aff4 (diff)
Merge pull request #5 from Seb-Park/new_parti
texture particles
Diffstat (limited to 'resources/shaders/particles.frag')
-rw-r--r--resources/shaders/particles.frag6
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/shaders/particles.frag b/resources/shaders/particles.frag
index 99373e7..85d9ac2 100644
--- a/resources/shaders/particles.frag
+++ b/resources/shaders/particles.frag
@@ -4,12 +4,12 @@ in vec4 ParticleColor;
out vec4 fragColor;
-uniform sampler2D sprite;
+uniform sampler2D particle_texture;
uniform float alpha;
void main()
{
- // color = (texture(sprite, TexCoords) * ParticleColor);
- fragColor = vec4(1,1,1,alpha);
+ vec4 c = texture(particle_texture, TexCoords);
+ fragColor = c*vec4(1,1,1,alpha)*1.6;
}