mirror of
https://github.com/open-goal/jak-project
synced 2026-06-12 13:35:39 -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>
93 lines
3.4 KiB
Common Lisp
Vendored
Generated
93 lines
3.4 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type vehicle-controls
|
|
(deftype vehicle-controls (structure)
|
|
((steering float)
|
|
(throttle float)
|
|
(brake float)
|
|
(lean-z float)
|
|
)
|
|
:pack-me
|
|
)
|
|
|
|
;; definition for method 3 of type vehicle-controls
|
|
(defmethod inspect ((this vehicle-controls))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'vehicle-controls)
|
|
(format #t "~1Tsteering: ~f~%" (-> this steering))
|
|
(format #t "~1Tthrottle: ~f~%" (-> this throttle))
|
|
(format #t "~1Tbrake: ~f~%" (-> this brake))
|
|
(format #t "~1Tlean-z: ~f~%" (-> this lean-z))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition of type pilot-info
|
|
(deftype pilot-info (basic)
|
|
((entity basic)
|
|
(vehicle handle)
|
|
(left-right-interp float)
|
|
(front-back-interp float)
|
|
(up-down-interp float)
|
|
(up-down-accel-factor float)
|
|
(front-back-accel-factor float)
|
|
(left-right-accel-factor float)
|
|
(stance uint8)
|
|
(seat-index int8)
|
|
(backup-nav-radius float)
|
|
(cam-side-shift float)
|
|
(enable-cam-side-shift symbol)
|
|
(gun? symbol)
|
|
(controls vehicle-controls :inline)
|
|
(accel-array vector 8 :inline)
|
|
(local-accel vector :inline)
|
|
(pilot-trans vector :inline)
|
|
(pilot-quat vector :inline)
|
|
(pilot-scale vector :inline)
|
|
(pilot-time time-frame)
|
|
(as-daxter? symbol)
|
|
(art-group-backup basic)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type pilot-info
|
|
(defmethod inspect ((this pilot-info))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~1Tentity: ~A~%" (-> this entity))
|
|
(format #t "~1Tvehicle: #x~X~%" (-> this vehicle))
|
|
(format #t "~1Tleft-right-interp: ~f~%" (-> this left-right-interp))
|
|
(format #t "~1Tfront-back-interp: ~f~%" (-> this front-back-interp))
|
|
(format #t "~1Tup-down-interp: ~f~%" (-> this up-down-interp))
|
|
(format #t "~1Tup-down-accel-factor: ~f~%" (-> this up-down-accel-factor))
|
|
(format #t "~1Tfront-back-accel-factor: ~f~%" (-> this front-back-accel-factor))
|
|
(format #t "~1Tleft-right-accel-factor: ~f~%" (-> this left-right-accel-factor))
|
|
(format #t "~1Tstance: ~D~%" (-> this stance))
|
|
(format #t "~1Tseat-index: ~D~%" (-> this seat-index))
|
|
(format #t "~1Tbackup-nav-radius: ~f~%" (-> this backup-nav-radius))
|
|
(format #t "~1Tcam-side-shift: ~f~%" (-> this cam-side-shift))
|
|
(format #t "~1Tenable-cam-side-shift: ~A~%" (-> this enable-cam-side-shift))
|
|
(format #t "~1Tgun?: ~A~%" (-> this gun?))
|
|
(format #t "~1Tcontrols: #<vehicle-controls @ #x~X>~%" (-> this controls))
|
|
(format #t "~1Taccel-array: ~`vector`P~%" (-> this accel-array))
|
|
(format #t "~1Tlocal-accel: ~`vector`P~%" (-> this local-accel))
|
|
(format #t "~1Tpilot-trans: ~`vector`P~%" (-> this pilot-trans))
|
|
(format #t "~1Tpilot-quat: ~`vector`P~%" (-> this pilot-quat))
|
|
(format #t "~1Tpilot-scale: ~`vector`P~%" (-> this pilot-scale))
|
|
(format #t "~1Tpilot-time: ~D~%" (-> this pilot-time))
|
|
(format #t "~1Tas-daxter?: ~A~%" (-> this as-daxter?))
|
|
(format #t "~1Tart-group-backup: ~A~%" (-> this art-group-backup))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|