summaryrefslogtreecommitdiff
path: root/workspaces
diff options
context:
space:
mode:
Diffstat (limited to 'workspaces')
-rw-r--r--workspaces/main/shaders/common_uniforms.wgsl14
-rw-r--r--workspaces/main/timeline.seq164
-rw-r--r--workspaces/main/timeline.seq.backup105
-rw-r--r--workspaces/test/shaders/common_uniforms.wgsl14
-rw-r--r--workspaces/test/timeline.seq4
-rw-r--r--workspaces/test/timeline.seq.backup8
6 files changed, 211 insertions, 98 deletions
diff --git a/workspaces/main/shaders/common_uniforms.wgsl b/workspaces/main/shaders/common_uniforms.wgsl
index ce1be53..1ab8939 100644
--- a/workspaces/main/shaders/common_uniforms.wgsl
+++ b/workspaces/main/shaders/common_uniforms.wgsl
@@ -1,11 +1,11 @@
struct CommonUniforms {
- resolution: vec2<f32>,
- _pad0: f32,
- _pad1: f32,
- aspect_ratio: f32,
- time: f32,
- beat: f32,
- audio_intensity: f32,
+ resolution: vec2<f32>, // Screen dimensions
+ aspect_ratio: f32, // Width/height ratio
+ time: f32, // Physical time in seconds (unaffected by tempo)
+ beat_time: f32, // Musical time in beats (absolute, tempo-scaled)
+ beat_phase: f32, // Fractional beat (0.0-1.0 within current beat)
+ audio_intensity: f32, // Audio peak for beat sync
+ _pad: f32, // Padding
};
struct GlobalUniforms {
view_proj: mat4x4<f32>,
diff --git a/workspaces/main/timeline.seq b/workspaces/main/timeline.seq
index c3e2316..ab9e40d 100644
--- a/workspaces/main/timeline.seq
+++ b/workspaces/main/timeline.seq
@@ -2,104 +2,104 @@
# Generated by Timeline Editor
# BPM 120
-SEQUENCE 0.00 0
- EFFECT - FlashCubeEffect 0.00 2.44
- EFFECT + FlashEffect 0.00 1.00 color=1.0,0.5,0.5 decay=0.95
- EFFECT + FadeEffect 0.10 1.00
- EFFECT + SolarizeEffect 0.00 2.00
- EFFECT + VignetteEffect 0.00 2.50 radius=0.6 softness=0.1
+SEQUENCE 0.00s 0
+EFFECT - FlashCubeEffect 0.00s 2.44s
+EFFECT + FlashEffect 0.00s 1.00s color=1.0,0.5,0.5 decay=0.95
+EFFECT + FadeEffect 0.10s 1.00s
+EFFECT + SolarizeEffect 0.00s 2.00s
+EFFECT + VignetteEffect 0.00s 2.50s radius=0.6 softness=0.1
-SEQUENCE 2.50 0 "rotating cube"
- EFFECT + CircleMaskEffect 0.00 4.00 0.50
- EFFECT + RotatingCubeEffect 0.00 4.00
- EFFECT + GaussianBlurEffect 1.00 2.00 strength=1.0
- EFFECT + GaussianBlurEffect 3.00 4.00 strength=2.0
+SEQUENCE 2.50s 0 "rotating cube"
+EFFECT + CircleMaskEffect 0.00s 4.00s 0.50
+EFFECT + RotatingCubeEffect 0.00s 4.00s
+EFFECT + GaussianBlurEffect 1.00s 2.00s strength=1.0
+EFFECT + GaussianBlurEffect 3.00s 4.00s strength=2.0
-SEQUENCE 5.93 0
- EFFECT - FlashCubeEffect 0.11 1.45
- EFFECT + FlashEffect 0.00 0.20
+SEQUENCE 5.93s 0
+EFFECT - FlashCubeEffect 0.11s 1.45s
+EFFECT + FlashEffect 0.00s 0.20s
-SEQUENCE 6.90 1 "spray"
- EFFECT + ParticleSprayEffect 0.00 2.00
- EFFECT + ParticlesEffect 0.00 3.00
- EFFECT = GaussianBlurEffect 0.00 2.00 strength=3.0
+SEQUENCE 6.90s 1 "spray"
+EFFECT + ParticleSprayEffect 0.00s 2.00s
+EFFECT + ParticlesEffect 0.00s 3.00s
+EFFECT = GaussianBlurEffect 0.00s 2.00s strength=3.0
-SEQUENCE 8.50 2 "Hybrid3D"
- EFFECT + ThemeModulationEffect 0.00 2.00
- EFFECT + HeptagonEffect 0.20 2.00
- EFFECT + ParticleSprayEffect 0.00 2.00
- EFFECT = ParticlesEffect 0.00 2.00
- EFFECT + Hybrid3DEffect 0.00 2.00
- EFFECT + GaussianBlurEffect 0.00 2.00
- EFFECT + CNNEffect 0.0 2.0 layers=3 blend=.9
+SEQUENCE 8.50s 2 "Hybrid3D"
+EFFECT + ThemeModulationEffect 0.00s 2.00s
+EFFECT + HeptagonEffect 0.20s 2.00s
+EFFECT + ParticleSprayEffect 0.00s 2.00s
+EFFECT = ParticlesEffect 0.00s 2.00s
+EFFECT + Hybrid3DEffect 0.00s 2.00s
+EFFECT + GaussianBlurEffect 0.00s 2.00s
+EFFECT + CNNEffect 0.0s 2.0s layers=3 blend=.9
# EFFECT + ChromaAberrationEffect 0.00 1.50 offset=0.01 angle=1.57
-SEQUENCE 10.50 0 "CNN effect"
- EFFECT + HeptagonEffect 0.0 12.00
+SEQUENCE 10.50s 0 "CNN effect"
+EFFECT + HeptagonEffect 0.0s 12.00s
# EFFECT + RotatingCubeEffect 0.00 12.0
# EFFECT + Hybrid3DEffect 0.00 12.00
- EFFECT + Scene1Effect 0.0 12.0
- EFFECT + CNNEffect 1.0 12.0 layers=3 blend=.5
+EFFECT + Scene1Effect 0.0s 12.0s
+EFFECT + CNNEffect 1.0s 12.0s layers=3 blend=.5
-SEQUENCE 22.0 0 "buggy"
- EFFECT + HeptagonEffect 0.00 0.20
- EFFECT + FadeEffect 0.11 1.01
+SEQUENCE 22.0s 0 "buggy"
+EFFECT + HeptagonEffect 0.00s 0.20s
+EFFECT + FadeEffect 0.11s 1.01s
-SEQUENCE 22.14 3
- EFFECT + ThemeModulationEffect 0.00 4.00
- EFFECT = HeptagonEffect 0.00 4.00
- EFFECT + GaussianBlurEffect 0.00 5.00 strength=1.5
- EFFECT + ChromaAberrationEffect 0.00 5.00 offset=0.03 angle=0.785
- EFFECT + SolarizeEffect 0.00 5.00
+SEQUENCE 22.14s 3
+EFFECT + ThemeModulationEffect 0.00s 4.00s
+EFFECT = HeptagonEffect 0.00s 4.00s
+EFFECT + GaussianBlurEffect 0.00s 5.00s strength=1.5
+EFFECT + ChromaAberrationEffect 0.00s 5.00s offset=0.03 angle=0.785
+EFFECT + SolarizeEffect 0.00s 5.00s
-SEQUENCE 23.00 2
- EFFECT - FlashCubeEffect 0.20 1.50
- EFFECT + HeptagonEffect 0.00 2.00
- EFFECT + ParticleSprayEffect 0.00 2.00
- EFFECT + ParticlesEffect 0.00 2.00
+SEQUENCE 23.00s 2
+EFFECT - FlashCubeEffect 0.20s 1.50s
+EFFECT + HeptagonEffect 0.00s 2.00s
+EFFECT + ParticleSprayEffect 0.00s 2.00s
+EFFECT + ParticlesEffect 0.00s 2.00s
-SEQUENCE 22.75 2 "Fade"
- EFFECT - FlashCubeEffect 0.20 1.50
- EFFECT + FlashEffect 0.00 1.00
+SEQUENCE 22.75s 2 "Fade"
+EFFECT - FlashCubeEffect 0.20s 1.50s
+EFFECT + FlashEffect 0.00s 1.00s
-SEQUENCE 23.88 10
- EFFECT - FlashCubeEffect 0.20 1.50
- EFFECT + GaussianBlurEffect 0.00 2.00
- EFFECT + FlashEffect 0.00 0.20
- EFFECT = FlashEffect 0.50 0.20
+SEQUENCE 23.88s 10
+EFFECT - FlashCubeEffect 0.20s 1.50s
+EFFECT + GaussianBlurEffect 0.00s 2.00s
+EFFECT + FlashEffect 0.00s 0.20s
+EFFECT = FlashEffect 0.50s 0.20s
-SEQUENCE 25.59 1
- EFFECT + ThemeModulationEffect 0.00 8.00
- EFFECT + HeptagonEffect 0.20 2.00
- EFFECT + ParticleSprayEffect 0.00 8.00
- EFFECT + Hybrid3DEffect 0.00 8.06
- EFFECT + GaussianBlurEffect 0.00 8.00
- EFFECT + ChromaAberrationEffect 0.00 8.14
- EFFECT + SolarizeEffect 0.00 7.88
+SEQUENCE 25.59s 1
+EFFECT + ThemeModulationEffect 0.00s 8.00s
+EFFECT + HeptagonEffect 0.20s 2.00s
+EFFECT + ParticleSprayEffect 0.00s 8.00s
+EFFECT + Hybrid3DEffect 0.00s 8.06s
+EFFECT + GaussianBlurEffect 0.00s 8.00s
+EFFECT + ChromaAberrationEffect 0.00s 8.14s
+EFFECT + SolarizeEffect 0.00s 7.88s
-SEQUENCE 33.08 0
- EFFECT + ThemeModulationEffect 0.00 3.00
- EFFECT + VignetteEffect 0.00 3.00 radius=0.6 softness=0.3
- EFFECT + SolarizeEffect 0.00 3.00
+SEQUENCE 33.08s 0
+EFFECT + ThemeModulationEffect 0.00s 3.00s
+EFFECT + VignetteEffect 0.00s 3.00s radius=0.6 softness=0.3
+EFFECT + SolarizeEffect 0.00s 3.00s
-SEQUENCE 35.31 0
- EFFECT + ThemeModulationEffect 0.00 4.00
- EFFECT + HeptagonEffect 0.20 2.00
- EFFECT + GaussianBlurEffect 0.00 8.00
- EFFECT + SolarizeEffect 0.00 2.00
+SEQUENCE 35.31s 0
+EFFECT + ThemeModulationEffect 0.00s 4.00s
+EFFECT + HeptagonEffect 0.20s 2.00s
+EFFECT + GaussianBlurEffect 0.00s 8.00s
+EFFECT + SolarizeEffect 0.00s 2.00s
-SEQUENCE 42.29 0
- EFFECT + ThemeModulationEffect 0.00 6.00
- EFFECT = HeptagonEffect 0.20 2.00
- EFFECT + Hybrid3DEffect 0.00 4.00
- EFFECT + ParticleSprayEffect 0.00 5.50
- EFFECT + HeptagonEffect 0.00 8.00
- EFFECT + ChromaAberrationEffect 0.00 7.50
- EFFECT + GaussianBlurEffect 0.00 8.00
+SEQUENCE 42.29s 0
+EFFECT + ThemeModulationEffect 0.00s 6.00s
+EFFECT = HeptagonEffect 0.20s 2.00s
+EFFECT + Hybrid3DEffect 0.00s 4.00s
+EFFECT + ParticleSprayEffect 0.00s 5.50s
+EFFECT + HeptagonEffect 0.00s 8.00s
+EFFECT + ChromaAberrationEffect 0.00s 7.50s
+EFFECT + GaussianBlurEffect 0.00s 8.00s
-SEQUENCE 50.02 0
- EFFECT + ThemeModulationEffect 0.00 4.00
- EFFECT + HeptagonEffect 0.00 9.50
- EFFECT + ChromaAberrationEffect 0.00 9.00
- EFFECT + GaussianBlurEffect 0.00 8.00
+SEQUENCE 50.02s 0
+EFFECT + ThemeModulationEffect 0.00s 4.00s
+EFFECT + HeptagonEffect 0.00s 9.50s
+EFFECT + ChromaAberrationEffect 0.00s 9.00s
+EFFECT + GaussianBlurEffect 0.00s 8.00s
diff --git a/workspaces/main/timeline.seq.backup b/workspaces/main/timeline.seq.backup
new file mode 100644
index 0000000..c3e2316
--- /dev/null
+++ b/workspaces/main/timeline.seq.backup
@@ -0,0 +1,105 @@
+# Demo Timeline
+# Generated by Timeline Editor
+# BPM 120
+
+SEQUENCE 0.00 0
+ EFFECT - FlashCubeEffect 0.00 2.44
+ EFFECT + FlashEffect 0.00 1.00 color=1.0,0.5,0.5 decay=0.95
+ EFFECT + FadeEffect 0.10 1.00
+ EFFECT + SolarizeEffect 0.00 2.00
+ EFFECT + VignetteEffect 0.00 2.50 radius=0.6 softness=0.1
+
+SEQUENCE 2.50 0 "rotating cube"
+ EFFECT + CircleMaskEffect 0.00 4.00 0.50
+ EFFECT + RotatingCubeEffect 0.00 4.00
+ EFFECT + GaussianBlurEffect 1.00 2.00 strength=1.0
+ EFFECT + GaussianBlurEffect 3.00 4.00 strength=2.0
+
+SEQUENCE 5.93 0
+ EFFECT - FlashCubeEffect 0.11 1.45
+ EFFECT + FlashEffect 0.00 0.20
+
+SEQUENCE 6.90 1 "spray"
+ EFFECT + ParticleSprayEffect 0.00 2.00
+ EFFECT + ParticlesEffect 0.00 3.00
+ EFFECT = GaussianBlurEffect 0.00 2.00 strength=3.0
+
+SEQUENCE 8.50 2 "Hybrid3D"
+ EFFECT + ThemeModulationEffect 0.00 2.00
+ EFFECT + HeptagonEffect 0.20 2.00
+ EFFECT + ParticleSprayEffect 0.00 2.00
+ EFFECT = ParticlesEffect 0.00 2.00
+ EFFECT + Hybrid3DEffect 0.00 2.00
+ EFFECT + GaussianBlurEffect 0.00 2.00
+ EFFECT + CNNEffect 0.0 2.0 layers=3 blend=.9
+# EFFECT + ChromaAberrationEffect 0.00 1.50 offset=0.01 angle=1.57
+
+SEQUENCE 10.50 0 "CNN effect"
+ EFFECT + HeptagonEffect 0.0 12.00
+# EFFECT + RotatingCubeEffect 0.00 12.0
+# EFFECT + Hybrid3DEffect 0.00 12.00
+ EFFECT + Scene1Effect 0.0 12.0
+ EFFECT + CNNEffect 1.0 12.0 layers=3 blend=.5
+
+SEQUENCE 22.0 0 "buggy"
+ EFFECT + HeptagonEffect 0.00 0.20
+ EFFECT + FadeEffect 0.11 1.01
+
+SEQUENCE 22.14 3
+ EFFECT + ThemeModulationEffect 0.00 4.00
+ EFFECT = HeptagonEffect 0.00 4.00
+ EFFECT + GaussianBlurEffect 0.00 5.00 strength=1.5
+ EFFECT + ChromaAberrationEffect 0.00 5.00 offset=0.03 angle=0.785
+ EFFECT + SolarizeEffect 0.00 5.00
+
+SEQUENCE 23.00 2
+ EFFECT - FlashCubeEffect 0.20 1.50
+ EFFECT + HeptagonEffect 0.00 2.00
+ EFFECT + ParticleSprayEffect 0.00 2.00
+ EFFECT + ParticlesEffect 0.00 2.00
+
+SEQUENCE 22.75 2 "Fade"
+ EFFECT - FlashCubeEffect 0.20 1.50
+ EFFECT + FlashEffect 0.00 1.00
+
+SEQUENCE 23.88 10
+ EFFECT - FlashCubeEffect 0.20 1.50
+ EFFECT + GaussianBlurEffect 0.00 2.00
+ EFFECT + FlashEffect 0.00 0.20
+ EFFECT = FlashEffect 0.50 0.20
+
+SEQUENCE 25.59 1
+ EFFECT + ThemeModulationEffect 0.00 8.00
+ EFFECT + HeptagonEffect 0.20 2.00
+ EFFECT + ParticleSprayEffect 0.00 8.00
+ EFFECT + Hybrid3DEffect 0.00 8.06
+ EFFECT + GaussianBlurEffect 0.00 8.00
+ EFFECT + ChromaAberrationEffect 0.00 8.14
+ EFFECT + SolarizeEffect 0.00 7.88
+
+SEQUENCE 33.08 0
+ EFFECT + ThemeModulationEffect 0.00 3.00
+ EFFECT + VignetteEffect 0.00 3.00 radius=0.6 softness=0.3
+ EFFECT + SolarizeEffect 0.00 3.00
+
+SEQUENCE 35.31 0
+ EFFECT + ThemeModulationEffect 0.00 4.00
+ EFFECT + HeptagonEffect 0.20 2.00
+ EFFECT + GaussianBlurEffect 0.00 8.00
+ EFFECT + SolarizeEffect 0.00 2.00
+
+SEQUENCE 42.29 0
+ EFFECT + ThemeModulationEffect 0.00 6.00
+ EFFECT = HeptagonEffect 0.20 2.00
+ EFFECT + Hybrid3DEffect 0.00 4.00
+ EFFECT + ParticleSprayEffect 0.00 5.50
+ EFFECT + HeptagonEffect 0.00 8.00
+ EFFECT + ChromaAberrationEffect 0.00 7.50
+ EFFECT + GaussianBlurEffect 0.00 8.00
+
+SEQUENCE 50.02 0
+ EFFECT + ThemeModulationEffect 0.00 4.00
+ EFFECT + HeptagonEffect 0.00 9.50
+ EFFECT + ChromaAberrationEffect 0.00 9.00
+ EFFECT + GaussianBlurEffect 0.00 8.00
+
diff --git a/workspaces/test/shaders/common_uniforms.wgsl b/workspaces/test/shaders/common_uniforms.wgsl
index ce1be53..1ab8939 100644
--- a/workspaces/test/shaders/common_uniforms.wgsl
+++ b/workspaces/test/shaders/common_uniforms.wgsl
@@ -1,11 +1,11 @@
struct CommonUniforms {
- resolution: vec2<f32>,
- _pad0: f32,
- _pad1: f32,
- aspect_ratio: f32,
- time: f32,
- beat: f32,
- audio_intensity: f32,
+ resolution: vec2<f32>, // Screen dimensions
+ aspect_ratio: f32, // Width/height ratio
+ time: f32, // Physical time in seconds (unaffected by tempo)
+ beat_time: f32, // Musical time in beats (absolute, tempo-scaled)
+ beat_phase: f32, // Fractional beat (0.0-1.0 within current beat)
+ audio_intensity: f32, // Audio peak for beat sync
+ _pad: f32, // Padding
};
struct GlobalUniforms {
view_proj: mat4x4<f32>,
diff --git a/workspaces/test/timeline.seq b/workspaces/test/timeline.seq
index 100c7da..3cbfb93 100644
--- a/workspaces/test/timeline.seq
+++ b/workspaces/test/timeline.seq
@@ -2,7 +2,7 @@
# Minimal timeline for audio/visual sync testing
# BPM 120 (set in test_demo.track)
-SEQUENCE 0.0 0 "Main Loop"
- EFFECT + FlashEffect 0.0 16.0
+SEQUENCE 0.0s 0 "Main Loop"
+EFFECT + FlashEffect 0.0s 16.0s
END_DEMO 32b
diff --git a/workspaces/test/timeline.seq.backup b/workspaces/test/timeline.seq.backup
new file mode 100644
index 0000000..100c7da
--- /dev/null
+++ b/workspaces/test/timeline.seq.backup
@@ -0,0 +1,8 @@
+# WORKSPACE: test
+# Minimal timeline for audio/visual sync testing
+# BPM 120 (set in test_demo.track)
+
+SEQUENCE 0.0 0 "Main Loop"
+ EFFECT + FlashEffect 0.0 16.0
+
+END_DEMO 32b
generated by cgit v1.2.3 (git 2.51.0) at 2026-02-12 11:46:14 +0000