diff options
| author | skal <pascal.massimino@gmail.com> | 2026-02-13 08:21:34 +0100 |
|---|---|---|
| committer | skal <pascal.massimino@gmail.com> | 2026-02-13 08:21:34 +0100 |
| commit | eb15703a3f87e4eadc8839b06de12b9c6ec54023 (patch) | |
| tree | 06dcbb3e40df2f08b433927c96335e104b4d0aa7 /cmake/DemoCodegen.cmake | |
| parent | 10673f00dfece584ba81d581b69c9ba706a5ea5a (diff) | |
Refactor: Reorganize workspaces and remove assets/ directory
Workspace structure now:
- workspaces/{main,test}/obj/ (3D models)
- workspaces/{main,test}/shaders/ (WGSL shaders)
- workspaces/{main,test}/music/ (audio samples)
Changes:
- Moved workspaces/*/assets/music/ → workspaces/*/music/
- Updated assets.txt paths (assets/music/ → music/)
- Moved test_demo.{seq,track} to tools/
- Moved assets/originals/ → tools/originals/
- Removed assets/common/ (legacy, duplicated in workspaces)
- Removed assets/final/ (legacy, superseded by workspaces)
- Updated hot-reload paths in main.cc
- Updated CMake references for test_demo and validation
- Updated gen_spectrograms.sh paths
handoff(Claude): Workspace reorganization complete
Diffstat (limited to 'cmake/DemoCodegen.cmake')
| -rw-r--r-- | cmake/DemoCodegen.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/DemoCodegen.cmake b/cmake/DemoCodegen.cmake index 6c56cbd..272e424 100644 --- a/cmake/DemoCodegen.cmake +++ b/cmake/DemoCodegen.cmake @@ -21,12 +21,8 @@ function(parse_asset_list INPUT_TXT OUT_FILE_LIST) string(REGEX REPLACE "^[^,]+,[^,]+,[ ]*([^,]+).*" "\\1" FILENAME "${LINE}") string(STRIP "${FILENAME}" FILENAME) - # Try workspace-relative path first + # Use workspace-relative path set(FULL_PATH "${INPUT_DIR}/${FILENAME}") - if(NOT EXISTS ${FULL_PATH}) - # Fall back to legacy path for compatibility - set(FULL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/assets/final/${FILENAME}") - endif() if(EXISTS ${FULL_PATH}) list(APPEND ASSET_FILES ${FULL_PATH}) @@ -108,7 +104,7 @@ add_custom_target(generate_tracker_music ALL DEPENDS ${GENERATED_MUSIC_DATA_CC}) # Asset packing pack_assets(assets ${WORKSPACE_ASSETS} GEN_DEMO_H GEN_DEMO_CC generate_demo_assets) -pack_test_assets(test_assets ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/test_assets_list.txt GEN_TEST_H GEN_TEST_CC generate_test_assets) +pack_test_assets(test_assets ${CMAKE_CURRENT_SOURCE_DIR}/workspaces/test/assets.txt GEN_TEST_H GEN_TEST_CC generate_test_assets) # Mark generated files so CMake always checks if they need rebuilding set_source_files_properties(${GEN_DEMO_H} ${GEN_DEMO_CC} PROPERTIES GENERATED TRUE) |