diff options
Diffstat (limited to 'assets')
33 files changed, 48 insertions, 32 deletions
diff --git a/assets/demo.seq b/assets/demo.seq index b30dd68..79872d3 100644 --- a/assets/demo.seq +++ b/assets/demo.seq @@ -33,8 +33,9 @@ SEQUENCE 4b 0 EFFECT + FlashEffect 0.0 0.2 # Priority 0 (was 4, now contiguous) SEQUENCE 6b 1 - EFFECT + ParticlesEffect 0 4 # Priority 0 - EFFECT = GaussianBlurEffect 0 8 # Priority 0 (same layer) + EFFECT + ParticleSprayEffect 0 4 # Priority 0 (spray particles) + EFFECT + ParticlesEffect 0 4 # Priority 1 + EFFECT = GaussianBlurEffect 0 8 # Priority 1 (same layer) SEQUENCE 7b 0 EFFECT + HeptagonEffect 0.0 .2 # Priority 0 @@ -52,7 +53,8 @@ SEQUENCE 8b 3 SEQUENCE 12b 2 EFFECT - FlashCubeEffect .2 3 # Priority -1 (background) EFFECT + HeptagonEffect 0 4 # Priority 0 - EFFECT + ParticlesEffect 0 4 # Priority 1 + EFFECT + ParticleSprayEffect 0 4 # Priority 1 (spray particles) + EFFECT + ParticlesEffect 0 4 # Priority 2 SEQUENCE 15b 2 EFFECT - FlashCubeEffect .2 3 # Priority -1 (background) @@ -67,18 +69,20 @@ SEQUENCE 16b 10 SEQUENCE 17b 2 EFFECT + ThemeModulationEffect 0 4 # Priority 0 EFFECT + HeptagonEffect 0.2 2.0 # Priority 1 - EFFECT = ParticlesEffect 0 4 # Priority 1 (same layer) - EFFECT + Hybrid3DEffect 0 4 # Priority 2 - EFFECT + GaussianBlurEffect 0 8 # Priority 3 - EFFECT + ChromaAberrationEffect 0 6 # Priority 4 + EFFECT + ParticleSprayEffect 0 4 # Priority 2 (spray particles) + EFFECT = ParticlesEffect 0 4 # Priority 2 (same layer) + EFFECT + Hybrid3DEffect 0 4 # Priority 3 + EFFECT + GaussianBlurEffect 0 8 # Priority 4 + EFFECT + ChromaAberrationEffect 0 6 # Priority 5 SEQUENCE 24b 1 EFFECT + ThemeModulationEffect 0 8 # Priority 0 EFFECT + HeptagonEffect 0.2 2.0 # Priority 1 - EFFECT + Hybrid3DEffect 0 20 # Priority 2 - EFFECT + GaussianBlurEffect 0 8 # Priority 3 - EFFECT + ChromaAberrationEffect 0 10 # Priority 4 - EFFECT + SolarizeEffect 0 10 # Priority 5 + EFFECT + ParticleSprayEffect 0 8 # Priority 2 (spray particles - longer duration) + EFFECT + Hybrid3DEffect 0 20 # Priority 3 + EFFECT + GaussianBlurEffect 0 8 # Priority 4 + EFFECT + ChromaAberrationEffect 0 10 # Priority 5 + EFFECT + SolarizeEffect 0 10 # Priority 6 SEQUENCE 32b 0 EFFECT + ThemeModulationEffect 0 4 # Priority 0 @@ -96,9 +100,10 @@ SEQUENCE 56b 0 EFFECT + ThemeModulationEffect 0 8 # Priority 0 EFFECT = HeptagonEffect 0.2 2.0 # Priority 0 (same layer) EFFECT + Hybrid3DEffect 0 4 # Priority 1 - EFFECT + HeptagonEffect 0 16 # Priority 2 - EFFECT + ChromaAberrationEffect 0 16 # Priority 3 - EFFECT + GaussianBlurEffect 0 8 # Priority 4 + EFFECT + ParticleSprayEffect 0 8 # Priority 2 (spray particles) + EFFECT + HeptagonEffect 0 16 # Priority 3 + EFFECT + ChromaAberrationEffect 0 16 # Priority 4 + EFFECT + GaussianBlurEffect 0 8 # Priority 5 SEQUENCE 62b 0 EFFECT + ThemeModulationEffect 0 3 # Priority 0 diff --git a/assets/final/BASS_1.spec b/assets/final/BASS_1.spec Binary files differdeleted file mode 100644 index 4cbee44..0000000 --- a/assets/final/BASS_1.spec +++ /dev/null diff --git a/assets/final/BASS_GUITAR_FEEL.spec b/assets/final/BASS_GUITAR_FEEL.spec Binary files differnew file mode 100644 index 0000000..54f49a6 --- /dev/null +++ b/assets/final/BASS_GUITAR_FEEL.spec diff --git a/assets/final/BASS_SYNTH_1.spec b/assets/final/BASS_SYNTH_1.spec Binary files differindex b0e9eb9..33bc0a0 100644 --- a/assets/final/BASS_SYNTH_1.spec +++ b/assets/final/BASS_SYNTH_1.spec diff --git a/assets/final/CRASH_1.spec b/assets/final/CRASH_1.spec Binary files differdeleted file mode 100644 index 3420831..0000000 --- a/assets/final/CRASH_1.spec +++ /dev/null diff --git a/assets/final/CRASH_DMX.spec b/assets/final/CRASH_DMX.spec Binary files differnew file mode 100644 index 0000000..45ee52d --- /dev/null +++ b/assets/final/CRASH_DMX.spec diff --git a/assets/final/HIHAT_3.spec b/assets/final/HIHAT_3.spec Binary files differdeleted file mode 100644 index cf92370..0000000 --- a/assets/final/HIHAT_3.spec +++ /dev/null diff --git a/assets/final/HIHAT_4.spec b/assets/final/HIHAT_4.spec Binary files differdeleted file mode 100644 index eace1e2..0000000 --- a/assets/final/HIHAT_4.spec +++ /dev/null diff --git a/assets/final/HIHAT_CLOSED_DMX.spec b/assets/final/HIHAT_CLOSED_DMX.spec Binary files differnew file mode 100644 index 0000000..8fce1d2 --- /dev/null +++ b/assets/final/HIHAT_CLOSED_DMX.spec diff --git a/assets/final/HIHAT_CLOSED_DUFF.spec b/assets/final/HIHAT_CLOSED_DUFF.spec Binary files differnew file mode 100644 index 0000000..f738271 --- /dev/null +++ b/assets/final/HIHAT_CLOSED_DUFF.spec diff --git a/assets/final/HIHAT_CLOSED_ER_1.spec b/assets/final/HIHAT_CLOSED_ER_1.spec Binary files differnew file mode 100644 index 0000000..bb03f5e --- /dev/null +++ b/assets/final/HIHAT_CLOSED_ER_1.spec diff --git a/assets/final/HITHAT_2.spec b/assets/final/HITHAT_2.spec Binary files differdeleted file mode 100644 index fe0579c..0000000 --- a/assets/final/HITHAT_2.spec +++ /dev/null diff --git a/assets/final/KICK_2.spec b/assets/final/KICK_2.spec Binary files differdeleted file mode 100644 index d23d5a9..0000000 --- a/assets/final/KICK_2.spec +++ /dev/null diff --git a/assets/final/KICK_3.spec b/assets/final/KICK_3.spec Binary files differdeleted file mode 100644 index cedba5a..0000000 --- a/assets/final/KICK_3.spec +++ /dev/null diff --git a/assets/final/KICK_606.spec b/assets/final/KICK_606.spec Binary files differnew file mode 100644 index 0000000..10af84a --- /dev/null +++ b/assets/final/KICK_606.spec diff --git a/assets/final/KICK_90S_2.spec b/assets/final/KICK_90S_2.spec Binary files differnew file mode 100644 index 0000000..126409e --- /dev/null +++ b/assets/final/KICK_90S_2.spec diff --git a/assets/final/RIDE_1.spec b/assets/final/RIDE_1.spec Binary files differdeleted file mode 100644 index 5971959..0000000 --- a/assets/final/RIDE_1.spec +++ /dev/null diff --git a/assets/final/RIDE_CUP_1.spec b/assets/final/RIDE_CUP_1.spec Binary files differnew file mode 100644 index 0000000..78867c1 --- /dev/null +++ b/assets/final/RIDE_CUP_1.spec diff --git a/assets/final/SNARE_1.spec b/assets/final/SNARE_1.spec Binary files differdeleted file mode 100644 index b425374..0000000 --- a/assets/final/SNARE_1.spec +++ /dev/null diff --git a/assets/final/SNARE_2.spec b/assets/final/SNARE_2.spec Binary files differdeleted file mode 100644 index 4dd5cb9..0000000 --- a/assets/final/SNARE_2.spec +++ /dev/null diff --git a/assets/final/SNARE_3.spec b/assets/final/SNARE_3.spec Binary files differdeleted file mode 100644 index a3afba6..0000000 --- a/assets/final/SNARE_3.spec +++ /dev/null diff --git a/assets/final/SNARE_808.spec b/assets/final/SNARE_808.spec Binary files differnew file mode 100644 index 0000000..2923c3c --- /dev/null +++ b/assets/final/SNARE_808.spec diff --git a/assets/final/SNARE_909_TUNE_8.spec b/assets/final/SNARE_909_TUNE_8.spec Binary files differnew file mode 100644 index 0000000..4693c05 --- /dev/null +++ b/assets/final/SNARE_909_TUNE_8.spec diff --git a/assets/final/SNARE_BLUE_ROOM.spec b/assets/final/SNARE_BLUE_ROOM.spec Binary files differnew file mode 100644 index 0000000..b24baa7 --- /dev/null +++ b/assets/final/SNARE_BLUE_ROOM.spec diff --git a/assets/final/SPLASH_1.spec b/assets/final/SPLASH_1.spec Binary files differdeleted file mode 100644 index 545ad12..0000000 --- a/assets/final/SPLASH_1.spec +++ /dev/null diff --git a/assets/final/SPLASH_GROUNDED.spec b/assets/final/SPLASH_GROUNDED.spec Binary files differnew file mode 100644 index 0000000..a919be4 --- /dev/null +++ b/assets/final/SPLASH_GROUNDED.spec diff --git a/assets/final/SYNTH_BASS_DISTORT.spec b/assets/final/SYNTH_BASS_DISTORT.spec Binary files differnew file mode 100644 index 0000000..33bc0a0 --- /dev/null +++ b/assets/final/SYNTH_BASS_DISTORT.spec diff --git a/assets/final/demo_assets.txt b/assets/final/demo_assets.txt index d5ce9b4..6293696 100644 --- a/assets/final/demo_assets.txt +++ b/assets/final/demo_assets.txt @@ -1,24 +1,22 @@ # Asset Name, Compression Type, Filename/Placeholder, Description # --- Drum & Percussion Samples --- -KICK_1, NONE, kick1.spec, "A drum kick sample" -KICK_2, NONE, KICK_606.spec, "606 Kick" -KICK_3, NONE, KICK_90S_2.spec, "90s Kick" -SNARE_1, NONE, snare1.spec, "A snare drum sample" -SNARE_2, NONE, SNARE_808.spec, "808 Snare" -SNARE_3, NONE, SNARE_909_TUNE_8.spec, "909 Snare" -SNARE_4, NONE, SNARE_BLUE_ROOM.spec, "Snare Blue Room" -HIHAT_1, NONE, hihat1.spec, "A hi-hat sample" -HIHAT_2, NONE, HIHAT_CLOSED_DMX.spec, "DMX Closed Hi-hat" -HIHAT_3, NONE, HIHAT_CLOSED_DUFF.spec, "Duff Closed Hi-hat" -HIHAT_4, NONE, HIHAT_CLOSED_ER_1.spec, "ER-1 Closed Hi-hat" +KICK_1, NONE, KICK_606.spec, "606 Kick" +KICK_2, NONE, KICK_90S_2.spec, "90s Kick" +SNARE_1, NONE, SNARE_808.spec, "808 Snare" +SNARE_2, NONE, SNARE_909_TUNE_8.spec, "909 Snare" +SNARE_3, NONE, SNARE_BLUE_ROOM.spec, "Snare Blue Room" +HIHAT_1, NONE, HIHAT_CLOSED_DMX.spec, "DMX Closed Hi-hat" +HIHAT_2, NONE, HIHAT_CLOSED_DUFF.spec, "Duff Closed Hi-hat" +HIHAT_3, NONE, HIHAT_CLOSED_ER_1.spec, "ER-1 Closed Hi-hat" CRASH_1, NONE, CRASH_DMX.spec, "DMX Crash" RIDE_1, NONE, RIDE_CUP_1.spec, "Ride Cymbal" SPLASH_1, NONE, SPLASH_GROUNDED.spec, "Splash Cymbal" # --- Melodic Samples --- BASS_1, NONE, BASS_GUITAR_FEEL.spec, "Bass Guitar" -SYNTH_BASS_1, NONE, SYNTH_BASS_DISTORT.spec, "Distorted Synth Bass" +BASS_2, NONE, BASS_SYNTH_1.spec, "Synth Bass 1" +BASS_3, NONE, SYNTH_BASS_DISTORT.spec, "Distorted Synth Bass" # --- Procedural Textures --- NOISE_TEX, PROC(gen_noise, 1234, 16), _, "Procedural noise texture for bump mapping" diff --git a/assets/final/hihat1.spec b/assets/final/hihat1.spec Binary files differdeleted file mode 100644 index 181b240..0000000 --- a/assets/final/hihat1.spec +++ /dev/null diff --git a/assets/final/kick1.spec b/assets/final/kick1.spec Binary files differdeleted file mode 100644 index cbd55a2..0000000 --- a/assets/final/kick1.spec +++ /dev/null diff --git a/assets/final/shaders/particle_render.wgsl b/assets/final/shaders/particle_render.wgsl index 6f115ec..6a955f0 100644 --- a/assets/final/shaders/particle_render.wgsl +++ b/assets/final/shaders/particle_render.wgsl @@ -18,6 +18,7 @@ struct Uniforms { struct VSOut { @builtin(position) pos: vec4<f32>, @location(0) color: vec4<f32>, + @location(1) uv: vec2<f32>, }; @vertex fn vs_main(@builtin(vertex_index) vi: u32, @builtin(instance_index) ii: u32) -> VSOut { @@ -36,9 +37,21 @@ struct VSOut { let s = sin(p.rot.x); let rotated_offset = vec2<f32>(offset.x * c - offset.y * s, offset.x * s + offset.y * c); let pos = vec2<f32>(p.pos.x + rotated_offset.x * size / uniforms.aspect_ratio, p.pos.y + rotated_offset.y * size); - return VSOut(vec4<f32>(pos, 0.0, 1.0), p.color * (0.5 + 0.5 * uniforms.audio_peak)); + + // Fade based on lifetime (p.pos.w goes from 1.0 to 0.0) + let lifetime_fade = p.pos.w; + let color_with_fade = vec4<f32>(p.color.rgb * (0.5 + 0.5 * uniforms.audio_peak), p.color.a * lifetime_fade); + + return VSOut(vec4<f32>(pos, 0.0, 1.0), color_with_fade, offset); } -@fragment fn fs_main(@location(0) color: vec4<f32>) -> @location(0) vec4<f32> { - return color; +@fragment fn fs_main(@location(0) color: vec4<f32>, @location(1) uv: vec2<f32>) -> @location(0) vec4<f32> { + // Calculate distance from center for circular shape + let dist = length(uv); + + // Smooth circular falloff (1.0 at center, 0.0 at edge) + let circle_alpha = smoothstep(1.0, 0.5, dist); + + // Apply circular fade to alpha channel + return vec4<f32>(color.rgb, color.a * circle_alpha); } diff --git a/assets/final/snare1.spec b/assets/final/snare1.spec Binary files differdeleted file mode 100644 index fd086f7..0000000 --- a/assets/final/snare1.spec +++ /dev/null diff --git a/assets/music.track b/assets/music.track index 95297ce..d1d1ee7 100644 --- a/assets/music.track +++ b/assets/music.track @@ -4,15 +4,15 @@ # Import expanded drum kit SAMPLE ASSET_KICK_1 SAMPLE ASSET_KICK_2 -SAMPLE ASSET_KICK_3 +SAMPLE ASSET_KICK_2 SAMPLE ASSET_SNARE_1 SAMPLE ASSET_SNARE_2 SAMPLE ASSET_SNARE_3 -SAMPLE ASSET_SNARE_4 +SAMPLE ASSET_SNARE_3 SAMPLE ASSET_HIHAT_1 SAMPLE ASSET_HIHAT_2 SAMPLE ASSET_HIHAT_3 -SAMPLE ASSET_HIHAT_4 +SAMPLE ASSET_HIHAT_3 SAMPLE ASSET_CRASH_1 SAMPLE ASSET_RIDE_1 SAMPLE ASSET_SPLASH_1 |