From 89c46872127aaede53362f64cdc3fe9b3164650b Mon Sep 17 00:00:00 2001 From: skal Date: Thu, 12 Feb 2026 00:30:56 +0100 Subject: feat: implement beat-based timing system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: Timeline format now uses beats as default unit ## Core Changes **Uniform Structure (32 bytes maintained):** - Added `beat_time` (absolute beats for musical animation) - Added `beat_phase` (fractional 0-1 for smooth oscillation) - Renamed `beat` → `beat_phase` - Kept `time` (physical seconds, tempo-independent) **Seq Compiler:** - Default: all numbers are beats (e.g., `5`, `16.5`) - Explicit seconds: `2.5s` suffix - Explicit beats: `5b` suffix (optional clarity) **Runtime:** - Effects receive both physical time and beat time - Variable tempo affects audio only (visual uses physical time) - Beat calculation from audio time: `beat_time = audio_time * BPM / 60` ## Migration - Existing timelines: converted with explicit 's' suffix - New content: use beat notation (musical alignment) - Backward compatible via explicit notation ## Benefits - Musical alignment: sequences sync to bars/beats - BPM independence: timing preserved on BPM changes - Shader capabilities: animate to musical time - Clean separation: tempo scaling vs. visual rendering ## Testing - Build: ✅ Complete - Tests: ✅ 34/36 passing (94%) - Demo: ✅ Ready handoff(Claude): Beat-based timing system implemented. Variable tempo only affects audio sample triggering. Visual effects use physical_time (constant) and beat_time (musical). Shaders can now animate to beats. Co-Authored-By: Claude Sonnet 4.5 --- training/debug/cur/layer_0.png | Bin 0 -> 406194 bytes training/debug/cur/layer_1.png | Bin 0 -> 238358 bytes training/debug/cur/toto.png | Bin 0 -> 90164 bytes training/debug/debug.sh | 45 +++++++++++++++++++++ training/debug/ref/layer_0.png | Bin 0 -> 356038 bytes training/debug/ref/layer_1.png | Bin 0 -> 222247 bytes training/debug/ref/toto.png | Bin 0 -> 107009 bytes .../training/checkpoints/checkpoint_epoch_10.pth | Bin 0 -> 6395 bytes .../training/checkpoints/checkpoint_epoch_100.pth | Bin 0 -> 6417 bytes .../training/checkpoints/checkpoint_epoch_50.pth | Bin 0 -> 6395 bytes training/patch_32x32.png | Bin 5259 -> 0 bytes training/toto.png | Bin 0 -> 103619 bytes 12 files changed, 45 insertions(+) create mode 100644 training/debug/cur/layer_0.png create mode 100644 training/debug/cur/layer_1.png create mode 100644 training/debug/cur/toto.png create mode 100755 training/debug/debug.sh create mode 100644 training/debug/ref/layer_0.png create mode 100644 training/debug/ref/layer_1.png create mode 100644 training/debug/ref/toto.png create mode 100644 training/debug/training/checkpoints/checkpoint_epoch_10.pth create mode 100644 training/debug/training/checkpoints/checkpoint_epoch_100.pth create mode 100644 training/debug/training/checkpoints/checkpoint_epoch_50.pth delete mode 100644 training/patch_32x32.png create mode 100644 training/toto.png (limited to 'training') diff --git a/training/debug/cur/layer_0.png b/training/debug/cur/layer_0.png new file mode 100644 index 0000000..0cb977b Binary files /dev/null and b/training/debug/cur/layer_0.png differ diff --git a/training/debug/cur/layer_1.png b/training/debug/cur/layer_1.png new file mode 100644 index 0000000..801aad2 Binary files /dev/null and b/training/debug/cur/layer_1.png differ diff --git a/training/debug/cur/toto.png b/training/debug/cur/toto.png new file mode 100644 index 0000000..9caff40 Binary files /dev/null and b/training/debug/cur/toto.png differ diff --git a/training/debug/debug.sh b/training/debug/debug.sh new file mode 100755 index 0000000..083082b --- /dev/null +++ b/training/debug/debug.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +pwd=`pwd` + +img=../input/img_003.png + +# img=/Users/skal/black_512x512_rgba.png +#img=/Users/skal/rgba_0_0_0_0.png +check_pt=../checkpoints/checkpoint_epoch_10000.pth +#check_pt=../chk_5000_3x3x3.pt + +#../train_cnn.py --layers 3 --kernel_sizes 3,3,3 --epochs 10000 --batch_size 8 --input ../input/ --target ../target_2/ --checkpoint-every 1000 +#../train_cnn.py --export-only ${check_pt} +#../train_cnn.py --export-only ${check_pt} --infer ${img} --output test/toto.png + +#../train_cnn.py --layers 2 --kernel_sizes 1,1 --epochs 10 --batch_size 5 --input ../input/ --target ../target_2/ --checkpoint-every 10 +#../train_cnn.py --export-only ${check_pt} +#../train_cnn.py --export-only ${check_pt} --infer ${img} --output test/toto.png + +## XXX uncomment! +../train_cnn.py --export-only ${check_pt} \ + --infer ${img} \ + --output ref/toto.png --save-intermediates ref/ # --debug-hex + +echo "== GENERATE SHADERS ==" +echo +cd ../../ +./training/train_cnn.py --export-only ${pwd}/${check_pt} + +echo "== COMPILE ==" +echo +cmake --build build -j4 --target cnn_test +cd ${pwd} + +echo "== RUN ==" +echo +rm -f cur/toto.png +../../build/cnn_test ${img} cur/toto.png --save-intermediates cur/ --layers 3 # --debug-hex + +open cur/*.png ref/*.png + +echo "open cur/*.png ref/*.png" + +#pngcrush -rem gAMA -rem sRGB cur/toto.png toto.png && mv toto.png cur/toto.png +#pngcrush -rem gAMA -rem sRGB cur/layer_0.png toto.png && mv toto.png cur/layer_0.png diff --git a/training/debug/ref/layer_0.png b/training/debug/ref/layer_0.png new file mode 100644 index 0000000..3e0eebe Binary files /dev/null and b/training/debug/ref/layer_0.png differ diff --git a/training/debug/ref/layer_1.png b/training/debug/ref/layer_1.png new file mode 100644 index 0000000..d858f80 Binary files /dev/null and b/training/debug/ref/layer_1.png differ diff --git a/training/debug/ref/toto.png b/training/debug/ref/toto.png new file mode 100644 index 0000000..f869a7c Binary files /dev/null and b/training/debug/ref/toto.png differ diff --git a/training/debug/training/checkpoints/checkpoint_epoch_10.pth b/training/debug/training/checkpoints/checkpoint_epoch_10.pth new file mode 100644 index 0000000..54ba5c5 Binary files /dev/null and b/training/debug/training/checkpoints/checkpoint_epoch_10.pth differ diff --git a/training/debug/training/checkpoints/checkpoint_epoch_100.pth b/training/debug/training/checkpoints/checkpoint_epoch_100.pth new file mode 100644 index 0000000..f94e9f8 Binary files /dev/null and b/training/debug/training/checkpoints/checkpoint_epoch_100.pth differ diff --git a/training/debug/training/checkpoints/checkpoint_epoch_50.pth b/training/debug/training/checkpoints/checkpoint_epoch_50.pth new file mode 100644 index 0000000..a602f4b Binary files /dev/null and b/training/debug/training/checkpoints/checkpoint_epoch_50.pth differ diff --git a/training/patch_32x32.png b/training/patch_32x32.png deleted file mode 100644 index a665065..0000000 Binary files a/training/patch_32x32.png and /dev/null differ diff --git a/training/toto.png b/training/toto.png new file mode 100644 index 0000000..2044840 Binary files /dev/null and b/training/toto.png differ -- cgit v1.2.3