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

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

Browse Source
This commit is contained in:
Markus Järvisalo
2024-07-29 22:22:07 +03:00
parent 0284461cd5 9646be5552
commit a8c521bfcf
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shader.glsl
View File

@ -322,9 +322,15 @@ vec3 postProcess(vec3 col) {
return col; return col;
} }
vec3 getCpos(float time) {
return vec3((cos(time)-0.9)*2., -sin(time)*0.8, 5.);;
}
vec3 cameraPos() vec3 cameraPos()
{ {
// first zoom in to the gate // first zoom in to the gate
vec3 cPos = vec3(0., clamp(6.-u_time,2.,6.), clamp((75.-u_time*8.),6.,75.)); vec3 cPos = vec3(0., clamp(6.-u_time,2.,6.), clamp((75.-u_time*8.),6.,75.));
if (u_time > 7.5) cPos += vec3(0., clamp(7.5-u_time,-1.,0.), 0.); if (u_time > 7.5) cPos += vec3(0., clamp(7.5-u_time,-1.,0.), 0.);
// close up shot for 1st glyph lock // close up shot for 1st glyph lock
@ -340,6 +346,13 @@ vec3 cameraPos()
{ {
cPos = vec3(-1., -.7, 4.); cPos = vec3(-1., -.7, 4.);
} }
if (u_time > 22.) {
cPos = getCpos(u_time);
}
if (u_time > 26.5) {
cPos = mix(getCpos(26.5), vec3(0., 0., 5.), clamp((u_time-26.5) * 1.5, 0., 1.1));
}
return cPos; return cPos;
} }
@ -417,6 +430,7 @@ vec3 sceneGate(vec2 uv)
if(mat ==5.) if(mat ==5.)
col *= chevronColor; // activated glyph color col *= chevronColor; // activated glyph color
} }
col = applyFog(col, d, rd, vec3(0., -.1, -1.), .01); col = applyFog(col, d, rd, vec3(0., -.1, -1.), .01);
col = colorFlashesAnim(col); // animated color flash col = colorFlashesAnim(col); // animated color flash
return postProcess(col); return postProcess(col);