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>
295 lines
10 KiB
Common Lisp
295 lines
10 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: cylinder.gc
|
|
;; name in dgo: cylinder
|
|
;; dgos: GAME, ENGINE
|
|
|
|
;; Note: "cylinder" refers to a capsule, "cylinder-flat" refers to a real cylinder with end caps.
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defmethod ray-capsule-intersect ((this cylinder) (probe-origin vector) (probe-dir vector))
|
|
"Intersect a ray with a capsule."
|
|
(let ((t2-0 (new 'stack-no-clear 'vector))
|
|
(end-pt (new 'stack-no-clear 'vector))
|
|
)
|
|
;; first intersect with the cylinder part.
|
|
(let ((result (ray-cylinder-intersect
|
|
probe-origin
|
|
probe-dir
|
|
(-> this origin)
|
|
(-> this axis)
|
|
(-> this radius)
|
|
(-> this length)
|
|
t2-0
|
|
)
|
|
)
|
|
)
|
|
;; next, intersect with the sphere at the origin.
|
|
(let ((u-origin-sph (ray-sphere-intersect probe-origin probe-dir (-> this origin) (-> this radius))))
|
|
;; if that was closer, we went through both the sphere and the wall, and we want the sphere.
|
|
(if (and (>= u-origin-sph 0.0) (or (< result 0.0) (< u-origin-sph result)))
|
|
(set! result u-origin-sph)
|
|
)
|
|
)
|
|
;; compute the location of the other end's sphere's origin
|
|
(vector+float*! end-pt (-> this origin) (-> this axis) (-> this length))
|
|
;; intersect that
|
|
(let ((u-end-sphere (ray-sphere-intersect probe-origin probe-dir end-pt (-> this radius))))
|
|
;; and pick it if it's closer.
|
|
(if (and (>= u-end-sphere 0.0) (or (< result 0.0) (< u-end-sphere result)))
|
|
(set! result u-end-sphere)
|
|
)
|
|
)
|
|
result
|
|
)
|
|
)
|
|
)
|
|
|
|
;; This is used to hold vertices for debug-drawing cylinders.
|
|
(deftype cylinder-verts (structure)
|
|
((vert vector 24 :inline)
|
|
)
|
|
)
|
|
|
|
|
|
(defmethod debug-draw ((this cylinder) (arg0 vector4w))
|
|
"Debug draw a cylinder. This is slow and ugly"
|
|
(local-vars
|
|
(sv-896 matrix)
|
|
(sv-912 int)
|
|
(sv-928 (function vector vector vector float vector))
|
|
(sv-944 vector)
|
|
(sv-960 vector)
|
|
(sv-976 vector)
|
|
(sv-992 (function vector vector vector float vector))
|
|
(sv-1008 vector)
|
|
(sv-1024 vector)
|
|
(sv-1040 vector)
|
|
(sv-1056 (function vector vector vector float vector))
|
|
(sv-1072 vector)
|
|
(sv-1088 vector)
|
|
(sv-1104 vector)
|
|
(sv-1120 (function vector vector vector float vector))
|
|
(sv-1136 vector)
|
|
(sv-1152 vector)
|
|
(sv-1168 vector)
|
|
)
|
|
(rlet ((vf0 :class vf)
|
|
(vf4 :class vf)
|
|
(vf5 :class vf)
|
|
(vf6 :class vf)
|
|
)
|
|
(init-vf0-vector)
|
|
(let ((s1-0 (new 'stack-no-clear 'vector))
|
|
(s0-0 (new 'stack-no-clear 'vector))
|
|
)
|
|
(if (< 0.999 (fabs (-> this axis y)))
|
|
(vector-cross! s1-0 (-> this axis) (new 'static 'vector :z 1.0))
|
|
(vector-cross! s1-0 (-> this axis) (new 'static 'vector :y 1.0))
|
|
)
|
|
(vector-normalize! s1-0 (-> this radius))
|
|
(vector-float*! s0-0 (-> this axis) (* 0.125 (-> this length)))
|
|
(let ((s5-0 (new 'stack-no-clear 'cylinder-verts))
|
|
(s4-0 (new 'stack-no-clear 'cylinder-verts))
|
|
(s3-0 (new 'stack-no-clear 'matrix))
|
|
)
|
|
(matrix-axis-angle! s3-0 (-> this axis) 4096.0)
|
|
(set! sv-896 (new 'stack-no-clear 'matrix))
|
|
(vector-matrix*! (the-as vector sv-896) (-> this origin) s3-0)
|
|
(let ((v1-5 (-> s3-0 vector 3)))
|
|
(.lvf vf4 (&-> (-> this origin) quad))
|
|
(.lvf vf5 (&-> sv-896 vector 0 quad))
|
|
(.mov.vf vf6 vf0 :mask #b1000)
|
|
(.sub.vf vf6 vf4 vf5 :mask #b111)
|
|
(.svf (&-> v1-5 quad) vf6)
|
|
)
|
|
(set! sv-912 0)
|
|
(while (< sv-912 8)
|
|
(vector+! (-> s5-0 vert (+ sv-912 8)) (-> this origin) s1-0)
|
|
(vector+float*! (-> s5-0 vert (+ sv-912 8)) (-> s5-0 vert (+ sv-912 8)) s0-0 (the float sv-912))
|
|
(set! sv-912 (+ sv-912 1))
|
|
)
|
|
(dotimes (s0-1 8)
|
|
(set! sv-928 vector+float*!)
|
|
(set! sv-944 (-> s5-0 vert s0-1))
|
|
(set! sv-960 (-> this origin))
|
|
(set! sv-976 s1-0)
|
|
(let ((a3-1 (cos (* 2048.0 (the float (- 7 s0-1))))))
|
|
(sv-928 sv-944 sv-960 sv-976 a3-1)
|
|
)
|
|
(set! sv-992 vector+float*!)
|
|
(set! sv-1008 (-> s5-0 vert s0-1))
|
|
(set! sv-1024 (-> s5-0 vert s0-1))
|
|
(set! sv-1040 (-> this axis))
|
|
(let ((a3-2 (* (- (-> this radius)) (sin (* 2048.0 (the float (- 7 s0-1)))))))
|
|
(sv-992 sv-1008 sv-1024 sv-1040 a3-2)
|
|
)
|
|
(set! sv-1056 vector+float*!)
|
|
(set! sv-1072 (-> s5-0 vert (+ s0-1 16)))
|
|
(set! sv-1088 (-> this origin))
|
|
(set! sv-1104 s1-0)
|
|
(let ((a3-3 (cos (* 2048.0 (the float s0-1)))))
|
|
(sv-1056 sv-1072 sv-1088 sv-1104 a3-3)
|
|
)
|
|
(set! sv-1120 vector+float*!)
|
|
(set! sv-1136 (-> s5-0 vert (+ s0-1 16)))
|
|
(set! sv-1152 (-> s5-0 vert (+ s0-1 16)))
|
|
(set! sv-1168 (-> this axis))
|
|
(let ((a3-4 (+ (-> this length) (* (-> this radius) (sin (* 2048.0 (the float s0-1)))))))
|
|
(sv-1120 sv-1136 sv-1152 sv-1168 a3-4)
|
|
)
|
|
)
|
|
(dotimes (s2-1 16)
|
|
(dotimes (s1-1 24)
|
|
(vector-matrix*! (-> s4-0 vert s1-1) (-> s5-0 vert s1-1) s3-0)
|
|
(camera-line (-> s5-0 vert s1-1) (-> s4-0 vert s1-1) arg0)
|
|
(if (nonzero? s1-1)
|
|
(camera-line (-> s5-0 vert s1-1) (-> s5-0 vert (+ s1-1 -1)) arg0)
|
|
)
|
|
)
|
|
(let ((v1-77 s5-0))
|
|
(set! s5-0 s4-0)
|
|
(set! s4-0 v1-77)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
)
|
|
|
|
(defun ray-arbitrary-circle-intersect ((probe-origin vector) (probe-dir vector) (circle-origin vector) (circle-normal vector) (radius float))
|
|
"Intersect a ray with a non-axis-aligned circle."
|
|
(let* ((v1-1 (vector-! (new 'stack-no-clear 'vector) circle-origin probe-origin)) ;; circle -> probe offset
|
|
(f0-2 (/ (vector-dot v1-1 circle-normal) (vector-dot probe-dir circle-normal)))
|
|
)
|
|
(cond
|
|
((or (< 1.0 f0-2) (< f0-2 0.0))
|
|
-100000000.0
|
|
)
|
|
((let ((a0-7 (new 'stack-no-clear 'vector)))
|
|
(vector-float*! a0-7 probe-dir f0-2)
|
|
(vector-! a0-7 a0-7 v1-1)
|
|
(< (vector-dot a0-7 a0-7) (* radius radius))
|
|
)
|
|
f0-2
|
|
)
|
|
(else
|
|
-100000000.0
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod ray-flat-cyl-intersect ((this cylinder-flat) (probe-origin vector) (probe-dir vector))
|
|
"Intersect with a real cylinder."
|
|
(let ((gp-0 (new 'stack-no-clear 'vector))
|
|
(end-pt (new 'stack-no-clear 'vector))
|
|
)
|
|
0.0
|
|
0.0
|
|
;; walls
|
|
(let ((result (ray-cylinder-intersect
|
|
probe-origin
|
|
probe-dir
|
|
(-> this origin)
|
|
(-> this axis)
|
|
(-> this radius)
|
|
(-> this length)
|
|
gp-0
|
|
)
|
|
)
|
|
)
|
|
;; one end cap
|
|
(let ((u-origin-circle
|
|
(ray-arbitrary-circle-intersect probe-origin probe-dir (-> this origin) (-> this axis) (-> this radius))
|
|
)
|
|
)
|
|
(when (and (>= u-origin-circle 0.0) (or (< result 0.0) (< u-origin-circle result)))
|
|
(set! result u-origin-circle)
|
|
(set! (-> gp-0 quad) (-> this origin quad))
|
|
)
|
|
)
|
|
;; get other end cap
|
|
(vector+float*! end-pt (-> this origin) (-> this axis) (-> this length))
|
|
(let ((u-end-circle (ray-arbitrary-circle-intersect probe-origin probe-dir end-pt (-> this axis) (-> this radius)))
|
|
)
|
|
(when (and (>= u-end-circle 0.0) (or (< result 0.0) (< u-end-circle result)))
|
|
(set! result u-end-circle)
|
|
(set! (-> gp-0 quad) (-> end-pt quad))
|
|
)
|
|
)
|
|
result
|
|
)
|
|
)
|
|
)
|
|
|
|
;; debug draw for cylinder flat.
|
|
(deftype cylinder-flat-verts (structure)
|
|
((vert vector 10 :inline)
|
|
)
|
|
)
|
|
|
|
|
|
(defmethod debug-draw ((this cylinder-flat) (arg0 vector4w))
|
|
(local-vars (sv-448 vector) (sv-464 int))
|
|
(rlet ((vf0 :class vf)
|
|
(vf4 :class vf)
|
|
(vf5 :class vf)
|
|
(vf6 :class vf)
|
|
)
|
|
(init-vf0-vector)
|
|
(let ((s1-0 (new 'stack-no-clear 'vector))
|
|
(s0-0 (new 'stack-no-clear 'vector))
|
|
)
|
|
(if (< 0.999 (fabs (-> this axis y)))
|
|
(vector-cross! s1-0 (-> this axis) (new 'static 'vector :z 1.0))
|
|
(vector-cross! s1-0 (-> this axis) (new 'static 'vector :y 1.0))
|
|
)
|
|
(vector-normalize! s1-0 (-> this radius))
|
|
(vector-float*! s0-0 (-> this axis) (* 0.14285715 (-> this length)))
|
|
(let ((s5-0 (new 'stack-no-clear 'cylinder-flat-verts))
|
|
(s4-0 (new 'stack-no-clear 'cylinder-flat-verts))
|
|
(s3-0 (new 'stack-no-clear 'matrix))
|
|
)
|
|
(matrix-axis-angle! s3-0 (-> this axis) 4096.0)
|
|
(set! sv-448 (new 'stack-no-clear 'vector))
|
|
(vector-matrix*! sv-448 (-> this origin) s3-0)
|
|
(let ((v1-5 (-> s3-0 vector 3)))
|
|
(.lvf vf4 (&-> (-> this origin) quad))
|
|
(.lvf vf5 (&-> sv-448 quad))
|
|
(.mov.vf vf6 vf0 :mask #b1000)
|
|
(.sub.vf vf6 vf4 vf5 :mask #b111)
|
|
(.svf (&-> v1-5 quad) vf6)
|
|
)
|
|
(set! sv-464 0)
|
|
(while (< sv-464 8)
|
|
(vector+! (-> s5-0 vert (+ sv-464 1)) (-> this origin) s1-0)
|
|
(vector+float*! (-> s5-0 vert (+ sv-464 1)) (-> s5-0 vert (+ sv-464 1)) s0-0 (the float sv-464))
|
|
(set! sv-464 (+ sv-464 1))
|
|
)
|
|
(set! (-> s5-0 vert 0 quad) (-> this origin quad))
|
|
(vector+float*! (-> s5-0 vert 9) (-> this origin) (-> this axis) (-> this length))
|
|
(dotimes (s2-1 16)
|
|
(dotimes (s1-1 10)
|
|
(vector-matrix*! (-> s4-0 vert s1-1) (-> s5-0 vert s1-1) s3-0)
|
|
(camera-line (-> s5-0 vert s1-1) (-> s4-0 vert s1-1) arg0)
|
|
(if (nonzero? s1-1)
|
|
(camera-line (-> s5-0 vert s1-1) (-> s5-0 vert (+ s1-1 -1)) arg0)
|
|
)
|
|
)
|
|
(let ((v1-43 s5-0))
|
|
(set! s5-0 s4-0)
|
|
(set! s4-0 v1-43)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
)
|