mirror of
https://github.com/open-goal/jak-project
synced 2026-06-05 03:08:40 -04:00
Matt Dallmeyer
56d495bc9f
I discovered that `yakow`s are kinda broken if you try to use them in custom levels in jak 2/3. It's due to the missing `yakow-lod0` texture and associated fix, replacing it with `yak-medfur-end`. This solution works fine for the decompiler on vanilla levels. But for building custom levels, the requested art-groups were being handled before the textures were, and so it was impossible to have `yak-medfur-end` on hand to do the replacement. You'd hit an exception here because `idx_in_level_texture` would still be `INT32_MAX`: https://github.com/open-goal/jak-project/blob/c08118509b84feba002bd9e208f49162b4218556/decompiler/level_extractor/extract_merc.cpp#L806 My fix was just to swap the order when building custom levels, and handle the textures first. I only made the changes for jak2/3, because I see @Hat-Kid has a slightly different implementation for jak1. There's one other small change relating to the `combo_id` / `pc_combo_tex_id` short-circtuiting - I think `pc_combo_tex_id` is always 0 for vanilla textures? So initially `yakow-lod0` actually ended up matching the `combo_id` of the checkerboard texture from the test-zone GLB. I just added another sanity check here that the texture names match too. (I also added yakows in the test-zone.jsonc files 🐄)
443 lines
11 KiB
JSON
443 lines
11 KiB
JSON
{
|
|
"version": "0.2.1",
|
|
"defaults": {},
|
|
"configurations": [
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - Unit-Tests - Summary",
|
|
"args": [
|
|
"--gtest_brief=1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - Unit-Tests - Verbose",
|
|
"args": [
|
|
"--gtest_brief=0"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - Draft Tests - Verbose",
|
|
"args": [
|
|
"--gtest_brief=0",
|
|
"--gtest_filter=\"*Draft*\""
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - TypeConsistency - Verbose",
|
|
"args": [
|
|
"--gtest_brief=0",
|
|
"--gtest_filter=\"*TypeConsistency*\""
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - TypeConsistency - Jak 2 - Verbose",
|
|
"args": [
|
|
"--gtest_brief=0",
|
|
"--gtest_filter=\"*Jak2TypeConsistency*\""
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - WithGameTests - Verbose",
|
|
"args": [
|
|
"--gtest_brief=0",
|
|
"--gtest_filter=\"*WithGameTests*\""
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "offline-test.exe (bin\\offline-test.exe)",
|
|
"name": "Tests - Offline Tests - Jak 1",
|
|
"args": [
|
|
"--iso_data_path",
|
|
"${workspaceRoot}/iso_data/jak1",
|
|
"--game",
|
|
"jak1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "offline-test.exe (bin\\offline-test.exe)",
|
|
"name": "Tests - Offline Tests - Jak 2",
|
|
"args": [
|
|
"--iso_data_path",
|
|
"${workspaceRoot}/iso_data/jak2",
|
|
"--game",
|
|
"jak2"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "offline-test.exe (bin\\offline-test.exe)",
|
|
"name": "Tests - Offline Tests - Jak 3",
|
|
"args": [
|
|
"--iso_data_path",
|
|
"${workspaceRoot}/iso_data/jak3",
|
|
"--game",
|
|
"jak3"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "offline-test.exe (bin\\offline-test.exe)",
|
|
"name": "Tests - Offline Tests - Jak 1 - Specific File",
|
|
"args": [
|
|
"--iso_data_path",
|
|
"${workspaceRoot}/iso_data/jak1",
|
|
"--game",
|
|
"jak1",
|
|
"--file",
|
|
"euler-h"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "offline-test.exe (bin\\offline-test.exe)",
|
|
"name": "Tests - Offline Tests - Jak 2 - Specific File",
|
|
"args": [
|
|
"--iso_data_path",
|
|
"${workspaceRoot}/iso_data/jak2",
|
|
"--game",
|
|
"jak2",
|
|
"--file",
|
|
"oracle-texture"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - Jak 1 - Runtime",
|
|
"args": [
|
|
"-v",
|
|
"--game",
|
|
"jak1",
|
|
"--",
|
|
"-fakeiso",
|
|
"-debug"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - GPU Test",
|
|
"args": [
|
|
"-v",
|
|
"--gpu-test",
|
|
"opengl",
|
|
"--gpu-test-out-path",
|
|
"./gpu-test.json"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - Jak 1 - Runtime (boot)",
|
|
"args": [
|
|
"-v",
|
|
"--game",
|
|
"jak1",
|
|
"--",
|
|
"-boot",
|
|
"-fakeiso",
|
|
"-debug"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - Jak 2 - Runtime (no boot)",
|
|
"args": [
|
|
"-v",
|
|
"--game",
|
|
"jak2",
|
|
"--",
|
|
"-fakeiso",
|
|
"-debug"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - Jak 2 - Runtime (boot)",
|
|
"args": [
|
|
"-v",
|
|
"--game",
|
|
"jak2",
|
|
"--",
|
|
"-boot",
|
|
"-fakeiso",
|
|
"-debug"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - Jak 2 - Runtime (release)",
|
|
"args": [
|
|
"-v",
|
|
"--game",
|
|
"jak2",
|
|
"--",
|
|
"-boot",
|
|
"-fakeiso"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "gk.exe (bin\\gk.exe)",
|
|
"name": "Game - Jak 3 - Runtime (boot)",
|
|
"args": [
|
|
"-v",
|
|
"--game",
|
|
"jak3",
|
|
"--",
|
|
"-boot",
|
|
"-fakeiso",
|
|
"-debug"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc.exe (bin\\goalc.exe)",
|
|
"name": "REPL - Jak 1",
|
|
"args": [
|
|
"--user-auto",
|
|
"--game",
|
|
"jak1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc.exe (bin\\goalc.exe)",
|
|
"name": "REPL - Jak 2",
|
|
"args": [
|
|
"--user-auto",
|
|
"--game",
|
|
"jak2"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc.exe (bin\\goalc.exe)",
|
|
"name": "REPL - Jak 3",
|
|
"args": [
|
|
"--user-auto",
|
|
"--game",
|
|
"jak3"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 1",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak1/jak1_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"ntsc_v1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 1 NTSC-U v2",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak1/jak1_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"ntsc_v2"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 1 PAL",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak1/jak1_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"pal"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 2",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak2/jak2_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"ntsc_v1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 2 - Extract",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak2/jak2_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"ntsc_v1",
|
|
"--config-override \"{\\\"decompile_code\\\": false, \\\"levels_extract\\\": true, \\\"allowed_objects\\\": []}\""
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 3",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak3/jak3_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"ntsc_v1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "decompiler.exe (bin\\decompiler.exe)",
|
|
"name": "Decompiler - Jak 3 - Extract",
|
|
"args": [
|
|
"${workspaceRoot}/decompiler/config/jak3/jak3_config.jsonc",
|
|
"${workspaceRoot}/iso_data",
|
|
"${workspaceRoot}/decompiler_out",
|
|
"--version",
|
|
"ntsc_v1",
|
|
"--config-override \"{\\\"decompile_code\\\": false, \\\"levels_extract\\\": true, \\\"allowed_objects\\\": []}\""
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "memory_dump_tool.exe (bin\\memory_dump_tool.exe)",
|
|
"name": "Tools - EE Memory Analyze - Jak 1",
|
|
"args": [
|
|
"\"${workspaceRoot}/eeMemory.bin\"",
|
|
"--output-path",
|
|
"\"${workspaceRoot}\"",
|
|
"--game",
|
|
"jak1"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "memory_dump_tool.exe (bin\\memory_dump_tool.exe)",
|
|
"name": "Tools - EE Memory Analyze - Jak 2",
|
|
"args": [
|
|
"\"${workspaceRoot}/eeMemory.bin\"",
|
|
"--output-path",
|
|
"\"${workspaceRoot}\"",
|
|
"--game",
|
|
"jak2"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "dgo_unpacker.exe (bin\\dgo_unpacker.exe)",
|
|
"name": "Tools - DGO Unpacker (test)",
|
|
"args": [
|
|
"C:\\GameData\\Jak1\\Backup\\DGO-PAL\\GAME",
|
|
"C:\\GameData\\Jak1\\Backup\\DISC-PAL\\CGO\\GAME.CGO"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "extractor.exe (bin\\extractor.exe)",
|
|
"name": "Tools - Extractor - Full",
|
|
"args": [
|
|
"D:\\ISOs\\Jak\\Temp\\bad.iso"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "lsp.exe (bin\\lsp.exe)",
|
|
"name": "Tools - LSP",
|
|
"args": []
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "type_searcher.exe (bin\\type_searcher.exe)",
|
|
"name": "Tools - Type Searcher",
|
|
"args": [
|
|
"--game",
|
|
"jak2",
|
|
"--output-path",
|
|
"./search-results.json",
|
|
"--size",
|
|
255,
|
|
"--fields",
|
|
"[{\\\"type\\\":\\\"quaternion\\\",\\\"offset\\\":48}]"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "formatter.exe (bin\\formatter.exe)",
|
|
"name": "Tools - Formatter - Inplace",
|
|
"args": [
|
|
"--write",
|
|
"--file",
|
|
"C:\\Users\\xtvas\\Repositories\\opengoal\\jak-project\\goal_src\\jak1\\engine\\camera\\cam-states.gc"
|
|
]
|
|
},
|
|
{
|
|
"type": "default",
|
|
"project": "CMakeLists.txt",
|
|
"projectTarget": "goalc-test.exe (bin\\goalc-test.exe)",
|
|
"name": "Tests - Formatter",
|
|
"args": [
|
|
"--gtest_brief=0",
|
|
"--gtest_filter=\"*FormatterTests*\""
|
|
]
|
|
}
|
|
]
|
|
} |