mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -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>
478 lines
18 KiB
Common Lisp
478 lines
18 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: path.gc
|
|
;; name in dgo: path
|
|
;; dgos: ENGINE, GAME
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defmethod debug-draw ((this path-control))
|
|
(cond
|
|
((logtest? (-> this flags) (path-control-flag not-found))
|
|
(when (and (type? (-> this process) process-drawable) *display-entity-errors*)
|
|
(let ((s5-0 add-debug-text-3d)
|
|
(s4-0 #t)
|
|
(s3-0 318)
|
|
)
|
|
(format (clear *temp-string*) "path data error in ~S" (-> this process name))
|
|
(s5-0
|
|
s4-0
|
|
(the-as bucket-id s3-0)
|
|
*temp-string*
|
|
(-> this process root trans)
|
|
(font-color red)
|
|
(the-as vector2h #f)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
((let ((a0-5 this))
|
|
(and *display-path-marks* (logtest? (-> a0-5 flags) (path-control-flag display)))
|
|
)
|
|
(dotimes (s5-1 (-> this curve num-cverts))
|
|
(let ((s4-1 (-> this curve cverts s5-1)))
|
|
(if (and (logtest? (-> this flags) (path-control-flag draw-line)) (< s5-1 (+ (-> this curve num-cverts) -1)))
|
|
(add-debug-line
|
|
#t
|
|
(bucket-id debug-no-zbuf1)
|
|
s4-1
|
|
(-> this curve cverts (+ s5-1 1))
|
|
(new 'static 'rgba :r #xff :g #x80 :a #x80)
|
|
#f
|
|
(the-as rgba -1)
|
|
)
|
|
)
|
|
(if (logtest? (-> this flags) (path-control-flag draw-point))
|
|
(add-debug-x #t (bucket-id debug-no-zbuf1) s4-1 (new 'static 'rgba :r #xff :a #x80))
|
|
)
|
|
(when (logtest? (-> this flags) (path-control-flag draw-text))
|
|
(let ((s3-1 add-debug-text-3d)
|
|
(s2-1 #t)
|
|
(s1-0 318)
|
|
)
|
|
(format (clear *temp-string*) "~D" s5-1)
|
|
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod total-distance ((this path-control))
|
|
"Calcuate the total path length by summing the distance between each adjacent [[curve]] vertex"
|
|
(let ((f30-0 0.0))
|
|
(dotimes (s5-0 (+ (-> this curve num-cverts) -1))
|
|
(+! f30-0 (vector-vector-distance (-> this curve cverts s5-0) (-> this curve cverts (+ s5-0 1))))
|
|
)
|
|
f30-0
|
|
)
|
|
)
|
|
|
|
(defmethod total-distance ((this curve-control))
|
|
"Will lazily calculate and set the [[curve]]'s `length`
|
|
@returns total path length of the [[curve]]
|
|
@see [[curve-length]]"
|
|
(let ((f0-0 (-> this curve length)))
|
|
(when (= f0-0 0.0)
|
|
(set! f0-0 (curve-length (-> this curve)))
|
|
(set! (-> this curve length) f0-0)
|
|
)
|
|
f0-0
|
|
)
|
|
)
|
|
|
|
(defmethod get-point-in-path! ((this path-control) (ret vector) (idx float) (search-type symbol))
|
|
"Depending on the value of `idx`, the result can be quite different:
|
|
- if `idx` is less than `0.0` - return the first vertex in the path
|
|
- if `idx` is greater than the number of vertices in the path, return the last vertex
|
|
- if `search-type` is equal to `exact` OR `idx` is an integral number (ex 1.0), return that vertex
|
|
- otherwise, do a linear interpolation between the vertex at `idx` (truncated) and the next vertex
|
|
using the fractional component of `idx` as the interpolant, return this result
|
|
|
|
@param! ret The [[vector]] that is used to hold the return value
|
|
@param idx Either the vertex index or also partially the interpolant in a LERP
|
|
@param search-type The only recognized value is `exact`
|
|
@returns Either a distinct vertex along the path, or some fractional point between two vertices"
|
|
(let ((num-vertices (-> this curve num-cverts))
|
|
(vert-idx (the float (the int idx)))
|
|
)
|
|
(cond
|
|
((< idx 0.0)
|
|
(set! (-> ret quad) (-> this curve cverts 0 quad))
|
|
)
|
|
((>= vert-idx (the float (+ num-vertices -1)))
|
|
(set! (-> ret quad) (-> this curve cverts (+ num-vertices -1) quad))
|
|
)
|
|
((or (= search-type 'exact) (= vert-idx idx))
|
|
(set! (-> ret quad) (-> this curve cverts (the int vert-idx) quad))
|
|
)
|
|
(else
|
|
(vector-lerp!
|
|
ret
|
|
(-> this curve cverts (the int vert-idx))
|
|
(-> this curve cverts (the int (+ 1.0 vert-idx)))
|
|
(- idx vert-idx)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
ret
|
|
)
|
|
|
|
(defmethod get-random-point ((this path-control) (arg0 vector))
|
|
"Attempts to retrieve a random point along the path, returns the [[*null-vector*]] if no vertices are defined"
|
|
(cond
|
|
((> (-> this curve num-cverts) 0)
|
|
(let ((a0-2 (rand-vu-int-count (-> this curve num-cverts))))
|
|
(set! (-> arg0 quad) (-> this curve cverts a0-2 quad))
|
|
)
|
|
)
|
|
(else
|
|
(format #t "WARNING: method get-random-point called on a path-control object with no vertices.~%")
|
|
(if self
|
|
(format #t "current process is ~A~%" (-> self name))
|
|
)
|
|
(set! (-> arg0 quad) (-> *null-vector* quad))
|
|
)
|
|
)
|
|
arg0
|
|
)
|
|
|
|
(defmethod get-point-at-percent-along-path! ((this path-control) (ret vector) (percent float) (search-type symbol))
|
|
"@param! ret The [[vector]] that is used to hold the return value
|
|
@param percent The percentage along the path
|
|
@param search-type The only recognized value is `exact`
|
|
@returns the point closest to some arbitrary percentage along the path
|
|
@see [[path-control::10]]"
|
|
(get-point-in-path! this ret (* percent (the float (+ (-> this curve num-cverts) -1))) search-type)
|
|
)
|
|
|
|
(defmethod get-point-at-percent-along-path! ((this curve-control) (arg0 vector) (arg1 float) (arg2 symbol))
|
|
"@param! ret The [[vector]] that is used to hold the return value
|
|
@param percent The percentage along the path
|
|
@param search-type The only recognized value is `exact`
|
|
@returns the point closest to some arbitrary percentage along the path
|
|
@see [[path-control::10]]"
|
|
(if (not (logtest? (-> this flags) (path-control-flag not-found)))
|
|
(curve-evaluate!
|
|
arg0
|
|
arg1
|
|
(-> this curve cverts)
|
|
(-> this curve num-cverts)
|
|
(-> this curve knots)
|
|
(-> this curve num-knots)
|
|
)
|
|
)
|
|
arg0
|
|
)
|
|
|
|
(defmethod get-point-in-path! ((this curve-control) (arg0 vector) (arg1 float) (arg2 symbol))
|
|
"Depending on the value of `idx`, the result can be quite different:
|
|
- if `idx` is less than `0.0` - return the first vertex in the path
|
|
- if `idx` is greater than the number of vertices in the path, return the last vertex
|
|
- if `search-type` is equal to `exact` OR `idx` is an integral number (ex 1.0), return that vertex
|
|
- otherwise, do a linear interpolation between the vertex at `idx` (truncated) and the next vertex
|
|
using the fractional component of `idx` as the interpolant, return this result
|
|
|
|
@param! ret The [[vector]] that is used to hold the return value
|
|
@param idx Either the vertex index or also partially the interpolant in a LERP
|
|
@param search-type The only recognized value is `exact`
|
|
@returns Either a distinct vertex along the path, or some fractional point between two vertices"
|
|
(if (not (logtest? (-> this flags) (path-control-flag not-found)))
|
|
(curve-evaluate!
|
|
arg0
|
|
(/ arg1 (the float (+ (-> this curve num-cverts) -1)))
|
|
(-> this curve cverts)
|
|
(-> this curve num-cverts)
|
|
(-> this curve knots)
|
|
(-> this curve num-knots)
|
|
)
|
|
)
|
|
arg0
|
|
)
|
|
|
|
(defmethod displacement-between-two-points! ((this path-control) (ret vector) (idx float) (mag float))
|
|
"Return value can differ quite a bit:
|
|
- If [[path-control-flag::4]] is set OR there are less than 2 vertices OR `idx` is less than `0.0` - return [[*null-vector*]]
|
|
- Otherwise, find the scaled (by `mag`) displacement vector between two points in the path:
|
|
- If `idx` is not beyond the second last vertex, the result is between vertex `idx` and `idx+1`
|
|
- else, the result is between the second last vertex and the last
|
|
|
|
@param! ret The [[vector]] that is used to hold the return value
|
|
@param idx The vertex index
|
|
@param mag The magnitude to scale the resulting displacement vector by
|
|
@returns The displacement [[vector]] between two points in the path, the last 2, or the [[*null-vector*]]"
|
|
(let ((num-vertices (-> this curve num-cverts))
|
|
(vert-idx (the float (the int idx)))
|
|
)
|
|
(cond
|
|
((or (logtest? (-> this flags) (path-control-flag not-found)) (< num-vertices 2) (< idx 0.0))
|
|
(vector-reset! ret)
|
|
)
|
|
(else
|
|
(let ((capped-idx (fmin vert-idx (the float (+ num-vertices -2)))))
|
|
(vector-! ret (-> this curve cverts (the int (+ 1.0 capped-idx))) (-> this curve cverts (the int capped-idx)))
|
|
)
|
|
(vector-float*! ret ret mag)
|
|
)
|
|
)
|
|
)
|
|
ret
|
|
)
|
|
|
|
(defmethod displacement-between-two-points-copy! ((this path-control) (ret vector) (idx float) (mag float))
|
|
"Calls [[path-control::26]] with the provided args
|
|
@see [[path-control::26]]"
|
|
(displacement-between-two-points! this ret idx mag)
|
|
)
|
|
|
|
(defmethod displacement-between-points-at-percent-scaled! ((this path-control) (ret vector) (percent float) (mag float))
|
|
"Calls [[path-control::12], with the `idx` at a given percent along the path
|
|
@param ret The [[vector]] that is used to hold the return value
|
|
@param percent The percentage along the path to find the first index
|
|
@param mag Multiplied by the number of points in the path and scales the resulting vector
|
|
@returns The displacement between the last two points of the path scaled to the magnitude equal to the number of points in the path"
|
|
(displacement-between-two-points-copy!
|
|
this
|
|
ret
|
|
(* percent (the float (+ (-> this curve num-cverts) -1)))
|
|
(* mag (the float (+ (-> this curve num-cverts) -1)))
|
|
)
|
|
)
|
|
|
|
(defmethod displacement-between-two-points-normalized! ((this path-control) (ret vector) (idx float))
|
|
"Calls [[path-control::26], with the provided `idx`
|
|
@param! ret The [[vector]] the result is stored within
|
|
@param idx The vertex index
|
|
@returns The resulting displacement vector, normalized
|
|
@see [[path-control::26]]"
|
|
(displacement-between-two-points! this ret idx 1.0)
|
|
(vector-normalize! ret 1.0)
|
|
)
|
|
|
|
(defmethod displacement-between-points-at-percent-normalized! ((this path-control) (ret vector) (percent float))
|
|
"Calls [[path-control::13], with the `idx` at a given percent along the path
|
|
@param! ret The [[vector]] the result is stored within
|
|
@param percent The percentage along the path
|
|
@returns The resulting displacement vector, normalized
|
|
@see [[path-control::13]]
|
|
@see [[path-control::14]]"
|
|
(displacement-between-two-points-normalized!
|
|
this
|
|
ret
|
|
(* percent (the float (+ (-> this curve num-cverts) -1)))
|
|
)
|
|
)
|
|
|
|
(defmethod displacement-between-two-points! ((this curve-control) (arg0 vector) (arg1 float) (arg2 float))
|
|
"Return value can differ quite a bit:
|
|
- If [[path-control-flag::4]] is set OR there are less than 2 vertices OR `idx` is less than `0.0` - return [[*null-vector*]]
|
|
- Otherwise, find the scaled (by `mag`) displacement vector between two points in the path:
|
|
- If `idx` is not beyond the second last vertex, the result is between vertex `idx` and `idx+1`
|
|
- else, the result is between the second last vertex and the last
|
|
|
|
@param! ret The [[vector]] that is used to hold the return value
|
|
@param idx The vertex index
|
|
@param mag The magnitude to scale the resulting displacement vector by
|
|
@returns The displacement [[vector]] between two points in the path, the last 2, or the [[*null-vector*]]"
|
|
(when (not (logtest? (-> this flags) (path-control-flag not-found)))
|
|
(let ((s4-0 (new 'stack-no-clear 'vector)))
|
|
(curve-evaluate!
|
|
arg0
|
|
arg1
|
|
(-> this curve cverts)
|
|
(-> this curve num-cverts)
|
|
(-> this curve knots)
|
|
(-> this curve num-knots)
|
|
)
|
|
(cond
|
|
((< arg1 (- 1.0 arg2))
|
|
(curve-evaluate!
|
|
s4-0
|
|
(+ arg1 arg2)
|
|
(-> this curve cverts)
|
|
(-> this curve num-cverts)
|
|
(-> this curve knots)
|
|
(-> this curve num-knots)
|
|
)
|
|
(vector-! arg0 s4-0 arg0)
|
|
)
|
|
(else
|
|
(curve-evaluate!
|
|
s4-0
|
|
(- arg1 arg2)
|
|
(-> this curve cverts)
|
|
(-> this curve num-cverts)
|
|
(-> this curve knots)
|
|
(-> this curve num-knots)
|
|
)
|
|
(vector-! arg0 arg0 s4-0)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod displacement-between-two-points-copy! ((this curve-control) (ret vector) (percent float) (mag float))
|
|
"Calls [[path-control::26]] with the `idx` at a given percent along the path @see [[path-control::26]]"
|
|
(displacement-between-two-points! this ret (/ percent (the float (+ (-> this curve num-cverts) -1))) mag)
|
|
)
|
|
|
|
(defmethod displacement-between-points-at-percent-scaled! ((this curve-control) (ret vector) (idx float) (mag float))
|
|
"Calls [[path-control::12], with the `idx` at a given percent along the path
|
|
@param ret The [[vector]] that is used to hold the return value
|
|
@param percent The percentage along the path to find the first index
|
|
@param mag Multiplied by the number of points in the path and scales the resulting vector
|
|
@returns The displacement between the last two points of the path scaled to the magnitude equal to the number of points in the path"
|
|
(displacement-between-two-points! this ret idx mag)
|
|
)
|
|
|
|
(defmethod displacement-between-points-at-percent-normalized! ((this curve-control) (ret vector) (percent float))
|
|
"Calls [[path-control::13], with the `idx` at a given percent along the path
|
|
@param! ret The [[vector]] the result is stored within
|
|
@param percent The percentage along the path
|
|
@returns The resulting displacement vector, normalized
|
|
@see [[path-control::13]]
|
|
@see [[path-control::14]]"
|
|
(displacement-between-two-points! this ret percent 0.01)
|
|
(vector-normalize! ret 1.0)
|
|
)
|
|
|
|
(defmethod displacement-between-two-points-normalized! ((this curve-control) (ret vector) (idx float))
|
|
"@see [[curve-control::12]]"
|
|
(displacement-between-points-at-percent-normalized!
|
|
this
|
|
ret
|
|
(/ idx (the float (+ (-> this curve num-cverts) -1)))
|
|
)
|
|
)
|
|
|
|
(defmethod get-furthest-point-on-path ((this path-control) (point vector))
|
|
"@param point The point to calculate distance from
|
|
@returns the `vertex-idx.interpolant` value to the point on the path furthest away from the `point`
|
|
@see [[path-control::10]]"
|
|
(let ((curr-point (new 'stack-no-clear 'vector))
|
|
(next-point (new 'stack-no-clear 'vector))
|
|
(given-point (new 'stack-no-clear 'vector))
|
|
(furthest-dist 4096000000.0)
|
|
(vert-idx 0.0)
|
|
)
|
|
(let ((closest-point (new 'stack-no-clear 'vector)))
|
|
(set! (-> given-point quad) (-> point quad))
|
|
(set! (-> given-point y) 0.0)
|
|
(get-point-in-path! this next-point 0.0 'interp)
|
|
(set! (-> next-point y) 0.0)
|
|
(dotimes (idx (+ (-> this curve num-cverts) -1))
|
|
(set! (-> curr-point quad) (-> next-point quad))
|
|
(get-point-in-path! this next-point (the float (+ idx 1)) 'interp)
|
|
(set! (-> next-point y) 0.0)
|
|
(let ((dist-to-point (vector-segment-distance-point! given-point curr-point next-point closest-point)))
|
|
(when (< dist-to-point furthest-dist)
|
|
(set! furthest-dist dist-to-point)
|
|
(set! vert-idx
|
|
(+ (/ (vector-vector-xz-distance closest-point curr-point) (vector-vector-xz-distance next-point curr-point))
|
|
(the float idx)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
vert-idx
|
|
)
|
|
)
|
|
|
|
(defmethod get-path-percentage-at-furthest-point ((this path-control) (point vector))
|
|
"@param point The point to calculate distance from
|
|
@returns the percentage of path completion from the point on the path furthest away from the `point`
|
|
@see [[path-control::14]]"
|
|
(/ (get-furthest-point-on-path this point) (the float (+ (-> this curve num-cverts) -1)))
|
|
)
|
|
|
|
(defmethod debug-draw ((this curve-control))
|
|
(cond
|
|
((logtest? (-> this flags) (path-control-flag not-found))
|
|
(when (and (type? (-> this process) process-drawable) *display-entity-errors*)
|
|
(let ((s5-0 add-debug-text-3d)
|
|
(s4-0 #t)
|
|
(s3-0 318)
|
|
)
|
|
(format (clear *temp-string*) "curve data error in ~S" (-> this process name))
|
|
(s5-0
|
|
s4-0
|
|
(the-as bucket-id s3-0)
|
|
*temp-string*
|
|
(-> this process root trans)
|
|
(font-color red)
|
|
(the-as vector2h #f)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
((let ((a0-5 this))
|
|
(and *display-path-marks* (logtest? (-> a0-5 flags) (path-control-flag display)))
|
|
)
|
|
(if (and (logtest? (-> this flags) (path-control-flag draw-line)) (> (-> this curve num-cverts) 0))
|
|
(add-debug-curve2
|
|
#t
|
|
(bucket-id debug-no-zbuf1)
|
|
(-> this curve)
|
|
(new 'static 'rgba :r #xff :g #x80 :a #x80)
|
|
#f
|
|
)
|
|
)
|
|
(dotimes (s5-1 (-> this curve num-cverts))
|
|
(let ((s4-1 (-> this curve cverts s5-1)))
|
|
(if (logtest? (-> this flags) (path-control-flag draw-point))
|
|
(add-debug-x #t (bucket-id debug-no-zbuf1) s4-1 (new 'static 'rgba :r #xff :a #x80))
|
|
)
|
|
(when (logtest? (-> this flags) (path-control-flag draw-text))
|
|
(let ((s3-1 add-debug-text-3d)
|
|
(s2-1 #t)
|
|
(s1-0 (bucket-id debug-no-zbuf1))
|
|
)
|
|
(format (clear *temp-string*) "~D" s5-1)
|
|
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod path-control-method-24 ((this path-control) (arg0 vector))
|
|
"TODO"
|
|
(let ((s4-0 (-> this curve num-cverts)))
|
|
(let ((f30-0 (/ 1.0 (the float s4-0))))
|
|
(set-vector! arg0 0.0 0.0 0.0 0.0)
|
|
(dotimes (s3-0 s4-0)
|
|
(vector+float*!
|
|
arg0
|
|
arg0
|
|
(get-point-in-path! this (new 'stack-no-clear 'vector) (the float s3-0) 'interp)
|
|
f30-0
|
|
)
|
|
)
|
|
)
|
|
(dotimes (s3-1 s4-0)
|
|
(let ((f0-10
|
|
(vector-vector-distance arg0 (get-point-in-path! this (new 'stack-no-clear 'vector) (the float s3-1) 'interp))
|
|
)
|
|
)
|
|
(if (< (-> arg0 w) f0-10)
|
|
(set! (-> arg0 w) (+ 4096.0 f0-10))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
arg0
|
|
)
|