mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
619f39d3b7
This adds support for using enums in lumps using the new lump types `enum-int32` and `enum-uint32`. Also adds these other new lump types: - `water-height` (takes 3 meter floats, an enum and another optional meter float) - `eco-info` (takes an enum and an int) - `vector3m` (3 meter floats + `w` set to 1.0)
119 lines
3.9 KiB
C++
119 lines
3.9 KiB
C++
#include "Entity.h"
|
|
|
|
namespace jak2 {
|
|
size_t EntityActor::generate(DataObjectGenerator& gen) const {
|
|
size_t result = res_lump.generate_header(gen, "entity-actor");
|
|
for (int i = 0; i < 4; i++) {
|
|
gen.add_word_float(trans[i]);
|
|
}
|
|
gen.add_word(aid);
|
|
gen.add_word(kill_mask);
|
|
gen.add_type_tag(etype);
|
|
|
|
ASSERT(game_task < UINT16_MAX);
|
|
ASSERT(vis_id < UINT16_MAX);
|
|
u32 packed = (game_task) | (vis_id << 16);
|
|
gen.add_word(packed);
|
|
|
|
for (int i = 0; i < 4; i++) {
|
|
gen.add_word_float(quat[i]);
|
|
}
|
|
|
|
res_lump.generate_tag_list_and_data(gen, result);
|
|
return result;
|
|
}
|
|
|
|
size_t generate_drawable_actor(DataObjectGenerator& gen,
|
|
const EntityActor& actor,
|
|
size_t actor_loc) {
|
|
gen.align_to_basic();
|
|
gen.add_type_tag("drawable-actor"); // 0
|
|
size_t result = gen.current_offset_bytes();
|
|
gen.add_word(actor.vis_id); // 4
|
|
gen.link_word_to_byte(gen.add_word(0), actor_loc); // 8
|
|
gen.add_word(0); // 12
|
|
for (int i = 0; i < 4; i++) {
|
|
gen.add_word_float(actor.bsphere[i]); // 16, 20, 24, 28
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
size_t generate_inline_array_actors(DataObjectGenerator& gen,
|
|
const std::vector<EntityActor>& actors) {
|
|
std::vector<size_t> actor_locs;
|
|
for (auto& actor : actors) {
|
|
actor_locs.push_back(actor.generate(gen));
|
|
}
|
|
|
|
gen.align_to_basic();
|
|
gen.add_type_tag("drawable-inline-array-actor"); // 0
|
|
size_t result = gen.current_offset_bytes();
|
|
ASSERT(actors.size() < UINT16_MAX);
|
|
gen.add_word(actors.size() << 16); // 4
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
gen.add_word(0);
|
|
|
|
ASSERT((gen.current_offset_bytes() % 16) == 0);
|
|
|
|
for (size_t i = 0; i < actors.size(); i++) {
|
|
generate_drawable_actor(gen, actors[i], actor_locs[i]);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void add_actors_from_json(const nlohmann::json& json,
|
|
std::vector<EntityActor>& actor_list,
|
|
u32 base_aid,
|
|
decompiler::DecompilerTypeSystem& dts) {
|
|
for (const auto& actor_json : json) {
|
|
auto& actor = actor_list.emplace_back();
|
|
actor.aid = actor_json.value("aid", base_aid + actor_list.size());
|
|
actor.trans = vectorm3_from_json(actor_json.at("trans"));
|
|
actor.etype = actor_json.at("etype").get<std::string>();
|
|
if (actor_json.contains("kill_mask") && actor_json.at("kill_mask").is_string()) {
|
|
actor.kill_mask = get_enum_val(actor_json.at("kill_mask").get<std::string>(), dts);
|
|
} else {
|
|
actor.kill_mask = actor_json.value("kill_mask", 0);
|
|
}
|
|
if (actor_json.contains("game_task") && actor_json.at("game_task").is_string()) {
|
|
actor.game_task = get_enum_val(actor_json.at("game_task").get<std::string>(), dts);
|
|
} else {
|
|
actor.game_task = actor_json.value("game_task", 0);
|
|
}
|
|
actor.vis_id = actor_json.value("vis_id", 0);
|
|
actor.quat = math::Vector4f(0, 0, 0, 1);
|
|
if (actor_json.find("quat") != actor_json.end()) {
|
|
actor.quat = vector_from_json(actor_json.at("quat"));
|
|
}
|
|
actor.bsphere = vectorm4_from_json(actor_json.at("bsphere"));
|
|
|
|
if (actor_json.find("lump") != actor_json.end()) {
|
|
for (auto [key, value] : actor_json.at("lump").items()) {
|
|
if (value.is_string()) {
|
|
std::string value_string = value.get<std::string>();
|
|
if (value_string.size() > 0 && value_string[0] == '\'') {
|
|
actor.res_lump.add_res(
|
|
std::make_unique<ResSymbol>(key, value_string.substr(1), -1000000000.0000));
|
|
} else {
|
|
actor.res_lump.add_res(
|
|
std::make_unique<ResString>(key, value_string, -1000000000.0000));
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if (value.is_array()) {
|
|
actor.res_lump.add_res(res_from_json_array(key, value, dts));
|
|
}
|
|
}
|
|
}
|
|
actor.res_lump.sort_res();
|
|
}
|
|
}
|
|
} // namespace jak2
|