mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-08 14:36:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

[graphics] tfrag3 renderer (#978)

Browse Source 
* begin work

* work

* working objs

* exporting

* it works

* before some time of day fixes

* add time of day interp and also fix zbuffer

* some small blending fixes

* improve randomess

* clean up extraction and missing blend mode

* culling, time of day, more level fixes

* more cleanup

* cleanup memory usage

* windows fix
This commit is contained in:
water111
2021-12-04 12:33:18 -05:00
committed by GitHub
parent 0d7b7da116
commit 083202929c
92 changed files with 5533 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/util/DataParser.cpp
+9 -12
View File
@@ -116,8 +116,7 @@ ParsedData parse_data(const std::string& str) {
// try as .type
if (first_thing == ".type") {
LinkedWord word(0);
word.kind = LinkedWord::TYPE_PTR;
word.symbol_name = line;
word.set_to_symbol(LinkedWord::TYPE_PTR, line);
result.words.push_back(word);
byte_offset += 4;
continue;
@@ -125,8 +124,7 @@ ParsedData parse_data(const std::string& str) {
if (first_thing == ".symbol") {
LinkedWord word(0);
word.kind = LinkedWord::SYM_PTR;
word.symbol_name = line;
word.set_to_symbol(LinkedWord::SYM_PTR, line);
result.words.push_back(word);
byte_offset += 4;
continue;
@@ -137,7 +135,7 @@ ParsedData parse_data(const std::string& str) {
throw std::runtime_error("Got something after .empty-list, this is not allowed");
}
LinkedWord word(0);
word.kind = LinkedWord::EMPTY_PTR;
word.set_to_empty_ptr();
result.words.push_back(word);
byte_offset += 4;
continue;
@@ -151,8 +149,7 @@ ParsedData parse_data(const std::string& str) {
result.labels.emplace_back();
}
LinkedWord word(0);
word.kind = LinkedWord::PTR;
word.label_id = l.idx;
word.set_to_pointer(LinkedWord::PTR, l.idx);
result.words.push_back(word);
byte_offset += 4;
continue;
@@ -160,7 +157,7 @@ ParsedData parse_data(const std::string& str) {
auto val = std::stoull(line, nullptr, 16);
assert(val <= UINT32_MAX);
LinkedWord word(val);
word.kind = LinkedWord::PLAIN_DATA;
word.set_to_plain_data();
result.words.push_back(word);
byte_offset += 4;
continue;
@@ -197,18 +194,18 @@ std::string ParsedData::print() const {
// print word
auto& word = words.at(idx);
switch (word.kind) {
switch (word.kind()) {
case LinkedWord::PLAIN_DATA:
result += fmt::format(" .word 0x{:x}\n", word.data);
break;
case LinkedWord::PTR:
result += fmt::format(" .word {}\n", labels.at(word.label_id).name);
result += fmt::format(" .word {}\n", labels.at(word.label_id()).name);
break;
case LinkedWord::SYM_PTR:
result += fmt::format(" .symbol {}\n", word.symbol_name);
result += fmt::format(" .symbol {}\n", word.symbol_name());
break;
case LinkedWord::TYPE_PTR:
result += fmt::format(" .type {}\n", word.symbol_name);
result += fmt::format(" .type {}\n", word.symbol_name());
break;
case LinkedWord::EMPTY_PTR:
result += " .empty-list\n";