From 9b0e678611ae5efdb4b8bb81cfbc6f13d87559c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petri=20J=C3=A4rvisalo?= Date: Tue, 28 May 2024 22:53:49 +0300 Subject: [PATCH] fixes --- 4k_test.zip | 0 4k_test2.zip | Bin 0 -> 3809 bytes base.config | 2 +- minified.config | 2 +- shader.glsl | 39 +++--------- shader_minified.h | 159 +++++++++++++++++++++------------------------- 6 files changed, 86 insertions(+), 116 deletions(-) create mode 100644 4k_test.zip create mode 100644 4k_test2.zip diff --git a/4k_test.zip b/4k_test.zip new file mode 100644 index 0000000..e69de29 diff --git a/4k_test2.zip b/4k_test2.zip new file mode 100644 index 0000000000000000000000000000000000000000..762b509783bcee4f12b937759b5657ee87742940 GIT binary patch literal 3809 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 B22KC~ literal 0 HcmV?d00001 diff --git a/base.config b/base.config index 3fa7725..1bb12cc 100644 --- a/base.config +++ b/base.config @@ -59,7 +59,7 @@ EXE_LINKER_PROGRAM=Crinkler QUOTE=\" -CRINKLER_ORDERTRIES=4000 +CRINKLER_ORDERTRIES=400 AUDIO_BUFFER_ALLOCATED_LENGTH=5257472 AUDIO_SAMPLING_RATE=44100 diff --git a/minified.config b/minified.config index 6aa77c4..d136c9c 100644 --- a/minified.config +++ b/minified.config @@ -8,7 +8,7 @@ include $(PARENT_CONFIG) # Visuals EXE_LINKER_PROGRAM=Crinkler -CRINKLER_ORDERTRIES=4000 +CRINKLER_ORDERTRIES=400 SHADER_FILE=shader_minified.h TIME_UNIFORM_NAME='v' RESOLUTION_UNIFORM_NAME='m' diff --git a/shader.glsl b/shader.glsl index 5096028..3c3a14f 100644 --- a/shader.glsl +++ b/shader.glsl @@ -3,16 +3,6 @@ uniform vec2 resolution; uniform sampler2D texture_sampler; uniform sampler2D texts; -#define MAX_STEPS 100 -#define MAX_DIST 20. -#define SURF_DIST .001 -#define TAU 6.283185 -#define PI 3.141592 - -#define FOG_DENSITY 0.01 - - - struct Obj { float distance; // distance map int material; // material Id @@ -25,8 +15,7 @@ mat2 Rot(float a) { } vec3 applyFog(in vec3 color, in float distance) { - - float fogAmount = 1.0 - exp(-distance*FOG_DENSITY); + float fogAmount = 1.0 - exp(-distance *0.01); vec3 fogColor = vec3(0.17, 0.16, 0.24); return mix( color, fogColor, fogAmount ); } @@ -95,13 +84,13 @@ Obj castRay(vec3 ro, vec3 rd) { float t = 0.0; Obj res = Obj(-1., -1); - for(int i=0; i MAX_DIST || res.distance < abs(SURF_DIST*t) ) break; + if (t > 20.0 || res.distance < abs(0.001*t) ) break; } - if (t > MAX_DIST) t = -1.0; + if (t > 20.0) t = -1.0; res.distance = t; return res; } @@ -109,7 +98,7 @@ Obj castRay(vec3 ro, vec3 rd) { float castShadow(vec3 ro, vec3 rd) { float res = 1.0; float t = 0.001; - for(int i = 0; i < MAX_STEPS; i++) { + for(int i = 0; i < 100; i++) { vec3 pos = ro + t* rd; float h = mapScene(pos).distance; res = min(res, 10.0*h/t); @@ -191,23 +180,16 @@ vec3 shading(vec3 v, vec3 n, vec3 dir, int material) { float sun_dif = clamp(dot(n, SUN_DIR), 0., 1.); final += outMaterial * vec3(0.0353, 0.2667, 0.4784) * sun_dif; } - // final += texture( iChannel0, ref ).rgb * fresnel( Ks, n, -dir ); - // vec3 col = vec3(0.4)* ref.x; - //vec3 col = vec3(0.0588, 0.0588, 0.1216);// - vec3(0.149, 0.0863, 0.2314) * v.x; - //final += col * fresnel( vec3(.5), ref, -dir ); - return final; + return final; } void main() { - vec2 p = (2.0 * gl_FragCoord.xy - resolution.xy) / resolution.y; + vec2 p = (gl_FragCoord.xy * 2. - resolution.xy) / min(resolution.x, resolution.y); + // vec2 p = (2.0 * gl_FragCoord.xy - resolution.xy) / resolution.y; float angle = time*0.4; - // angle = 2.0; // comment to rotate - // gl_FragColor = vec4(vec3(sdCog2d(p)), 1.); - // return; - // camera vec3 ta = vec3(0.0, 0., 0.0); vec3 ro = ta + vec3(4.*sin(angle), cos(angle), 4.*cos(angle)); // *cos(angle)) @@ -227,7 +209,6 @@ void main() col = shading(pos, nor, rd , t.material); // apply fog col = applyFog(col, t.distance); - } - - gl_FragColor = vec4( pow( col, vec3(1.0/1.3) ), 1.0 ); + } + gl_FragColor = vec4( pow(col, vec3(1.0/1.3) ), 1.0 ); } \ No newline at end of file diff --git a/shader_minified.h b/shader_minified.h index 5c807f7..f2d7e3b 100644 --- a/shader_minified.h +++ b/shader_minified.h @@ -9,152 +9,141 @@ const char *__temp_cleaned_shader_glsl = "uniform float v;" "uniform vec2 m;" - "uniform sampler2D e,d;\n" - "#define MAX_STEPS 100\n" - "#define MAX_DIST 20.\n" - "#define SURF_DIST.001\n" - "#define TAU 6.283185\n" - "#define PI 3.141592\n" - "#define FOG_DENSITY 0.01\nstruct Obj{float distance;int material;};" + "uniform sampler2D e,d;struct Obj{float distance;int material;};" "mat2 n(float v)" "{" - "float m=sin(v),d=cos(v);" - "return mat2(d,-m,m,d);" + "float f=sin(v),y=cos(v);" + "return mat2(y,-f,f,y);" "}" - "vec3 n(vec3 v,float m)" + "float n(vec3 v,float m)" "{" - "float d=1.-exp(-m*FOG_DENSITY);" - "return mix(v,vec3(.17,.16,.24),d);" - "}" - "float s(vec3 v,float m)" - "{" - "vec2 d=vec2(m,abs(v.z)-.15);" - "return min(max(d.x,d.y),0.)+length(max(d,0.));" + "vec2 f=vec2(m,abs(v.z)-.15);" + "return min(max(f.x,f.y),0.)+length(max(f,0.));" "}" "float s(vec2 v)" "{" - "float d=1.-smoothstep(-.2,.8,sin(atan(v.y,v.x)*12.))*.14;" - "return smoothstep(d,d+2.,length(v)*2.);" + "float f=1.-smoothstep(-.2,.8,sin(atan(v.y,v.x)*12.))*.14;" + "return smoothstep(f,f+2.,length(v)*2.);" "}" - "float x(float m,float v)" + "float s(float f,float v)" "{" - "float d=max(.02-abs(-m-v),0.);" - "return max(-m,v)+d*d*.25/.02;" + "float m=max(.02-abs(-f-v),0.);" + "return max(-f,v)+m*m*.25/.02;" "}" "float x(vec3 v)" "{" - "vec3 m=vec3(0),d=v-m,y=vec3(0,0,1)-m;" - "return length(d-y*clamp(dot(d,y)/dot(y,y),0.,1.))-.2;" + "vec3 f=vec3(0),m=v-f,y=vec3(0,0,1)-f;" + "return length(m-y*clamp(dot(m,y)/dot(y,y),0.,1.))-.2;" "}" - "float p(vec3 v,float m)" + "float x(vec3 v,float m)" "{" "v.xy*=n(m);" - "float d=s(v,s(v.xy)),y=x(v-vec3(0,0,-.5));" - "return.8*x(y,d)-.001;" + "float f=n(v,s(v.xy)),y=x(v-vec3(0,0,-.5));" + "return.8*s(y,f)-.001;" "}" - "Obj p(vec3 m)" + "Obj f(vec3 m)" "{" - "float d=1e10;" + "float f=1e10;" "Obj e=Obj(m.y+1.5+sin(m.z*.6)*.2+sin(m.x*1.3)*.1,0);" "{" - "float y=p(m+vec3(1,0,0),v);" - "d=min(d,y);" + "float y=x(m+vec3(1,0,0),v);" + "f=min(f,y);" "}" "{" - "float y=p(m+vec3(.5,-.87,0),-v);" - "d=min(d,y);" + "float y=x(m+vec3(.5,-.87,0),-v);" + "f=min(f,y);" "}" "{" - "float y=p(m+vec3(.5,.87,0),-v);" - "d=min(d,y);" + "float y=x(m+vec3(.5,.87,0),-v);" + "f=min(f,y);" "}" - "Obj y=Obj(d,1);" + "Obj y=Obj(f,1);" "return e.distance>y.distance?" "y:" "e;" "}" - "Obj t(vec3 v,vec3 m)" + "Obj f(vec3 v,vec3 y)" "{" - "float d=0.;" + "float m=0.;" "Obj r=Obj(-1.,-1);" - "for(int y=0;yMAX_DIST||r.distance20.||r.distanceMAX_DIST)" - "d=-1.;" - "r.distance=d;" + "if(m>20.)" + "m=-1.;" + "r.distance=m;" "return r;" "}" - "float f(vec3 v,vec3 m)" + "float p(vec3 v,vec3 m)" "{" - "float d=1.,y=.001;" - "for(int r=0;r20.)" + "r+=n;" + "if(r>20.)" "break;" "}" - "return clamp(d,0.,1.);" + "return clamp(y,0.,1.);" "}" - "vec3 f(vec3 v)" + "vec3 p(vec3 v)" "{" "vec2 m=vec2(.001,0);" - "vec3 d=vec3(p(v+m.xyy).distance-p(v-m.xyy).distance,p(v+m.yxy).distance-p(v-m.yxy).distance,p(v+m.yyx).distance-p(v-m.yyx).distance);" - "return normalize(d);" + "vec3 y=vec3(f(v+m.xyy).distance-f(v-m.xyy).distance,f(v+m.yxy).distance-f(v-m.yxy).distance,f(v+m.yyx).distance-f(v-m.yyx).distance);" + "return normalize(y);" "}" - "vec3 f(vec3 m,vec3 v,vec3 d)" + "vec3 f(vec3 v,vec3 m,vec3 y)" "{" - "return m+(1.-m)*pow(clamp(1.-dot(v,d),0.,1.),5.);" + "return v+(1.-v)*pow(clamp(1.-dot(m,y),0.,1.),5.);" "}" - "vec3 f(vec3 v,vec3 d,vec3 m,int y)" + "vec3 f(vec3 v,vec3 y,vec3 m,int c)" "{" "float e=1.;" - "vec3 r=vec3(0),c=reflect(m,d),a=vec3(.5),i=vec3(1),n=vec3(.1255);" - "if(y==0)" - "n=vec3(.1412),e=3.1;" - "else if(y==1)" - "n=vec3(.1765,.1961,.2275),e=21.;" + "vec3 r=vec3(0),d=reflect(m,y),n=vec3(.5),a=vec3(1),O=vec3(.1255);" + "if(c==0)" + "O=vec3(.1412),e=3.1;" + "else if(c==1)" + "O=vec3(.1765,.1961,.2275),e=21.;" "{" - "vec3 x=normalize(vec3(-2,.3,10)-v),O=vec3(max(0.,dot(x,c))),l=f(a,normalize(x-m),x);" - "O=pow(O,vec3(e));" - "r+=n*O*(vec3(.71,.51,.72)*5.)*mix(i*vec3(max(0.,dot(x,d))),O,l);" + "vec3 x=normalize(vec3(-2,.3,10)-v),i=vec3(max(0.,dot(x,d))),l=f(n,normalize(x-m),x);" + "i=pow(i,vec3(e));" + "r+=O*i*(vec3(.71,.51,.72)*5.)*mix(a*vec3(max(0.,dot(x,y))),i,l);" "}" "{" - "vec3 x=normalize(vec3(5,5,-20)-v),O=vec3(max(0.,dot(x,c))),l=f(a,normalize(x-m),x);" - "O=pow(O,vec3(e));" - "r+=n*O*(vec3(.14,.36,.83)*7.)*mix(i*vec3(max(0.,dot(x,d))),O,l);" + "vec3 x=normalize(vec3(5,5,-20)-v),i=vec3(max(0.,dot(x,d))),l=f(n,normalize(x-m),x);" + "i=pow(i,vec3(e));" + "r+=O*i*(vec3(.14,.36,.83)*7.)*mix(a*vec3(max(0.,dot(x,y))),i,l);" "}" "{" "vec3 x=vec3(0,.4,1);" - "float O=clamp(dot(d,x),0.,1.),l=f(v+d*.02,x);" - "r+=n*vec3(1.1,1.2,1.5)*O*O*l;" + "float i=clamp(dot(y,x),0.,1.),l=p(v+y*.02,x);" + "r+=O*vec3(1.1,1.2,1.5)*i*i*l;" "}" - "r+=n*vec3(.0353,.2667,.4784)*clamp(dot(d,vec3(0,.6,-1)),0.,1.);" + "r+=O*vec3(.0353,.2667,.4784)*clamp(dot(y,vec3(0,.6,-1)),0.,1.);" "return r;" "}" "void main()" "{" - "vec2 d=(2.*gl_FragCoord.xy-m.xy)/m.y;" - "float y=v*.4;" - "vec3 e=vec3(0),x=e+vec3(4.*sin(y),cos(y),4.*cos(y)),O=normalize(e-x),c=normalize(cross(O,vec3(0,1,0))),l=normalize(d.x*c+d.y*normalize(cross(c,O))+1.4*O),r=vec3(.1451,.1098,.1608)-vec3(.9725,.5176,0)*l.y;" - "Obj i=t(x,l);" - "if(i.distance>0.)" + "vec2 y=(gl_FragCoord.xy*2.-m.xy)/min(m.x,m.y);" + "float x=v*.4;" + "vec3 e=vec3(0),i=e+vec3(4.*sin(x),cos(x),4.*cos(x)),c=normalize(e-i),r=normalize(cross(c,vec3(0,1,0))),l=normalize(y.x*r+y.y*normalize(cross(r,c))+1.4*c),d=vec3(.1451,.1098,.1608)-vec3(.9725,.5176,0)*l.y;" + "Obj n=f(i,l);" + "if(n.distance>0.)" "{" - "vec3 a=x+l*i.distance,s=f(a);" - "r=f(a,s,l,i.material);" - "r=n(r,i.distance);" + "vec3 a=i+l*n.distance,O=p(a);" + "d=f(a,O,l,n.material);" + "d=mix(d,vec3(.17,.16,.24),1.-exp(-n.distance*.01));" "}" - "gl_FragColor=vec4(pow(r,vec3(1./1.3)),1);" + "gl_FragColor=vec4(pow(d,vec3(1./1.3)),1);" "}"; #endif // SHADER_MINIFIED_H_