mirror of
https://github.com/open-goal/jak-project
synced 2026-07-29 23:49:11 -04:00
ManDude
cd68cb671e
Major change to how `deftype` shows up in our code: - the decompiler will no longer emit the `offset-assert`, `method-count-assert`, `size-assert` and `flag-assert` parameters. There are extremely few cases where having this in the decompiled code is helpful, as the types there come from `all-types` which already has those parameters. This also doesn't break type consistency because: - the asserts aren't compared. - the first step of the test uses `all-types`, which has the asserts, which will throw an error if they're bad. - the decompiler won't emit the `heap-base` parameter unless necessary now. - the decompiler will try its hardest to turn a fixed-offset field into an `overlay-at` field. It falls back to the old offset if all else fails. - `overlay-at` now supports field "dereferencing" to specify the offset that's within a field that's a structure, e.g.: ```lisp (deftype foobar (structure) ((vec vector :inline) (flags int32 :overlay-at (-> vec w)) ) ) ``` in this structure, the offset of `flags` will be 12 because that is the final offset of `vec`'s `w` field within this structure. - **removed ID from all method declarations.** IDs are only ever automatically assigned now. Fixes #3068. - added an `:overlay` parameter to method declarations, in order to declare a new method that goes on top of a previously-defined method. Syntax is `:overlay <method-name>`. Please do not ever use this. - added `state-methods` list parameter. This lets you quickly specify a list of states to be put in the method table. Same syntax as the `states` list parameter. The decompiler will try to put as many states in this as it can without messing with the method ID order. Also changes `defmethod` to make the first type definition (before the arguments) optional. The type can now be inferred from the first argument. Fixes #3093. --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
101 lines
5.0 KiB
Common Lisp
Vendored
Generated
101 lines
5.0 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type collide-query
|
|
(deftype collide-query (structure)
|
|
((best-other-tri collide-tri-result :inline)
|
|
(best-my-tri collide-tri-result :inline :overlay-at best-other-tri)
|
|
(ignore-processes process-tree 2)
|
|
(ignore-process0 process-tree :overlay-at (-> ignore-processes 0))
|
|
(ignore-process1 process-tree :overlay-at (-> ignore-processes 1))
|
|
(ignore-pat pat-surface)
|
|
(ignore-pat-s32 int32 :overlay-at ignore-pat)
|
|
(collide-with collide-spec)
|
|
(collide-with-s32 int32 :overlay-at collide-with)
|
|
(overlay-params uint32 3 :offset 112)
|
|
(bbox bounding-box :inline)
|
|
(bbox4w bounding-box4w :inline)
|
|
(bsphere sphere :inline)
|
|
(start-pos vector :inline)
|
|
(move-dist vector :inline)
|
|
(rlength vector :inline)
|
|
(exit-planes plane 2 :inline)
|
|
(radius float :overlay-at (-> exit-planes 0 data 3))
|
|
(inv-mat matrix :inline :offset 288)
|
|
(spheres (inline-array sphere) :overlay-at (-> overlay-params 0))
|
|
(num-spheres uint32 :overlay-at (-> overlay-params 1))
|
|
(solid-only symbol :overlay-at (-> overlay-params 2))
|
|
(best-dist float :overlay-at spheres)
|
|
(best-other-prim collide-shape-prim :overlay-at num-spheres)
|
|
(best-my-prim collide-shape-prim :overlay-at solid-only)
|
|
(move-vec vector :inline :overlay-at move-dist)
|
|
(best-u float :overlay-at best-dist)
|
|
(action-mask collide-action)
|
|
(local-box4w bounding-box4w :inline)
|
|
(search-box bounding-box4w :inline)
|
|
(search-vector vector4w :inline)
|
|
(instance-mat matrix :inline)
|
|
(instance-ptr basic)
|
|
(x-addr uint32)
|
|
(x-step uint32)
|
|
(y-addr uint32)
|
|
(y-step uint32)
|
|
(z-addr uint32)
|
|
(z-step uint32)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type collide-query
|
|
(defmethod inspect ((this collide-query))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'collide-query)
|
|
(format #t "~1Tbest-other-tri: #<collide-tri-result @ #x~X>~%" (-> this best-other-tri))
|
|
(format #t "~1Tbest-my-tri: #<collide-tri-result @ #x~X>~%" (-> this best-other-tri))
|
|
(format #t "~1Tignore-processes[2] @ #x~X~%" (-> this ignore-processes))
|
|
(format #t "~1Tignore-process0: ~A~%" (-> this ignore-process0))
|
|
(format #t "~1Tignore-process1: ~A~%" (-> this ignore-process1))
|
|
(format #t "~1Tignore-pat: ~D~%" (-> this ignore-pat))
|
|
(format #t "~1Tcollide-with: ~D~%" (-> this collide-with))
|
|
(format #t "~1Toverlay-params[3] @ #x~X~%" (&-> this best-dist))
|
|
(format #t "~1Tbbox: #<bounding-box @ #x~X>~%" (-> this bbox))
|
|
(format #t "~1Tbbox4w: #<bounding-box4w @ #x~X>~%" (-> this bbox4w))
|
|
(format #t "~1Tbsphere: #<sphere @ #x~X>~%" (-> this bsphere))
|
|
(format #t "~1Tstart-pos: #<vector @ #x~X>~%" (-> this start-pos))
|
|
(format #t "~1Tmove-dist: #<vector @ #x~X>~%" (-> this move-dist))
|
|
(format #t "~1Trlength: #<vector @ #x~X>~%" (-> this rlength))
|
|
(format #t "~1Texit-planes[2] @ #x~X~%" (-> this exit-planes))
|
|
(format #t "~1Tradius: ~f~%" (-> this radius))
|
|
(format #t "~1Tinv-mat: #<matrix @ #x~X>~%" (-> this inv-mat))
|
|
(format #t "~1Tspheres: #x~X~%" (-> this best-dist))
|
|
(format #t "~1Tnum-spheres: ~D~%" (-> this num-spheres))
|
|
(format #t "~1Tsolid-only: ~A~%" (-> this best-my-prim))
|
|
(format #t "~1Tbest-dist: ~f~%" (the-as float (-> this best-dist)))
|
|
(format #t "~1Tbest-other-prim: ~A~%" (-> this num-spheres))
|
|
(format #t "~1Tbest-my-prim: ~A~%" (-> this best-my-prim))
|
|
(format #t "~1Tmove-vec: #<vector @ #x~X>~%" (-> this move-dist))
|
|
(format #t "~1Tbest-u: ~f~%" (the-as float (-> this best-dist)))
|
|
(format #t "~1Taction-mask: ~D~%" (-> this action-mask))
|
|
(format #t "~1Tlocal-box4w: #<bounding-box4w @ #x~X>~%" (-> this local-box4w))
|
|
(format #t "~1Tsearch-box: #<bounding-box4w @ #x~X>~%" (-> this search-box))
|
|
(format #t "~1Tsearch-vector: #<vector4w @ #x~X>~%" (-> this search-vector))
|
|
(format #t "~1Tinstance-mat: #<matrix @ #x~X>~%" (-> this instance-mat))
|
|
(format #t "~1Tinstance-ptr: ~A~%" (-> this instance-ptr))
|
|
(format #t "~1Tx-addr: ~D~%" (-> this x-addr))
|
|
(format #t "~1Tx-step: ~D~%" (-> this x-step))
|
|
(format #t "~1Ty-addr: ~D~%" (-> this y-addr))
|
|
(format #t "~1Ty-step: ~D~%" (-> this y-step))
|
|
(format #t "~1Tz-addr: ~D~%" (-> this z-addr))
|
|
(format #t "~1Tz-step: ~D~%" (-> this z-step))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition for symbol *collide-test-flag*, type symbol
|
|
(define *collide-test-flag* #f)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|