mirror of
https://github.com/open-goal/jak-project
synced 2026-07-10 23:22:17 -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>
62 lines
2.0 KiB
Common Lisp
62 lines
2.0 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: res-h.gc
|
|
;; name in dgo: res-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
;; the indices of two res tags. If the specific key-frame time is in between two
|
|
;; res-tags, this type is used to return the indices of the first res tag before and after
|
|
;; the specified time.
|
|
(deftype res-tag-pair (uint64)
|
|
((lo int32 :offset 0)
|
|
(hi int32 :offset 32)
|
|
)
|
|
;; made-up type
|
|
)
|
|
|
|
(define-extern *res-static-buf* pointer)
|
|
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype res-tag (uint128)
|
|
((name symbol :offset 0 :size 32)
|
|
(key-frame float :offset 32 :size 32)
|
|
(elt-type type :offset 64 :size 32)
|
|
(data-offset uint16 :offset 96 :size 16)
|
|
(elt-count uint32 :offset 112 :size 15)
|
|
(inlined? uint8 :offset 127 :size 1)
|
|
)
|
|
)
|
|
|
|
(deftype res-lump (basic)
|
|
((length int32)
|
|
(allocated-length int32)
|
|
(data-base pointer)
|
|
(data-top pointer)
|
|
(data-size int32)
|
|
(extra entity-links)
|
|
(tag (pointer res-tag))
|
|
)
|
|
(:methods
|
|
(new (symbol type int int) _type_)
|
|
(get-property-data (_type_ symbol symbol float pointer (pointer res-tag) pointer) pointer :no-virtual)
|
|
(get-property-struct (_type_ symbol symbol float structure (pointer res-tag) pointer) structure :no-virtual)
|
|
(get-property-value (_type_ symbol symbol float uint128 (pointer res-tag) pointer) uint128 :no-virtual)
|
|
(get-property-value-float (_type_ symbol symbol float float (pointer res-tag) pointer) float :no-virtual)
|
|
(get-tag-index-data (_type_ int) pointer)
|
|
(get-tag-data (_type_ res-tag) pointer)
|
|
(allocate-data-memory-for-tag! (_type_ res-tag) res-tag)
|
|
(sort! (_type_) _type_)
|
|
(add-data! (_type_ res-tag pointer) res-lump)
|
|
(add-32bit-data! (_type_ res-tag object) res-lump)
|
|
(lookup-tag-idx (_type_ symbol symbol float) res-tag-pair :no-virtual)
|
|
(make-property-data (_type_ float res-tag-pair pointer) pointer)
|
|
(get-curve-data! (_type_ curve symbol symbol float) symbol)
|
|
)
|
|
)
|
|
|
|
|
|
(define *res-key-string* (new 'global 'string 64 (the-as string #f)))
|