decomp3: font-h, display, profile, settings-h, `camera-defs-h…

…`, `text-h` (#3335)
open-goal · Jan 27, 2024 · f045e6c · f045e6c
1 parent 17f5f74
commit f045e6c
Show file tree

Hide file tree

Showing 24 changed files with 6,635 additions and 115 deletions.
diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc
diff --git a/decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc b/decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc
@@ -7,5 +7,8 @@
     [32, "(function process symbol)"],
     [34, "(function process symbol)"],
     [36, "(function process symbol)"]
+  ],
+  "profile": [
+    [3, "(function profile-segment-array profile-collapse none)"]
   ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/label_types.jsonc b/decompiler/config/jak3/ntsc_v1/label_types.jsonc
@@ -34,5 +34,9 @@
     ["L1043", "uint64", true],
     ["L1046", "uint64", true],
     ["L1044", "uint64", true]
+  ],
+  "profile": [
+    ["L3", "(inline-array profile-spec)", 14],
+    ["L2", "(pointer uint64)", 584]
   ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/type_casts.jsonc b/decompiler/config/jak3/ntsc_v1/type_casts.jsonc
@@ -150,5 +150,52 @@
   ],
   "(method 9 connection)": [[8, "a0", "pointer"]],
   "(method 10 connection)": [[8, "a0", "pointer"]],
-  "(method 11 connection)": [[5, "a1", "pointer"]]
+  "(method 11 connection)": [[5, "a1", "pointer"]],
+  "(method 10 profile-array)": [
+    [[69, 73], "a0", "(pointer uint128)"],
+    [[73, 82], "a1", "vector4w"],
+    [[82, 89], "a1", "vector4w"],
+    [[90, 96], "a0", "vector4w"],
+    [[113, 117], "a1", "(pointer uint128)"],
+    [[117, 126], "a2", "vector4w"],
+    [[126, 136], "a2", "vector4w"],
+    [[137, 149], "a1", "vector4w"],
+    [[187, 191], "t2", "(pointer int128)"],
+    [[191, 225], "t4", "vector4w"],
+    [[225, 231], "a2", "vector4w"],
+    [[231, 237], "a2", "vector4w"]
+  ],
+  "draw-sprite2d-xy": [
+    [[35, 40], "t0", "dma-packet"],
+    [[45, 49], "t0", "gs-gif-tag"],
+    [54, "t0", "(pointer gs-prim)"],
+    [56, "t0", "(pointer gs-rgbaq)"],
+    [67, "t0", "(pointer gs-xyzf)"],
+    [88, "t0", "(pointer gs-xyzf)"],
+    [[97, 109], "v1", "(pointer uint64)"]
+  ],
+  "draw-sprite2d-xy-absolute": [
+    [[6, 10], "t4", "dma-packet"],
+    [[16, 19], "t4", "gs-gif-tag"],
+    [24, "t4", "(pointer gs-prim)"],
+    [25, "t4", "(pointer gs-rgbaq)"],
+    [36, "t4", "(pointer gs-xyzf)"],
+    [49, "t4", "(pointer gs-xyzf)"],
+    [[62, 69], "v1", "(pointer uint64)"]
+  ],
+  "draw-quad2d": [
+    [[18, 22], "t2", "dma-packet"],
+    [[28, 31], "t2", "gs-gif-tag"],
+    [36, "t2", "(pointer gs-prim)"],
+    [38, "t2", "(pointer gs-rgbaq)"],
+    [46, "t2", "(pointer gs-xyzf)"],
+    [48, "t2", "(pointer gs-rgbaq)"],
+    [61, "t2", "(pointer gs-xyzf)"],
+    [63, "t2", "(pointer gs-rgbaq)"],
+    [76, "t2", "(pointer gs-xyzf)"],
+    [78, "t2", "(pointer gs-rgbaq)"],
+    [96, "t2", "(pointer gs-xyzf)"],
+    [97, "t2", "(pointer uint64)"],
+    [[110, 117], "v1", "(pointer uint64)"]
+  ]
 }
diff --git a/goal_src/jak3/engine/camera/camera-defs-h.gc b/goal_src/jak3/engine/camera/camera-defs-h.gc
@@ -7,3 +7,55 @@
 
 ;; DECOMP BEGINS
 
+(deftype camera-bank (basic)
+  ((collide-move-rad         float)
+   (joypad                   uint32)
+   (min-detectable-velocity  float)
+   (attack-timeout           time-frame)
+   (default-string-max-y     meters)
+   (default-string-min-y     meters)
+   (default-string-max-z     meters)
+   (default-string-min-z     meters)
+   (default-string-push-z    meters)
+   (default-tilt-adjust      degrees)
+   )
+  )
+
+
+(define *CAMERA-bank* (new 'static 'camera-bank
+                        :collide-move-rad 1638.4
+                        :min-detectable-velocity 40.96
+                        :attack-timeout (seconds 0.25)
+                        :default-string-max-y (meters 3)
+                        :default-string-min-y (meters 1)
+                        :default-string-max-z (meters 12.5)
+                        :default-string-min-z (meters 5)
+                        :default-string-push-z (meters 10)
+                        :default-tilt-adjust (degrees -6.5000005)
+                        )
+        )
+
+(deftype camera-master-bank (basic)
+  ((onscreen-head-height             meters)
+   (onscreen-foot-height             meters)
+   (target-height                    meters)
+   (up-move-to-pitch-ratio-in-air    float)
+   (down-move-to-pitch-ratio-in-air  float)
+   (up-move-to-pitch-on-ground       float)
+   (down-move-to-pitch-on-ground     float)
+   (pitch-off-blend                  float)
+   )
+  )
+
+
+(define *CAMERA_MASTER-bank* (new 'static 'camera-master-bank
+                               :onscreen-head-height (meters 2.65)
+                               :onscreen-foot-height (meters -0.5)
+                               :target-height (meters 2.15)
+                               :up-move-to-pitch-ratio-in-air 1.0
+                               :down-move-to-pitch-ratio-in-air 0.5
+                               :up-move-to-pitch-on-ground 0.9
+                               :down-move-to-pitch-on-ground 0.9
+                               :pitch-off-blend 0.5
+                               )
+        )