mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
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>
109 lines
2.8 KiB
Common Lisp
109 lines
2.8 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: drawable-group.gc
|
|
;; name in dgo: drawable-group
|
|
;; dgos: GAME, ENGINE
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defmethod new drawable-group ((allocation symbol) (type-to-make type) (arg0 int))
|
|
"Allocate a drawable-group with enough room for arg0 drawables"
|
|
(let ((v0-0 (object-new allocation type-to-make (the-as int (+ (-> type-to-make size) (* (+ arg0 -1) 4))))))
|
|
(set! (-> v0-0 length) arg0)
|
|
v0-0
|
|
)
|
|
)
|
|
|
|
(defmethod inspect drawable-group ((this drawable-group))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tid: ~D~%" (-> this id))
|
|
(format #t "~Tlength: ~D~%" (-> this length))
|
|
(format #t "~Tdata[~D]: @ #x~X~%" (-> this length) (-> this data))
|
|
(dotimes (s5-0 (-> this length))
|
|
(format #t "~T [~D] ~A~%" s5-0 (-> this data s5-0))
|
|
)
|
|
this
|
|
)
|
|
|
|
(defmethod print ((this drawable-group))
|
|
(format #t "#<~A @ #x~X [~D]" (-> this type) this (-> this length))
|
|
(dotimes (s5-0 (-> this length))
|
|
(format #t " ~A" (-> this data s5-0))
|
|
)
|
|
(format #t ">")
|
|
this
|
|
)
|
|
|
|
(defmethod length ((this drawable-group))
|
|
(-> this length)
|
|
)
|
|
|
|
(defmethod asize-of ((this drawable-group))
|
|
(the-as int (+ (-> drawable-group size) (* (+ (-> this length) -1) 4)))
|
|
)
|
|
|
|
(defmethod mem-usage ((this drawable-group) (arg0 memory-usage-block) (arg1 int))
|
|
(set! (-> arg0 length) (max 1 (-> arg0 length)))
|
|
(set! (-> arg0 data 0 name) "drawable-group")
|
|
(+! (-> arg0 data 0 count) 1)
|
|
(let ((v1-6 (asize-of this)))
|
|
(+! (-> arg0 data 0 used) v1-6)
|
|
(+! (-> arg0 data 0 total) (logand -16 (+ v1-6 15)))
|
|
)
|
|
(dotimes (s3-0 (-> this length))
|
|
(mem-usage (-> this data s3-0) arg0 arg1)
|
|
)
|
|
this
|
|
)
|
|
|
|
(defmethod login ((this drawable-group))
|
|
(dotimes (s5-0 (-> this length))
|
|
(login (-> this data s5-0))
|
|
)
|
|
this
|
|
)
|
|
|
|
(defmethod draw ((this drawable-group) (arg0 drawable-group) (arg1 display-frame))
|
|
(when (vis-cull (-> this id))
|
|
(when (sphere-cull (-> this bsphere))
|
|
(dotimes (s3-0 (-> this length))
|
|
(draw (-> this data s3-0) (-> arg0 data s3-0) arg1)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod collect-stats ((this drawable-group))
|
|
(when (vis-cull (-> this id))
|
|
(when (sphere-cull (-> this bsphere))
|
|
(dotimes (s5-0 (-> this length))
|
|
(collect-stats (-> this data s5-0))
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod debug-draw ((this drawable-group) (arg0 drawable) (arg1 display-frame))
|
|
(when (vis-cull (-> this id))
|
|
(when (sphere-cull (-> this bsphere))
|
|
(dotimes (s3-0 (-> this length))
|
|
(debug-draw (-> this data s3-0) (-> (the-as drawable-group arg0) data s3-0) arg1)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod unpack-vis ((this drawable-group) (arg0 (pointer int8)) (arg1 (pointer int8)))
|
|
(dotimes (s4-0 (-> this length))
|
|
(set! arg1 (unpack-vis (-> this data s4-0) arg0 arg1))
|
|
)
|
|
arg1
|
|
)
|