diff --git a/4kdemo.compofiller b/4kdemo.compofiller index baa5bd0..a1db361 100644 --- a/4kdemo.compofiller +++ b/4kdemo.compofiller @@ -6,7 +6,7 @@ PROJECT_INFO_FILE=prod.nfo PROJECT_SCREENSHOT= # Currently active config file name -ACTIVE_CONFIG=minified.config +ACTIVE_CONFIG=base.config # ------- GUI options/preferences -------- # Automatically rebuild DLLs when things have changed? diff --git a/base.config b/base.config index 2001a43..52287ae 100644 --- a/base.config +++ b/base.config @@ -8,8 +8,8 @@ MUSIC_BEATS_PER_BAR=4.0 ########### Visuals ############ SHADER_FILE=shader.glsl -RESOLUTION_X=1920 -RESOLUTION_Y=1080 +RESOLUTION_X=1280 +RESOLUTION_Y=720 USE_TIME_UNIFORM=1 TIME_UNIFORM_NAME='u_time' @@ -23,7 +23,7 @@ FRAME_TO_TEXTURE=0 USE_MIPMAP=0 SECOND_PASS_NEGATIVE_TIME=0 -# Texts +# Texts USE_TEXTS=0 USE_TEXTS_UNIFORM=0 TEXTS_UNIFORM_NAME='texts' diff --git a/shader.glsl b/shader.glsl index e185076..8bf2b75 100644 --- a/shader.glsl +++ b/shader.glsl @@ -170,7 +170,7 @@ vec3 map(vec3 p, int displace) vec3 p2 = ringAnim(p), q2=p2; an = PI/16.; q2.xy = rot2D(floor((atan(p2.y,p2.x)/an) + .5)*an)*q2.xy; - d2 = sdBox2( q2.xyz - vec3(1.75,0.,0.), vec3(.04, .14, .05) ) - .02; + d2 = sdBox2( q2.xyz - vec3(1.75,0.,0.), vec3(.04, .14, .05) ) - .02 + noise(p.xy*100.,1e-3,0); d = min(d, d2); if (d==d2) mat = 6.; diff --git a/shader_minified.h b/shader_minified.h index 88b8607..653558f 100644 --- a/shader_minified.h +++ b/shader_minified.h @@ -26,6 +26,8 @@ const char *__temp_cleaned_shader_glsl = "{" "float z=max(m-abs(v-y),0.);" "return max(v,y)+z*z*.25/m;" + "float z=max(m-abs(v-y),0.);" + "return max(v,y)+z*z*.25/m;" "}" "float f(vec2 v,int y)" "{" @@ -170,11 +172,11 @@ const char *__temp_cleaned_shader_glsl = "float i=0.;" "for(int c=0;c<100;c++)" "{" - "m=x(v+y*i,0);" - "if(f==0&&m.z<.3)" - "z+=.05/(1.+10.*pow(m.z,.5));" - "i+=m.x;" - "if(m.x<.001||i>4e2)" + "m=x(v+y*i,0).x;" + "if(f==0)" + "z+=.05/(1.+10.*pow(x(v+y*i,0).z,.5));" + "i+=m;" + "if(m<1e-4||i>6e2)" "break;" "}" "return i;"