Merge branch 'main' of https://github.com/Seb-Park/ocean-simulation

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;
 }