final ? 4095

This commit is contained in:
2024-07-31 21:16:38 +03:00
parent 01dd045a6a
commit 610c2391b1
4 changed files with 12 additions and 15 deletions

View File

@ -6,7 +6,7 @@ PROJECT_INFO_FILE=prod.nfo
PROJECT_SCREENSHOT=
# Currently active config file name
ACTIVE_CONFIG=base.config
ACTIVE_CONFIG=minified.config
# ------- GUI options/preferences --------
# Automatically rebuild DLLs when things have changed?

View File

@ -8,8 +8,8 @@ MUSIC_BEATS_PER_BAR=4.0
########### Visuals ############
SHADER_FILE=shader.glsl
RESOLUTION_X=1280
RESOLUTION_Y=720
RESOLUTION_X=1980
RESOLUTION_Y=1080
USE_TIME_UNIFORM=1
TIME_UNIFORM_NAME='u_time'

View File

@ -287,10 +287,9 @@ float specular(vec3 normal,vec3 lightPos,vec3 rayOrigin,float specular) {
}
vec3 getSeaColor(vec3 p, vec3 n, vec3 l, vec3 eye) {
vec3 color = SEA_BASE + diffuse(n,l,60.0) * SEA_WATER_COLOR * 0.3;
float fresnel = pow(clamp(1.-dot(n, -eye), 0., 1.), .9);
color -= vec3(0.73, 0.15, 0.66) * fresnel;
color -= vec3(0.73, 0.15, 0.66) * pow(clamp(1.-dot(n, -eye), 0., 1.), .7);
color += vec3(specular(n,l,eye,60.0))*0.2;
return color;
}

View File

@ -26,8 +26,6 @@ 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)"
"{"
@ -111,7 +109,7 @@ const char *__temp_cleaned_shader_glsl =
"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;"
"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)"
"z=6.;"
@ -172,11 +170,11 @@ const char *__temp_cleaned_shader_glsl =
"float i=0.;"
"for(int c=0;c<100;c++)"
"{"
"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)"
"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)"
"break;"
"}"
"return i;"
@ -202,7 +200,7 @@ const char *__temp_cleaned_shader_glsl =
"}"
"vec3 s(vec3 v,vec3 y,vec3 f,vec3 m)"
"{"
"return F+pow(dot(y,f)*.4+.6,60.)*K*.3-vec3(.73,.15,.66)*pow(clamp(1.-dot(y,-m),0.,1.),.9)+vec3(n(y,f,m,60.))*.2;"
"return F+pow(dot(y,f)*.4+.6,60.)*K*.3-vec3(.73,.15,.66)*pow(clamp(1.-dot(y,-m),0.,1.),.7)+vec3(n(y,f,m,60.))*.2;"
"}"
"vec3 t(vec2 v,vec3 y,vec3 i,float m)"
"{"