mirror of
https://github.com/open-goal/jak-project
synced 2026-06-09 04:40:19 -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>
62 lines
1.5 KiB
Common Lisp
Vendored
Generated
62 lines
1.5 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type curve
|
|
(deftype curve (structure)
|
|
((cverts (inline-array vector))
|
|
(num-cverts int32)
|
|
(knots (pointer float))
|
|
(num-knots int32)
|
|
(length float)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type curve
|
|
(defmethod inspect ((this curve))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'curve)
|
|
(format #t "~1Tcverts: #x~X~%" (-> this cverts))
|
|
(format #t "~1Tnum-cverts: ~D~%" (-> this num-cverts))
|
|
(format #t "~1Tknots: #x~X~%" (-> this knots))
|
|
(format #t "~1Tnum-knots: ~D~%" (-> this num-knots))
|
|
(format #t "~1Tlength: ~f~%" (-> this length))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition of type border-plane
|
|
(deftype border-plane (basic)
|
|
((name symbol)
|
|
(action basic)
|
|
(slot int8)
|
|
(trans vector :inline)
|
|
(normal vector :inline)
|
|
)
|
|
(:methods
|
|
(debug-draw (_type_) int)
|
|
(point-past-plane? (_type_ vector) symbol)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type border-plane
|
|
(defmethod inspect ((this border-plane))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~1Tname: ~A~%" (-> this name))
|
|
(format #t "~1Taction: ~A~%" (-> this action))
|
|
(format #t "~1Tslot: ~D~%" (-> this slot))
|
|
(format #t "~1Ttrans: ~`vector`P~%" (-> this trans))
|
|
(format #t "~1Tnormal: ~`vector`P~%" (-> this normal))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|