mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 18:23:13 -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>
91 lines
2.9 KiB
Common Lisp
Vendored
Generated
91 lines
2.9 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type collide-frag-vertex
|
|
(deftype collide-frag-vertex (vector)
|
|
()
|
|
)
|
|
|
|
;; definition for method 3 of type collide-frag-vertex
|
|
;; INFO: Used lq/sq
|
|
(defmethod inspect ((this collide-frag-vertex))
|
|
(format #t "[~8x] ~A~%" this 'collide-frag-vertex)
|
|
(format #t "~Tdata[4] @ #x~X~%" (&-> this x))
|
|
(format #t "~Tx: ~f~%" (-> this x))
|
|
(format #t "~Ty: ~f~%" (-> this y))
|
|
(format #t "~Tz: ~f~%" (-> this z))
|
|
(format #t "~Tw: ~f~%" (-> this w))
|
|
(format #t "~Tquad: ~D~%" (-> this quad))
|
|
this
|
|
)
|
|
|
|
;; definition of type collide-frag-mesh
|
|
(deftype collide-frag-mesh (basic)
|
|
((packed-data uint32)
|
|
(pat-array uint32)
|
|
(strip-data-len uint16)
|
|
(poly-count uint16)
|
|
(base-trans vector :inline)
|
|
(vertex-count uint8 :overlay-at (-> base-trans w))
|
|
(vertex-data-qwc uint8 :offset 29)
|
|
(total-qwc uint8 :offset 30)
|
|
(unused uint8 :offset 31)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type collide-frag-mesh
|
|
(defmethod inspect ((this collide-frag-mesh))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tpacked-data: #x~X~%" (-> this packed-data))
|
|
(format #t "~Tpat-array: #x~X~%" (-> this pat-array))
|
|
(format #t "~Tstrip-data-len: ~D~%" (-> this strip-data-len))
|
|
(format #t "~Tpoly-count: ~D~%" (-> this poly-count))
|
|
(format #t "~Tbase-trans: #<vector @ #x~X>~%" (-> this base-trans))
|
|
(format #t "~Tvertex-count: ~D~%" (-> this vertex-count))
|
|
(format #t "~Tvertex-data-qwc: ~D~%" (-> this vertex-data-qwc))
|
|
(format #t "~Ttotal-qwc: ~D~%" (-> this total-qwc))
|
|
(format #t "~Tunused: ~D~%" (-> this unused))
|
|
this
|
|
)
|
|
|
|
;; definition of type collide-fragment
|
|
(deftype collide-fragment (drawable)
|
|
((mesh collide-frag-mesh :offset 8)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type collide-fragment
|
|
(defmethod inspect ((this collide-fragment))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tid: ~D~%" (-> this id))
|
|
(format #t "~Tbsphere: ~`vector`P~%" (-> this bsphere))
|
|
(format #t "~Tmesh: ~A~%" (-> this mesh))
|
|
this
|
|
)
|
|
|
|
;; definition of type drawable-inline-array-collide-fragment
|
|
(deftype drawable-inline-array-collide-fragment (drawable-inline-array)
|
|
((data collide-fragment 1 :inline)
|
|
(pad uint32)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type drawable-inline-array-collide-fragment
|
|
(defmethod inspect ((this drawable-inline-array-collide-fragment))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tid: ~D~%" (-> this id))
|
|
(format #t "~Tbsphere: ~`vector`P~%" (-> this bsphere))
|
|
(format #t "~Tlength: ~D~%" (-> this length))
|
|
(format #t "~Tdata[1] @ #x~X~%" (-> this data))
|
|
this
|
|
)
|
|
|
|
;; definition of type drawable-tree-collide-fragment
|
|
(deftype drawable-tree-collide-fragment (drawable-tree)
|
|
((data-override drawable-inline-array :overlay-at (-> data 0))
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|