fix particle texture and foam

4 files changed, 2 insertions, 2 deletions

diff --git a/resources/images/foam3.png b/resources/images/foam3.png
index e601df4..b25b73f 100644
--- a/resources/images/foam3.png
+++ b/resources/images/foam3.png
diff --git a/resources/images/particle.png b/resources/images/particle.png
index 68b8ac2..9efb1f0 100644
--- a/resources/images/particle.png
+++ b/resources/images/particle.png
diff --git a/resources/shaders/particles.frag b/resources/shaders/particles.frag
index 85d9ac2..fdbd8f0 100644
--- a/resources/shaders/particles.frag
+++ b/resources/shaders/particles.frag
@@ -11,5 +11,5 @@ uniform float alpha;
 void main()
 {
     vec4 c = texture(particle_texture, TexCoords);
-    fragColor = c*vec4(1,1,1,alpha)*1.6;
+    fragColor = c*vec4(1,1,1,alpha);
 }
diff --git a/resources/shaders/particles.vert b/resources/shaders/particles.vert
index 6e9e388..5175617 100644
--- a/resources/shaders/particles.vert
+++ b/resources/shaders/particles.vert
@@ -13,7 +13,7 @@ uniform float alpha;
 void main()
 {
     float scale = 1.f;//2000.0f;
-    TexCoords = vec2(pos.x, pos.w);
+    TexCoords = vec2(pos.z, pos.w);
     //ParticleColor = color;
    // gl_Position = projection *view* vec4((pos * scale) + vec2(offset), 0.0, 1.0);
    gl_Position = (vec4(pos.x*alpha, pos.y*alpha, 0, 1) + projection*view*vec4(vec3(offset), 1))*scale;