Get rid of extra_load(), rename parameters

This commit is contained in:
Matthias Schiffer 2016-02-03 14:19:09 +01:00
parent 22e600bde8
commit d5375d5308
5 changed files with 33 additions and 36 deletions

View file

@ -5,9 +5,9 @@ out vec4 fragColor;
uniform vec2 res;
uniform float time;
uniform int param_k;
uniform int param_l;
uniform int param_m;
uniform int param0;
uniform int param1;
uniform int param2;
const float sharpness = 300;
@ -35,10 +35,10 @@ void main(void) {
float scene = 0;
int n = param_k + 32;
float k = param_l;
int n = param0 + 32;
float k = param1;
for (int i = 0; i < n; i++) {
float c = square(vec2(0.5, 0) * rot(PI/2*(4.0*i/n)) * vec2(1, 1), 0.3 + 0.02 * param_m, -PI/2*(k*i/n + time/1500), p * (1 + 0.03*param_m));
float c = square(vec2(0.5, 0) * rot(PI/2*(4.0*i/n)) * vec2(1, 1), 0.3 + 0.02 * param2, -PI/2*(k*i/n + time/1500), p * (1 + 0.03*param2));
scene = abs(scene - c);
}