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

lisää optimointia

Browse Source
This commit is contained in:
Petri Järvisalo
2024-07-29 08:13:18 +03:00
parent b4c88efb92
commit f5cfde0373
5 changed files with 473 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
shader.glsl
View File

@ -1,4 +1,4 @@
// precision mediump float;
//precision mediump float;
uniform vec2 u_resolution;
uniform float u_time;
const float PI = 22./7.;
@ -26,7 +26,7 @@ float noise( in vec2 p, float scale )
{
vec2 i = floor( p );
vec2 f = fract( p );
vec2 u = f*f*(3.0-2.0*f);
vec2 u = f*f*(3.-2.*f);
return -scale+scale*mix( mix( hash( i + vec2(0.0,0.0) ),
hash( i + vec2(1.0,0.0) ), u.x),
mix( hash( i + vec2(0.0,1.0) ),
@ -35,12 +35,15 @@ float noise( in vec2 p, float scale )
float displacement( vec3 p )
{
return noise(10.*p.xy+u_time+1e3, 0.2) + 0.5*noise(10.*(p.xy+2.0)-u_time+1e3, 0.2);
return noise(10.*p.xy+u_time+1e3, 0.2) + 0.5*noise(10.*(p.xy+2.0)-u_time+1e3, .2);
}
/////////////////
// GEOMETRY //
/////////////////
float sdSphere(vec3 p, float r) {
return length(p)-r;
}
float sdCappedCylinder( vec3 p, float h, float r )
{
@ -91,6 +94,7 @@ vec3 fogColor2 = vec3(.7, .4, .2); // fog color2
vec3 indirColor = vec3(.2, .1, .3); // indirect light color
vec3 light1Color = vec3(.9, .5, .7);
vec3 light2Color = vec3(.8, .7, .5);
vec3 chevronColor = vec3(.9, .3, 0.);
// with duration d, startTime s and speed up with timeFact
float timedSine(float maxCycles, float startTime, float timeFact) {
@ -138,11 +142,11 @@ vec2 map(in vec3 p)
// Stargate
// Ring boxes
const float an = PI/12.;
float angrot = floor(atan(p.y,p.x)/an + .5)*an;
float an = PI/12.;
float anRot = floor(atan(p.y,p.x)/an + .5)*an;
vec3 q = p;
q.xy = mat2(cos(angrot),-sin(angrot),
sin(angrot), cos(angrot))*q.xy;
q.xy = mat2(cos(anRot),-sin(anRot),
sin(anRot), cos(anRot))*q.xy;
float d = sdBox( q.xy - vec2(1.8,0.), vec2(0.24,0.14) ) - .02;
// Main ring
@ -150,85 +154,71 @@ vec2 map(in vec3 p)
d = min(d,d2);
// Inner ring
float d3 = abs(length(p.xy) - 1.75) - .08;
d3 = smax( d3, abs(p.z - .1)-.04, .005 );
d = max(-d3,d);
d2 = abs(length(p.xy) - 1.75) - .08;
d2 = smax( d2, abs(p.z - .1)-.04, .005 );
d = max(-d2,d);
// Depth slice rings
d = smax( d, abs(p.z)-.1, .02 );
// Prisms
for(float i = 0.; i < 8.; i++ ) {
float secDist = PI / 4.; // sector distance
float angle = 24.67 / (PI * 2.); // sector size
vec3 q = p;
float rotationIncrement = angle + ((i+1.)*secDist);
// Prisms
for(float i = 0.; i < 8.; i++ ) {
an = 24.67 / (PI * 2.); // sector size
q = p;
anRot = an + (i+1.) * PI / 4.;
// Nudge first and the last prism out of the ground
if (i == 1.) rotationIncrement += .2;
if (i == 7.) rotationIncrement -= .2;
q.xy = rot2D(rotationIncrement) * q.xy;
if (i == 1.) anRot += .2;
if (i == 7.) anRot -= .2;
q.xy = rot2D(anRot) * q.xy;
float rotateDelay = STARTDELAY + ((i - 1.) * glyphPhase + 1.5);
float rotateDelay = STARTDELAY + (i - 1.) * glyphPhase + 1.5;
// We can now call each prism by it's index
// draw all except the middle bottom prism
if (i > 0.) {
q.x -= 1.95;
vec3 q2 = q; // new point for movable parts
if(u_time > rotateDelay) q2.x = prismAnim(q2.x, rotateDelay);
float prismOut = sdTriPrism(vec3(q2.x - .14, q2.y - 0. , q2.z), vec2(.22,.22), .5) - .01;
float prismIn = sdTriPrism(vec3(q2.x, q2.y, q2.z ), vec2(.2,.12), .5) - .02;
float prismTop = sdTriPrism(vec3(q.x - .06, q.y, q.z), vec2(.1,.15), .5) - .01;
float d4 = max(-prismOut, prismIn);
d4 = min(d4, prismTop);
d = min(d, d4);
if(u_time > rotateDelay) q2.x = prismAnim(q2.x, rotateDelay);
float prismTop = sdTriPrism(vec3(q.x - .06, q.y, q.z), vec2(.1,.15), .5)-.01;
d2 = max(- sdTriPrism(vec3(q2.x - .14, q2.y - 0. , q2.z), vec2(.22,.22), .5) - .01 , sdTriPrism(vec3(q2.x, q2.y, q2.z ), vec2(.2,.12), .5) - .02);
d2 = min(d2, prismTop);
d = min(d, d2);
// glyph locking thing material
if (d == d4) mat = 4.;
if (d == d2) mat = 4.;
// glyph locking prism material
if( d == prismTop && u_time > rotateDelay + .2) mat = 5.;
}
}
//Rotating glyphs
vec3 p2 = ringAnim(p);
float an2 = PI/16.;
vec3 p2 = ringAnim(p);
vec3 q2 = p2;
q2.xy = rot2D(floor((atan(p2.y,p2.x)/an2) + .5)*an2)*q2.xy;
float d5 = sdBox2( q2.xyz - vec3(1.75,0.,0.), vec3(.04, .14, .05) ) - .02;
d = min(d, d5);
if (d==d5) mat = 4.;
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;
d = min(d, d2);
if (d==d2) mat = 4.;
// Gate Base
// Gate Base
d2 = 1e3;
float stepDist = 1.5;
float steps = 1e3;
for(int i = 0; i < 4; i++) {
float step = sdBox2(vec3(p.x,p.y+stepDist,p.z), vec3(2., .1,stepDist)) - .05;
steps = min(steps, step);
d2 = min(d2, step);
d = min(d, step);
stepDist += .2;
}
if (d==d2) mat = 2.0;
float sand = (p.y + 4.25) + 1.5*noise((vec2((p.x*.04),(p.z-40.)*.04))+100., 15.);
//sand += noise(p.yz, .25); // + 0.025*noise(p.xz*50.+100., .05);
d = min(d,sand);
float water = 1000.;
float cylinder1 = sdCappedCylinder ( p, .025, 1.6);
float cylinder2 = sdCappedCylinder ( p, 2.0, clamp((2.0 - (u_time*2.0 - 2.0*23.0)),0.,2.0));
float cylinder3 = sdCappedCylinder ( p, 0.3, 1.6);
float disp = 0.;
disp = displacement(p)*clamp(((u_time-24.0)*0.5), 0., 0.25);
cylinder1 = cylinder1 + disp;
water = max(-cylinder2, cylinder1);
water = max(water, cylinder3);
d = min(d, water);
if (d==water) mat = 1.0;
if (d==steps) mat = 2.0;
if (d==sand) mat = 3.0;
d2 = (p.y + 4.25) + 1.5*noise((vec2((p.x*.04),(p.z-40.)*.04))+100., 15.);
d = min(d,d2);
if (d==d2) mat = 3.0;
d2 = 1e3;
d2 = max(-sdCappedCylinder(p, 2.0, clamp((2.0 - (u_time*2.0 - 2.0*23.0)),0.,2.0)), sdCappedCylinder(p, .025, 1.6)+ displacement(p)*clamp(((u_time-24.0)*0.5), 0., 0.25));
d2 = max(d2, sdCappedCylinder ( p, 0.3, 1.6));
d = min(d, d2);
if (d==d2) mat = 1.0;
return vec2( d, mat );
}
@ -335,15 +325,14 @@ vec3 colorFlashesAnim(in vec3 col) {
float delay = 10.75;
if(u_time > delay) {
float x = smoothstep(-1.,.8,sin((timedSine(.8, delay, 8.)*2.)));
col = mix(col, vec3(.95, .35, .06) * (x * 1.4), x *.76);
col = mix(col, chevronColor * (x * 1.4), x *.76);
}
return col;
}
void main()
vec3 sceneGate(vec2 uv)
{
// Initialization
vec2 uv = (gl_FragCoord.xy * 2. - u_resolution.xy) / u_resolution.y;
// Initialization
vec3 ro = cameraPos();
vec3 rd = getCameraRayDir(uv, ro, cameraPointAt(), 2.); // ray direction
vec3 col = vec3(0.); // color
@ -359,24 +348,14 @@ void main()
// 2: Light position
// 3: Light intensity
// 4: Shadow intensity
float dif = 0.; //getLight(p, vec3( 2, 50, 2), .5, .2);
// Color for light 1
// col = vec3(dif * vec3(0.9216, 0.9294, 0.9412));
// Light 2
dif = getLight(p, vec3( 10., 15., 25.), 1., .2);
float dif = getLight(p, vec3( 10., 15., 25.), 1., .2);
col += dif * light1Color;
dif = getLight(p, vec3( 4., 2., -15.), 1., 1.);
col += dif * light2Color;
/*vec3 lightPosition = vec3(1.7,-1.1,0.3);
float len = length( lightPosition - p);
float att = 8.0 / (1.0 + 8.1*len + 0.01*len*len); // light attenuation
if(u_time > 10.76) {
col += vec3(dif * vec3(0.95, 0.35, 0.06) * att);
}*/
// indirect lightning -> vec3 in normalize is light direction
col += indirColor * clamp( dot( getNormal(p), normalize(vec3(0. , 1., 10.))), 0., 1.);
@ -391,13 +370,86 @@ void main()
else if(mat==4.)
col *= vec3(.1);
else if(mat ==5.)
col *= vec3(0.9, 0.3, 0.); // activated glyph color
col *= chevronColor; // activated glyph color
}
float fogAmount = .01;
// col = col*exp(-d*fogAmount) + applyFog(col, d, rd, vec3(0., .3, -1.), fogAmount) * (1.0-exp(-d*fogAmount));
col = applyFog(col, d, rd, vec3(0., -.1, -1.), fogAmount);
col = colorFlashesAnim(col); // animated color flash
gl_FragColor = vec4(postProcess(col), 1.);
float fogAmount = .01;
col = applyFog(col, d, rd, vec3(0., -.1, -1.), fogAmount);
col = colorFlashesAnim(col); // animated color flash
return postProcess(col);
}
void pMod1(inout float p, float size) {
float halfsize = size*0.5;
p = mod(p + halfsize, size) - halfsize;
}
void getQ(inout vec3 q, float i, float speed, float radius) {
q.z -= .5;
q.xy *= rot2D(sin(speed*u_time*.25)*PI);
q.x -= radius * sin(i / PI);
q.y -= radius * cos(i / PI);
q.z += i * .01;
}
vec2 map2(vec3 pos) {
float d = 1e3;
float mat;
pMod1(pos.z, 1.);
for (float i = 0.; i < 90.; i++) {
vec3 q = pos;
getQ(q, i, -1., 3.);
float b = sdSphere(q, 0.05);
d = min(d, b);
if (d == b) mat = 0.;
q = pos;
getQ(q, i, 1., .3);
b = sdSphere(q, 0.01);
d = min(d, b);
if (d == b) mat = 1.;
}
return vec2(d, mat);
}
vec3 palette(float t) {
vec3 a = vec3(0.5, 0.5, 0.5);
vec3 b = vec3(1.0, 1.0, 1.0);
vec3 c = vec3(1.0, 1.0, 1.0);
vec3 d = vec3(0.0, 0.66, 0.33);
return a + b * cos(6.3 * (c*t+d));
}
float rayMarch2(vec3 ro, vec3 rd) {
float t = 0.;
float d;
for (int i = 0; i < 60; i++) {
vec3 p = ro + rd * t;
d = map2(p).x;
t += d;
if (d < .002 || t > 20.) break;
}
return t;
}
vec3 sceneTunnel(vec2 uv) {
vec3 ro = vec3(0.,0.,u_time*2. );
vec3 rd = normalize(vec3(uv, .7));
float d = rayMarch2(ro, rd);
vec3 p = ro + rd * d;
float mat = map2(p).y;
vec3 col = vec3(0., 0., .1);
if (d < 10.) {
if (mat == 0.) col = vec3( 0., .3, .6);
if (mat == 1.) col = palette(1. - .4*d);
}
return col;
}
void main() {
vec2 uv = (gl_FragCoord.xy * 2. - u_resolution.xy) / u_resolution.y;
if (u_time < 29.) {
gl_FragColor = vec4(sceneGate(uv), 1.);
} else {
gl_FragColor = vec4(sceneTunnel(uv), 1.);
}
}