mirror of
https://github.com/open-goal/jak-project
synced 2026-07-11 15:28:58 -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>
72 lines
1.6 KiB
Common Lisp
72 lines
1.6 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: aligner-h.gc
|
|
;; name in dgo: aligner-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
(defenum align-flags
|
|
:bitfield #t
|
|
:type uint32
|
|
(disabled) ;; keep object velocity
|
|
(af01)
|
|
(af02)
|
|
(af03)
|
|
(af04)
|
|
(af05)
|
|
)
|
|
|
|
(defenum align-opts
|
|
:bitfield #t
|
|
:type uint32
|
|
(adjust-x-vel)
|
|
(adjust-y-vel)
|
|
(adjust-xz-vel)
|
|
(keep-other-velocities)
|
|
(adjust-quat) ;; 16
|
|
(alop0)
|
|
(alop1)
|
|
(alop2)
|
|
(alop3)
|
|
(alop4)
|
|
(alop5)
|
|
(no-gravity)
|
|
(ignore-y-if-zero)
|
|
)
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype align-control (basic)
|
|
((flags align-flags)
|
|
(process process-drawable)
|
|
(frame-group art-joint-anim)
|
|
(frame-num float)
|
|
(matrix matrix 2 :inline)
|
|
(transform transform 2 :inline)
|
|
(delta transformq :inline)
|
|
(last-speed meters)
|
|
(align transformq :inline :overlay-at (-> transform 0 trans data 0))
|
|
)
|
|
(:methods
|
|
(new (symbol type process) _type_)
|
|
(compute-alignment! (_type_) transformq)
|
|
(align! (_type_ align-opts float float float) trsqv)
|
|
(align-vel-and-quat-only! (_type_ align-opts vector int float float) trsqv :behavior process)
|
|
(first-transform (_type_) transform)
|
|
(second-transform (_type_) transform)
|
|
)
|
|
)
|
|
|
|
|
|
;; WARN: Return type mismatch object vs align-control.
|
|
(defmethod new align-control ((allocation symbol) (type-to-make type) (arg0 process))
|
|
(let ((this (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
|
|
(when (zero? this)
|
|
(go process-drawable-art-error "memory")
|
|
(return (the-as align-control 0))
|
|
)
|
|
(set! (-> this process) (the-as process-drawable arg0))
|
|
(the-as align-control this)
|
|
)
|
|
)
|