From f9270a472206c30355eda42bc2388db18c035296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petri=20J=C3=A4rvisalo?= Date: Wed, 31 Jul 2024 21:44:25 +0300 Subject: [PATCH] no nyt --- minified.config | 2 +- shader.glsl | 9 ++--- shader_minified.h | 98 +++++++++++++++++++++++------------------------ 3 files changed, 53 insertions(+), 56 deletions(-) diff --git a/minified.config b/minified.config index bafe933..7d70fa8 100644 --- a/minified.config +++ b/minified.config @@ -8,7 +8,6 @@ include $(PARENT_CONFIG) # Visuals EXE_LINKER_PROGRAM=Crinkler -CRINKLER_ORDERTRIES=30000 SHADER_FILE=shader_minified.h TIME_UNIFORM_NAME='y' RESOLUTION_UNIFORM_NAME='v' @@ -21,3 +20,4 @@ TWO_PASS_RENDERING=0 SECOND_PASS_NEGATIVE_TIME=0 USE_TEXTS=0 USE_TEXTS_UNIFORM=0 +CRINKLER_ORDERTRIES=30000 diff --git a/shader.glsl b/shader.glsl index 6e59cc6..e5bf5dc 100644 --- a/shader.glsl +++ b/shader.glsl @@ -368,7 +368,7 @@ vec3 cameraPointAt() { // flash screen with glyph color when it is locked vec3 colorFlashesAnim(vec3 col) { if(u_time > 10.75) { - float x = smoothstep(-1.,.8,sin((timedSine(vec3(.8, 10.75, 8.))*2.))); + float x = smoothstep(sin(timedSine(vec3(.8, 10.75, 8.)*2.)), -1.,.8); col = mix(col, chevronColor * (x * 1.4), x *.76); } return col; @@ -405,12 +405,9 @@ vec3 sceneGate(vec2 uv) col += indirColor * cl( dot( n, no(vec3(0. , 1., 10.))), 0., 1.); if(mat==0.) - col *= vec3(0.21, 0.35, 0.33) + addSpecular(n,rd,.5, 2.); + col *= vec3(0.2, 0.3, 0.3) + addSpecular(n,rd,.5, 2.); if(mat==1.) - { - //float fresnel = pow(clamp(1.-dot(n, -rd), 0., 1.), .5); - col = getSeaColor(p, n, no(vec3(0.0,0.3,0.8)),no(rd)); //+ vec3(1., 1.0 ,1.); * fresnel; - } + col = getSeaColor(p, n, no(vec3(0.0,0.3,0.8)),no(rd)); if(mat==2.) col *= vec3(.8, .8, .5); if(mat==3.) diff --git a/shader_minified.h b/shader_minified.h index d6fdde9..914851b 100644 --- a/shader_minified.h +++ b/shader_minified.h @@ -39,13 +39,13 @@ const char *__temp_cleaned_shader_glsl = "}" "float x(vec2 v,float y,int m)" "{" - "vec2 d=floor(v);" + "vec2 s=floor(v);" "v=fract(v);" "v=v*v*(3.-2.*v);" "float z=y;" "if(m==1)" "z=2.;" - "return-y+z*mix(mix(f(d+vec2(0),m),f(d+vec2(1,0),m),v.x),mix(f(d+vec2(0,1),m),f(d+vec2(1),m),v.x),v.y);" + "return-y+z*mix(mix(f(s+vec2(0),m),f(s+vec2(1,0),m),v.x),mix(f(s+vec2(0,1),m),f(s+vec2(1),m),v.x),v.y);" "}" "float s(vec3 v,float y,float m)" "{" @@ -99,27 +99,27 @@ const char *__temp_cleaned_shader_glsl = "}" "vec3 x(vec3 v,int f)" "{" - "float z=0.,i=1e3,r=m/12.,p,d=floor(atan(v.y,v.x)/r+.5)*r;" - "vec3 a=v;" - "a.xy=n(d)*a.xy;" - "float c=length(max(abs(a.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02,l=abs(length(v.xy)-1.8)-.2;" - "c=min(c,l);" + "float z=0.,i=1e3,r=m/12.,p,a=floor(atan(v.y,v.x)/r+.5)*r;" + "vec3 c=v;" + "c.xy=n(a)*c.xy;" + "float d=length(max(abs(c.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02,l=abs(length(v.xy)-1.8)-.2;" + "d=min(d,l);" "l=n(abs(length(v.xy)-1.75)-.08,abs(v.z-.1)-.04,.005);" - "c=n(max(-l,c),abs(v.z)-.1,.02);" + "d=n(max(-l,d),abs(v.z)-.1,.02);" "vec3 C=x(v),K=C;" "r=m/16.;" "K.xy=n(floor(atan(C.y,C.x)/r+.5)*r)*K.xy;" "l=n(K.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02+x(v.xy*1e2,.001,0);" - "c=min(c,l);" - "if(c==l)" + "d=min(d,l);" + "if(d==l)" "z=6.;" "l=1e3;" "float F=1.5,e=0.,b,g=4.,E=.6,D=.2;" "for(int i=0;i<4;i++)" "p=n(vec3(v.x,v.y+F+.05,v.z),vec3(2,.2,F))-.05,l=min(l,p),F+=.2;" "l+=x(v.xz*50.+2e2,.01,0)-x(v.yz*2.+1.5,.15,0);" - "c=min(c,l);" - "if(c==l)" + "d=min(d,l);" + "if(d==l)" "z=2.;" "if(f==1)" "{" @@ -128,47 +128,47 @@ const char *__temp_cleaned_shader_glsl = "b=t((f+y)*E,g)+t((f-y)*E,g),e+=b*D,f*=mat2(1.6,1.2,-1.2,1.6),E*=1.9,D*=.22,g=mix(g,1.,.4);" "}" "l=max(max(-s(v,2.,min(2.-(y-23.)*3.,2.3)),s(v,.025,1.6)-e*.15),s(v,.3,1.7));" - "c=min(c,l);" - "if(c==l)" + "d=min(d,l);" + "if(d==l)" "z=1.;" "l=v.y+3.7+x(vec2(v.x,v.z*.44-40.)*.04+1e2,20.,0)+.25*sin(v.z*.5+y);" - "c=min(c,l);" - "if(c==l)" + "d=min(d,l);" + "if(d==l)" "z=3.;" "for(float f=0.;f<8.;f++)" "{" "r=24.67/(m*2.);" - "a=v;" - "d=r+(f+1.)*m/4.;" + "c=v;" + "a=r+(f+1.)*m/4.;" "if(f==1.)" - "d+=.2;" + "a+=.2;" "if(f==7.)" - "d-=.2;" - "a.xy=n(d)*a.xy;" + "a-=.2;" + "c.xy=n(a)*c.xy;" "float p=9.+(f-1.)*2.+1.5;" "if(f>0.)" "{" - "a.x-=1.95;" - "vec3 v=a;" + "c.x-=1.95;" + "vec3 v=c;" "if(y>p)" "v.x=t(vec2(v.x,p));" - "float f=s(vec3(a.x-.06,a.yz),vec2(.1,.15))-.01;" + "float f=s(vec3(c.x-.06,c.yz),vec2(.1,.15))-.01;" "l=min(max(-s(vec3(v.x-.14,v.yz),vec2(.22))-.01,s(vec3(v),vec2(.2,.12))-.02),f);" - "c=min(c,l);" - "if(c==l)" + "d=min(d,l);" + "if(d==l)" "z=4.;" - "if(c==f)" + "if(d==f)" "if(y>p+.2)" "z=5.,i=min(l,f);" "}" "}" - "return vec3(c,z,i);" + "return vec3(d,z,i);" "}" "float t(vec3 v,vec3 y,int f)" "{" "vec3 m;" "float i=0.;" - "for(int c=0;c<100;c++)" + "for(int r=0;r<100;r++)" "{" "m=x(v+y*i,0);" "if(f==0&&m.z<.3)" @@ -184,13 +184,13 @@ const char *__temp_cleaned_shader_glsl = "vec2 y=vec2(.01,0);" "return f(x(v,1).x-vec3(x(v-y.xyy,1).x,x(v-y.yxy,1).x,x(v-y.yyx,1)));" "}" - "float f(vec3 v,vec3 y,float m,vec3 z)" + "float f(vec3 v,vec3 y,float m,vec3 d)" "{" "float i=1.;" "vec3 l=f(y-v);" - "i=f(dot(z,l),0.,i);" - "float c=t(v+z*.0025,l,1);" - "if(c10.75)" "{" - "float f=smoothstep(-1.,.8,sin(s(vec3(.8,10.75,8))*2.));" + "float f=smoothstep(sin(s(vec3(.8,10.75,8)*2.)),-1.,.8);" "v=mix(v,f*1.4*C,f*.76);" "}" "return v;" @@ -253,32 +253,32 @@ const char *__temp_cleaned_shader_glsl = "}" "vec3 e(vec2 v)" "{" - "vec3 m=f(),i=t(v,m,n(),f((28.-y)*-2.,2.,25.)),d=vec3(0);" - "float K=t(m,i,0),g=0.;" + "vec3 m=f(),d=t(v,m,n(),f((28.-y)*-2.,2.,25.)),i=vec3(0);" + "float K=t(m,d,0),g=0.;" "if(K<2e2)" "{" - "vec3 v=m+i*K,y=w(v);" + "vec3 v=m+d*K,y=w(v);" "g=x(v,0).y;" - "d+=l*f(v,vec3(10,15,25),.2,y);" - "d+=r*f(v,vec3(4,2,-15),1.,y);" - "d+=c*f(dot(y,f(vec3(0,1,10))),0.,1.);" + "i+=l*f(v,vec3(10,15,25),.2,y);" + "i+=r*f(v,vec3(4,2,-15),1.,y);" + "i+=c*f(dot(y,f(vec3(0,1,10))),0.,1.);" "if(g==0.)" - "d*=vec3(.21,.35,.33)+h(y,i,.5,2.);" + "i*=vec3(.2,.3,.3)+h(y,d,.5,2.);" "if(g==1.)" - "d=s(v,y,f(vec3(0,.3,.8)),f(i));" + "i=s(v,y,f(vec3(0,.3,.8)),f(d));" "if(g==2.)" - "d*=vec3(.8,.8,.5);" + "i*=vec3(.8,.8,.5);" "if(g==3.)" - "d*=vec3(.8,.8,.5)+x(v.xz*5e2+1e5,.3,0);" + "i*=vec3(.8,.8,.5)+x(v.xz*5e2+1e5,.3,0);" "if(g==4.)" - "d*=vec3(0,.08,.11)+h(y,i,.3,.7);" + "i*=vec3(0,.08,.11)+h(y,d,.3,.7);" "if(g==5.)" - "d=C*.4;" + "i=C*.4;" "if(g==6.)" - "d*=vec3(.01,.04,.06)+h(y,i,.1,2.5);" + "i*=vec3(.01,.04,.06)+h(y,d,.1,2.5);" "}" - "d+=z*C*3.;" - "return smoothstep(0.,1.,pow(h(mix(d,mix(a,p,pow(max(dot(i,vec3(0,-.1,-1)),0.),8.)),1.-exp(-K*.01)))*vec3(.9,.8,.7),vec3(.45)))+1.2-vec3(f((32.-y)*.35,0.,1.2));" + "i+=z*C*3.;" + "return smoothstep(0.,1.,pow(h(mix(i,mix(a,p,pow(max(dot(d,vec3(0,-.1,-1)),0.),8.)),1.-exp(-K*.01)))*vec3(.9,.8,.7),vec3(.45)))+1.-vec3(f((31.-y)*.5,0.,1.));" "}" "void main()" "{"