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

Merge branch 'experimental' of http://gitlab.xn--jrvisalo-0za.fi/markus.jarvisalo/4kdemo into experimental

Browse Source
This commit is contained in:
Markus Järvisalo
2024-07-31 21:08:18 +03:00
parent 10a7d12eb8 96f49bfdff
commit 01dd045a6a
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
4kdemo.compofiller
View File

@ -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?

6
base.config
View File

@ -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'

2
shader.glsl
View File

@ -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.;

12
shader_minified.h
View File

@ -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;"