mirror of
https://github.com/open-goal/jak-project
synced 2026-05-28 00:16:20 -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>
79 lines
2.4 KiB
Common Lisp
Vendored
Generated
79 lines
2.4 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type dynamics
|
|
(deftype dynamics (basic)
|
|
((name symbol)
|
|
(gravity-max meters)
|
|
(gravity-length meters)
|
|
(gravity vector :inline)
|
|
(gravity-normal vector :inline)
|
|
(walk-distance meters)
|
|
(run-distance meters)
|
|
)
|
|
(:methods
|
|
(set-gravity-length (_type_ float) none)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type dynamics
|
|
(defmethod inspect ((this dynamics))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~1Tname: ~A~%" (-> this name))
|
|
(format #t "~1Tgravity-max: (meters ~m)~%" (-> this gravity-max))
|
|
(format #t "~1Tgravity-length: (meters ~m)~%" (-> this gravity-length))
|
|
(format #t "~1Tgravity: ~`vector`P~%" (-> this gravity))
|
|
(format #t "~1Tgravity-normal: ~`vector`P~%" (-> this gravity-normal))
|
|
(format #t "~1Twalk-distance: (meters ~m)~%" (-> this walk-distance))
|
|
(format #t "~1Trun-distance: (meters ~m)~%" (-> this run-distance))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; definition for method 9 of type dynamics
|
|
;; WARN: Return type mismatch int vs none.
|
|
(defmethod set-gravity-length ((this dynamics) (arg0 float))
|
|
(set! (-> this gravity-length) arg0)
|
|
(vector-float*! (-> this gravity) (-> this gravity-normal) arg0)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
;; definition for function time-to-apex
|
|
(defun time-to-apex ((arg0 float) (arg1 float))
|
|
(the int (/ arg0 (- (* 0.0033333334 arg1))))
|
|
)
|
|
|
|
;; definition for function time-to-ground
|
|
(defun time-to-ground ((arg0 float) (arg1 float) (arg2 float))
|
|
(let ((f0-0 0.0)
|
|
(v0-0 0)
|
|
)
|
|
(while (< (- arg2) f0-0)
|
|
(set! arg0 (- arg0 (* 0.0033333334 arg1)))
|
|
(+! f0-0 (* 0.0033333334 arg0))
|
|
(+! v0-0 1)
|
|
)
|
|
v0-0
|
|
)
|
|
)
|
|
|
|
;; definition for symbol *standard-dynamics*, type dynamics
|
|
(define *standard-dynamics* (new 'static 'dynamics
|
|
:name 'standard
|
|
:gravity-max (meters 40)
|
|
:gravity-length (meters 60)
|
|
:gravity (new 'static 'vector :y 245760.0 :w 1.0)
|
|
:gravity-normal (new 'static 'vector :y 1.0 :w 1.0)
|
|
:walk-distance (meters 2)
|
|
:run-distance (meters 5)
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|