mirror of
https://github.com/open-goal/jak-project
synced 2026-07-11 07:25:37 -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>
210 lines
5.3 KiB
Common Lisp
Vendored
Generated
210 lines
5.3 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type pat-surface
|
|
(deftype pat-surface (uint32)
|
|
((skip uint8 :offset 0 :size 3)
|
|
(mode pat-mode :offset 3 :size 3)
|
|
(material pat-material :offset 6 :size 6)
|
|
(camera uint8 :offset 12 :size 2)
|
|
(event pat-event :offset 14 :size 6)
|
|
(noentity uint8 :offset 0 :size 1)
|
|
(nocamera uint8 :offset 1 :size 1)
|
|
(noedge uint8 :offset 2 :size 1)
|
|
(nolineofsight uint8 :offset 12 :size 1)
|
|
(unknown-bit uint8 :offset 15 :size 1)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type pat-surface
|
|
(defmethod inspect ((this pat-surface))
|
|
(format #t "[~8x] ~A~%" this 'pat-surface)
|
|
(format #t "~Tskip: ~D~%" (-> this skip))
|
|
(format #t "~Tmode: ~D~%" (-> this mode))
|
|
(format #t "~Tmaterial: ~D~%" (-> this material))
|
|
(format #t "~Tcamera: ~D~%" (-> this camera))
|
|
(format #t "~Tevent: ~D~%" (-> this event))
|
|
(format #t "~Tnoentity: ~D~%" (-> this noentity))
|
|
(format #t "~Tnocamera: ~D~%" (-> this nocamera))
|
|
(format #t "~Tnoedge: ~D~%" (-> this noedge))
|
|
(format #t "~Tnolineofsight: ~D~%" (-> this nolineofsight))
|
|
this
|
|
)
|
|
|
|
;; definition (debug) for function pat-material->string
|
|
(defun-debug pat-material->string ((arg0 pat-surface))
|
|
(case (-> arg0 material)
|
|
(((pat-material neutral))
|
|
"neutral"
|
|
)
|
|
(((pat-material rotate))
|
|
"rotate"
|
|
)
|
|
(((pat-material stopproj))
|
|
"stopproj"
|
|
)
|
|
(((pat-material swamp))
|
|
"swamp"
|
|
)
|
|
(((pat-material tube))
|
|
"tube"
|
|
)
|
|
(((pat-material straw))
|
|
"straw"
|
|
)
|
|
(((pat-material metal))
|
|
"metal"
|
|
)
|
|
(((pat-material dirt))
|
|
"dirt"
|
|
)
|
|
(((pat-material gravel))
|
|
"gravel"
|
|
)
|
|
(((pat-material crwood))
|
|
"crwood"
|
|
)
|
|
(((pat-material lava))
|
|
"lava"
|
|
)
|
|
(((pat-material hotcoals))
|
|
"hotcoals"
|
|
)
|
|
(((pat-material deepsnow))
|
|
"deepsnow"
|
|
)
|
|
(((pat-material snow))
|
|
"snow"
|
|
)
|
|
(((pat-material pcmetal))
|
|
"pcmetal"
|
|
)
|
|
(((pat-material grass))
|
|
"grass"
|
|
)
|
|
(((pat-material wood))
|
|
"wood"
|
|
)
|
|
(((pat-material sand))
|
|
"sand"
|
|
)
|
|
(((pat-material tar))
|
|
"tar"
|
|
)
|
|
(((pat-material waterbottom))
|
|
"waterbottom"
|
|
)
|
|
(((pat-material quicksand))
|
|
"quicksand"
|
|
)
|
|
(((pat-material ice))
|
|
"ice"
|
|
)
|
|
(((pat-material stone))
|
|
"stone"
|
|
)
|
|
(else
|
|
"*unknown*"
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition (debug) for function pat-mode->string
|
|
(defun-debug pat-mode->string ((arg0 pat-surface))
|
|
(case (-> arg0 mode)
|
|
(((pat-mode obstacle))
|
|
"obstacle"
|
|
)
|
|
(((pat-mode wall))
|
|
"wall"
|
|
)
|
|
(((pat-mode ground))
|
|
"ground"
|
|
)
|
|
(else
|
|
"*unknown*"
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition (debug) for function pat-event->string
|
|
(defun-debug pat-event->string ((arg0 pat-surface))
|
|
(case (-> arg0 event)
|
|
(((pat-event melt))
|
|
"melt"
|
|
)
|
|
(((pat-event burnup))
|
|
"burnup"
|
|
)
|
|
(((pat-event deadlyup))
|
|
"deadlyup"
|
|
)
|
|
(((pat-event burn))
|
|
"burn"
|
|
)
|
|
(((pat-event endlessfall))
|
|
"endlessfall"
|
|
)
|
|
(((pat-event deadly))
|
|
"deadly"
|
|
)
|
|
(((pat-event none))
|
|
"none"
|
|
)
|
|
(else
|
|
"*unknown*"
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition of type pat-mode-info
|
|
(deftype pat-mode-info (structure)
|
|
((name string)
|
|
(wall-angle float)
|
|
(color rgba)
|
|
(hilite-color rgba)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type pat-mode-info
|
|
(defmethod inspect ((this pat-mode-info))
|
|
(format #t "[~8x] ~A~%" this 'pat-mode-info)
|
|
(format #t "~Tname: ~A~%" (-> this name))
|
|
(format #t "~Twall-angle: ~f~%" (-> this wall-angle))
|
|
(format #t "~Tcolor: ~D~%" (-> this color))
|
|
(format #t "~Thilite-color: ~D~%" (-> this hilite-color))
|
|
this
|
|
)
|
|
|
|
;; definition for symbol *pat-mode-info*, type (inline-array pat-mode-info)
|
|
(define *pat-mode-info* (new 'static 'inline-array pat-mode-info 4
|
|
(new 'static 'pat-mode-info
|
|
:name "ground"
|
|
:wall-angle 0.2
|
|
:color (new 'static 'rgba :r #x7f :a #x40)
|
|
:hilite-color (new 'static 'rgba :r #xff :a #x80)
|
|
)
|
|
(new 'static 'pat-mode-info
|
|
:name "wall"
|
|
:wall-angle 2.0
|
|
:color (new 'static 'rgba :b #x7f :a #x40)
|
|
:hilite-color (new 'static 'rgba :b #xff :a #x80)
|
|
)
|
|
(new 'static 'pat-mode-info
|
|
:name "obstacle"
|
|
:wall-angle 0.82
|
|
:color (new 'static 'rgba :r #x7f :b #x7f :a #x40)
|
|
:hilite-color (new 'static 'rgba :r #xff :b #xff :a #x80)
|
|
)
|
|
(new 'static 'pat-mode-info
|
|
:name "pole"
|
|
:wall-angle 2.0
|
|
:color (new 'static 'rgba :r #x7f :g #x7f :a #x40)
|
|
:hilite-color (new 'static 'rgba :r #xff :g #xff :a #x80)
|
|
)
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|