mirror of
https://github.com/open-goal/jak-project
synced 2026-06-08 20:29:54 -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>
68 lines
1.8 KiB
Common Lisp
Vendored
Generated
68 lines
1.8 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type focus
|
|
(deftype focus (structure)
|
|
((handle handle)
|
|
(collide-with collide-spec)
|
|
)
|
|
(:methods
|
|
(clear-focused (_type_) none)
|
|
(collide-check? (_type_ process-focusable) object)
|
|
(reset-to-collide-spec (_type_ collide-spec) none)
|
|
(try-update-focus (_type_ process-focusable) symbol)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type focus
|
|
(defmethod inspect ((this focus))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'focus)
|
|
(format #t "~1Thandle: ~D~%" (-> this handle))
|
|
(format #t "~1Tcollide-with: ~D~%" (-> this collide-with))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition for method 11 of type focus
|
|
;; WARN: Return type mismatch int vs none.
|
|
(defmethod reset-to-collide-spec ((this focus) (arg0 collide-spec))
|
|
(set! (-> this collide-with) arg0)
|
|
(set! (-> this handle) (the-as handle #f))
|
|
0
|
|
(none)
|
|
)
|
|
|
|
;; definition for method 10 of type focus
|
|
(defmethod collide-check? ((this focus) (arg0 process-focusable))
|
|
(when (and arg0 (not (logtest? (-> arg0 focus-status) (focus-status disable dead))))
|
|
(let* ((s5-0 (-> arg0 root))
|
|
(v1-2 (if (type? s5-0 collide-shape)
|
|
s5-0
|
|
)
|
|
)
|
|
)
|
|
(and v1-2 (logtest? (-> this collide-with) (-> v1-2 root-prim prim-core collide-as)))
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition for method 12 of type focus
|
|
(defmethod try-update-focus ((this focus) (arg0 process-focusable))
|
|
(when (!= (handle->process (-> this handle)) arg0)
|
|
(set! (-> this handle) (process->handle arg0))
|
|
#t
|
|
)
|
|
)
|
|
|
|
;; definition for method 9 of type focus
|
|
;; WARN: Return type mismatch int vs none.
|
|
(defmethod clear-focused ((this focus))
|
|
(set! (-> this handle) (the-as handle #f))
|
|
0
|
|
(none)
|
|
)
|