mirror of
https://github.com/open-goal/jak-project
synced 2026-07-11 15:28:58 -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>
60 lines
1.7 KiB
Common Lisp
Vendored
Generated
60 lines
1.7 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type bounding-box
|
|
(deftype bounding-box (structure)
|
|
((min vector :inline)
|
|
(max vector :inline)
|
|
)
|
|
(:methods
|
|
(add-spheres! (_type_ (inline-array sphere) int) int)
|
|
(add-point! (_type_ vector3s) int)
|
|
(set-from-point-offset! (_type_ vector3s vector3s) int)
|
|
(set-from-point-offset-pad! (_type_ vector3s vector3s float) int)
|
|
(set-from-sphere! (_type_ sphere) int)
|
|
(set-from-spheres! (_type_ (inline-array sphere) int) int)
|
|
(add-box! (_type_ bounding-box) int)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type bounding-box
|
|
(defmethod inspect ((this bounding-box))
|
|
(format #t "[~8x] ~A~%" this 'bounding-box)
|
|
(format #t "~Tmin: ~`vector`P~%" (-> this min))
|
|
(format #t "~Tmax: ~`vector`P~%" (-> this max))
|
|
this
|
|
)
|
|
|
|
;; definition of type bounding-box4w
|
|
(deftype bounding-box4w (structure)
|
|
((min vector4w :inline)
|
|
(max vector4w :inline)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type bounding-box4w
|
|
(defmethod inspect ((this bounding-box4w))
|
|
(format #t "[~8x] ~A~%" this 'bounding-box4w)
|
|
(format #t "~Tmin: ~`vector4w`P~%" (-> this min))
|
|
(format #t "~Tmax: ~`vector4w`P~%" (-> this max))
|
|
this
|
|
)
|
|
|
|
;; definition of type bounding-box-both
|
|
(deftype bounding-box-both (structure)
|
|
((box bounding-box :inline)
|
|
(box4w bounding-box4w :inline)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type bounding-box-both
|
|
(defmethod inspect ((this bounding-box-both))
|
|
(format #t "[~8x] ~A~%" this 'bounding-box-both)
|
|
(format #t "~Tbox: #<bounding-box @ #x~X>~%" (-> this box))
|
|
(format #t "~Tbox4w: #<bounding-box4w @ #x~X>~%" (-> this box4w))
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|