mirror of
https://github.com/open-goal/jak-project
synced 2026-05-29 16:45:10 -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>
60 lines
1.4 KiB
Common Lisp
60 lines
1.4 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: simple-focus.gc
|
|
;; name in dgo: simple-focus
|
|
;; dgos: GAME, COMMON
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype simple-focus (process-focusable)
|
|
((first-time? symbol)
|
|
)
|
|
(:state-methods
|
|
idle
|
|
)
|
|
)
|
|
|
|
|
|
(defmethod get-trans ((this simple-focus) (arg0 int))
|
|
"@returns the `trans` [[vector]] from the process's `root` (typically either a [[trsqv]] or a [[collide-shape]])"
|
|
(-> this root trans)
|
|
)
|
|
|
|
(defmethod run-logic? ((this simple-focus))
|
|
(when (-> this first-time?)
|
|
(set! (-> this first-time?) #f)
|
|
#t
|
|
)
|
|
)
|
|
|
|
(defstate idle (simple-focus)
|
|
:virtual #t
|
|
:event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
|
|
(case message
|
|
(('move-trans)
|
|
(let ((v0-0 (-> self root trans)))
|
|
(set! (-> v0-0 quad) (-> (the-as vector (-> block param 0)) quad))
|
|
v0-0
|
|
)
|
|
)
|
|
)
|
|
)
|
|
:code sleep-code
|
|
)
|
|
|
|
;; WARN: Return type mismatch object vs none.
|
|
(defbehavior simple-focus-init-by-other simple-focus ()
|
|
"Initializes the new [[simple-focus]]. `first-time?` will be set to [[#t]]"
|
|
(let ((root (new 'process 'trsqv)))
|
|
(set! (-> self root) (the-as collide-shape root))
|
|
(vector-identity! (-> root scale))
|
|
(quaternion-identity! (-> root quat))
|
|
)
|
|
(logclear! (-> self mask) (process-mask enemy))
|
|
(set! (-> self first-time?) #t)
|
|
(set! (-> self event-hook) (-> (method-of-object self idle) event))
|
|
(go-virtual idle)
|
|
(none)
|
|
)
|