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

kamera ajoja

Browse Source
This commit is contained in:
Markus Järvisalo
2024-07-29 22:51:50 +03:00
parent a8c521bfcf
commit 4f1f573b8f
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
shader.glsl
View File

@ -75,18 +75,17 @@ float sdTriPrism( vec3 p, vec2 h, float rot )
////////////////// //////////////////
// POSITIONS // POSITIONS
const vec3 glyph1Pos = vec3(1.7,-1.1,0.0); //const vec3 glyph1Pos = vec3(1.7,-1.1,0.0);
const vec3 glyph2Pos = vec3(2.0,0.0,0.0); //const vec3 glyph2Pos = vec3(2.0,0.0,0.0);
const vec3 glyph3Pos = vec3(1.5,1.4,0.0); const vec3 glyph3Pos = vec3(1.5,1.4,0.0);
const vec3 glyph4Pos = vec3(0.0,2.0,0.0); const vec3 glyph4Pos = vec3(0.0,2.0,0.0);
const vec3 glyph5Pos = vec3(-1.5,1.4,0.0); const vec3 glyph5Pos = vec3(-1.5,1.4,0.0);
const vec3 glyph6Pos = vec3(1.5 * -1.,1.4,0.0); //const vec3 glyph6Pos = vec3(1.5 * -1.,1.4,0.0);
const vec3 glyph7Pos = vec3(1.7 * -1.,-1.1,0.0); //const vec3 glyph7Pos = vec3(1.7 * -1.,-1.1,0.0);
// DELAYS // DELAYS
float STARTDELAY = 9.; float STARTDELAY = 9.;
// COLORS // COLORS
vec3 fogColor1 = vec3(.4, .2, .4), // fog color1 vec3 fogColor1 = vec3(.4, .2, .4), // fog color1
fogColor2 = vec3(.7, .4, .2), // fog color2 fogColor2 = vec3(.7, .4, .2), // fog color2
@ -344,13 +343,11 @@ vec3 cameraPos()
} }
if (u_time > 19.5) if (u_time > 19.5)
{ {
cPos = vec3(-1., -.7, 4.); cPos = vec3(3., -.7, 4.);
} }
if (u_time > 22.) { if (u_time > 22.) {
cPos = getCpos(u_time); cPos.yz *= rot2D(((1.-cos(u_time-22.))*0.25)*-0.1);
} cPos.xz *= rot2D(sin((u_time-22.)*0.2)*.6);
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;