mirror of
https://github.com/open-goal/jak-project
synced 2026-07-29 15:44:03 -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>
151 lines
4.4 KiB
Common Lisp
151 lines
4.4 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: collide-touch-h.gc
|
|
;; name in dgo: collide-touch-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
(declare-type touching-shapes-entry structure)
|
|
(declare-type touching-prims-entry structure)
|
|
(define-extern get-intersect-point (function vector touching-prims-entry collide-shape touching-shapes-entry vector))
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype touching-prim (structure)
|
|
((cprim collide-shape-prim)
|
|
(has-tri? symbol)
|
|
(tri collide-tri-result :inline)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype touching-prims-entry (structure)
|
|
((next touching-prims-entry)
|
|
(prev touching-prims-entry)
|
|
(allocated? symbol)
|
|
(u float)
|
|
(prim1 touching-prim :inline)
|
|
(prim2 touching-prim :inline)
|
|
)
|
|
(:methods
|
|
(get-middle-of-bsphere-overlap (_type_ vector) vector)
|
|
(get-touched-prim (_type_ collide-shape touching-shapes-entry) collide-shape-prim)
|
|
(get-touched-tri (_type_ collide-shape touching-shapes-entry) collide-tri-result)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype touching-prims-entry-pool (structure)
|
|
((head touching-prims-entry)
|
|
(nodes touching-prims-entry 64 :inline)
|
|
)
|
|
(:methods
|
|
(new (symbol type) _type_)
|
|
(alloc-node (_type_) touching-prims-entry)
|
|
(get-free-node-count (_type_) int)
|
|
(init-list! (_type_) none)
|
|
(free-node (_type_ touching-prims-entry) touching-prims-entry)
|
|
)
|
|
)
|
|
|
|
|
|
(defmethod init-list! ((this touching-prims-entry-pool))
|
|
(let ((v1-0 (the-as touching-prims-entry #f)))
|
|
(let ((a1-0 (the-as touching-prims-entry (-> this nodes))))
|
|
(set! (-> this head) a1-0)
|
|
(countdown (a0-1 64)
|
|
(set! (-> a1-0 prev) v1-0)
|
|
(let ((a2-0 (&+ a1-0 240)))
|
|
(set! (-> a1-0 next) (the-as touching-prims-entry a2-0))
|
|
(set! (-> a1-0 allocated?) #f)
|
|
(set! v1-0 a1-0)
|
|
(set! a1-0 (the-as touching-prims-entry a2-0))
|
|
)
|
|
)
|
|
)
|
|
(set! (-> v1-0 next) #f)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
;; WARN: Return type mismatch structure vs touching-prims-entry-pool.
|
|
(defmethod new touching-prims-entry-pool ((allocation symbol) (type-to-make type))
|
|
(let ((t9-0 (method-of-type structure new))
|
|
(v1-1 type-to-make)
|
|
)
|
|
(-> type-to-make size)
|
|
(let ((gp-0 (t9-0 allocation v1-1)))
|
|
((method-of-type touching-prims-entry-pool init-list!) (the-as touching-prims-entry-pool gp-0))
|
|
(the-as touching-prims-entry-pool gp-0)
|
|
)
|
|
)
|
|
)
|
|
|
|
(deftype touching-shapes-entry (structure)
|
|
((cshape1 collide-shape)
|
|
(cshape2 collide-shape)
|
|
(resolve-u int8)
|
|
(head touching-prims-entry)
|
|
(handle1 handle)
|
|
(handle2 handle)
|
|
)
|
|
:pack-me
|
|
(:methods
|
|
(get-head (_type_) touching-prims-entry)
|
|
(get-next (_type_ touching-shapes-entry) touching-prims-entry)
|
|
(get-touched-shape (_type_ collide-shape) collide-shape)
|
|
(prims-touching? (_type_ collide-shape uint) touching-prims-entry)
|
|
(prims-touching-action? (_type_ collide-shape collide-action collide-action) basic)
|
|
(free-touching-prims-list (_type_) none)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype touching-list (structure)
|
|
((num-touching-shapes int32)
|
|
(resolve-u int8)
|
|
(touching-shapes touching-shapes-entry 32 :inline)
|
|
)
|
|
(:methods
|
|
(new (symbol type) _type_)
|
|
(add-touching-prims (_type_ collide-shape-prim collide-shape-prim float collide-tri-result collide-tri-result) none)
|
|
(free-nodes (_type_) none)
|
|
(update-from-step-size (_type_ float) none)
|
|
(send-events-for-touching-shapes (_type_) none)
|
|
(get-shapes-entry (_type_ collide-shape collide-shape) touching-shapes-entry)
|
|
)
|
|
)
|
|
|
|
|
|
;; WARN: Return type mismatch structure vs touching-list.
|
|
(defmethod new touching-list ((allocation symbol) (type-to-make type))
|
|
(let ((t9-0 (method-of-type structure new))
|
|
(v1-1 type-to-make)
|
|
)
|
|
(-> type-to-make size)
|
|
(let ((v0-0 (the-as touching-list (t9-0 allocation v1-1))))
|
|
(set! (-> v0-0 num-touching-shapes) 0)
|
|
(set! (-> v0-0 resolve-u) 0)
|
|
v0-0
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod get-head ((this touching-shapes-entry))
|
|
(-> this head)
|
|
)
|
|
|
|
;; WARN: Return type mismatch collide-shape vs touching-prims-entry.
|
|
(defmethod get-next ((this touching-shapes-entry) (arg0 touching-shapes-entry))
|
|
(the-as touching-prims-entry (-> arg0 cshape1))
|
|
)
|
|
|
|
(kmemopen global "collide-touching-lists")
|
|
|
|
(define-perm *touching-prims-entry-pool* touching-prims-entry-pool (new 'global 'touching-prims-entry-pool))
|
|
|
|
(define-perm *touching-list* touching-list (new 'global 'touching-list))
|
|
|
|
(kmemclose)
|