mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -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>
92 lines
2.4 KiB
Common Lisp
92 lines
2.4 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: lights-h.gc
|
|
;; name in dgo: lights-h
|
|
;; dgos: GAME, ENGINE
|
|
|
|
;; It seems like some of these are unused.
|
|
;; The commonly used lights are vu-lights and light-group.
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
;; this type represents the lights that can be sent to the VU for merc (and maybe generic?) rendering.
|
|
;; it contains 3 directional lights and an ambient light.
|
|
;; Note that the data is transposed to be faster for use in the VU code.
|
|
;; the w components are unused for lighting information - you can put whatever you want in them...
|
|
(deftype vu-lights (structure)
|
|
((direction vector 3 :inline)
|
|
(color vector 3 :inline)
|
|
(ambient vector :inline)
|
|
)
|
|
)
|
|
|
|
;; a single directional 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))
|
|
)
|
|
)
|
|
|
|
;; unused?
|
|
(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))
|
|
)
|
|
)
|
|
|
|
;; This likely doesn't work correctly in both GOAL and OpenGOAL
|
|
;; unused?
|
|
(deftype light-array (array)
|
|
()
|
|
)
|
|
|
|
;; unused?
|
|
(deftype light-volume (basic)
|
|
((light-array light-array)
|
|
)
|
|
)
|
|
|
|
;; unused?
|
|
(deftype light-volume-sphere (light-volume)
|
|
((bsphere sphere :inline)
|
|
)
|
|
)
|
|
|
|
;; unused?
|
|
(deftype light-volume-planes (light-volume)
|
|
((planes vertical-planes)
|
|
)
|
|
)
|
|
|
|
;; unused?
|
|
(deftype light-volume-array (array)
|
|
()
|
|
)
|
|
|
|
|
|
(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
|
|
)
|
|
|
|
;; the primary light type, used before conversion to vu-lights.
|
|
(deftype light-group (structure)
|
|
((dir0 light :inline)
|
|
(dir1 light :inline)
|
|
(dir2 light :inline)
|
|
(ambi light :inline)
|
|
(lights light 4 :inline :overlay-at dir0)
|
|
)
|
|
)
|