mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
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>
87 lines
1.7 KiB
Common Lisp
87 lines
1.7 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: mspace-h.gc
|
|
;; name in dgo: mspace-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
(declare-type cspace structure)
|
|
(define-extern cspace<-parented-transformq-joint! (function cspace transformq none))
|
|
(define-extern cspace<-transformq! (function cspace transformq matrix))
|
|
(define-extern matrix<-transformq! (function matrix transformq matrix))
|
|
(define-extern matrix<-parented-transformq! (function matrix transformq vector matrix))
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype joint (basic)
|
|
((name basic)
|
|
(number int32)
|
|
(parent joint)
|
|
(bind-pose matrix :inline)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype bone-cache (structure)
|
|
((bone-matrix uint32)
|
|
(parent-matrix uint32)
|
|
(dummy uint32)
|
|
(frame uint32)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype bone (structure)
|
|
((transform matrix :inline)
|
|
(position vector :inline :overlay-at (-> transform data 12))
|
|
(scale vector :inline)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype skeleton (inline-array-class)
|
|
((bones bone :inline :dynamic)
|
|
)
|
|
)
|
|
|
|
|
|
(set! (-> skeleton heap-base) (the-as uint 80))
|
|
|
|
(deftype cspace (structure)
|
|
((parent cspace)
|
|
(joint joint)
|
|
(joint-num int16)
|
|
(geo drawable)
|
|
(bone bone)
|
|
(param0 (function cspace transformq none))
|
|
(param1 basic)
|
|
(param2 basic)
|
|
)
|
|
(:methods
|
|
(new (symbol type drawable) _type_)
|
|
(reset-and-assign-geo! (_type_ drawable) _type_)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype cspace-array (inline-array-class)
|
|
((data cspace :inline :dynamic)
|
|
)
|
|
)
|
|
|
|
|
|
(set! (-> cspace-array heap-base) (the-as uint 32))
|
|
|
|
(defmethod print ((this cspace))
|
|
(format
|
|
#t
|
|
"#<cspace ~S @ #x~X>"
|
|
(if (-> this joint)
|
|
(-> this joint name)
|
|
"nojoint"
|
|
)
|
|
this
|
|
)
|
|
this
|
|
)
|