mirror of
https://github.com/open-goal/jak-project
synced 2026-08-08 10:34:30 -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>
176 lines
5.2 KiB
Common Lisp
Vendored
Generated
176 lines
5.2 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type vu-lights
|
|
(deftype vu-lights (structure)
|
|
((direction vector 3 :inline)
|
|
(color vector 3 :inline)
|
|
(ambient vector :inline)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type vu-lights
|
|
(defmethod inspect ((this vu-lights))
|
|
(format #t "[~8x] ~A~%" this 'vu-lights)
|
|
(format #t "~Tdirection[3] @ #x~X~%" (-> this direction))
|
|
(format #t "~Tcolor[3] @ #x~X~%" (-> this color))
|
|
(format #t "~Tambient: ~`vector`P~%" (-> this ambient))
|
|
this
|
|
)
|
|
|
|
;; definition of type light
|
|
(deftype light (structure)
|
|
((direction vector :inline)
|
|
(color rgbaf :inline)
|
|
(levels vector :inline)
|
|
(level float :overlay-at (-> levels x))
|
|
(sort-level float :overlay-at (-> levels y))
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type light
|
|
(defmethod inspect ((this light))
|
|
(format #t "[~8x] ~A~%" this 'light)
|
|
(format #t "~Tdirection: #<vector @ #x~X>~%" (-> this direction))
|
|
(format #t "~Tcolor: #<rgbaf @ #x~X>~%" (-> this color))
|
|
(format #t "~Tlevels: #<vector @ #x~X>~%" (-> this levels))
|
|
(format #t "~Tlevel: ~f~%" (-> this levels x))
|
|
(format #t "~Tsort-level: ~f~%" (-> this levels y))
|
|
this
|
|
)
|
|
|
|
;; definition of type light-ellipse
|
|
(deftype light-ellipse (structure)
|
|
((matrix matrix :inline)
|
|
(color rgbaf :inline)
|
|
(name basic :overlay-at (-> matrix data 3))
|
|
(decay-start float :overlay-at (-> matrix data 7))
|
|
(ambient-point-ratio float :overlay-at (-> matrix data 11))
|
|
(level float :overlay-at (-> matrix data 15))
|
|
(func-symbol basic :overlay-at (-> color a))
|
|
(func basic :overlay-at (-> color a))
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type light-ellipse
|
|
(defmethod inspect ((this light-ellipse))
|
|
(format #t "[~8x] ~A~%" this 'light-ellipse)
|
|
(format #t "~Tmatrix: #<matrix @ #x~X>~%" (-> this matrix))
|
|
(format #t "~Tcolor: #<rgbaf @ #x~X>~%" (-> this color))
|
|
(format #t "~Tname: ~A~%" (-> this matrix vector 0 w))
|
|
(format #t "~Tdecay-start: ~f~%" (-> this matrix vector 1 w))
|
|
(format #t "~Tambient-point-ratio: ~f~%" (-> this matrix vector 2 w))
|
|
(format #t "~Tlevel: ~f~%" (-> this matrix vector 3 w))
|
|
(format #t "~Tfunc-symbol: ~A~%" (-> this color w))
|
|
(format #t "~Tfunc: ~A~%" (-> this color w))
|
|
this
|
|
)
|
|
|
|
;; definition of type light-array
|
|
(deftype light-array (array)
|
|
()
|
|
)
|
|
|
|
;; definition for method 3 of type light-array
|
|
(defmethod inspect ((this light-array))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Ttype: ~A~%" (-> this type))
|
|
(format #t "~Tlength: ~D~%" (-> this length))
|
|
(format #t "~Tallocated-length: ~D~%" (-> this allocated-length))
|
|
(format #t "~Tcontent-type: ~A~%" (-> this content-type))
|
|
this
|
|
)
|
|
|
|
;; definition of type light-volume
|
|
(deftype light-volume (basic)
|
|
((light-array light-array)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type light-volume
|
|
(defmethod inspect ((this light-volume))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tlight-array: ~A~%" (-> this light-array))
|
|
this
|
|
)
|
|
|
|
;; definition of type light-volume-sphere
|
|
(deftype light-volume-sphere (light-volume)
|
|
((bsphere sphere :inline)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type light-volume-sphere
|
|
(defmethod inspect ((this light-volume-sphere))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tlight-array: ~A~%" (-> this light-array))
|
|
(format #t "~Tbsphere: #<sphere @ #x~X>~%" (-> this bsphere))
|
|
this
|
|
)
|
|
|
|
;; definition of type light-volume-planes
|
|
(deftype light-volume-planes (light-volume)
|
|
((planes vertical-planes)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type light-volume-planes
|
|
(defmethod inspect ((this light-volume-planes))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tlight-array: ~A~%" (-> this light-array))
|
|
(format #t "~Tplanes: #<vertical-planes @ #x~X>~%" (-> this planes))
|
|
this
|
|
)
|
|
|
|
;; definition of type light-volume-array
|
|
(deftype light-volume-array (array)
|
|
()
|
|
)
|
|
|
|
;; definition for method 3 of type light-volume-array
|
|
(defmethod inspect ((this light-volume-array))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Ttype: ~A~%" (-> this type))
|
|
(format #t "~Tlength: ~D~%" (-> this length))
|
|
(format #t "~Tallocated-length: ~D~%" (-> this allocated-length))
|
|
(format #t "~Tcontent-type: ~A~%" (-> this content-type))
|
|
this
|
|
)
|
|
|
|
;; definition for method 2 of type light
|
|
(defmethod print ((this light))
|
|
(format
|
|
#t
|
|
"#<light [~F] ~F ~F ~F "
|
|
(-> this levels x)
|
|
(-> this direction x)
|
|
(-> this direction y)
|
|
(-> this direction z)
|
|
)
|
|
(format #t "~F ~F ~F @ #x~X>" (-> this color x) (-> this color y) (-> this color z) this)
|
|
this
|
|
)
|
|
|
|
;; definition of type light-group
|
|
(deftype light-group (structure)
|
|
((dir0 light :inline)
|
|
(dir1 light :inline)
|
|
(dir2 light :inline)
|
|
(ambi light :inline)
|
|
(lights light 4 :inline :overlay-at dir0)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type light-group
|
|
(defmethod inspect ((this light-group))
|
|
(format #t "[~8x] ~A~%" this 'light-group)
|
|
(format #t "~Tdir0: ~`light`P~%" (-> this dir0))
|
|
(format #t "~Tdir1: ~`light`P~%" (-> this dir1))
|
|
(format #t "~Tdir2: ~`light`P~%" (-> this dir2))
|
|
(format #t "~Tambi: ~`light`P~%" (-> this ambi))
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|