markus/4kintro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zoomi

Browse Source
This commit is contained in:
Teemu Järvisalo
2024-07-29 20:09:00 +03:00
parent c659731142
commit 719e6d367d
2 changed files with 34 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shader.glsl
View File

@ -333,6 +333,7 @@ vec3 cameraPos()
if (u_time > 10.5) cPos = vec3(2.,-1.,1.); if (u_time > 10.5) cPos = vec3(2.,-1.,1.);
// zoom away for 2nd glyph animation // zoom away for 2nd glyph animation
if (u_time > 12.) cPos = vec3(-1., -.7, 4.); if (u_time > 12.) cPos = vec3(-1., -.7, 4.);
if (u_time > 22.) cPos = vec3(0., -1., 5.);
return cPos; return cPos;
} }
@ -363,7 +364,7 @@ vec3 sceneGate(vec2 uv)
{ {
// Initialization // Initialization
vec3 ro = cameraPos(), vec3 ro = cameraPos(),
rd = getCameraRayDir(uv, ro, cameraPointAt(), 2.), rd = getCameraRayDir(uv, ro, cameraPointAt(), clamp((25.-u_time)*-1.,2.,25.)),
col = vec3(0.); col = vec3(0.);
float d = rayMarch(ro, rd); float d = rayMarch(ro, rd);

181
shader_minified.h
View File

@ -55,8 +55,7 @@ const char *__temp_cleaned_shader_glsl =
"vec3 a=vec3(.4,.2,.4),c=vec3(.7,.4,.2),s=vec3(.2,.1,.3),i=vec3(.9,.5,.7),k=vec3(.8,.7,.5),p=vec3(.9,.3,0),d=vec3(0,.1,.2),r=vec3(.4,.5,.3);" "vec3 a=vec3(.4,.2,.4),c=vec3(.7,.4,.2),s=vec3(.2,.1,.3),i=vec3(.9,.5,.7),k=vec3(.8,.7,.5),p=vec3(.9,.3,0),d=vec3(0,.1,.2),r=vec3(.4,.5,.3);"
"float n(vec3 v)" "float n(vec3 v)"
"{" "{"
"v.y*=v.z;" "return min((y-v.y)*v.z,v.x*m);"
"return m*min((y*v.z-v.y)/m,v.x);"
"}" "}"
"vec3 x(vec3 v)" "vec3 x(vec3 v)"
"{" "{"
@ -72,24 +71,20 @@ const char *__temp_cleaned_shader_glsl =
"}" "}"
"return v;" "return v;"
"}" "}"
"float e(vec2 v)" "float t(vec2 v)"
"{" "{"
"if(y>=v.y)" "if(y>=v.y)"
"v.x+=.045*clamp(sin(n(vec3(3,v.y,40))*.4),-.8,.8);" "v.x+=.045*clamp(sin(n(vec3(3,v.y,40))*.4),-.8,.8);"
"return v.x;" "return v.x;"
"}" "}"
"float e(vec2 v,float y)" "float t(vec2 v,float y)"
"{" "{"
"v+=n(v,1.,1);" "v+=n(v,1.,1);"
"vec2 m=1.-abs(sin(v)),c=abs(cos(v));" "vec2 m=1.-abs(sin(v)),c=abs(cos(v));"
"m=mix(m,c,m);" "m=mix(m,c,m);"
"return pow(1.-pow(m.x*m.y,.65),y);" "return pow(1.-pow(m.x*m.y,.65),y);"
"}" "}"
<<<<<<< HEAD
"vec2 t(vec3 v,int a)"
=======
"vec2 e(vec3 v,int a)" "vec2 e(vec3 v,int a)"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"{" "{"
"float c=0.,i=m/12.,r=floor(atan(v.y,v.x)/i+.5)*i;" "float c=0.,i=m/12.,r=floor(atan(v.y,v.x)/i+.5)*i;"
"vec3 s=v;" "vec3 s=v;"
@ -114,19 +109,11 @@ const char *__temp_cleaned_shader_glsl =
"if(l>0.)" "if(l>0.)"
"{" "{"
"s.x-=1.95;" "s.x-=1.95;"
<<<<<<< HEAD
"vec3 t=s;"
"if(y>z)"
"t.x=e(vec2(t.x,z));"
"float h=x(vec3(s.x-.06,s.yz),vec2(.1,.15))-.01;"
"p=max(-x(vec3(t.x-.14,t.yz),vec2(.22))-.01,x(vec3(t),vec2(.2,.12))-.02);"
=======
"vec3 e=s;" "vec3 e=s;"
"if(y>z)" "if(y>z)"
"e.x=t(vec2(e.x,z));" "e.x=t(vec2(e.x,z));"
"float h=x(vec3(s.x-.06,s.yz),vec2(.1,.15))-.01;" "float h=x(vec3(s.x-.06,s.yz),vec2(.1,.15))-.01;"
"p=max(-x(vec3(e.x-.14,e.yz),vec2(.22))-.01,x(vec3(e),vec2(.2,.12))-.02);" "p=max(-x(vec3(e.x-.14,e.yz),vec2(.22))-.01,x(vec3(e),vec2(.2,.12))-.02);"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"p=min(p,h);" "p=min(p,h);"
"d=min(d,p);" "d=min(d,p);"
"if(d==p)" "if(d==p)"
@ -135,15 +122,9 @@ const char *__temp_cleaned_shader_glsl =
"c=5.;" "c=5.;"
"}" "}"
"}" "}"
<<<<<<< HEAD
"vec3 t=x(v),l=t;"
"i=m/16.;"
"l.xy=f(floor(atan(t.y,t.x)/i+.5)*i)*l.xy;"
=======
"vec3 e=x(v),l=e;" "vec3 e=x(v),l=e;"
"i=m/16.;" "i=m/16.;"
"l.xy=f(floor(atan(e.y,e.x)/i+.5)*i)*l.xy;" "l.xy=f(floor(atan(e.y,e.x)/i+.5)*i)*l.xy;"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"p=n(l.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02;" "p=n(l.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02;"
"d=min(d,p);" "d=min(d,p);"
"if(d==p)" "if(d==p)"
@ -169,16 +150,9 @@ const char *__temp_cleaned_shader_glsl =
"{" "{"
"vec2 w=v.xy;" "vec2 w=v.xy;"
"for(int u=0;u<4;u++)" "for(int u=0;u<4;u++)"
<<<<<<< HEAD
"k=e((w+y)*C,g),k+=e((w-y)*C,g),h+=k*F,w*=mat2(1.6,1.2,-1.2,1.6),C*=1.9,F*=.22,g=mix(g,1.,.4);"
"}"
"float w=x(v,.025,1.6)-h*.15;"
"p=max(-x(v,2.,clamp(2.-3.*(y-23.),-.2,2.3)),w);"
=======
"k=t((w+y)*C,g),k+=t((w-y)*C,g),h+=k*F,w*=mat2(1.6,1.2,-1.2,1.6),C*=1.9,F*=.22,g=mix(g,1.,.4);" "k=t((w+y)*C,g),k+=t((w-y)*C,g),h+=k*F,w*=mat2(1.6,1.2,-1.2,1.6),C*=1.9,F*=.22,g=mix(g,1.,.4);"
"}" "}"
"p=max(-x(v,2.,min(2.-(y-23.)*3.,2.3)),x(v,.025,1.6)-h*.15);" "p=max(-x(v,2.,min(2.-(y-23.)*3.,2.3)),x(v,.025,1.6)-h*.15);"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"p=max(p,x(v,.3,1.7));" "p=max(p,x(v,.3,1.7));"
"d=min(d,p);" "d=min(d,p);"
"if(d==p)" "if(d==p)"
@ -190,42 +164,26 @@ const char *__temp_cleaned_shader_glsl =
"float m,i=0.;" "float m,i=0.;"
"for(int d=0;d<90;d++)" "for(int d=0;d<90;d++)"
"{" "{"
<<<<<<< HEAD
"m=t(v+y*i,0).x;"
=======
"m=e(v+y*i,0).x;" "m=e(v+y*i,0).x;"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"i+=m;" "i+=m;"
"if(abs(m)<.001||i>4e2)" "if(abs(m)<.001||i>4e2)"
"break;" "break;"
"}" "}"
"return i;" "return i;"
"}" "}"
"vec3 h(vec3 v)" "vec3 e(vec3 v)"
"{" "{"
"vec2 m=vec2(.01,0);" "vec2 m=vec2(.01,0);"
<<<<<<< HEAD
"vec3 y=t(v,1).x-vec3(t(v-m.xyy,1).x,t(v-m.yxy,1).x,t(v-m.yyx,1));"
=======
"vec3 y=e(v,1).x-vec3(e(v-m.xyy,1).x,e(v-m.yxy,1).x,e(v-m.yyx,1));" "vec3 y=e(v,1).x-vec3(e(v-m.xyy,1).x,e(v-m.yxy,1).x,e(v-m.yyx,1));"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"return normalize(y);" "return normalize(y);"
"}" "}"
"float e(vec3 v,vec3 m,float y,vec3 d)" "float e(vec3 v,vec3 m,float y,vec3 d)"
"{" "{"
<<<<<<< HEAD
"vec3 c=normalize(m-v);" "vec3 c=normalize(m-v);"
"float x=clamp(dot(d,c),0.,1.),p=h(v+d*.0025,c);" "float x=clamp(dot(d,c),0.,1.),p=h(v+d*.0025,c);"
"if(abs(p)<length(m-v))" "if(abs(p)<length(m-v))"
"x*=y;" "x*=y;"
"return x;" "return x;"
=======
"vec3 p=normalize(m-v);"
"float c=clamp(dot(d,p),0.,1.),a=h(v+d*.0025,p);"
"if(abs(a)<length(m-v))"
"c*=y;"
"return c;"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"}" "}"
"float e(vec3 v,vec3 y,vec3 d)" "float e(vec3 v,vec3 y,vec3 d)"
"{" "{"
@ -233,69 +191,24 @@ const char *__temp_cleaned_shader_glsl =
"}" "}"
"vec3 h(vec3 v,vec3 m,vec3 y)" "vec3 h(vec3 v,vec3 m,vec3 y)"
"{" "{"
<<<<<<< HEAD
"vec3 c=normalize(vec3(0,.3,.8));" "vec3 c=normalize(vec3(0,.3,.8));"
"float p=clamp(1.-dot(m,-y),0.,1.);" "float p=clamp(1.-dot(m,-y),0.,1.);"
"p=min(pow(p,5.),.5);" "p=min(pow(p,5.),.5);"
"vec3 i=mix(d+pow(dot(m,c)*.4+.6,60.)*r*.3,vec3(0,.5,1),p);" "vec3 i=mix(d+pow(dot(m,c)*.4+.6,60.)*r*.3,vec3(0,.5,1),p);"
"i+=vec3(e(m,c,y))*.3;" "i+=vec3(e(m,c,y))*.3;"
=======
"vec3 p=normalize(vec3(0,.3,.8));"
"float c=clamp(1.-dot(m,-y),0.,1.);"
"c=min(pow(c,5.),.5);"
"vec3 i=mix(d+pow(dot(m,p)*.4+.6,60.)*r*.3,vec3(0,.5,1),c);"
"i+=vec3(e(m,p,y))*.3;"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"return i;" "return i;"
"}" "}"
"vec3 t(vec2 v,vec3 y,vec3 m)" "vec3 f(vec2 v,vec3 y,vec3 m,float p)"
"{" "{"
<<<<<<< HEAD
"vec3 d=normalize(m-y),c=normalize(cross(vec3(0,1,0),d));" "vec3 d=normalize(m-y),c=normalize(cross(vec3(0,1,0),d));"
"return normalize(d*2.+v.x*c+v.y*cross(d,c));" "return normalize(d*p+v.x*c+v.y*cross(d,c));"
"}" "}"
"vec3 t(vec3 v)" "vec3 h(vec3 v)"
"{" "{"
"v*=vec3(.9,.8,.7);"
"v=pow(v,vec3(.4545));"
"return smoothstep(0.,1.,v);"
"}"
"vec3 e()"
"{"
"vec3 m=vec3(0,clamp(6.-y,2.,6.),clamp(75.-y*8.,6.,75.));"
"if(y>7.5)"
"m+=vec3(0,clamp(7.5-y,-1.,0.),0);"
"if(y>10.5)"
"m=vec3(2,-1,1);"
"if(y>12.)"
"m=vec3(-1,-.7,4);"
"if(y>13.)"
"m=mix(vec3(-1,-.7,4),vec3(0,.5,-1),(y-13.)*.3);"
"return m;"
"}"
"vec3 f()"
"{"
"vec3 m=vec3(0,-.5,0);"
"if(y>10.5)"
"m=vec3(1.7,-1.1,0);"
"if(y>12.)"
"m=vec3(0);"
"if(y>13.)"
"m=mix(vec3(0),vec3(0,2,-5),(y-13.)*.3);"
"return m;"
=======
"vec3 d=normalize(m-y),p=normalize(cross(vec3(0,1,0),d));"
"return normalize(d*2.+v.x*p+v.y*cross(d,p));"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"}"
"vec3 w(vec3 v)"
"{"
<<<<<<< HEAD
=======
"v*=vec3(.9,.8,.7);" "v*=vec3(.9,.8,.7);"
"v=pow(v,vec3(.4545));" "v=pow(v,vec3(.4545));"
"v=smoothstep(0.,1.,v);" "v=smoothstep(0.,1.,v);"
"v+=1.2-vec3(clamp((37.-y)*.35,0.,1.2));" "v+=1.2-vec3(clamp((32.-y)*.35,0.,1.2));"
"return v;" "return v;"
"}" "}"
"vec3 e()" "vec3 e()"
@ -306,7 +219,9 @@ const char *__temp_cleaned_shader_glsl =
"if(y>10.5)" "if(y>10.5)"
"v=vec3(2,-1,1);" "v=vec3(2,-1,1);"
"if(y>12.)" "if(y>12.)"
"v=vec3(-1,-1,4);" "v=vec3(-1,-.7,4);"
"if(y>22.)"
"v=vec3(0,-1,5);"
"return v;" "return v;"
"}" "}"
"vec3 f()" "vec3 f()"
@ -315,87 +230,55 @@ const char *__temp_cleaned_shader_glsl =
"if(y>10.5)" "if(y>10.5)"
"v=vec3(1.7,-1.1,0);" "v=vec3(1.7,-1.1,0);"
"if(y>12.)" "if(y>12.)"
"v=vec3(0,.1,0);" "v=vec3(0);"
"return v;" "return v;"
"}" "}"
"vec3 w(vec3 v)" "vec3 w(vec3 v)"
"{" "{"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"if(y>10.75)" "if(y>10.75)"
"{" "{"
"float m=smoothstep(-1.,.8,sin(n(vec3(.8,10.75,8))*2.));" "float c=smoothstep(-1.,.8,sin(n(vec3(.8,10.75,8))*2.));"
"v=mix(v,m*1.4*p,m*.76);" "v=mix(v,c*1.4*p,c*.76);"
"}" "}"
"return v;" "return v;"
"}" "}"
<<<<<<< HEAD "vec3 t(vec3 v,vec3 y,float m)"
"vec3 l(vec2 v)"
"{"
=======
"vec3 w(vec3 v,vec3 y,float m)"
"{" "{"
"return vec3(e(v,normalize(vec3(0,.3,.8)),normalize(y)))*m;" "return vec3(e(v,normalize(vec3(0,.3,.8)),normalize(y)))*m;"
"}" "}"
"vec3 l(vec2 v)" "vec3 l(vec2 v)"
"{" "{"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe "vec3 m=e(),d=f(v,m,f(),clamp((25.-y)*-1.,2.,25.)),r=vec3(0);"
"vec3 m=e(),y=t(v,m,f()),d=vec3(0);" "float x=h(m,d);"
"float x=h(m,y);"
"if(x<150.)" "if(x<150.)"
"{" "{"
<<<<<<< HEAD "vec3 l=m+d*x,z=e(l);"
"vec3 l=m+y*x,r=h(l);" "float g=e(l,0).y,C=e(l,vec3(10,15,25),.2,z);"
"float g=t(l,0).y,z=e(l,vec3(10,15,25),.2,r);" "r+=C*i;"
======= "C=e(l,vec3(4,2,-15),1.,z);"
"vec3 l=m+y*x,r=e(l);" "r+=C*k;"
"float g=e(l,0).y,z=e(l,vec3(10,15,25),.2,r);" "r+=s*clamp(dot(z,normalize(vec3(0,1,10))),0.,1.);"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"d+=z*i;"
"z=e(l,vec3(4,2,-15),1.,r);"
"d+=z*k;"
"d+=s*clamp(dot(r,normalize(vec3(0,1,10))),0.,1.);"
"if(g==0.)" "if(g==0.)"
<<<<<<< HEAD "r*=vec3(.3)+t(z,d,.5);"
"d*=vec3(.3)+vec3(e(r,normalize(vec3(0,.3,.8)),normalize(y)))*.5;"
"if(g==1.)" "if(g==1.)"
"d=h(l,r,normalize(y));" "r=h(l,z,normalize(d));"
"if(g==2.)" "if(g==2.)"
"d*=vec3(.3,.1,0)+vec3(e(r,normalize(vec3(0,.3,.8)),normalize(y)))*.1;" "r*=vec3(.3,.1,0)+t(z,d,.1);"
"if(g==3.)" "if(g==3.)"
"d*=vec3(.8,.8,.5)+n(l.xz*5e2+1e2,.3,0);" "r*=vec3(.8,.8,.5)+n(l.xz*5e2+1e5,.3,0);"
"if(g==4.)" "if(g==4.)"
"d*=vec3(.1)+vec3(e(r,normalize(vec3(0,.3,.8)),normalize(y)))*.5;" "r*=vec3(.1)+t(z,d,.5);"
=======
"d*=vec3(.3)+w(r,y,.5);"
"if(g==1.)"
"d=h(l,r,normalize(y));"
"if(g==2.)"
"d*=vec3(.3,.1,0)+w(r,y,.1);"
"if(g==3.)"
"d*=vec3(.8,.8,.5)+n(l.xz*5e2+1e5,.3,0);"
"if(g==4.)"
"d*=vec3(.1)+w(r,y,.5);"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"if(g==5.)" "if(g==5.)"
"d*=p;" "r*=p;"
"}" "}"
"d=mix(d,mix(a,c,pow(max(dot(y,vec3(0,-.1,-1)),0.),8.)),1.-exp(-x*.01));" "r=mix(r,mix(a,c,pow(max(dot(d,vec3(0,-.1,-1)),0.),8.)),1.-exp(-x*.01));"
"d=w(d);" "r=w(r);"
<<<<<<< HEAD "return h(r);"
"return t(d);"
"}"
"void main()"
"{"
"vec2 m=(gl_FragCoord.xy*2.-v.xy)/v.y;"
"gl_FragColor=vec4(l(m),1);"
=======
"return h(d);"
"}" "}"
"void main()" "void main()"
"{" "{"
"vec2 y=(gl_FragCoord.xy*2.-v.xy)/v.y;" "vec2 y=(gl_FragCoord.xy*2.-v.xy)/v.y;"
"gl_FragColor=vec4(l(y),1);" "gl_FragColor=vec4(l(y),1);"
>>>>>>> 9c678c16119a84c2197603631430e7a36a9630fe
"}"; "}";
#endif // SHADER_MINIFIED_H_ #endif // SHADER_MINIFIED_H_