mirror_js/condition
1
0
Fork 0
mirror of https://github.com/FMS-Cat/condition.git synced 2025-08-08 06:56:31 +02:00
Code Issues Projects Releases Wiki Activity

aesthetics: slightly better execution of wub raymarcher

Browse Source
This commit is contained in:
FMS-Cat
2021-03-22 06:02:57 +09:00
parent 7090af9910
commit e7c9323a67
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/Raymarcher.ts
View File

@@ -48,7 +48,7 @@ export class Raymarcher {
); );
material.addUniform( 'deformAmp', '1f', auto( 'Music/NEURO_WUB_AMP' ) ); material.addUniform( 'deformAmp', '1f', auto( 'Music/NEURO_WUB_AMP' ) );
material.addUniform( 'deformFreq', '1f', auto( 'Music/NEURO_WUB_FREQ' ) ); material.addUniform( 'deformFreq', '1f', 1.0 + 7.0 * auto( 'Music/NEURO_DETUNE' ) );
material.addUniform( 'deformTime', '1f', auto( 'Music/NEURO_TIME' ) ); material.addUniform( 'deformTime', '1f', auto( 'Music/NEURO_TIME' ) );
} }
}, },

3
src/shaders/raymarcher.frag
View File

@@ -61,8 +61,6 @@ float fDistFunc( vec3 p ) {
if ( length( p ) > 2.0 ) { return length( p ) - 1.8; } if ( length( p ) > 2.0 ) { return length( p ) - 1.8; }
p += 0.5 * deformAmp / deformFreq * noise( vec4( deformFreq * p.xyz, 4.0 * deformFreq * deformTime ) );
{ {
vec3 pt = p; vec3 pt = p;
@@ -74,6 +72,7 @@ float fDistFunc( vec3 p ) {
} }
float dist = distFunc( p, time ); float dist = distFunc( p, time );
dist += 0.5 * deformAmp / deformFreq * noise( vec4( deformFreq * p.xyz, 4.0 * deformFreq * deformTime ) );
return max( distSlasher, dist ); return max( distSlasher, dist );
} }