decomp3: geometry, vector, timer-h, ocean table files and game-task related enums (#3329)

Author: Hat-Kid

common/type_system/TypeSystem.cpp

@@ -2113,7 +2113,7 @@ std::optional<std::string> find_best_field_in_structure(const TypeSystem& ts,
   }
   for (size_t i = start_field; i < (size_t)end_field; ++i) {
     const auto& field = st->fields().at(i);
-    auto type = ts.lookup_type(field.type());
+    auto type = ts.lookup_type_allow_partial_def(field.type());
     if (field.is_dynamic() || field.offset() > offset || field.user_placed() != want_fixed) {
       continue;
     }

decompiler/analysis/insert_lets.cpp

@@ -347,6 +347,7 @@ FormElement* rewrite_as_send_event(LetElement* in,
           Matcher::any_reg(1));
       break;
     case GameVersion::Jak2:
+    case GameVersion::Jak3:
       // in jak 2, the event message block holds a ppointer instead.
       set_from_matcher = Matcher::set(
           Matcher::deref(Matcher::reg(block_var_reg), false, {DerefTokenMatcher::string("from")}),

decompiler/config/jak3/all-types.gc

@@ -1,5 +1,5 @@
 {
-"gkernel": [
+  "gkernel": [
     [17, "(function process symbol)"],
     [24, "(function process symbol)"],
     [26, "(function process symbol)"],

decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc

@@ -2,5 +2,37 @@
   "math": [
     ["L108", "(pointer float)", 32],
     ["L109", "(pointer float)", 32]
+  ],
+  "ocean-trans-tables": [
+    ["L1", "(inline-array vector)", 4],
+    ["L2", "(pointer float)", 160],
+    ["L3", "(pointer float)", 100],
+    ["L4", "(pointer float)", 72],
+    ["L5", "(pointer float)", 72],
+    ["L6", "(pointer float)", 72],
+    ["L7", "(pointer float)", 72],
+    ["L8", "(pointer float)", 44],
+    ["L9", "(pointer float)", 44],
+    ["L10", "(pointer float)", 44],
+    ["L11", "(pointer float)", 44],
+    ["L12", "(pointer float)", 40],
+    ["L13", "(pointer float)", 40],
+    ["L14", "(pointer float)", 40],
+    ["L15", "(pointer float)", 40],
+    ["L16", "(pointer float)", 28],
+    ["L17", "(pointer float)", 28],
+    ["L18", "(pointer float)", 28],
+    ["L19", "(pointer float)", 28]
+  ],
+  "ocean-frames": [["L1", "(pointer uint32)", 16384]],
+  "task-control-h": [
+    ["L1042", "uint64", true],
+    ["L1047", "uint64", true],
+    ["L1048", "uint64", true],
+    ["L1045", "uint64", true],
+    ["L1049", "uint64", true],
+    ["L1043", "uint64", true],
+    ["L1046", "uint64", true],
+    ["L1044", "uint64", true]
   ]
 }

decompiler/config/jak3/ntsc_v1/label_types.jsonc

@@ -1,4 +1,13 @@
 {
   "quaternion-smooth-seek!": [[16, "quaternion"]],
-  "eul->matrix": [[16, "vector"]]
+  "eul->matrix": [[16, "vector"]],
+  "segment-segment-find-intersection-xz": [[16, "vector"]],
+  "vector-line-xz-distance-point!": [[16, "matrix"]],
+  "vector-segment-xz-distance-point!": [[16, "matrix"]],
+  "nearest-dist2-between-moving-points": [[16, ["inline-array", "vector", 2]]],
+  "vector-circle-tangent-new": [
+    [32, "vector"],
+    [48, "vector"]
+  ],
+  "rotate-vector-to-vector": [[16, "quaternion"]]
 }

decompiler/config/jak3/ntsc_v1/stack_structures.jsonc

@@ -47,10 +47,6 @@
     [13, "a0", "pointer"],
     [25, "v1", "pointer"]
   ],
-  "(method 14 dead-pool)": [
-    [[24, 25], "v1", "(pointer process)"],
-    [[30, 39], "s4", "(pointer process)"]
-  ],
   "method-state": [[12, "a2", "state"]],
   "(method 0 protect-frame)": [
     [0, "a0", "int"],
@@ -86,5 +82,44 @@
     [18, "f0", "float"],
     [18, "f1", "float"],
     [[23, 32], "f0", "float"]
+  ],
+  "generate-rand-vector-on-sphere": [
+    [12, "v1", "float"],
+    [28, "v1", "float"]
+  ],
+  "vector-segment-distance-point!": [[[21, 30], "f1", "float"]],
+  "vector4-array-add!": [
+    [11, "s5", "(inline-array vector4)"],
+    [12, "s4", "(inline-array vector4)"],
+    [13, "gp", "(inline-array vector4)"]
+  ],
+  "vector4-array-sub!": [
+    [11, "s5", "(inline-array vector4)"],
+    [12, "s4", "(inline-array vector4)"],
+    [13, "gp", "(inline-array vector4)"]
+  ],
+  "vector4-array-mul!": [
+    [11, "s5", "(inline-array vector4)"],
+    [12, "s4", "(inline-array vector4)"],
+    [13, "gp", "(inline-array vector4)"]
+  ],
+  "vector4-array-scale!": [
+    [11, "s5", "(inline-array vector4)"],
+    [12, "gp", "(inline-array vector4)"]
+  ],
+  "vector4-array-madd!": [
+    [13, "s5", "(inline-array vector4)"],
+    [14, "s4", "(inline-array vector4)"],
+    [15, "gp", "(inline-array vector4)"]
+  ],
+  "vector4-array-msub!": [
+    [13, "s5", "(inline-array vector4)"],
+    [14, "s4", "(inline-array vector4)"],
+    [15, "gp", "(inline-array vector4)"]
+  ],
+  "vector4-array-lerp!": [
+    [13, "s5", "(inline-array vector4)"],
+    [14, "s4", "(inline-array vector4)"],
+    [15, "gp", "(inline-array vector4)"]
   ]
 }

decompiler/config/jak3/ntsc_v1/type_casts.jsonc

@@ -170,9 +170,6 @@
   "(method 0 process-tree)": {
     "args": ["allocation", "type-to-make", "name"]
   },
-  "(method 0 process)": {
-    "args": ["allocation", "type-to-make", "name"]
-  },
   "(method 9 process-tree)": {
     "args": ["this", "active-tree", "name", "stack-pointer"]
   },
@@ -333,7 +330,6 @@
   "change-to-last-brother": {
     "args": ["proc"]
   },
-
   "matrix-transpose!": {
     "args": ["dst", "src"]
   },
@@ -414,5 +410,11 @@
   },
   "string>=?": {
     "args": ["a", "b"]
+  },
+  "game-task->string": {
+    "args": ["task"],
+    "vars": {
+      "v1-0": "val"
+    }
   }
 }

decompiler/config/jak3/ntsc_v1/var_names.jsonc

@@ -967,6 +967,12 @@ const std::unordered_map<
                {"speeches", ArrayFieldDecompMeta(TypeSpec("bot-speech-info"), 16)},
                {"dirs", ArrayFieldDecompMeta(TypeSpec("vector"), 16)},
                {"speech-tunings", ArrayFieldDecompMeta(TypeSpec("bot-speech-tuning"), 16)}}},
+         }},
+        {GameVersion::Jak3,
+         {
+             {"ocean-near-indices",
+              {{"data", ArrayFieldDecompMeta(TypeSpec("ocean-near-index"), 32)}}},
+             {"ocean-mid-masks", {{"data", ArrayFieldDecompMeta(TypeSpec("ocean-mid-mask"), 8)}}},
          }}};
 
 goos::Object decompile_structure(const TypeSpec& type,