mirror of
https://github.com/open-goal/jak-project
synced 2026-06-22 09:05:44 -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>
45 lines
1.5 KiB
Common Lisp
Vendored
Generated
45 lines
1.5 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type los-control
|
|
(deftype los-control (structure)
|
|
((src-proc handle)
|
|
(dst-proc handle)
|
|
(have-los time-frame)
|
|
(have-no-los time-frame)
|
|
(check-interval time-frame)
|
|
(last-check-time time-frame)
|
|
(last-collide-result collide-tri-result :inline)
|
|
(collide-with collide-spec :offset 144)
|
|
)
|
|
(:methods
|
|
(los-control-method-9 (_type_ process-focusable vector float) none :behavior process)
|
|
(check-los? (_type_ time-frame) symbol :behavior process)
|
|
(skip-check-los? (_type_ int) symbol :behavior process)
|
|
(set-dst-proc! (_type_ handle) none)
|
|
(new-source! (_type_ process time-frame collide-spec) none)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type los-control
|
|
(defmethod inspect ((this los-control))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'los-control)
|
|
(format #t "~1Tsrc-proc: ~D~%" (-> this src-proc))
|
|
(format #t "~1Tdst-proc: ~D~%" (-> this dst-proc))
|
|
(format #t "~1Thave-los: ~D~%" (-> this have-los))
|
|
(format #t "~1Thave-no-los: ~D~%" (-> this have-no-los))
|
|
(format #t "~1Tcheck-interval: ~D~%" (-> this check-interval))
|
|
(format #t "~1Tlast-check-time: ~D~%" (-> this last-check-time))
|
|
(format #t "~1Tlast-collide-result: #<collide-tri-result @ #x~X>~%" (-> this last-collide-result))
|
|
(format #t "~1Tcollide-with: ~D~%" (-> this collide-with))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|