mirror of
https://github.com/open-goal/jak-project
synced 2026-07-09 23:01:56 -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
1.5 KiB
Common Lisp
Vendored
Generated
54 lines
1.5 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type pov-camera
|
|
(deftype pov-camera (process-drawable)
|
|
((flags pov-camera-flag)
|
|
(debounce-start-time time-frame)
|
|
(notify-handle handle)
|
|
(anim-name string)
|
|
(command-list pair)
|
|
(mask-to-clear process-mask)
|
|
(music-volume-movie float)
|
|
(sfx-volume-movie float)
|
|
)
|
|
(:state-methods
|
|
pov-camera-abort
|
|
pov-camera-done-playing
|
|
pov-camera-playing
|
|
pov-camera-start-playing
|
|
pov-camera-startup
|
|
)
|
|
(:methods
|
|
(abort? (_type_) symbol :behavior pov-camera)
|
|
(target-grabbed? (_type_) symbol)
|
|
(pov-camera-method-27 () none)
|
|
(pov-camera-method-28 () none)
|
|
(target-released? (_type_) symbol)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type pov-camera
|
|
(defmethod inspect ((this pov-camera))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(let ((t9-0 (method-of-type process-drawable inspect)))
|
|
(t9-0 this)
|
|
)
|
|
(format #t "~2Tflags: ~D~%" (-> this flags))
|
|
(format #t "~2Tdebounce-start-time: ~D~%" (-> this debounce-start-time))
|
|
(format #t "~2Tnotify-handle: ~D~%" (-> this notify-handle))
|
|
(format #t "~2Tanim-name: ~A~%" (-> this anim-name))
|
|
(format #t "~2Tcommand-list: ~A~%" (-> this command-list))
|
|
(format #t "~2Tmask-to-clear: ~D~%" (-> this mask-to-clear))
|
|
(format #t "~2Tmusic-volume-movie: ~f~%" (-> this music-volume-movie))
|
|
(format #t "~2Tsfx-volume-movie: ~f~%" (-> this sfx-volume-movie))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|