mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -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>
60 lines
2 KiB
Common Lisp
60 lines
2 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: drawable-h.gc
|
|
;; name in dgo: drawable-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
(declare-type region-prim-list structure)
|
|
(declare-type collide-list structure)
|
|
(declare-type collide-query structure)
|
|
|
|
;; NOTE - for sparticle-launcher and editable
|
|
(define-extern sphere-in-view-frustum? (function sphere symbol))
|
|
|
|
;; NOTE - for default-menu
|
|
(define-extern *edit-instance* string)
|
|
(declare-type prototype-bucket basic)
|
|
(define-extern find-instance-by-name (function string prototype-bucket))
|
|
(define-extern prototype-bucket-type (function prototype-bucket type))
|
|
(define-extern print-prototype-list (function none))
|
|
(define-extern prototype-bucket-recalc-fields (function prototype-bucket prototype-bucket))
|
|
(define-extern determine-pause-mode (function int))
|
|
(define-extern vis-cull (function int symbol))
|
|
(define-extern sphere-cull (function vector symbol))
|
|
|
|
(define-extern drawable-tri-count (function drawable int)) ;; NOTE - defined in kernel?
|
|
(declare-type debug-vertex-stats basic)
|
|
(define-extern drawable-vertex-ratio (function drawable debug-vertex-stats int)) ;; NOTE - defined in kernel?
|
|
|
|
(declare-type draw-control basic)
|
|
(define-extern add-process-drawable (function process-drawable draw-control symbol dma-buffer none))
|
|
(define-extern dma-add-process-drawable (function process-drawable draw-control symbol dma-buffer none))
|
|
|
|
;; gun
|
|
(define-extern line-in-view-frustum? (function vector vector symbol))
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype drawable (basic)
|
|
((id int16)
|
|
(bsphere vector :inline)
|
|
)
|
|
(:methods
|
|
(login (_type_) _type_)
|
|
(draw (_type_ _type_ display-frame) none)
|
|
(fill-collide-list-from-box (_type_ int collide-list collide-query) int)
|
|
(fill-collide-list-from-line-sphere (_type_ int collide-list collide-query) int)
|
|
(collect-stats (_type_) none)
|
|
(debug-draw (_type_ drawable display-frame) none)
|
|
(unpack-vis (_type_ (pointer int8) (pointer int8)) (pointer int8))
|
|
(collect-regions (_type_ sphere int region-prim-list) none)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype drawable-error (drawable)
|
|
((name string)
|
|
)
|
|
)
|