summaryrefslogtreecommitdiff
path: root/workspaces
diff options
context:
space:
mode:
Diffstat (limited to 'workspaces')
-rw-r--r--workspaces/main/assets.txt16
-rw-r--r--workspaces/main/shaders/particle_compute.wgsl5
-rw-r--r--workspaces/main/shaders/particle_compute_v2.wgsl31
-rw-r--r--workspaces/main/shaders/particle_render.wgsl5
-rw-r--r--workspaces/main/shaders/particle_render_v2.wgsl53
-rw-r--r--workspaces/main/shaders/rotating_cube.wgsl (renamed from workspaces/main/shaders/rotating_cube_v2.wgsl)0
-rw-r--r--workspaces/main/timeline.seq124
-rw-r--r--workspaces/main/timeline_v2.seq45
-rw-r--r--workspaces/main/workspace.cfg2
-rw-r--r--workspaces/test/assets.txt10
10 files changed, 56 insertions, 235 deletions
diff --git a/workspaces/main/assets.txt b/workspaces/main/assets.txt
index 9d15213..71dd7e0 100644
--- a/workspaces/main/assets.txt
+++ b/workspaces/main/assets.txt
@@ -33,9 +33,9 @@ SHADER_RAY_TRIANGLE, NONE, ../../common/shaders/ray_triangle.wgsl, "Ray-Triangle
SHADER_MAIN, NONE, shaders/main_shader.wgsl, "Main Heptagon Shader"
SHADER_PARTICLE_COMPUTE, NONE, shaders/particle_compute.wgsl, "Particle Compute Shader"
SHADER_PARTICLE_RENDER, NONE, shaders/particle_render.wgsl, "Particle Render Shader"
-SHADER_PARTICLE_COMPUTE_V2, NONE, shaders/particle_compute_v2.wgsl, "Particle Compute Shader V2"
-SHADER_PARTICLE_RENDER_V2, NONE, shaders/particle_render_v2.wgsl, "Particle Render Shader V2"
-SHADER_ROTATING_CUBE_V2, NONE, shaders/rotating_cube_v2.wgsl, "Rotating Cube Shader V2"
+SHADER_PARTICLE_COMPUTE_V2, NONE, shaders/particle_compute.wgsl, "Particle Compute Shader"
+SHADER_PARTICLE_RENDER_V2, NONE, shaders/particle_render.wgsl, "Particle Render Shader"
+SHADER_ROTATING_CUBE_V2, NONE, shaders/rotating_cube.wgsl, "Rotating Cube Shader"
SHADER_PASSTHROUGH, NONE, ../../common/shaders/passthrough.wgsl, "Passthrough Shader"
SHADER_ELLIPSE, NONE, shaders/ellipse.wgsl, "Ellipse Shader"
SHADER_PARTICLE_SPRAY_COMPUTE, NONE, shaders/particle_spray_compute.wgsl, "Particle Spray Compute"
@@ -82,9 +82,9 @@ CIRCLE_MASK_RENDER_SHADER, NONE, shaders/circle_mask_render.wgsl, "Circle mask r
MASKED_CUBE_SHADER, NONE, shaders/masked_cube.wgsl, "Masked cube shader"
SHADER_SCENE1, NONE, shaders/scene1.wgsl, "Scene1 effect shader"
-# --- Sequence v2 Shaders ---
-SHADER_SEQUENCE_V2_UNIFORMS, NONE, ../../common/shaders/sequence_v2_uniforms.wgsl, "Sequence v2 Uniforms Snippet"
+# --- Sequence Shaders ---
+SHADER_SEQUENCE_V2_UNIFORMS, NONE, ../../common/shaders/sequence_uniforms.wgsl, "Sequence Uniforms Snippet"
SHADER_POSTPROCESS_INLINE, NONE, ../../common/shaders/postprocess_inline.wgsl, "Inline Post-Process Functions"
-SHADER_PASSTHROUGH_V2, NONE, ../../common/shaders/passthrough_v2.wgsl, "Passthrough Shader (v2)"
-SHADER_GAUSSIAN_BLUR_V2, NONE, ../../common/shaders/gaussian_blur_v2.wgsl, "Gaussian Blur Shader (v2)"
-SHADER_HEPTAGON_V2, NONE, ../../common/shaders/heptagon_v2.wgsl, "Heptagon Shader (v2)"
+SHADER_PASSTHROUGH_V2, NONE, ../../common/shaders/passthrough.wgsl, "Passthrough Shader"
+SHADER_GAUSSIAN_BLUR_V2, NONE, ../../common/shaders/gaussian_blur.wgsl, "Gaussian Blur Shader"
+SHADER_HEPTAGON_V2, NONE, ../../common/shaders/heptagon.wgsl, "Heptagon Shader"
diff --git a/workspaces/main/shaders/particle_compute.wgsl b/workspaces/main/shaders/particle_compute.wgsl
index ae513c8..d7a24b6 100644
--- a/workspaces/main/shaders/particle_compute.wgsl
+++ b/workspaces/main/shaders/particle_compute.wgsl
@@ -1,3 +1,4 @@
+// Particle simulation (compute shader) - V2
struct Particle {
pos: vec4<f32>,
vel: vec4<f32>,
@@ -5,10 +6,10 @@ struct Particle {
color: vec4<f32>,
};
-#include "common_uniforms"
+#include "sequence_uniforms"
@group(0) @binding(0) var<storage, read_write> particles: array<Particle>;
-@group(0) @binding(1) var<uniform> uniforms: CommonUniforms;
+@group(0) @binding(1) var<uniform> uniforms: UniformsSequenceParams;
@compute @workgroup_size(64)
fn main(@builtin(global_invocation_id) id: vec3<u32>) {
diff --git a/workspaces/main/shaders/particle_compute_v2.wgsl b/workspaces/main/shaders/particle_compute_v2.wgsl
deleted file mode 100644
index 3683826..0000000
--- a/workspaces/main/shaders/particle_compute_v2.wgsl
+++ /dev/null
@@ -1,31 +0,0 @@
-// Particle simulation (compute shader) - V2
-struct Particle {
- pos: vec4<f32>,
- vel: vec4<f32>,
- rot: vec4<f32>,
- color: vec4<f32>,
-};
-
-#include "sequence_v2_uniforms"
-
-@group(0) @binding(0) var<storage, read_write> particles: array<Particle>;
-@group(0) @binding(1) var<uniform> uniforms: UniformsSequenceParams;
-
-@compute @workgroup_size(64)
-fn main(@builtin(global_invocation_id) id: vec3<u32>) {
- let i = id.x;
- if (i >= arrayLength(&particles)) {
- return;
- }
- var p = particles[i];
- let new_pos = p.pos.xyz + p.vel.xyz * 0.016;
- p.pos = vec4<f32>(new_pos, p.pos.w);
- p.vel.y = p.vel.y - 0.01 * (1.0 + uniforms.audio_intensity * 5.0);
- p.rot.x = p.rot.x + p.rot.y * 0.016;
- if (p.pos.y < -1.5) {
- p.pos.y = 1.5;
- p.pos.x = (f32(i % 100u) / 50.0) - 1.0 + (uniforms.audio_intensity * 0.5);
- p.vel.y = 0.0;
- }
- particles[i] = p;
-}
diff --git a/workspaces/main/shaders/particle_render.wgsl b/workspaces/main/shaders/particle_render.wgsl
index 6a2b636..dd83220 100644
--- a/workspaces/main/shaders/particle_render.wgsl
+++ b/workspaces/main/shaders/particle_render.wgsl
@@ -1,3 +1,4 @@
+// Particle rendering (vertex + fragment) - V2
struct Particle {
pos: vec4<f32>,
vel: vec4<f32>,
@@ -5,10 +6,10 @@ struct Particle {
color: vec4<f32>,
};
-#include "common_uniforms"
+#include "sequence_uniforms"
@group(0) @binding(0) var<storage, read> particles: array<Particle>;
-@group(0) @binding(1) var<uniform> uniforms: CommonUniforms;
+@group(0) @binding(1) var<uniform> uniforms: UniformsSequenceParams;
struct VSOut {
@builtin(position) pos: vec4<f32>,
diff --git a/workspaces/main/shaders/particle_render_v2.wgsl b/workspaces/main/shaders/particle_render_v2.wgsl
deleted file mode 100644
index 8663658..0000000
--- a/workspaces/main/shaders/particle_render_v2.wgsl
+++ /dev/null
@@ -1,53 +0,0 @@
-// Particle rendering (vertex + fragment) - V2
-struct Particle {
- pos: vec4<f32>,
- vel: vec4<f32>,
- rot: vec4<f32>,
- color: vec4<f32>,
-};
-
-#include "sequence_v2_uniforms"
-
-@group(0) @binding(0) var<storage, read> particles: array<Particle>;
-@group(0) @binding(1) var<uniform> uniforms: UniformsSequenceParams;
-
-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 {
- let p = particles[ii];
- let size = 0.02 + p.pos.z * 0.01 + uniforms.audio_intensity * 0.02;
- var offsets = array<vec2<f32>, 6>(
- vec2<f32>(-1, -1),
- vec2<f32>(1, -1),
- vec2<f32>(-1, 1),
- vec2<f32>(-1, 1),
- vec2<f32>(1, -1),
- vec2<f32>(1, 1)
- );
- let offset = offsets[vi];
- let c = cos(p.rot.x);
- 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);
-
- // 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_intensity), 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(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/workspaces/main/shaders/rotating_cube_v2.wgsl b/workspaces/main/shaders/rotating_cube.wgsl
index d7e4cae..d7e4cae 100644
--- a/workspaces/main/shaders/rotating_cube_v2.wgsl
+++ b/workspaces/main/shaders/rotating_cube.wgsl
diff --git a/workspaces/main/timeline.seq b/workspaces/main/timeline.seq
index b4663bb..57e1c50 100644
--- a/workspaces/main/timeline.seq
+++ b/workspaces/main/timeline.seq
@@ -1,97 +1,45 @@
-# Demo Timeline
-# Generated by Timeline Editor
+# Demo Timeline v2
# BPM 90
-SEQUENCE 0.00 0
- EFFECT - FlashCubeEffect 0.00 4.00
-# EFFECT + FlashEffect 0.00 2.00 color=1.0,0.5,0.5 decay=0.95
-# EFFECT + FadeEffect 2.00 4.00
-# EFFECT + SolarizeEffect 0.00 4.00
- EFFECT + VignetteEffect 0.00 4.00 radius=0.6 softness=0.1
+SEQUENCE 0.00 0 "intro"
+ # FlashCube (placeholder) -> Vignette -> sink
+ EFFECT + PlaceholderEffect source -> temp1 0.00 4.00
+ EFFECT + PlaceholderEffect temp1 -> sink 0.00 4.00
-SEQUENCE 4.00 0 "rotating cube"
- EFFECT + CircleMaskEffect 0.00 4.00 0.50
- EFFECT + RotatingCubeEffect 0.00 4.00
- EFFECT + GaussianBlurEffect 1.00 4.00 strength=1.0
+SEQUENCE 4.00 0 "rotating_cube"
+ # RotatingCube -> Blur -> sink
+ EFFECT + RotatingCubeEffect source -> temp1 0.00 4.00
+ EFFECT + GaussianBlurEffect temp1 -> sink 1.00 4.00
-SEQUENCE 8.00 0 "Flash Cube"
- EFFECT - FlashCubeEffect 0.00 4.02
- EFFECT + FlashEffect 0.00 0.40
+SEQUENCE 8.00 0 "flash_cube"
+ # FlashCube (placeholder) -> Flash (placeholder) -> sink
+ EFFECT - PlaceholderEffect source -> temp1 0.00 4.02
+ EFFECT + PlaceholderEffect temp1 -> sink 0.00 0.40
-SEQUENCE 12.00 1 "spray"
- EFFECT + ParticleSprayEffect 0.00 2.00
- EFFECT + ParticlesEffect 2.00 4.00
- EFFECT = GaussianBlurEffect 0.00 4.00 strength=3.0
+SEQUENCE 12.00 1 "particles"
+ # Particles -> Blur -> sink
+ EFFECT + ParticlesEffect source -> temp1 0.00 4.00
+ EFFECT = GaussianBlurEffect temp1 -> sink 0.00 4.00
-SEQUENCE 16.00 2 "Hybrid3D + CNN"
- EFFECT + ThemeModulationEffect 0.00 4.00
- EFFECT + HeptagonEffect 0.00 4.00
- EFFECT + ParticleSprayEffect 0.00 2.00
- EFFECT = ParticlesEffect 2.00 4.00
- EFFECT + Hybrid3DEffect 0.00 4.00
- EFFECT + CNNv1Effect 0.00 4.00 layers=3 blend=.9
+SEQUENCE 16.00 2 "hybrid_heptagon"
+ # Heptagon -> Hybrid3D -> sink
+ EFFECT + HeptagonEffect source -> temp1 0.00 4.00
+ EFFECT + Hybrid3DEffect temp1 -> sink 0.00 4.00
-SEQUENCE 20.00 0 "CNN effect"
- EFFECT + HeptagonEffect 0.00 8.00
- EFFECT + Scene1Effect 0.00 8.00
- EFFECT + CNNv1Effect 6.00 8.00 layers=3 blend=.5
+SEQUENCE 20.00 0 "heptagon_scene"
+ # Heptagon -> Scene1 (placeholder) -> sink
+ EFFECT + HeptagonEffect source -> temp1 0.00 8.00
+ EFFECT + PlaceholderEffect temp1 -> sink 0.00 8.00
-SEQUENCE 28.00 0 "buggy"
- EFFECT + HeptagonEffect 0.00 2.00
- EFFECT + FadeEffect 0.00 2.00
-
-SEQUENCE 30.00 3 "Seq-8"
- EFFECT + ThemeModulationEffect 0.00 10.00
- EFFECT = HeptagonEffect 0.00 10.00
- EFFECT + GaussianBlurEffect 0.00 10.00 strength=1.5
- EFFECT + ChromaAberrationEffect 0.00 10.00 offset=0.03 angle=0.785
- EFFECT + SolarizeEffect 0.00 10.00
-
-SEQUENCE 40.00 2
- EFFECT - FlashCubeEffect 0.00 4.00
- EFFECT + HeptagonEffect 0.00 4.00
- EFFECT + ParticleSprayEffect 0.00 4.00
-
-SEQUENCE 44.00 2 "Fade"
- EFFECT - FlashCubeEffect 0.00 2.00
- EFFECT + FlashEffect 1.00 2.00
-
-SEQUENCE 46.00 10
- EFFECT - FlashCubeEffect 0.00 3.00
- EFFECT + GaussianBlurEffect 0.00 3.00
- EFFECT + FlashEffect 0.00 3.00
-
-SEQUENCE 49.00 1
- EFFECT + ThemeModulationEffect 0.00 8.00
- EFFECT + HeptagonEffect 0.00 8.00
- EFFECT + ParticleSprayEffect 0.00 8.00
- EFFECT + Hybrid3DEffect 0.00 8.00
- EFFECT + GaussianBlurEffect 0.00 8.00
- EFFECT + ChromaAberrationEffect 0.00 8.00
-
-SEQUENCE 57.00 0
- EFFECT + ThemeModulationEffect 0.00 7.00
- EFFECT + VignetteEffect 0.00 7.00 radius=0.6 softness=0.3
- EFFECT + SolarizeEffect 0.00 7.00
-
-SEQUENCE 64.00 0
- EFFECT + ThemeModulationEffect 0.00 4.00
- EFFECT + HeptagonEffect 0.00 4.00
- EFFECT + GaussianBlurEffect 0.00 4.00
- EFFECT + SolarizeEffect 0.00 4.00
-
-SEQUENCE 68.00 0 "double hepta!"
- EFFECT + ThemeModulationEffect 0.00 4.00
- EFFECT = HeptagonEffect 0.00 4.00
- EFFECT + Hybrid3DEffect 0.00 4.00
- EFFECT + ParticleSprayEffect 0.00 4.00
- EFFECT + HeptagonEffect 0.00 4.00
- EFFECT + ChromaAberrationEffect 0.00 4.00
- EFFECT + GaussianBlurEffect 0.00 4.00
-
-SEQUENCE 72.00 0 "The End"
- EFFECT + ThemeModulationEffect 0.00 7.00
- EFFECT + HeptagonEffect 0.00 7.00
- EFFECT + ChromaAberrationEffect 0.00 7.00
- EFFECT + GaussianBlurEffect 0.00 7.00
+SEQUENCE 28.00 0 "fade_test"
+ # Heptagon -> Fade (placeholder) -> sink
+ EFFECT + HeptagonEffect source -> temp1 0.00 2.00
+ EFFECT + PlaceholderEffect temp1 -> sink 0.00 2.00
+SEQUENCE 30.00 3 "complex_chain"
+ # Theme (placeholder) -> Heptagon -> Blur -> ChromaAberration (placeholder) -> Solarize (placeholder) -> sink
+ EFFECT + PlaceholderEffect source -> temp1 0.00 10.00
+ EFFECT = HeptagonEffect temp1 -> temp2 0.00 10.00
+ EFFECT + GaussianBlurEffect temp2 -> temp3 0.00 10.00
+ EFFECT + PlaceholderEffect temp3 -> temp4 0.00 10.00
+ EFFECT + PlaceholderEffect temp4 -> sink 0.00 10.00
diff --git a/workspaces/main/timeline_v2.seq b/workspaces/main/timeline_v2.seq
deleted file mode 100644
index 4b51023..0000000
--- a/workspaces/main/timeline_v2.seq
+++ /dev/null
@@ -1,45 +0,0 @@
-# Demo Timeline v2
-# BPM 90
-
-SEQUENCE 0.00 0 "intro"
- # FlashCube (placeholder) -> Vignette -> sink
- EFFECT + PlaceholderEffect source -> temp1 0.00 4.00
- EFFECT + PlaceholderEffect temp1 -> sink 0.00 4.00
-
-SEQUENCE 4.00 0 "rotating_cube"
- # RotatingCube -> Blur -> sink
- EFFECT + RotatingCubeEffectV2 source -> temp1 0.00 4.00
- EFFECT + GaussianBlurEffect temp1 -> sink 1.00 4.00
-
-SEQUENCE 8.00 0 "flash_cube"
- # FlashCube (placeholder) -> Flash (placeholder) -> sink
- EFFECT - PlaceholderEffect source -> temp1 0.00 4.02
- EFFECT + PlaceholderEffect temp1 -> sink 0.00 0.40
-
-SEQUENCE 12.00 1 "particles"
- # Particles -> Blur -> sink
- EFFECT + ParticlesEffectV2 source -> temp1 0.00 4.00
- EFFECT = GaussianBlurEffect temp1 -> sink 0.00 4.00
-
-SEQUENCE 16.00 2 "hybrid_heptagon"
- # Heptagon -> Hybrid3D -> sink
- EFFECT + HeptagonEffect source -> temp1 0.00 4.00
- EFFECT + Hybrid3DEffectV2 temp1 -> sink 0.00 4.00
-
-SEQUENCE 20.00 0 "heptagon_scene"
- # Heptagon -> Scene1 (placeholder) -> sink
- EFFECT + HeptagonEffect source -> temp1 0.00 8.00
- EFFECT + PlaceholderEffect temp1 -> sink 0.00 8.00
-
-SEQUENCE 28.00 0 "fade_test"
- # Heptagon -> Fade (placeholder) -> sink
- EFFECT + HeptagonEffect source -> temp1 0.00 2.00
- EFFECT + PlaceholderEffect temp1 -> sink 0.00 2.00
-
-SEQUENCE 30.00 3 "complex_chain"
- # Theme (placeholder) -> Heptagon -> Blur -> ChromaAberration (placeholder) -> Solarize (placeholder) -> sink
- EFFECT + PlaceholderEffect source -> temp1 0.00 10.00
- EFFECT = HeptagonEffect temp1 -> temp2 0.00 10.00
- EFFECT + GaussianBlurEffect temp2 -> temp3 0.00 10.00
- EFFECT + PlaceholderEffect temp3 -> temp4 0.00 10.00
- EFFECT + PlaceholderEffect temp4 -> sink 0.00 10.00
diff --git a/workspaces/main/workspace.cfg b/workspaces/main/workspace.cfg
index feaa3f1..5eff423 100644
--- a/workspaces/main/workspace.cfg
+++ b/workspaces/main/workspace.cfg
@@ -5,7 +5,7 @@ version = "1.0"
[build]
target = "demo64k"
-timeline = "timeline_v2.seq"
+timeline = "timeline.seq"
# music = "pop_punk_drums.track"
music = "beat_test.track"
assets = "assets.txt"
diff --git a/workspaces/test/assets.txt b/workspaces/test/assets.txt
index 8550eca..0f065d3 100644
--- a/workspaces/test/assets.txt
+++ b/workspaces/test/assets.txt
@@ -68,12 +68,12 @@ CIRCLE_MASK_COMPUTE_SHADER, NONE, shaders/circle_mask_compute.wgsl, "Circle mask
CIRCLE_MASK_RENDER_SHADER, NONE, shaders/circle_mask_render.wgsl, "Circle mask render shader"
MASKED_CUBE_SHADER, NONE, shaders/masked_cube.wgsl, "Masked cube shader"
-# --- Sequence v2 Shaders ---
-SHADER_SEQUENCE_V2_UNIFORMS, NONE, ../../common/shaders/sequence_v2_uniforms.wgsl, "Sequence v2 Uniforms Snippet"
+# --- Sequence Shaders ---
+SHADER_SEQUENCE_V2_UNIFORMS, NONE, ../../common/shaders/sequence_uniforms.wgsl, "Sequence Uniforms Snippet"
SHADER_POSTPROCESS_INLINE, NONE, ../../common/shaders/postprocess_inline.wgsl, "Inline Post-Process Functions"
-SHADER_PASSTHROUGH_V2, NONE, ../../common/shaders/passthrough_v2.wgsl, "Passthrough Shader (v2)"
-SHADER_GAUSSIAN_BLUR_V2, NONE, ../../common/shaders/gaussian_blur_v2.wgsl, "Gaussian Blur Shader (v2)"
-SHADER_HEPTAGON_V2, NONE, ../../common/shaders/heptagon_v2.wgsl, "Heptagon Shader (v2)"
+SHADER_PASSTHROUGH_V2, NONE, ../../common/shaders/passthrough.wgsl, "Passthrough Shader"
+SHADER_GAUSSIAN_BLUR_V2, NONE, ../../common/shaders/gaussian_blur.wgsl, "Gaussian Blur Shader"
+SHADER_HEPTAGON_V2, NONE, ../../common/shaders/heptagon.wgsl, "Heptagon Shader"
# --- Test Assets (for test_assets.cc) ---
TEST_ASSET_1, NONE, test_assets/test_asset_1.txt, "Test static asset"
generated by cgit v1.2.3 (git 2.51.0) at 2026-02-16 23:08:21 +0000