mirror of
https://github.com/open-goal/jak-project
synced 2026-07-10 15:14:15 -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>
89 lines
1.8 KiB
Common Lisp
89 lines
1.8 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: effect-control-h.gc
|
|
;; name in dgo: effect-control-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
(defenum effect-control-flag
|
|
:type uint32
|
|
:bitfield #t
|
|
(ecf0)
|
|
(ecf1)
|
|
(ecf2)
|
|
(ecf3)
|
|
(ecf4)
|
|
(ecf5)
|
|
(ecf6)
|
|
(ecf7)
|
|
(ecf8)
|
|
(ecf9)
|
|
(ecf10)
|
|
(ecf11)
|
|
(ecf12)
|
|
(ecf13)
|
|
(ecf14)
|
|
(ecf15)
|
|
(ecf16)
|
|
(ecf17)
|
|
(ecf18)
|
|
(ecf19)
|
|
(ecf20)
|
|
(ecf21)
|
|
(ecf22)
|
|
(ecf23)
|
|
(ecf24)
|
|
(ecf25)
|
|
(ecf26)
|
|
(ecf27)
|
|
(ecf28)
|
|
(ecf29)
|
|
(ecf30)
|
|
(ecf31)
|
|
)
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype effect-control (basic)
|
|
((process process-drawable)
|
|
(flags effect-control-flag)
|
|
(last-frame-group art-joint-anim)
|
|
(last-frame-num float)
|
|
(channel-offset int32)
|
|
(res res-lump)
|
|
(name (pointer res-tag))
|
|
(param uint32)
|
|
)
|
|
(:methods
|
|
(new (symbol type process-drawable) _type_)
|
|
(update-effects (_type_) none)
|
|
(do-effect (_type_ symbol float int) none)
|
|
(do-effect-for-surface (_type_ symbol float int basic pat-surface) none)
|
|
(play-effect-sound (_type_ symbol float int basic sound-name) int)
|
|
(set-channel-offset! (_type_ int) none)
|
|
(play-effects-from-res-lump (_type_ float float float) none)
|
|
)
|
|
)
|
|
|
|
|
|
(defmethod new effect-control ((allocation symbol) (type-to-make type) (arg0 process-drawable))
|
|
(cond
|
|
((res-lump-struct (-> arg0 draw jgeo extra) 'effect-name structure)
|
|
(let ((v0-1 (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
|
|
(set! (-> v0-1 process) arg0)
|
|
(set! (-> v0-1 last-frame-group) #f)
|
|
v0-1
|
|
)
|
|
)
|
|
(else
|
|
(the-as effect-control #f)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod set-channel-offset! ((this effect-control) (arg0 int))
|
|
(set! (-> this channel-offset) arg0)
|
|
0
|
|
(none)
|
|
)
|