mirror of
https://github.com/open-goal/jak-project
synced 2026-06-16 06:46:07 -04:00
Hat Kid
710f3ac117
Custom levels for Jak 2/3 now support envmapped TIE geometry. The TIE extract was also changed to ignore materials that have the specular flag set, but are missing a roughness texture. Jak 2/3 now also support the `build-actor` tool. The `build-custom-level` and `build-actor` macros now have a few new options: - Both now have a `force-run` option (`#f` by default) that, when set to `#t`, will always run level/art group generation even if the output files are up to date. - `build-custom-level` has a `gen-fr3` option (`#t` by default) that, when set to `#f`, will skip generating the FR3 file for the custom level and only generate the GOAL level file to skip the potentially slow process of finding and adding art groups and textures. Useful for when you want to temporarily edit only the GOAL side of the level (such as entity placement, etc.). - `build-actor` has a `texture-bucket` option (default 0) which will determine what DMA sink group the model will be placed in, which is useful to determine the draw order of the model. Previously, this was omitted, resulting in shadows not drawing over custom actors because the actors were put in a bucket that is drawn after shadows (this behavior can be restored with `:texture-bucket #f`).
145 lines
6.7 KiB
C++
145 lines
6.7 KiB
C++
#include "LevelFile.h"
|
|
|
|
#include "goalc/data_compiler/DataObjectGenerator.h"
|
|
|
|
namespace jak2 {
|
|
size_t DrawableTreeArray::add_to_object_file(DataObjectGenerator& gen) const {
|
|
/*
|
|
(deftype drawable-tree-array (drawable-group)
|
|
((trees drawable-tree 1 :offset 32 :score 100))
|
|
:flag-assert #x1200000024
|
|
)
|
|
(deftype drawable-group (drawable)
|
|
((length int16 :offset 6)
|
|
(data drawable 1 :offset-assert 32)
|
|
)
|
|
(:methods
|
|
(new (symbol type int) _type_)
|
|
)
|
|
:flag-assert #x1200000024
|
|
)
|
|
*/
|
|
gen.align_to_basic();
|
|
gen.add_type_tag("drawable-tree-array");
|
|
size_t result = gen.current_offset_bytes();
|
|
int num_trees = 0;
|
|
num_trees += tfrags.size();
|
|
num_trees += ties.size();
|
|
gen.add_word(num_trees << 16);
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
|
|
// todo add trees...
|
|
|
|
if (num_trees == 0) {
|
|
gen.add_word(0); // the one at the end.
|
|
} else {
|
|
int tree_word = (int)gen.current_offset_bytes() / 4;
|
|
for (int i = 0; i < num_trees; i++) {
|
|
gen.add_word(0);
|
|
}
|
|
|
|
for (auto& tfrag : tfrags) {
|
|
// gen.set_word(tree_word++, tfrag.add_to_object_file(gen));
|
|
gen.link_word_to_byte(tree_word++, tfrag.add_to_object_file(gen));
|
|
}
|
|
|
|
for (auto& tie : ties) {
|
|
gen.link_word_to_byte(tree_word++, tie.add_to_object_file(gen));
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
size_t generate_u32_array(const std::vector<u32>& array, DataObjectGenerator& gen) {
|
|
gen.align(4);
|
|
size_t result = gen.current_offset_bytes();
|
|
for (auto& entry : array) {
|
|
gen.add_word(entry);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
std::vector<u8> LevelFile::save_object_file() const {
|
|
DataObjectGenerator gen;
|
|
gen.add_type_tag("bsp-header");
|
|
|
|
// add blank space for the bsp-header
|
|
while (gen.words() < 100) {
|
|
gen.add_word(0);
|
|
}
|
|
|
|
//(info file-info :offset 4)
|
|
auto file_info_slot = info.add_to_object_file(gen);
|
|
gen.link_word_to_byte(1, file_info_slot);
|
|
|
|
//(bsphere vector :inline :offset-assert 16)
|
|
//(all-visible-list (pointer uint16) :offset-assert 32)
|
|
//(visible-list-length int32 :offset-assert 36)
|
|
//(drawable-trees drawable-tree-array :offset-assert 40)
|
|
gen.link_word_to_byte(40 / 4, drawable_trees.add_to_object_file(gen));
|
|
//(pat pointer :offset-assert 44)
|
|
//(pat-length int32 :offset-assert 48)
|
|
//(texture-remap-table (pointer uint64) :offset-assert 52)
|
|
//(texture-remap-table-len int32 :offset-assert 56)
|
|
//(texture-ids (pointer texture-id) :offset-assert 60)
|
|
//(texture-page-count int32 :offset-assert 64)
|
|
//(unknown-basic basic :offset-assert 68)
|
|
//(name symbol :offset-assert 72)
|
|
gen.link_word_to_symbol(name, 72 / 4);
|
|
//(nickname symbol :offset-assert 76)
|
|
gen.link_word_to_symbol(nickname, 76 / 4);
|
|
//(vis-info level-vis-info 8 :offset-assert 80)
|
|
//(actors drawable-inline-array-actor :offset-assert 112)
|
|
gen.link_word_to_byte(112 / 4, generate_inline_array_actors(gen, actors));
|
|
//(cameras (array entity-camera) :offset-assert 116)
|
|
//(nodes (inline-array bsp-node) :offset-assert 120)
|
|
//(level level :offset-assert 124)
|
|
//(current-leaf-idx uint16 :offset-assert 128)
|
|
//(cam-outside-bsp uint8 :offset 152)
|
|
//(cam-using-back uint8 :offset-assert 153)
|
|
//(cam-box-idx uint16 :offset-assert 154)
|
|
//(ambients symbol :offset-assert 156)
|
|
//(subdivide-close float :offset-assert 160)
|
|
//(subdivide-far float :offset-assert 160)
|
|
//(race-meshes (array entity-race-mesh) :offset-assert 168)
|
|
//(actor-birth-order (pointer uint32) :offset-assert 172)
|
|
gen.link_word_to_byte(172 / 4, generate_u32_array(actor_birth_order, gen));
|
|
//(light-hash light-hash :offset-assert 176)
|
|
//(nav-meshes (array entity-nav-mesh) :offset-assert 180)
|
|
//(actor-groups (array actor-group) :offset-assert 184)
|
|
//(region-trees (array drawable-tree-region-prim) :offset-assert 188)
|
|
//(region-array region-array :offset-assert 192)
|
|
//(collide-hash collide-hash :offset-assert 196)
|
|
gen.link_word_to_byte(196 / 4, add_to_object_file(collide_hash, gen));
|
|
//(wind-array uint32 :offset 200)
|
|
//(wind-array-length int32 :offset 204)
|
|
//(city-level-info city-level-info :offset 208)
|
|
//(vis-spheres vector-array :offset 216)
|
|
//(vis-spheres-length uint32 :offset 248)
|
|
//(region-tree drawable-tree-region-prim :offset 252)
|
|
//(tfrag-masks texture-masks-array :offset-assert 256)
|
|
//(tfrag-closest (pointer float) :offset-assert 260)
|
|
//(tfrag-mask-count uint32 :offset 260)
|
|
//(shrub-masks texture-masks-array :offset-assert 264)
|
|
//(shrub-closest (pointer float) :offset-assert 268)
|
|
//(shrub-mask-count uint32 :offset 268)
|
|
//(alpha-masks texture-masks-array :offset-assert 272)
|
|
//(alpha-closest (pointer float) :offset-assert 276)
|
|
//(alpha-mask-count uint32 :offset 276)
|
|
//(water-masks texture-masks-array :offset-assert 280)
|
|
//(water-closest (pointer float) :offset-assert 284)
|
|
//(water-mask-count uint32 :offset 284)
|
|
//(bsp-scale vector :inline :offset-assert 288)
|
|
//(bsp-offset vector :inline :offset-assert 304)
|
|
//(end uint8 :offset 399)
|
|
|
|
return gen.generate_v2();
|
|
}
|
|
} // namespace jak2
|