mirror of
https://github.com/open-goal/jak-project
synced 2026-07-29 23:49:11 -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>
102 lines
2.9 KiB
Common Lisp
102 lines
2.9 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: collide-frag.gc
|
|
;; name in dgo: collide-frag
|
|
;; dgos: ENGINE, GAME
|
|
|
|
#|@file
|
|
Note: this is probably not used in jak 2 - this is the old tree-based background collision stuff.
|
|
|#
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defmethod login ((this drawable-tree-collide-fragment))
|
|
this
|
|
)
|
|
|
|
(defmethod draw ((this drawable-tree-collide-fragment) (arg0 drawable-tree-collide-fragment) (arg1 display-frame))
|
|
(when *display-render-collision*
|
|
(dotimes (s4-0 (-> this length))
|
|
(draw (-> this data s4-0) (-> this data s4-0) arg1)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod unpack-vis ((this drawable-tree-collide-fragment) (arg0 (pointer int8)) (arg1 (pointer int8)))
|
|
arg1
|
|
)
|
|
|
|
;; WARN: Return type mismatch int vs collide-fragment.
|
|
(defmethod mem-usage ((this collide-fragment) (arg0 memory-usage-block) (arg1 int))
|
|
(let ((s5-0 (if (logtest? arg1 1)
|
|
54
|
|
50
|
|
)
|
|
)
|
|
(s4-0 (-> this mesh))
|
|
)
|
|
(set! (-> arg0 data s5-0 name) (symbol->string 'collide-fragment))
|
|
(+! (-> arg0 data s5-0 count) 1)
|
|
(let ((v1-11 (+ (asize-of this) (asize-of s4-0))))
|
|
(+! (-> arg0 data s5-0 used) v1-11)
|
|
(+! (-> arg0 data s5-0 total) (logand -16 (+ v1-11 15)))
|
|
)
|
|
(set! (-> arg0 data (+ s5-0 1) name) "collision-poly")
|
|
(+! (-> arg0 data (+ s5-0 1) count) (-> s4-0 poly-count))
|
|
(let ((v1-22 (+ (-> s4-0 strip-data-len) (-> s4-0 poly-count))))
|
|
(+! (-> arg0 data (+ s5-0 1) used) v1-22)
|
|
(+! (-> arg0 data (+ s5-0 1) total) v1-22)
|
|
)
|
|
(set! (-> arg0 data (+ s5-0 2) name) "collision-vertex")
|
|
(+! (-> arg0 data (+ s5-0 2) count) (-> s4-0 vertex-count))
|
|
(let ((v1-31 (* (-> s4-0 vertex-data-qwc) 16)))
|
|
(+! (-> arg0 data (+ s5-0 2) used) v1-31)
|
|
(let ((v0-2 (+ (-> arg0 data (+ s5-0 2) total) v1-31)))
|
|
(set! (-> arg0 data (+ s5-0 2) total) v0-2)
|
|
(the-as collide-fragment v0-2)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod login ((this drawable-inline-array-collide-fragment))
|
|
this
|
|
)
|
|
|
|
(defmethod draw ((this collide-fragment) (arg0 collide-fragment) (arg1 display-frame))
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod draw ((this drawable-inline-array-collide-fragment)
|
|
(arg0 drawable-inline-array-collide-fragment)
|
|
(arg1 display-frame)
|
|
)
|
|
(dotimes (s4-0 (-> this length))
|
|
(let ((s3-0 (-> this data s4-0)))
|
|
(if (sphere-cull (-> s3-0 bsphere))
|
|
(draw s3-0 s3-0 arg1)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod mem-usage ((this drawable-inline-array-collide-fragment) (arg0 memory-usage-block) (arg1 int))
|
|
(set! (-> arg0 length) (max 1 (-> arg0 length)))
|
|
(set! (-> arg0 data 0 name) (symbol->string 'drawable-group))
|
|
(+! (-> arg0 data 0 count) 1)
|
|
(let ((v1-7 32))
|
|
(+! (-> arg0 data 0 used) v1-7)
|
|
(+! (-> arg0 data 0 total) (logand -16 (+ v1-7 15)))
|
|
)
|
|
(dotimes (s3-0 (-> this length))
|
|
(mem-usage (-> this data s3-0) arg0 arg1)
|
|
)
|
|
this
|
|
)
|