Skip to content

Commit 77b17fa

Browse files
author
FMS-Cat
committed
fix: music
1 parent 9d3f48f commit 77b17fa

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/music/music.vert

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ float kick( float t, float attackRatio ) {
111111
vec2 deepkick( float t ) {
112112
if ( t < 0.0 ) { return vec2( 0.0 ); }
113113

114-
vec2 tt = t + 0.04 * wavetable( inRangeInteg( t, 3.0, 1E9, 1.0 ), vec2( 0.2 ), vec2( 0.0 ) );
115-
vec2 phase = 50.0 * tt - 4.0 * exp( -200.0 * tt ) - 9.4 * exp( -50.0 * tt );
114+
vec2 tt = t + mix( 0.0, 0.007, smoothstep( 0.0, 0.1, t ) ) * wavetable( 0.1 * t, vec2( 2.0 ), vec2( -0.1 ) );
115+
vec2 phase = 50.0 * tt - 3.0 * exp( -100.0 * tt ) - 5.4 * exp( -30.0 * tt );
116116
return exp( -1.0 * tt ) * sin( TAU * phase );
117117
}
118118

@@ -268,7 +268,7 @@ vec2 mainAudio( vec4 time ) {
268268
float sidechain = 1.0;
269269

270270
// -- kick ---------------------------------------------------------------------------------------
271-
if ( inRange( time.w, SECTION_BEGIN + 64.0 * BEAT, SECTION_NEURO - 16.0 * BEAT ) ) {
271+
if ( inRange( time.w, SECTION_BEGIN + 64.0 * BEAT, SECTION_NEURO - 14.5 * BEAT ) ) {
272272
float t = mod( mod( time.z - 1.5 * BEAT, 4.0 * BEAT ), 2.5 * BEAT );
273273
sidechain = smoothstep( 0.0, 0.7 * BEAT, t );
274274
dest += 0.25 * kick( t, 0.2 );
@@ -300,8 +300,8 @@ vec2 mainAudio( vec4 time ) {
300300
dest += 0.1 * longclap( t, time.w );
301301
}
302302

303-
if ( inRange( time.w, SECTION_NEURO - 17.0 * BEAT, SECTION_NEURO ) ) {
304-
dest += 0.1 * longclap( mod( time.z - ( SECTION_NEURO - 17.0 * BEAT ), 64.0 * BEAT ), time.w );
303+
if ( inRange( time.w, SECTION_BEGIN + 64.0 * BEAT, SECTION_NEURO ) ) {
304+
dest += 0.1 * longclap( time.z - 47.0 * BEAT, time.w );
305305
}
306306

307307
// -- pad ----------------------------------------------------------------------------------------
@@ -686,11 +686,11 @@ vec2 mainAudio( vec4 time ) {
686686

687687
// -- deepkick -----------------------------------------------------------------------------------
688688
if ( inRange( time.w, SECTION_BEGIN, SECTION_BEGIN + 16.0 * BEAT ) ) {
689-
dest += 0.4 * deepkick( mod( time.z, 16.0 * BEAT ) );
689+
dest += 0.3 * deepkick( mod( time.z, 16.0 * BEAT ) );
690690
}
691691

692692
if ( inRange( time.w, SECTION_AAAA - 8.0 * BEAT, SECTION_AAAA ) ) {
693-
dest += 0.4 * deepkick( mod( time.z, 8.0 * BEAT ) );
693+
dest += 0.3 * deepkick( mod( time.z, 8.0 * BEAT ) );
694694
}
695695

696696
// -- buildup ------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)