mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-06 03:39:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decomp] jak2: debug, debug-sphere (#1846)

Browse Source 
I wasn't able to 100% complete `debug` due to a bunch of level boundary
debug stuff I couldn't figure out. But, I added a ref test and
documented/copied over everything else into goal_src.

Most of the functions that existed in Jak 1 are identical, others got an
extra param or 2 and some now make copies of arguments instead of
modifying them. There's a bunch of new functions, including all of the
debug functions that used to be in `level-boundary` are now in `debug`.
At the very end of `debug` there's also some weird asm functions
checking for some EE memory controller bug (not sure what's up with
that)?
This commit is contained in:
Ethan Lafrenais
2022-09-07 18:14:34 -04:00
committed by GitHub
parent 44d59e6b33
commit 22982d2750
20 changed files with 4702 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak2/engine/anim/joint-mod-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -156,7 +156,7 @@
;; definition (debug) for function joint-mod-debug-draw
;; WARN: Return type mismatch int vs none.
(defun-debug joint-mod-debug-draw ((arg0 joint-mod))
(add-debug-matrix #t (bucket-id bucket-318) (-> arg0 joint bone transform) 8192.0)
(add-debug-matrix #t (bucket-id bucket-318) (-> arg0 joint bone transform) (meters 2.0))
0
(none)
)
test/decompiler/reference/jak2/engine/anim/joint-mod_REF.gc
Generated Vendored
+3 -3
View File
@@ -1006,7 +1006,7 @@
*display-target-marks*
(bucket-id bucket-318)
(-> gp-0 target)
819.2
(meters 0.2)
"look"
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
@@ -1133,7 +1133,7 @@
*display-target-marks*
(bucket-id bucket-318)
(-> gp-0 target)
819.2
(meters 0.2)
"look"
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
@@ -1250,7 +1250,7 @@
*display-target-marks*
(bucket-id bucket-318)
(-> gp-0 target)
819.2
(meters 0.2)
"look"
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
test/decompiler/reference/jak2/engine/debug/debug-h_REF.gc
Generated Vendored
+1
View File
@@ -67,6 +67,7 @@
)
;; definition for method 3 of type debug-vertex-stats
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect debug-vertex-stats ((obj debug-vertex-stats))
(when (not obj)
(set! obj obj)
test/decompiler/reference/jak2/engine/debug/debug-sphere_REF.gc
Generated Vendored
+104
View File
@@ -0,0 +1,104 @@
;;-*-Lisp-*-
(in-package goal)
;; definition for function make-debug-sphere-table
;; INFO: Used lq/sq
(defun make-debug-sphere-table ((points vector-array) (h-lines float) (v-lines float))
(local-vars (next-hz vector) (next-vt vector) (h-line int))
(let ((offset (new-stack-vector0))
(scale 1.0)
(num-points 0)
)
(set-vector! offset 0.0 0.0 0.0 1.0)
(dotimes (v-line (the int v-lines))
(let ((f28-0 (* scale (sin (* (the float v-line) (/ 32768.0 v-lines)))))
(f26-0 (* scale (sin (* (the float (+ v-line 1)) (/ 32768.0 v-lines)))))
(current (new-stack-vector0))
)
(set! next-hz (new 'stack-no-clear 'vector))
(set! (-> next-hz quad) (the-as uint128 0))
(set! next-vt (new 'stack-no-clear 'vector))
(set! (-> next-vt quad) (the-as uint128 0))
(set! (-> current y) (+ (-> offset y) (* (cos (* (the float v-line) (/ 32768.0 v-lines))) scale)))
(set! (-> next-hz y) (-> current y))
(set! (-> next-vt y) (+ (-> offset y) (* (cos (* (the float (+ v-line 1)) (/ 32768.0 v-lines))) scale)))
(set! h-line 0)
(while (< h-line (the int h-lines))
(set! (-> current x) (+ (-> offset x) (* (cos (* (the float h-line) (/ 65536.0 h-lines))) f28-0)))
(set! (-> current z) (+ (-> offset z) (* (sin (* (the float h-line) (/ 65536.0 h-lines))) f28-0)))
(set! (-> next-hz x) (+ (-> offset x) (* (cos (* (the float (+ h-line 1)) (/ 65536.0 h-lines))) f28-0)))
(set! (-> next-hz z) (+ (-> offset z) (* (sin (* (the float (+ h-line 1)) (/ 65536.0 h-lines))) f28-0)))
(set! (-> next-vt x) (+ (-> offset x) (* (cos (* (the float h-line) (/ 65536.0 h-lines))) f26-0)))
(set! (-> next-vt z) (+ (-> offset z) (* (sin (* (the float h-line) (/ 65536.0 h-lines))) f26-0)))
(set! (-> points data num-points quad) (-> current quad))
(set! (-> points data (+ num-points 1) quad) (-> next-hz quad))
(set! (-> points data (+ num-points 2) quad) (-> next-vt quad))
(+! num-points 3)
(set! h-line (+ h-line 1))
)
)
)
(set! (-> points length) num-points)
)
points
)
;; this part is debug only
(when *debug-segment*
;; definition for symbol *debug-sphere-table*, type (array vector-array)
(define *debug-sphere-table* (the-as (array vector-array) (new 'debug 'boxed-array vector-array 10)))
)
;; definition for function add-debug-sphere-from-table
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defun add-debug-sphere-from-table ((bucket bucket-id) (position vector) (radius meters) (color rgba) (table-idx int))
(local-vars (sphere-points vector-array) (point-3 vector))
(rlet ((vf1 :class vf)
(vf2 :class vf)
(vf3 :class vf)
(vf4 :class vf)
(vf5 :class vf)
)
(if (zero? (-> *debug-sphere-table* table-idx))
(set! (-> *debug-sphere-table* table-idx) (make-debug-sphere-table
(new 'debug 'vector-array (* (* 3 table-idx) table-idx))
(the float table-idx)
(the float table-idx)
)
)
)
(set! sphere-points (-> *debug-sphere-table* table-idx))
(set! point-3 (the-as vector (new-stack-vector0)))
(let ((point-1 (new-stack-vector0))
(point-2 (new-stack-vector0))
(points (-> sphere-points data))
)
(.lvf vf1 (&-> position quad))
(.mov vf2 radius)
(countdown (s4-1 (/ (-> sphere-points length) 3))
(.lvf vf3 (&-> points 0 quad))
(.lvf vf4 (&-> points 1 quad))
(.lvf vf5 (&-> points 2 quad))
(set! points (the-as (inline-array vector) (-> points 3)))
(.mul.x.vf vf3 vf3 vf2)
(.mul.x.vf vf4 vf4 vf2)
(.mul.x.vf vf5 vf5 vf2)
(.add.vf vf3 vf3 vf1)
(.add.vf vf4 vf4 vf1)
(.add.vf vf5 vf5 vf1)
(.svf (&-> point-1 quad) vf3)
(.svf (&-> point-2 quad) vf4)
(.svf (&-> point-3 quad) vf5)
(add-debug-line #t bucket point-1 point-2 color #f (the-as rgba -1))
(add-debug-line #t bucket point-1 point-3 color #f (the-as rgba -1))
)
)
0
(none)
)
)
test/decompiler/reference/jak2/engine/debug/debug_REF.gc
Generated Vendored
+1994
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle-launcher_REF.gc
Generated Vendored
+1 -1
View File
@@ -1283,7 +1283,7 @@
(-> s5-1 w)
(new 'static 'rgba :g #xff :a #x80)
)
(add-debug-matrix *display-sprite-marks* (bucket-id bucket-324) (-> obj origin) 8192.0)
(add-debug-matrix *display-sprite-marks* (bucket-id bucket-324) (-> obj origin) (meters 2.0))
)
(sphere-in-view-frustum? (the-as sphere s5-1))
)
test/decompiler/reference/jak2/engine/math/vector-h_REF.gc
Generated Vendored
+6 -6
View File
@@ -530,9 +530,9 @@
(goto cfg-4)
)
(format #t "[~8x] ~A~%" obj 'vector4w-2)
(format #t "~1Tdata[8] @ #x~X~%" (-> obj data))
(format #t "~1Tquad[2] @ #x~X~%" (-> obj data))
(format #t "~1Tvector[2] @ #x~X~%" (-> obj data))
(format #t "~1Tdata[8] @ #x~X~%" (-> obj vector))
(format #t "~1Tquad[2] @ #x~X~%" (-> obj vector))
(format #t "~1Tvector[2] @ #x~X~%" (-> obj vector))
(label cfg-4)
obj
)
@@ -555,9 +555,9 @@
(goto cfg-4)
)
(format #t "[~8x] ~A~%" obj 'vector4w-3)
(format #t "~1Tdata[12] @ #x~X~%" (-> obj data))
(format #t "~1Tquad[3] @ #x~X~%" (-> obj data))
(format #t "~1Tvector[3] @ #x~X~%" (-> obj data))
(format #t "~1Tdata[12] @ #x~X~%" (-> obj vector))
(format #t "~1Tquad[3] @ #x~X~%" (-> obj vector))
(format #t "~1Tvector[3] @ #x~X~%" (-> obj vector))
(label cfg-4)
obj
)
test/offline/config/jak2/config.jsonc
+2
View File
@@ -41,6 +41,8 @@
"(method 3 sprite-aux-list)",
// sprite-distort
"sprite-draw-distorters", // uses clipping flag.
// debug
"(method 3 debug-vertex-stats)", // multiple defined
// asm, weird vector dot
"(method 17 trsqv)",
// history - rgba issues