mirror of
https://github.com/open-goal/jak-project
synced 2026-08-08 18:44:15 -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>
54 lines
2.0 KiB
Common Lisp
Vendored
Generated
54 lines
2.0 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type depth-cue-data
|
|
(deftype depth-cue-data (structure)
|
|
((data vector :inline)
|
|
(sharpness float :overlay-at (-> data x))
|
|
(alpha float :overlay-at (-> data y))
|
|
(distance float :overlay-at (-> data z))
|
|
(w float :overlay-at (-> data w))
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type depth-cue-data
|
|
(defmethod inspect ((this depth-cue-data))
|
|
(format #t "[~8x] ~A~%" this 'depth-cue-data)
|
|
(format #t "~Tdata: #<vector @ #x~X>~%" (-> this data))
|
|
(format #t "~Tsharpness: ~f~%" (-> this data x))
|
|
(format #t "~Talpha: ~f~%" (-> this data y))
|
|
(format #t "~Tdistance: ~f~%" (-> this data z))
|
|
(format #t "~Tw: ~f~%" (-> this data w))
|
|
this
|
|
)
|
|
|
|
;; definition of type depth-cue-work
|
|
(deftype depth-cue-work (structure)
|
|
((texture-strip-tmpl dma-gif-packet :inline)
|
|
(temp-strip-tmpl dma-gif-packet :inline)
|
|
(stencil-tmpl dma-gif-packet :inline)
|
|
(clear-color vector4w :inline)
|
|
(set-color vector4w :inline)
|
|
(draw-color vector4w :inline)
|
|
(depth depth-cue-data)
|
|
(front depth-cue-data)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type depth-cue-work
|
|
(defmethod inspect ((this depth-cue-work))
|
|
(format #t "[~8x] ~A~%" this 'depth-cue-work)
|
|
(format #t "~Ttexture-strip-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this texture-strip-tmpl))
|
|
(format #t "~Ttemp-strip-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this temp-strip-tmpl))
|
|
(format #t "~Tstencil-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this stencil-tmpl))
|
|
(format #t "~Tclear-color: #<vector4w @ #x~X>~%" (-> this clear-color))
|
|
(format #t "~Tset-color: #<vector4w @ #x~X>~%" (-> this set-color))
|
|
(format #t "~Tdraw-color: #<vector4w @ #x~X>~%" (-> this draw-color))
|
|
(format #t "~Tdepth: #<depth-cue-data @ #x~X>~%" (-> this depth))
|
|
(format #t "~Tfront: #<depth-cue-data @ #x~X>~%" (-> this front))
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|