mirror of
https://github.com/open-goal/jak-project
synced 2026-06-10 04:54:31 -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>
101 lines
4.1 KiB
Common Lisp
Vendored
Generated
101 lines
4.1 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type camera-bank
|
|
(deftype camera-bank (basic)
|
|
((collide-move-rad float)
|
|
(joypad uint32)
|
|
(min-detectable-velocity float)
|
|
(attack-timeout time-frame)
|
|
(default-string-max-y meters)
|
|
(default-string-min-y meters)
|
|
(default-string-max-z meters)
|
|
(default-string-min-z meters)
|
|
(default-string-push-z meters)
|
|
(default-tilt-adjust degrees)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type camera-bank
|
|
(defmethod inspect ((this camera-bank))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~1Tcollide-move-rad: ~f~%" (-> this collide-move-rad))
|
|
(format #t "~1Tjoypad: ~D~%" (-> this joypad))
|
|
(format #t "~1Tmin-detectable-velocity: ~f~%" (-> this min-detectable-velocity))
|
|
(format #t "~1Tattack-timeout: ~D~%" (-> this attack-timeout))
|
|
(format #t "~1Tdefault-string-max-y: (meters ~m)~%" (-> this default-string-max-y))
|
|
(format #t "~1Tdefault-string-min-y: (meters ~m)~%" (-> this default-string-min-y))
|
|
(format #t "~1Tdefault-string-max-z: (meters ~m)~%" (-> this default-string-max-z))
|
|
(format #t "~1Tdefault-string-min-z: (meters ~m)~%" (-> this default-string-min-z))
|
|
(format #t "~1Tdefault-string-push-z: (meters ~m)~%" (-> this default-string-push-z))
|
|
(format #t "~1Tdefault-tilt-adjust: (deg ~r)~%" (-> this default-tilt-adjust))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition for symbol *CAMERA-bank*, type camera-bank
|
|
(define *CAMERA-bank* (new 'static 'camera-bank
|
|
:collide-move-rad 1638.4
|
|
:min-detectable-velocity 40.96
|
|
:attack-timeout (seconds 0.25)
|
|
:default-string-max-y (meters 3)
|
|
:default-string-min-y (meters 1)
|
|
:default-string-max-z (meters 12.5)
|
|
:default-string-min-z (meters 5)
|
|
:default-string-push-z (meters 10)
|
|
:default-tilt-adjust (degrees -6.5000005)
|
|
)
|
|
)
|
|
|
|
;; definition of type camera-master-bank
|
|
(deftype camera-master-bank (basic)
|
|
((onscreen-head-height meters)
|
|
(onscreen-foot-height meters)
|
|
(target-height meters)
|
|
(up-move-to-pitch-ratio-in-air float)
|
|
(down-move-to-pitch-ratio-in-air float)
|
|
(up-move-to-pitch-on-ground float)
|
|
(down-move-to-pitch-on-ground float)
|
|
(pitch-off-blend float)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type camera-master-bank
|
|
(defmethod inspect ((this camera-master-bank))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~1Tonscreen-head-height: (meters ~m)~%" (-> this onscreen-head-height))
|
|
(format #t "~1Tonscreen-foot-height: (meters ~m)~%" (-> this onscreen-foot-height))
|
|
(format #t "~1Ttarget-height: (meters ~m)~%" (-> this target-height))
|
|
(format #t "~1Tup-move-to-pitch-ratio-in-air: ~f~%" (-> this up-move-to-pitch-ratio-in-air))
|
|
(format #t "~1Tdown-move-to-pitch-ratio-in-air: ~f~%" (-> this down-move-to-pitch-ratio-in-air))
|
|
(format #t "~1Tup-move-to-pitch-on-ground: ~f~%" (-> this up-move-to-pitch-on-ground))
|
|
(format #t "~1Tdown-move-to-pitch-on-ground: ~f~%" (-> this down-move-to-pitch-on-ground))
|
|
(format #t "~1Tpitch-off-blend: ~f~%" (-> this pitch-off-blend))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition for symbol *CAMERA_MASTER-bank*, type camera-master-bank
|
|
(define *CAMERA_MASTER-bank* (new 'static 'camera-master-bank
|
|
:onscreen-head-height (meters 2.65)
|
|
:onscreen-foot-height (meters -0.5)
|
|
:target-height (meters 2.15)
|
|
:up-move-to-pitch-ratio-in-air 1.0
|
|
:down-move-to-pitch-ratio-in-air 0.5
|
|
:up-move-to-pitch-on-ground 0.9
|
|
:down-move-to-pitch-on-ground 0.9
|
|
:pitch-off-blend 0.5
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|