diff --git a/first.jai b/first.jai index 0a5dd81..d4125e0 100644 --- a/first.jai +++ b/first.jai @@ -15,6 +15,13 @@ Trueno_Build_Options :: struct { test_exe_game : bool; } +// Engine tests build against test_game/ so they work without the game/ directory; +// game tests build against the real game and its real resources. Kept in step with +// FLAG_USE_TEST_GAME in src/main.jai. +uses_test_game :: (opts: Trueno_Build_Options) -> bool { + return opts.test_engine || opts.test_exe_engine; +} + build_options_from_args :: (args: []string) -> Trueno_Build_Options { opts : Trueno_Build_Options; @@ -66,8 +73,9 @@ max_asset_file_size :: (dir: string, ext: string, floor: s64 = 0) -> s64 { } add_asset_buffer_sizes_to_compiler_strings :: (trueno_opts: Trueno_Build_Options, w: Workspace) { - pack_dir := ifx trueno_opts.test_exe_engine || trueno_opts.test_exe_game then "./test_packs" else "./packs"; - game_resources_dir := ifx trueno_opts.test_exe_engine || trueno_opts.test_exe_game then "./test_game/resources" else "./game/resources"; + use_test_game := uses_test_game(trueno_opts); + pack_dir := ifx use_test_game then "./test_packs" else "./packs"; + game_resources_dir := ifx use_test_game then "./test_game/resources" else "./game/resources"; sizes: [6]s64; sizes[0] = max_asset_file_size(pack_dir, ".pack", 1 * 1024 * 1024); @@ -254,8 +262,8 @@ wasm_build :: (opts: Build_Options, trueno_opts: Trueno_Build_Options) { opt := get_build_options(); trueno_opts := build_options_from_args(opt.compile_time_command_line); compile_shaders(); - is_test_exe := trueno_opts.test_exe_engine || trueno_opts.test_exe_game; - create_pack(is_test_exe, ifx is_test_exe then "./test_packs" else "./packs"); + use_test_game := uses_test_game(trueno_opts); + create_pack(use_test_game, ifx use_test_game then "./test_packs" else "./packs"); if trueno_opts.wasm_build { wasm_build(opt, trueno_opts); diff --git a/log_nvprosample.txt b/log_nvprosample.txt index f278c22..7da0b9d 100644 --- a/log_nvprosample.txt +++ b/log_nvprosample.txt @@ -26,33 +26,4 @@ VK_KHR_deferred_host_operations VK_KHR_acceleration_structure VK_KHR_ray_query -BLAS Compaction: 0.3MB -> 0.2MB (0.1MB saved, 31.9% smaller) -_______________ -Vulkan Version: - - available: 1.3.296 - - requesting: 1.3.0 -______________________ -Used Instance Layers : -VK_LAYER_KHRONOS_validation - -Used Instance Extensions : -____________________ -Devices : 2 -0: AMD Radeon RX 6700 XT (RADV NAVI22) - - Compatible -1: llvmpipe (LLVM 20.1.2, 256 bits) - - Compatible -Compatible physical devices found : 2 -Using Device: - - Device Name : AMD Radeon RX 6700 XT (RADV NAVI22) - - Vendor : AMD - - Driver Version : 25.2.8 - - API Version : 1.4.318 - - Device Type : Discrete GPU -________________________ -Used Device Extensions : -VK_KHR_deferred_host_operations -VK_KHR_acceleration_structure -VK_KHR_ray_query - -BLAS Compaction: 0.3MB -> 0.2MB (0.1MB saved, 31.9% smaller) +BLAS Compaction: 0.3MB -> 0.2MB (0.1MB saved, 32.1% smaller) diff --git a/settings.cfg b/settings.cfg index 88d4ab0..216dad2 100644 --- a/settings.cfg +++ b/settings.cfg @@ -1,4 +1,4 @@ -master_volume 0.276042 -music_volume 0 +master_volume 0.15 +music_volume 1 sfx_volume 1 -fullscreen 1 +fullscreen 0