mirror of
https://github.com/open-goal/jak-project
synced 2026-06-22 00:56:36 -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>
77 lines
2.7 KiB
Common Lisp
Vendored
Generated
77 lines
2.7 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type mud
|
|
(deftype mud (water-anim)
|
|
()
|
|
)
|
|
|
|
;; definition for method 3 of type mud
|
|
(defmethod inspect ((this mud))
|
|
(let ((t9-0 (method-of-type water-anim inspect)))
|
|
(t9-0 this)
|
|
)
|
|
this
|
|
)
|
|
|
|
;; definition for symbol ripple-for-mud, type ripple-wave-set
|
|
(define ripple-for-mud (new 'static 'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 1.0
|
|
:wave (new 'static 'inline-array ripple-wave 4
|
|
(new 'static 'ripple-wave :scale 40.0 :xdiv 1 :speed 1.5)
|
|
(new 'static 'ripple-wave :scale 40.0 :xdiv -1 :zdiv 1 :speed 1.5)
|
|
(new 'static 'ripple-wave :scale 20.0 :xdiv 5 :zdiv 3 :speed 0.75)
|
|
(new 'static 'ripple-wave)
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition for symbol ripple-for-small-mud, type ripple-wave-set
|
|
(define ripple-for-small-mud (new 'static 'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 1.0
|
|
:wave (new 'static 'inline-array ripple-wave 4
|
|
(new 'static 'ripple-wave :scale 20.0 :xdiv 2 :speed 0.5)
|
|
(new 'static 'ripple-wave :scale 20.0 :xdiv -2 :zdiv 2 :speed 0.5)
|
|
(new 'static 'ripple-wave :scale 20.0 :xdiv 5 :zdiv 3 :speed 0.75)
|
|
(new 'static 'ripple-wave)
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition for method 22 of type mud
|
|
;; INFO: Return type mismatch ripple-wave-set vs none.
|
|
(defmethod water-vol-method-22 ((this mud))
|
|
(let ((t9-0 (method-of-type water-anim water-vol-method-22)))
|
|
(t9-0 this)
|
|
)
|
|
(logclear! (-> this flags) (water-flags wt23))
|
|
(logior! (-> this flags) (water-flags wt18))
|
|
(let ((gp-0 (new 'process 'ripple-control)))
|
|
(set! (-> this draw ripple) gp-0)
|
|
(set! (-> gp-0 global-scale) 3072.0)
|
|
(set! (-> gp-0 waveform) ripple-for-mud)
|
|
(let ((v1-9 (res-lump-data (-> this entity) 'water-anim-fade-dist (pointer float))))
|
|
(when v1-9
|
|
(set! (-> gp-0 close-fade-dist) (-> v1-9 0))
|
|
(set! (-> gp-0 far-fade-dist) (-> v1-9 1))
|
|
)
|
|
)
|
|
(case (-> this look)
|
|
((21 25 29)
|
|
(set! (-> gp-0 close-fade-dist) 4096000000.0)
|
|
(set! (-> gp-0 far-fade-dist) 8192000000.0)
|
|
)
|
|
)
|
|
(case (-> this look)
|
|
((22 25 24 27 26 31)
|
|
(set! (-> gp-0 waveform) ripple-for-small-mud)
|
|
)
|
|
)
|
|
)
|
|
(none)
|
|
)
|