diff options
| author | skal <pascal.massimino@gmail.com> | 2026-02-01 18:56:47 +0100 |
|---|---|---|
| committer | skal <pascal.massimino@gmail.com> | 2026-02-01 18:56:47 +0100 |
| commit | e3ef115804b46e8bfc594987b04b1059aed5e002 (patch) | |
| tree | 3670f718ee23cf34e94984568900eac23022d1f0 /CMakeLists.txt | |
| parent | 7fab8880cca269621cd32610b22f2820567771f2 (diff) | |
feat(gpu/assets): Fix tests, integrate bumpy 3D renderer and procedural assets
- Fixed test_sequence by restoring MainSequence::init_test for mocking.
- Corrected CMakeLists.txt dependencies and source groupings to prevent duplicate symbols.
- standardizing Effect constructor signature for seq_compiler compatibility.
- Implemented Hybrid3DEffect using bumpy Renderer3D and procedural NOISE_TEX.
- Updated MainSequence to support depth buffer for 3D elements.
- Formatted all source files with clang-format.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b9fe43..1ece90c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,6 @@ set(GPU_SOURCES src/gpu/texture_manager.cc src/3d/renderer.cc ) -set(UTIL_SOURCES src/util/asset_manager.cc ${GEN_DEMO_CC}) set(PLATFORM_SOURCES src/platform.cc third_party/glfw3webgpu/glfw3webgpu.c) #-- - Tools Setup -- - @@ -143,6 +142,8 @@ add_custom_target(generate_timeline ALL DEPENDS ${GENERATED_TIMELINE_CC}) pack_assets(assets ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/demo_assets.txt GEN_DEMO_H GEN_DEMO_CC generate_demo_assets) pack_assets(test_assets ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/test_assets_list.txt GEN_TEST_H GEN_TEST_CC generate_test_assets) +set(UTIL_SOURCES src/util/asset_manager.cc) + #-- - Main Demo -- - add_executable(demo64k src/main.cc ${PLATFORM_SOURCES} ${GPU_SOURCES} ${AUDIO_SOURCES} ${PROCEDURAL_SOURCES} ${UTIL_SOURCES} ${GEN_DEMO_CC} ${GENERATED_TIMELINE_CC}) add_dependencies(demo64k generate_demo_assets generate_timeline) @@ -185,9 +186,9 @@ if(DEMO_BUILD_TESTS) set_source_files_properties(src/tests/test_assets.cc PROPERTIES COMPILE_DEFINITIONS "USE_TEST_ASSETS") add_test(NAME AssetManagerTest COMMAND test_assets) - add_executable(test_sequence src/tests/test_sequence.cc ${GPU_SOURCES} ${GENERATED_TIMELINE_CC} ${PLATFORM_SOURCES} ${UTIL_SOURCES}) + add_executable(test_sequence src/tests/test_sequence.cc ${GPU_SOURCES} ${UTIL_SOURCES} ${GEN_DEMO_CC} ${PROCEDURAL_SOURCES} ${GENERATED_TIMELINE_CC} ${PLATFORM_SOURCES}) target_link_libraries(test_sequence PRIVATE ${DEMO_LIBS}) - add_dependencies(test_sequence generate_timeline) + add_dependencies(test_sequence generate_timeline generate_demo_assets) add_test(NAME SequenceSystemTest COMMAND test_sequence) add_executable(test_procedural src/tests/test_procedural.cc ${PROCEDURAL_SOURCES}) @@ -196,11 +197,11 @@ if(DEMO_BUILD_TESTS) add_executable(test_3d src/tests/test_3d.cc) add_test(NAME ThreeDSystemTest COMMAND test_3d) - add_executable(test_texture_manager src/tests/test_texture_manager.cc ${GPU_SOURCES} ${PLATFORM_SOURCES} ${PROCEDURAL_SOURCES} ${AUDIO_SOURCES} ${GENERATED_TIMELINE_CC} ${UTIL_SOURCES}) + add_executable(test_texture_manager src/tests/test_texture_manager.cc ${GPU_SOURCES} ${PLATFORM_SOURCES} ${PROCEDURAL_SOURCES} ${AUDIO_SOURCES} ${GENERATED_TIMELINE_CC} ${UTIL_SOURCES} ${GEN_DEMO_CC}) target_link_libraries(test_texture_manager PRIVATE ${DEMO_LIBS}) add_test(NAME TextureManagerTest COMMAND test_texture_manager) - add_executable(test_3d_render src/tests/test_3d_render.cc src/3d/renderer.cc ${GPU_SOURCES} ${PLATFORM_SOURCES} ${PROCEDURAL_SOURCES} ${AUDIO_SOURCES} ${GENERATED_TIMELINE_CC} ${UTIL_SOURCES}) + add_executable(test_3d_render src/tests/test_3d_render.cc src/3d/renderer.cc ${GPU_SOURCES} ${PLATFORM_SOURCES} ${PROCEDURAL_SOURCES} ${AUDIO_SOURCES} ${GENERATED_TIMELINE_CC} ${UTIL_SOURCES} ${GEN_DEMO_CC}) target_link_libraries(test_3d_render PRIVATE ${DEMO_LIBS}) endif() |