diff --git a/shader.glsl b/shader.glsl index 81047e6..35c31f6 100644 --- a/shader.glsl +++ b/shader.glsl @@ -102,7 +102,7 @@ float sdTriPrism( vec3 p, vec2 h, float rot ) // ANIMATION // ////////////////// const float TWOPI = 6.28318530718; -vec3 lookAtPoint = vec3(0, -1., 0.); +vec3 lookAtPoint = vec3(0, -0.5, 0.); const vec3 glyph1Pos = vec3(1.7,-1.1,0.0); const vec3 glyph2Pos = vec3(2.0,0.0,0.0); @@ -123,7 +123,6 @@ float timedSine(float maxCycles, float startTime, float timeFact) { float calcFactor (float startTime) { - const float FACTOR = 9.0; float factor = 9.0 + 9.0*clamp(sin(timedSine(2.0, startTime, 2.5) * 0.05), -0.9, 0.9); return factor; } @@ -131,26 +130,24 @@ float calcFactor (float startTime) // Animate ring movements vec3 ringAnim( in vec3 p) { const float STARTDELAY = 9.0; - const float OTHERDELAY = 14.0; - - float factor = 0.; + const float OTHERDELAY = 15.0; // delay start if( u_time >= STARTDELAY ) { p.xy = rot2D(calcFactor(STARTDELAY)) * p.xy; } - // if(u_time >= OTHERDELAY) { - // p.xy = rot2D(calcFactor(OTHERDELAY) * -1.0) * p.xy; - // } + if(u_time >= OTHERDELAY) { + p.xy = rot2D(calcFactor(OTHERDELAY) * -1.0) * p.xy; + } return p; } // Animate prism movements float prismAnim(in float x, in float delay) { - if(u_time >= delay) { - x += (0.045*clamp(sin((timedSine(2.0, delay, 10.0) * 0.4)),-0.9, 0.9)); + if(u_time >= delay && u_time <= delay + 1.0) { + x += (0.045*clamp(sin((timedSine(3.0, delay, 20.0) * 0.4)),-0.8, 0.8)); } return x; } @@ -367,51 +364,67 @@ vec3 postProcess(vec3 col) { return col; } +// zoom camera on glyph lock for extra oomph +float cameraZoomAnim(float o) { + float delay = 13.45; + if(u_time > delay) { + o -= (0.25 - smoothstep(-0.7,0.5,sin((timedSine(1.5, delay, 8.0))))) * 0.2; + } + +return o; +} + vec3 cameraPos() { + // first zoom in to the gate vec3 cPos = vec3(0, clamp(6.-u_time,2.,6.), clamp((75.-u_time*8.0),6.,75.)); if (u_time > 7.5) { cPos += vec3(0, clamp(7.5-u_time,-1.,0.), 0.); } + // close up shot for 1st glyph lock if (u_time > 12.) { cPos = vec3(2.0,-1.0,1.0); } + //zoom away for 2nd glyph animation + if (u_time > 15.) { + cPos = vec3(-1.0, -1.0, 4.0); + } + + //close up shot for the 2nd glyph lock + + cPos.z = cameraZoomAnim(cPos.z); + return cPos; } vec3 cameraPointAt(vec3 p) { + // look at 1st glyph if(u_time > 12.) { p = glyph1Pos; } + if(u_time > 15.) { + p = vec3(0.0,0.1,0.0); + } + return p; } // flash screen with glyph color when it is locked vec3 colorFlashesAnim(in vec3 col) { vec3 flashColor = vec3(0.95, 0.35, 0.06); - float delay = 13.2; + float delay = 13.5; if(u_time > delay) { - float x = smoothstep(-1.0,0.8,sin((timedSine(0.38, delay*2.0, 2.0)*2.0))); + float x = smoothstep(-1.0,0.8,sin((timedSine(0.8, delay, 8.0)*2.0))); col = mix(col, flashColor * (x * 1.4), x * 0.76); } return col; } -// zoom camera on glyph lock for extra oomph -float cameraZoomAnim(float o) { - float delay = 13.0; - if(u_time > delay) { - o -= smoothstep(-0.7,0.5,sin((timedSine(0.4, delay, 1.0)*2.0))) * 0.2; - } - -return o; -} - void main() { // Initialization @@ -419,13 +432,11 @@ void main() vec3 ro = cameraPos(); - vec3 rd = getCameraRayDir(uv, ro, cameraPointAt(lookAtPoint), 1.); // ray direction + vec3 rd = getCameraRayDir(uv, ro, cameraPointAt(lookAtPoint), 2.); // ray direction vec3 col = vec3(0); // color float d = rayMarch(ro, rd); - // ro.z = cameraZoomAnim(ro.z); - if (d < 500.) { // Lighting vec3 p = ro + rd * d; @@ -476,11 +487,13 @@ void main() float fogAmount = 0.02; col = col*exp(-d*fogAmount) + applyFog(col, d, rd, vec3(0., .3, -1.), fogAmount) * (1.0-exp(-d*fogAmount)); - // col = colorFlashesAnim(col); // animated color flash + } else { col = vec3(0.1529, 0.1765, 0.3922) + rd.y * 0.4; } + + col = colorFlashesAnim(col); // animated color flash gl_FragColor = vec4(postProcess(col), 1); diff --git a/shader_minified.h b/shader_minified.h index 08b6635..a488558 100644 --- a/shader_minified.h +++ b/shader_minified.h @@ -27,24 +27,24 @@ const char *__temp_cleaned_shader_glsl = "}" "float n(vec2 v,float y)" "{" - "vec2 i=floor(v),m=fract(v),f=m*m*(3.-2.*m);" - "return-y+y*mix(mix(s(i+vec2(0)),s(i+vec2(1,0)),f.x),mix(s(i+vec2(0,1)),s(i+vec2(1)),f.x),f.y);" + "vec2 f=floor(v),m=fract(v),c=m*m*(3.-2.*m);" + "return-y+y*mix(mix(s(f+vec2(0)),s(f+vec2(1,0)),c.x),mix(s(f+vec2(0,1)),s(f+vec2(1)),c.x),c.y);" "}" - "float m(vec3 i)" + "float m(vec3 y)" "{" - "return n(10.*i.xy+v+999.,.2)+.5*n(10.*(i.xy+2.)-v+999.,.2);" + "return n(10.*y.xy+v+999.,.2)+.5*n(10.*(y.xy+2.)-v+999.,.2);" "}" - "float m(vec3 v,vec3 y,vec3 m,float i)" + "float m(vec3 v,vec3 y,vec3 m,float x)" "{" - "vec3 f=m-y,x=v-y;" - "float a=dot(f,f),c=dot(x,f),s=length(x*a-f*c)-i*a,n=abs(c-a*.5)-a*.5,d=s*s,z=n*n*a,l=max(s,n)<0.?" + "vec3 f=m-y,c=v-y;" + "float i=dot(f,f),a=dot(c,f),s=length(c*i-f*a)-x*i,l=abs(a-i*.5)-i*.5,d=s*s,z=l*l*i,p=max(s,l)<0.?" "-min(d,z):" "(s>0.?" "d:" - "0.)+(n>0.?" + "0.)+(l>0.?" "z:" "0.);" - "return sign(l)*sqrt(abs(l))/a;" + "return sign(p)*sqrt(abs(p))/i;" "}" "float m(vec3 v,vec3 y)" "{" @@ -62,190 +62,218 @@ const char *__temp_cleaned_shader_glsl = "if(v.x+y*v.y>0.)" "v.xy=vec2(v.x-y*v.y,-y*v.x-v.y)/2.;" "v.x-=clamp(v.x,-2.,0.);" - "float i=length(v.xy)*sign(-v.y)*f.x,x=abs(v.z)-f.y;" - "return length(max(vec2(i,x),0.))+min(max(i,x),0.);" + "float i=length(v.xy)*sign(-v.y)*f.x,c=abs(v.z)-f.y;" + "return length(max(vec2(i,c),0.))+min(max(i,c),0.);" "}" - "vec3 y=vec3(0,-1,0);" - "const vec3 a=vec3(1.7,-1.1,0),c=vec3(2,0,0),p=vec3(1.5,1.4,0),r=vec3(0,2,0),C=vec3(1.5,1.4,0),D=vec3(-1.5,1.4,0),F=vec3(-1.7,-1.1,0);" - "float t(float y,float m)" + "vec3 y=vec3(0,-.5,0);" + "const vec3 a=vec3(1.7,-1.1,0),c=vec3(2,0,0),p=vec3(1.5,1.4,0),r=vec3(0,2,0),z=vec3(1.5,1.4,0),C=vec3(-1.5,1.4,0),D=vec3(-1.7,-1.1,0);" + "float m(float y,float f,float m)" "{" "float i=2.*acos(-1.)/2.;" - "y*=m;" - "float f=(v*m-y)/i;" - "f=min(f,2.);" - "return i*f;" + "f*=m;" + "float r=(v*m-f)/i;" + "r=min(r,y);" + "return i*r;" "}" - "vec3 t(vec3 y)" + "float t(float v)" + "{" + "return 9.+9.*clamp(sin(m(2.,v,2.5)*.05),-.9,.9);" + "}" + "vec3 h(vec3 y)" "{" "if(v>=9.)" - "y.xy=n(9.+9.*clamp(sin(t(9.,2.5)*.05),-.9,.9))*y.xy;" + "y.xy=n(t(9.))*y.xy;" + "if(v>=15.)" + "y.xy=n(t(15.)*-1.)*y.xy;" "return y;" "}" - "float h(float y,float m)" + "float h(float y,float f)" "{" - "if(v>=m)" - "y+=.045*clamp(sin(t(m,10.)*.4),-.9,.9);" + "if(v>=f&&v<=f+1.)" + "y+=.045*clamp(sin(m(3.,f,20.)*.4),-.8,.8);" "return y;" "}" - "vec2 h(vec3 f)" + "vec2 l(vec3 y)" "{" - "float y=0.;" + "float f=0.;" "const float i=2.*acos(-1.)/24.;" - "float x=floor(atan(f.y,f.x)/i+.5)*i;" - "vec3 r=f;" + "float x=floor(atan(y.y,y.x)/i+.5)*i;" + "vec3 r=y;" "r.xy=mat2(cos(x),-sin(x),sin(x),cos(x))*r.xy;" "float c=length(max(abs(r.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02;" - "c=min(c,abs(length(f.xy)-1.8)-.2);" - "float a=abs(length(f.xy)-1.75)-.08;" - "a=n(a,abs(f.z-.1)-.04,.005);" - "c=max(-a,c);" - "c=n(c,abs(f.z)-.1,.02);" + "c=min(c,abs(length(y.xy)-1.8)-.2);" + "float e=abs(length(y.xy)-1.75)-.08;" + "e=n(e,abs(y.z-.1)-.04,.005);" + "c=max(-e,c);" + "c=n(c,abs(y.z)-.1,.02);" "float l=1.;" - "for(int e=0;e<8;e++)" + "for(int z=0;z<8;z++)" "{" - "vec3 d=f;" - "float z=24.67/(2.*acos(-1.))+l*(2.*acos(-1.)/8.);" - "if(e==1)" - "z+=.2;" - "if(e==7)" - "z-=.2;" - "d.xy=n(z)*d.xy;" - "if(e>0)" + "vec3 a=y;" + "float d=24.67/(2.*acos(-1.))+l*(2.*acos(-1.)/8.);" + "if(z==1)" + "d+=.2;" + "if(z==7)" + "d-=.2;" + "a.xy=n(d)*a.xy;" + "if(z>0)" "{" - "d.x-=1.95;" - "vec3 p=d;" - "p.x=h(p.x,float(e)*13.);" - "float C=s(vec3(p.x-.14,p.yz),vec2(.22))-.01,D=s(vec3(p),vec2(.2,.12))-.02,F=s(vec3(d.x-.06,d.yz),vec2(.1,.15))-.01,g=max(-C,D);" + "a.x-=1.95;" + "vec3 p=a;" + "p.x=h(p.x,float(z)*13.);" + "float C=s(vec3(p.x-.14,p.yz),vec2(.22))-.01,D=s(vec3(p),vec2(.2,.12))-.02,F=s(vec3(a.x-.06,a.yz),vec2(.1,.15))-.01,g=max(-C,D);" "g=min(g,F);" "c=min(c,g);" "if(c==g)" - "y=4.;" + "f=4.;" "if(c==F)" - "if(v>13.5&&e==1)" - "y=5.;" + "if(v>13.5&&z==1)" + "f=5.;" "}" "l+=1.;" "}" - "vec3 d=t(f);" + "vec3 a=h(y);" "float z=2.*acos(-1.)/32.;" - "vec3 e=d;" - "e.xy=n(floor(atan(d.y,d.x)/z+.5)*z)*e.xy;" - "float F=m(e.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02;" + "vec3 p=a;" + "p.xy=n(floor(atan(a.y,a.x)/z+.5)*z)*p.xy;" + "float F=m(p.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02;" "c=min(c,F);" "if(c==F)" - "y=4.;" - "float g=1.5,p=1e3;" + "f=4.;" + "float g=1.5,d=1e3;" "for(int C=0;C<4;C++)" "{" - "float D=m(vec3(f.x,f.y+g,f.z),vec3(2,.1,g))-.05;" - "p=min(p,D);" + "float D=m(vec3(y.x,y.y+g,y.z),vec3(2,.1,g))-.05;" + "d=min(d,D);" "c=min(c,D);" "g+=.2;" "}" - "float D=f.y+4.25+1.5*n(vec2(f.x*.04,(f.z-40.)*.04)+1e2,15.);" - "D+=n(f.yz,.25);" - "D+=.025*n(f.xz*50.+1e2,.05);" + "float D=y.y+4.25+1.5*n(vec2(y.x*.04,(y.z-40.)*.04)+1e2,15.);" + "D+=n(y.yz,.25);" + "D+=.025*n(y.xz*50.+1e2,.05);" "c=min(c,D);" - "float C=1e3,u=m(f,vec3(0),vec3(0,0,-.01),1.6),w=m(f,vec3(0,0,1),vec3(0,0,-1),clamp(2.-v*2.+26.,0.,2.)),E=m(f,vec3(0,0,1),vec3(0,0,-1),1.6),k=0.;" - "k=m(f)*clamp((v-14.)*.5,0.,.25);" + "float C=1e3,u=m(y,vec3(0),vec3(0,0,-.01),1.6),H=m(y,vec3(0,0,1),vec3(0,0,-1),clamp(2.-v*2.+26.,0.,2.)),G=m(y,vec3(0,0,1),vec3(0,0,-1),1.6),k=0.;" + "k=m(y)*clamp((v-14.)*.5,0.,.25);" "u+=k;" - "C=max(-w,u);" - "C=max(C,E);" + "C=max(-H,u);" + "C=max(C,G);" "c=min(c,C);" "if(c==C)" - "y=1.;" - "else if(c==p)" - "y=2.;" + "f=1.;" + "else if(c==d)" + "f=2.;" "else if(c==D)" - "y=3.;" - "return vec2(c,y);" + "f=3.;" + "return vec2(c,f);" "}" - "float e(vec3 v,vec3 y)" + "float l(vec3 v,vec3 y)" "{" - "float i=0.,f;" - "for(int c=0;c<200;c++)" + "float f=0.,c;" + "for(int i=0;i<200;i++)" "{" - "vec3 x=v+y*i;" - "f=h(x).x;" - "i+=f;" - "if(f<.001||i>8e2)" + "vec3 x=v+y*f;" + "c=l(x).x;" + "f+=c;" + "if(c<.001||f>8e2)" "break;" "}" - "return i;" + "return f;" "}" "vec3 e(vec3 v)" "{" - "float m=h(v).x;" - "vec2 f=vec2(.01,0);" - "vec3 y=m-vec3(h(v-f.xyy).x,h(v-f.yxy).x,h(v-f.yyx));" - "return normalize(y);" + "float f=l(v).x;" + "vec2 y=vec2(.01,0);" + "vec3 c=f-vec3(l(v-y.xyy).x,l(v-y.yxy).x,l(v-y.yyx));" + "return normalize(c);" "}" - "float e(vec3 v,vec3 f,float y,float m)" + "float e(vec3 v,vec3 y,float f,float m)" "{" - "vec3 c=normalize(f-v),x=e(v);" - "float i=clamp(dot(x,c),0.,y),a=e(v+x*.0025,c);" - "if(a13.45)" + "y-=(.25-smoothstep(-.7,.5,sin(m(1.5,13.45,8.))))*.2;" + "return y;" + "}" + "vec3 d()" "{" "vec3 y=vec3(0,clamp(6.-v,2.,6.),clamp(75.-v*8.,6.,75.));" "if(v>7.5)" "y+=vec3(0,clamp(7.5-v,-1.,0.),0);" "if(v>12.)" "y=vec3(2,-1,1);" + "if(v>15.)" + "y=vec3(-1,-1,4);" + "y.z=w(y.z);" "return y;" "}" - "vec3 w(vec3 y)" + "vec3 F(vec3 y)" "{" "if(v>12.)" "y=a;" + "if(v>15.)" + "y=vec3(0,.1,0);" + "return y;" + "}" + "vec3 H(vec3 y)" + "{" + "vec3 c=vec3(.95,.35,.06);" + "if(v>13.5)" + "{" + "float f=smoothstep(-1.,.8,sin(m(.8,13.5,8.)*2.));" + "y=mix(y,f*1.4*c,f*.76);" + "}" "return y;" "}" "void main()" "{" "vec2 v=(gl_FragCoord.xy*2.-i.xy)/i.y;" - "vec3 f=e(),c=e(v,f,w(y)),x=vec3(0);" - "float a=e(f,c);" + "vec3 f=d(),c=e(v,f,F(y)),m=vec3(0);" + "float a=l(f,c);" "if(a<5e2)" "{" - "vec3 m=f+c*a;" - "float d=h(m).y,r=0.;" - "r=e(m,vec3(-3,5,5),1.,.2);" - "x+=vec3(r*vec3(.502,.2824,.102));" - "r=e(m,vec3(3,-2,5),.75,.8);" - "x+=vec3(r*vec3(.2784,.3647,.6588));" - "vec3 C=e(m);" - "x+=vec3(.1216,.1216,.1137)*clamp(dot(C,normalize(vec3(1,10,1))),0.,1.);" - "if(d==0.)" - "x*=vec3(.3);" - "else if(d==1.)" - "x*=vec3(0,0,.5);" - "else if(d==2.)" - "x*=vec3(.3608,.1765,.0471);" - "else if(d==3.)" - "x*=vec3(.8471,.8549,.4667);" - "else if(d==4.)" - "x*=vec3(.1);" - "else if(d==5.)" - "x*=vec3(.95,.35,.06);" - "x=x*exp(-a*.02)+mix(x,mix(vec3(.2667,.2941,.3451),vec3(.302,.3176,.3725),pow(max(dot(c,vec3(0,.3,-1)),0.),8.)),1.-exp(-a*.02))*(1.-exp(-a*.02));" + "vec3 x=f+c*a;" + "float z=l(x).y,r=0.;" + "r=e(x,vec3(-3,5,5),1.,.2);" + "m+=vec3(r*vec3(.502,.2824,.102));" + "r=e(x,vec3(3,-2,5),.75,.8);" + "m+=vec3(r*vec3(.2784,.3647,.6588));" + "vec3 p=e(x);" + "m+=vec3(.1216,.1216,.1137)*clamp(dot(p,normalize(vec3(1,10,1))),0.,1.);" + "if(z==0.)" + "m*=vec3(.3);" + "else if(z==1.)" + "m*=vec3(0,0,.5);" + "else if(z==2.)" + "m*=vec3(.3608,.1765,.0471);" + "else if(z==3.)" + "m*=vec3(.8471,.8549,.4667);" + "else if(z==4.)" + "m*=vec3(.1);" + "else if(z==5.)" + "m*=vec3(.95,.35,.06);" + "m=m*exp(-a*.02)+mix(m,mix(vec3(.2667,.2941,.3451),vec3(.302,.3176,.3725),pow(max(dot(c,vec3(0,.3,-1)),0.),8.)),1.-exp(-a*.02))*(1.-exp(-a*.02));" "}" "else" - " x=vec3(.1529,.1765,.3922)+c.y*.4;" - "gl_FragColor=vec4(l(x),1);" + " m=vec3(.1529,.1765,.3922)+c.y*.4;" + "m=H(m);" + "gl_FragColor=vec4(d(m),1);" "}"; #endif // SHADER_MINIFIED_H_