mirror of
https://github.com/open-goal/jak-project
synced 2026-08-09 02:49:19 -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>
88 lines
2.1 KiB
Common Lisp
88 lines
2.1 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: wind-h.gc
|
|
;; name in dgo: wind-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype wind-vector (structure)
|
|
((wind-pos vector4w :inline)
|
|
(wind-vel vector4w :inline)
|
|
(stiffness float :overlay-at (-> wind-vel data 3))
|
|
)
|
|
)
|
|
|
|
|
|
(define *wind-scales* (new 'static 'boxed-array :type uint8
|
|
#x2
|
|
#x5
|
|
#x2
|
|
#x3
|
|
#x2
|
|
#x2
|
|
#x3
|
|
#x10
|
|
#xa
|
|
#x2
|
|
#x4
|
|
#x2
|
|
#x8
|
|
#x2
|
|
#x2
|
|
#x10
|
|
#x2
|
|
#x2
|
|
#x8
|
|
#x2
|
|
#x10
|
|
#x2
|
|
#x4
|
|
#x10
|
|
#xa
|
|
#x2
|
|
#x4
|
|
#x2
|
|
#x8
|
|
#x2
|
|
#x2
|
|
#x10
|
|
)
|
|
)
|
|
|
|
(deftype wind-work (basic)
|
|
((wind-array vector 64 :inline)
|
|
(wind-normal vector :inline)
|
|
(wind-temp vector :inline)
|
|
(wind-force float 64)
|
|
(wind-const vector :inline)
|
|
(wind-time uint32)
|
|
(wait-to-vu0 uint32)
|
|
(wait-to-spr uint32)
|
|
(wait-from-spr uint32)
|
|
(spr-index uint32)
|
|
(count uint32)
|
|
(next-count uint32)
|
|
(last-count uint32)
|
|
(to-spr uint32)
|
|
(from-spr uint32)
|
|
(next-mem uint32)
|
|
(last-mem uint32)
|
|
(next-spr uint32)
|
|
(last-spr uint32)
|
|
(to-ptrs uint32 3)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype wind-dma (structure)
|
|
((buffer0 wind-vector 128 :inline)
|
|
(buffer1 wind-vector 128 :inline)
|
|
(buffer2 wind-vector 128 :inline)
|
|
)
|
|
)
|
|
|
|
;; DECOMP ENDS
|
|
(define-extern level-update-wind (function wind-work none))
|