mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 02:06:59 -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>
58 lines
1.1 KiB
Common Lisp
58 lines
1.1 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: predator-h.gc
|
|
;; name in dgo: predator-h
|
|
;; dgos: FOR
|
|
|
|
;; +++predator-node-flag
|
|
(defenum predator-node-flag
|
|
:type uint32
|
|
:bitfield #t
|
|
(taken)
|
|
(spawnable)
|
|
)
|
|
;; ---predator-node-flag
|
|
|
|
|
|
;; +++predator-edge-flag
|
|
(defenum predator-edge-flag
|
|
:type uint16
|
|
:bitfield #t
|
|
)
|
|
;; ---predator-edge-flag
|
|
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype predator-node (structure)
|
|
((position vector :inline)
|
|
(nav-mesh-id uint32)
|
|
(edge-index int16)
|
|
(edge-count int16)
|
|
(radius float)
|
|
(flags predator-node-flag)
|
|
(points uint32)
|
|
(pos-x float :overlay-at (-> position data 0))
|
|
(pos-y float :overlay-at (-> position data 1))
|
|
(pos-z float :overlay-at (-> position data 2))
|
|
)
|
|
)
|
|
|
|
|
|
(deftype predator-edge (structure)
|
|
((dest-node-id uint16)
|
|
(flags predator-edge-flag)
|
|
)
|
|
:pack-me
|
|
)
|
|
|
|
|
|
(deftype predator-graph (structure)
|
|
((node-count uint16)
|
|
(edge-count uint16)
|
|
(node (inline-array predator-node))
|
|
(edge (inline-array predator-edge))
|
|
)
|
|
)
|