code clean up; one more shader toy

Author: Jiang Feng

hmiios2014/OpenglWindow.cpp

@@ -238,7 +238,7 @@ bool OpenglWindow::event(QEvent* event)
               || l_keyevent->key() == Qt::Key_9
               || l_keyevent->key() == Qt::Key_0)
         {
-            selectShader((l_keyevent->key() - Qt::Key_1) + 1);
+            selectShader(l_keyevent->key() - Qt::Key_0);
         }
         return true;
     }

hmiios2014/TSDWindow.cpp

@@ -578,8 +578,8 @@ void TSDWindow::render()
 
     m_program->bind();
     m_program->setUniformValue(m_matrixUniform, matrix);
-    m_program->setUniformValue(m_mouse, mouse[0] * devicePixelRatio(), -mouse[1] * devicePixelRatio() + resolution[1]/2);
-    m_program->setUniformValue(m_mouseDelta, mouseDelta[0] * devicePixelRatio(), -mouseDelta[1] * devicePixelRatio());
+    m_program->setUniformValue(m_mouse, mouse[0] * retinaScale, -mouse[1] * retinaScale + resolution[1]/2);
+    m_program->setUniformValue(m_mouseDelta, mouseDelta[0] * retinaScale, -mouseDelta[1] * retinaScale);
     m_program->setUniformValue(m_resolution, resolution[0], resolution[1]);
     m_program->setUniformValue(m_time, time);
     m_program->setUniformValue(m_shaderId, m_shader);

hmiios2014/fshader.glsl

@@ -186,6 +186,25 @@ void main() {
 				}
 				gl_FragColor = vec4(o.xyz, 1.0);
 			}
+			else if(shader_id == 6)
+			{
+				const int   complexity      = 3;    // More points of color.
+				const float mouse_factor    = 56.0;  // Makes it more/less jumpy.
+				const float mouse_offset    = 40.0;   // Drives complexity in the amount of curls/cuves.  Zero is a single whirlpool.
+				const float fluid_speed     = 108.0;  // Drives speed, higher number will make it slower.
+				const float color_intensity = 0.8;
+
+				vec2 p=(2.0*(gl_FragCoord.xy - mouseDelta.xy)-resolution)/max(resolution.x,resolution.y);
+				for(int i=1;i<complexity;i++)
+				{
+					vec2 newp=p + time*0.1;
+					newp.x+=0.6/float(i)*sin(float(i)*p.y+time/fluid_speed+0.3*float(i)) + 0.5; // + mouse.y/mouse_factor+mouse_offset;
+					newp.y+=0.6/float(i)*sin(float(i)*p.x+time/fluid_speed+0.3*float(i+10)) - 0.5; // - mouse.x/mouse_factor+mouse_offset;
+					p=newp;
+				}
+				vec3 col=vec3(color_intensity*sin(3.0*p.x)+color_intensity,color_intensity*sin(3.0*p.y)+color_intensity,color_intensity*sin(p.x+p.y)+color_intensity);
+				gl_FragColor=vec4(col, 1.0);
+			}
 			else
 			{
 				gl_FragColor =vec4(.0, .6, .0,1.);