add more accurate foam height saturation, poppping bubble effect

3 files changed, 6 insertions, 6 deletions

diff --git a/resources/images/foam3.png b/resources/images/foam3.png
index ab48f97..1113912 100644
--- a/resources/images/foam3.png
+++ b/resources/images/foam3.png
diff --git a/resources/images/halftone.png b/resources/images/halftone.png
index e059862..cc11eba 100644
--- a/resources/images/halftone.png
+++ b/resources/images/halftone.png
diff --git a/resources/shaders/foam.frag b/resources/shaders/foam.frag
index af0cf4c..be95183 100644
--- a/resources/shaders/foam.frag
+++ b/resources/shaders/foam.frag
@@ -33,21 +33,21 @@ float getSaturation(vec2 k, vec2 xzPos, float adjWaveLength, float phaseC){
 void main() {
     float height = pos.y;
    float saturation = constants[0];//getSaturation(dir, vec2(pos.x, pos.z), 200.f, constants[0]);
-   vec4 m_uv = texture(halftone_texture, tex);
-   float m_threshold = m_uv.r * m_uv.g * m_uv.b;
+   vec4 m_uv = texture(halftone_texture, tex*2);
+   float m_threshold = (m_uv.r + m_uv.g + m_uv.b) / 3;
 
    // final rgba color at x,z pos
    vec4 h = vec4(0,0,1,1);
    if (saturation > m_threshold) h = vec4(1,1,1, 1);
 
    // add fading effect to bubble popping
-   vec4 g = clamp(.5*saturation - m_threshold, 0, 1) * h;
+   vec4 g = clamp(saturation - m_threshold, 0, 1) * h;
 
    // apply foam texture
-   vec4 foam = texture(foam_texture, tex*3);
+   vec4 foam = texture(foam_texture, tex + time*.0003);
    vec4 j = vec4(0,0,0,0);
-   if (saturation > m_threshold) j = vec4(g*foam);
+   if (saturation > m_threshold) j = g*foam*1.8;
 
 
-   fragColor = vec4(vec3(j), saturation);
+   fragColor = j; //vec4(vec3(g), 1);
 }