mirror of
https://github.com/open-goal/jak-project
synced 2026-08-04 17:19:49 -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>
37 lines
1.2 KiB
Common Lisp
37 lines
1.2 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: background-h.gc
|
|
;; name in dgo: background-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
;; NOTE : the limits here seem arbitrary and must be increased if you add more levels.
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype background-work (basic)
|
|
((tfrag-tree-count int32)
|
|
(tfrag-trees drawable-tree-tfrag 8)
|
|
(tfrag-levels level 8)
|
|
(tfrag-trans-tree-count int32)
|
|
(tfrag-trans-trees drawable-tree-tfrag-trans 8)
|
|
(tfrag-trans-levels level 8)
|
|
(tfrag-water-tree-count int32)
|
|
(tfrag-water-trees drawable-tree-tfrag-water 8)
|
|
(tfrag-water-levels level 8)
|
|
(shrub-tree-count int32)
|
|
(shrub-trees drawable-tree-instance-shrub 8)
|
|
(shrub-levels level 8)
|
|
(tie-tree-count int32)
|
|
(tie-trees drawable-tree-instance-tie 8)
|
|
(tie-levels level 8)
|
|
(tie-generic basic 8)
|
|
(tie-generic-trans basic 8)
|
|
(wait-to-vu0 uint32)
|
|
)
|
|
)
|
|
|
|
;; DECOMP ENDS
|
|
|
|
(define-extern *background-work* background-work)
|