mirror of
https://github.com/open-goal/jak-project
synced 2026-06-09 20:50:55 -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>
105 lines
3.6 KiB
Common Lisp
Vendored
Generated
105 lines
3.6 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type chain-physics-setup
|
|
(deftype chain-physics-setup (structure)
|
|
((joint-index int32)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type chain-physics-setup
|
|
(defmethod inspect ((this chain-physics-setup))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'chain-physics-setup)
|
|
(format #t "~1Tjoint-index: ~D~%" (-> this joint-index))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition of type chain-physics-joint
|
|
(deftype chain-physics-joint (structure)
|
|
((position vector :inline)
|
|
(velocity vector :inline)
|
|
(old-x vector :inline)
|
|
(joint-mod joint-mod)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type chain-physics-joint
|
|
(defmethod inspect ((this chain-physics-joint))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'chain-physics-joint)
|
|
(format #t "~1Tposition: #<vector @ #x~X>~%" (-> this position))
|
|
(format #t "~1Tvelocity: #<vector @ #x~X>~%" (-> this velocity))
|
|
(format #t "~1Told-x: #<vector @ #x~X>~%" (-> this old-x))
|
|
(format #t "~1Tjoint-mod: ~A~%" (-> this joint-mod))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition of type chain-physics
|
|
(deftype chain-physics (basic)
|
|
((chain-joints chain-physics-joint 20 :inline)
|
|
(num-joints uint8)
|
|
(root-joint-index uint8)
|
|
(joint-length float)
|
|
(gravity vector :inline)
|
|
(gravity-target vector :inline)
|
|
(stretch-vel float)
|
|
(stretch-vel-parallel float)
|
|
(compress-vel float)
|
|
(compress-vel-parallel float)
|
|
(negate-y symbol)
|
|
(axial-slop float)
|
|
(maximum-stretch float)
|
|
(turn-off-start time-frame)
|
|
(turn-off-duration time-frame)
|
|
)
|
|
(:methods
|
|
(initialize-chain-joints (_type_) symbol)
|
|
(turn-off (_type_ time-frame) none :behavior process)
|
|
(update (_type_ process-drawable) none :behavior process)
|
|
(gravity-update (_type_ process-drawable) none)
|
|
(apply-gravity (_type_ vector int process-drawable) none :behavior process)
|
|
(chain-physics-method-14 (_type_ vector int) none)
|
|
(clamp-length (_type_ vector vector object process-drawable) vector)
|
|
(chain-physics-method-16 (_type_ int) float)
|
|
(chain-physics-method-17 (_type_ vector int) none)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type chain-physics
|
|
(defmethod inspect ((this chain-physics))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~1Tchain-joints[20] @ #x~X~%" (-> this chain-joints))
|
|
(format #t "~1Tnum-joints: ~D~%" (-> this num-joints))
|
|
(format #t "~1Troot-joint-index: ~D~%" (-> this root-joint-index))
|
|
(format #t "~1Tjoint-length: ~f~%" (-> this joint-length))
|
|
(format #t "~1Tgravity: #<vector @ #x~X>~%" (-> this gravity))
|
|
(format #t "~1Tgravity-target: #<vector @ #x~X>~%" (-> this gravity-target))
|
|
(format #t "~1Tstretch-vel: ~f~%" (-> this stretch-vel))
|
|
(format #t "~1Tstretch-vel-parallel: ~f~%" (-> this stretch-vel-parallel))
|
|
(format #t "~1Tcompress-vel: ~f~%" (-> this compress-vel))
|
|
(format #t "~1Tcompress-vel-parallel: ~f~%" (-> this compress-vel-parallel))
|
|
(format #t "~1Tnegate-y: ~A~%" (-> this negate-y))
|
|
(format #t "~1Taxial-slop: ~f~%" (-> this axial-slop))
|
|
(format #t "~1Tmaximum-stretch: ~f~%" (-> this maximum-stretch))
|
|
(format #t "~1Tturn-off-start: ~D~%" (-> this turn-off-start))
|
|
(format #t "~1Tturn-off-duration: ~D~%" (-> this turn-off-duration))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|