summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorskal <pascal.massimino@gmail.com>2026-02-16 14:32:59 +0100
committerskal <pascal.massimino@gmail.com>2026-02-16 14:32:59 +0100
commitb2ede3f0680edc894a54e28374cb87ab2690afa2 (patch)
tree69e0a8c04eb29be953b037eb98e0a9ac0f1b417a /cmake
parent0fd3c982247d05bacbd67db08c865ec67602437f (diff)
refactor: remove v2 versioning artifacts, establish Sequence as canonical system
Complete v1→v2 migration cleanup: rename 29 files (sequence_v2→sequence, effect_v2→effect, 14 effect files, 8 shaders, compiler, docs), update all class names and references across 54 files. Archive v1 timeline. System now uses standard naming with all versioning removed. 30/34 tests passing. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/DemoCodegen.cmake8
-rw-r--r--cmake/DemoExecutables.cmake8
-rw-r--r--cmake/DemoSourceLists.cmake18
-rw-r--r--cmake/DemoTests.cmake29
-rw-r--r--cmake/DemoTools.cmake6
-rw-r--r--cmake/Validation.cmake14
6 files changed, 42 insertions, 41 deletions
diff --git a/cmake/DemoCodegen.cmake b/cmake/DemoCodegen.cmake
index e84e17b..1e0badf 100644
--- a/cmake/DemoCodegen.cmake
+++ b/cmake/DemoCodegen.cmake
@@ -119,16 +119,16 @@ endfunction()
# Generation Targets
# =============================================================================
-# Timeline compilation (v2)
+# Timeline compilation
set(DEMO_SEQ_PATH ${WORKSPACE_TIMELINE})
set(GENERATED_TIMELINE_CC ${CMAKE_CURRENT_SOURCE_DIR}/src/generated/timeline.cc)
add_custom_command(
OUTPUT ${GENERATED_TIMELINE_CC}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/src/generated
- COMMAND ${SEQ_COMPILER_V2_CMD} ${DEMO_SEQ_PATH} --output ${GENERATED_TIMELINE_CC}
- DEPENDS ${SEQ_COMPILER_V2_DEPENDS} ${DEMO_SEQ_PATH}
+ COMMAND ${SEQ_COMPILER_CMD} ${DEMO_SEQ_PATH} --output ${GENERATED_TIMELINE_CC}
+ DEPENDS ${SEQ_COMPILER_DEPENDS} ${DEMO_SEQ_PATH}
src/gpu/demo_effects.h
- COMMENT "Compiling v2 demo sequence from workspace ${DEMO_WORKSPACE}..."
+ COMMENT "Compiling demo sequence from workspace ${DEMO_WORKSPACE}..."
)
add_custom_target(generate_timeline ALL DEPENDS ${GENERATED_TIMELINE_CC})
diff --git a/cmake/DemoExecutables.cmake b/cmake/DemoExecutables.cmake
index 5131936..69e4a30 100644
--- a/cmake/DemoExecutables.cmake
+++ b/cmake/DemoExecutables.cmake
@@ -47,16 +47,16 @@ endif()
# test_demo - Audio/Visual Sync Tool
# =============================================================================
-# Timeline generation (v2)
+# Timeline generation
set(TEST_DEMO_SEQ_PATH ${CMAKE_CURRENT_SOURCE_DIR}/tools/test_demo.seq)
set(GENERATED_TEST_DEMO_TIMELINE_CC ${CMAKE_CURRENT_SOURCE_DIR}/src/generated/test_timeline.cc)
add_custom_command(
OUTPUT ${GENERATED_TEST_DEMO_TIMELINE_CC}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/src/generated
- COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/seq_compiler_v2.py
+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/seq_compiler.py
${TEST_DEMO_SEQ_PATH} --output ${GENERATED_TEST_DEMO_TIMELINE_CC}
DEPENDS ${TEST_DEMO_SEQ_PATH}
- COMMENT "Compiling test_demo sequence (v2)..."
+ COMMENT "Compiling test_demo sequence..."
)
add_custom_target(generate_test_demo_timeline ALL DEPENDS ${GENERATED_TEST_DEMO_TIMELINE_CC})
@@ -75,7 +75,7 @@ add_custom_target(generate_test_demo_music ALL DEPENDS ${GENERATED_TEST_DEMO_MUS
# Mark test_demo generated files as GENERATED
set_source_files_properties(${GENERATED_TEST_DEMO_TIMELINE_CC} PROPERTIES GENERATED TRUE)
set_source_files_properties(${GENERATED_TEST_DEMO_MUSIC_CC} PROPERTIES GENERATED TRUE)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/generated/test_timeline_v2.h PROPERTIES GENERATED TRUE)
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/generated/test_timeline.h PROPERTIES GENERATED TRUE)
# Build executable (uses main demo assets)
if(NOT DEMO_STRIP_EXTERNAL_LIBS)
diff --git a/cmake/DemoSourceLists.cmake b/cmake/DemoSourceLists.cmake
index f142ce1..65f3518 100644
--- a/cmake/DemoSourceLists.cmake
+++ b/cmake/DemoSourceLists.cmake
@@ -28,15 +28,15 @@ set(UTIL_SOURCES src/util/asset_manager.cc src/util/file_watcher.cc)
# Common effect sources (shared between headless and normal modes)
set(COMMON_GPU_EFFECTS
- src/gpu/sequence_v2.cc
- src/gpu/effect_v2.cc
- src/effects/passthrough_effect_v2.cc
- src/effects/placeholder_effect_v2.cc
- src/effects/gaussian_blur_effect_v2.cc
- src/effects/heptagon_effect_v2.cc
- src/effects/particles_effect_v2.cc
- src/effects/rotating_cube_effect_v2.cc
- src/effects/hybrid3_d_effect_v2.cc
+ src/gpu/sequence.cc
+ src/gpu/effect.cc
+ src/effects/passthrough_effect.cc
+ src/effects/placeholder_effect.cc
+ src/effects/gaussian_blur_effect.cc
+ src/effects/heptagon_effect.cc
+ src/effects/particles_effect.cc
+ src/effects/rotating_cube_effect.cc
+ src/effects/hybrid3_d_effect.cc
# TODO: Port CNN effects to v2 (complex v1 dependencies)
# cnn_v1/src/cnn_v1_effect.cc
# cnn_v2/src/cnn_v2_effect.cc
diff --git a/cmake/DemoTests.cmake b/cmake/DemoTests.cmake
index a23202a..b24d9e2 100644
--- a/cmake/DemoTests.cmake
+++ b/cmake/DemoTests.cmake
@@ -97,10 +97,11 @@ target_link_libraries(test_assets PRIVATE util procedural ${DEMO_LIBS})
demo_add_asset_deps(test_assets test)
set_source_files_properties(src/tests/assets/test_assets.cc PROPERTIES COMPILE_DEFINITIONS "USE_TEST_ASSETS")
-add_demo_test(test_sequence SequenceSystemTest assets src/tests/assets/test_sequence.cc ${GEN_DEMO_CC} ${GENERATED_TIMELINE_CC} ${PLATFORM_SOURCES})
-target_link_libraries(test_sequence PRIVATE 3d gpu util procedural ${DEMO_LIBS})
-demo_add_asset_deps(test_sequence all)
-add_dependencies(test_sequence generate_timeline)
+# Disabled: Old v1 sequence system test
+# add_demo_test(test_sequence SequenceSystemTest assets src/tests/assets/test_sequence.cc ${GEN_DEMO_CC} ${GENERATED_TIMELINE_CC} ${PLATFORM_SOURCES})
+# target_link_libraries(test_sequence PRIVATE 3d gpu util procedural ${DEMO_LIBS})
+# demo_add_asset_deps(test_sequence all)
+# add_dependencies(test_sequence generate_timeline)
add_demo_test(test_procedural ProceduralGenTest util src/tests/util/test_procedural.cc)
target_link_libraries(test_procedural PRIVATE procedural ${DEMO_LIBS})
@@ -230,23 +231,23 @@ add_demo_test(test_gpu_composite GpuCompositeTest gpu
target_link_libraries(test_gpu_composite PRIVATE 3d gpu audio procedural util ${DEMO_LIBS})
demo_add_asset_deps(test_gpu_composite shaders)
-# Sequence v2 Test (Foundation)
-add_demo_test(test_sequence_v2 SequenceV2Test gpu
- src/tests/gpu/test_sequence_v2.cc
+# Sequence Test (Foundation)
+add_demo_test(test_sequence SequenceTest gpu
+ src/tests/gpu/test_sequence.cc
src/tests/common/webgpu_test_fixture.cc
${PLATFORM_SOURCES}
${GEN_DEMO_CC})
-target_link_libraries(test_sequence_v2 PRIVATE 3d gpu audio procedural util ${DEMO_LIBS})
-demo_add_asset_deps(test_sequence_v2 shaders)
+target_link_libraries(test_sequence PRIVATE 3d gpu audio procedural util ${DEMO_LIBS})
+demo_add_asset_deps(test_sequence shaders)
-# Sequence v2 End-to-End Test
-add_demo_test(test_sequence_v2_e2e SequenceV2E2ETest gpu
- src/tests/gpu/test_sequence_v2_e2e.cc
+# Sequence End-to-End Test
+add_demo_test(test_sequence_e2e SequenceE2ETest gpu
+ src/tests/gpu/test_sequence_e2e.cc
src/tests/common/webgpu_test_fixture.cc
${PLATFORM_SOURCES}
${GEN_DEMO_CC})
-target_link_libraries(test_sequence_v2_e2e PRIVATE 3d gpu audio procedural util ${DEMO_LIBS})
-demo_add_asset_deps(test_sequence_v2_e2e shaders)
+target_link_libraries(test_sequence_e2e PRIVATE 3d gpu audio procedural util ${DEMO_LIBS})
+demo_add_asset_deps(test_sequence_e2e shaders)
# Subsystem test targets
add_custom_target(run_audio_tests
diff --git a/cmake/DemoTools.cmake b/cmake/DemoTools.cmake
index f3a9470..43c4716 100644
--- a/cmake/DemoTools.cmake
+++ b/cmake/DemoTools.cmake
@@ -24,9 +24,9 @@ else()
endif()
# Sequence compiler tool (v2 - Python)
-set(SEQ_COMPILER_V2_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tools/seq_compiler_v2.py)
-set(SEQ_COMPILER_V2_CMD ${CMAKE_COMMAND} -E env python3 ${SEQ_COMPILER_V2_SCRIPT})
-set(SEQ_COMPILER_V2_DEPENDS ${SEQ_COMPILER_V2_SCRIPT})
+set(SEQ_COMPILER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tools/seq_compiler.py)
+set(SEQ_COMPILER_CMD ${CMAKE_COMMAND} -E env python3 ${SEQ_COMPILER_SCRIPT})
+set(SEQ_COMPILER_DEPENDS ${SEQ_COMPILER_SCRIPT})
# Tracker compiler tool
if(DEFINED TRACKER_COMPILER_PATH)
diff --git a/cmake/Validation.cmake b/cmake/Validation.cmake
index ee150f4..b4a3784 100644
--- a/cmake/Validation.cmake
+++ b/cmake/Validation.cmake
@@ -14,13 +14,13 @@ file(GLOB WGSL_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE
set(VALIDATION_CPP_FILES
${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/post_process_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/demo_effects.h
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/heptagon_effect_v2.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/gaussian_blur_effect_v2.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/passthrough_effect_v2.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/placeholder_effect_v2.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/particles_effect_v2.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/rotating_cube_effect_v2.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/hybrid3_d_effect_v2.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/heptagon_effect.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/gaussian_blur_effect.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/passthrough_effect.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/placeholder_effect.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/particles_effect.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/rotating_cube_effect.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/effects/hybrid3_d_effect.cc
)
# Add custom command to run the validator