mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 20:56:09 -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>
124 lines
3.0 KiB
Common Lisp
Vendored
Generated
124 lines
3.0 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type consiteb-part
|
|
(deftype consiteb-part (part-spawner)
|
|
()
|
|
)
|
|
|
|
;; definition for method 3 of type consiteb-part
|
|
(defmethod inspect ((this consiteb-part))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(let ((t9-0 (method-of-type part-spawner inspect)))
|
|
(t9-0 this)
|
|
)
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpartgroup group-consiteb-hanging-light
|
|
:id 1184
|
|
:bounds (static-bspherem 0 0 0 5)
|
|
:parts ((sp-item 5112 :fade-after (meters 120) :flags (bit6)) (sp-item 5113 :fade-after (meters 120) :flags (bit6)))
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpart 5112
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:y (meters 0.25))
|
|
(:scale-x (meters 2) (meters 0.1))
|
|
(:rot-x (degrees 2.25))
|
|
(:rot-z (degrees -17))
|
|
(:scale-y :copy scale-x)
|
|
(:r 117.0)
|
|
(:g 80.0)
|
|
(:b 54.0)
|
|
(:a 48.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.017))
|
|
(:flags (glow))
|
|
(:userdata 3072.0)
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpart 5113
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:y (meters 0.25))
|
|
(:scale-x (meters 4) (meters 0.1))
|
|
(:rot-x (degrees 4.5))
|
|
(:rot-z (degrees -17))
|
|
(:scale-y :copy scale-x)
|
|
(:r 128.0)
|
|
(:g 96.0)
|
|
(:b 62.0)
|
|
(:a 8.0 8.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.017))
|
|
(:flags (glow))
|
|
(:userdata 3072.0)
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpartgroup group-consiteb-panel-red-light
|
|
:id 1185
|
|
:flags (unk-4 unk-6)
|
|
:bounds (static-bspherem 0 0 0 2)
|
|
:rotate ((degrees 90) (degrees 0) (degrees 0))
|
|
:parts ((sp-item 5114 :fade-after (meters 120) :flags (bit6 bit7) :period (seconds 1) :length (seconds 0.017)))
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpart 5114
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 0.25))
|
|
(:rot-x (degrees 2.25))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 0.0)
|
|
(:b 0.0)
|
|
(:a 32.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.417))
|
|
(:flags (sp-cpuinfo-flag-2 glow))
|
|
(:userdata 1024.0)
|
|
(:rotate-y (degrees 0))
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpartgroup group-consiteb-panel-blue-light
|
|
:id 1186
|
|
:flags (unk-4 unk-6)
|
|
:bounds (static-bspherem 0 0 0 2)
|
|
:rotate ((degrees 90) (degrees 0) (degrees 0))
|
|
:parts ((sp-item 5115 :fade-after (meters 120) :flags (bit6 bit7) :period (seconds 0.5) :length (seconds 0.017)))
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defpart 5115
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 0.25))
|
|
(:rot-x (degrees 2.25))
|
|
(:scale-y :copy scale-x)
|
|
(:r 0.0)
|
|
(:g 0.0)
|
|
(:b 255.0)
|
|
(:a 32.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.25))
|
|
(:flags (sp-cpuinfo-flag-2 glow))
|
|
(:userdata 1024.0)
|
|
(:rotate-y (degrees 0))
|
|
)
|
|
)
|