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>
360 lines
12 KiB
Common Lisp
360 lines
12 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: chaincrate.gc
|
|
;; name in dgo: chaincrate
|
|
;; dgos: STR
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defpartgroup group-chain-crate-cable-sparks
|
|
:id 238
|
|
:bounds (static-bspherem 0 0 0 8)
|
|
:parts ((sp-item 1127 :fade-after (meters 100)))
|
|
)
|
|
|
|
(defpart 1127
|
|
:init-specs ((:texture (new 'static 'texture-id :index #x92 :page #xc))
|
|
(:num 5.0 5.0)
|
|
(:scale-x (meters 2.5))
|
|
(:rot-x 4)
|
|
(:scale-y (meters 0.1))
|
|
(:r 255.0)
|
|
(:g 255.0)
|
|
(:b 255.0)
|
|
(:a 128.0)
|
|
(:omega (degrees 0.07875))
|
|
(:vel-y (meters 0.06666667) (meters 0.06666667))
|
|
(:fade-g -0.85 -1.7)
|
|
(:fade-b -8.0)
|
|
(:fade-a -0.21333334 -0.21333334)
|
|
(:accel-y (meters -0.0016666667) (meters -0.00066666666))
|
|
(:friction 0.97)
|
|
(:timer (seconds 0.167) (seconds 0.497))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3))
|
|
(:func 'sparticle-motion-blur)
|
|
(:conerot-x (degrees 0) (degrees 80))
|
|
(:conerot-y (degrees 0) (degrees 360))
|
|
)
|
|
)
|
|
|
|
(defpartgroup group-chain-crate-guide-sparks
|
|
:id 239
|
|
:bounds (static-bspherem 0 0 0 8)
|
|
:parts ((sp-item 1128 :fade-after (meters 100)))
|
|
)
|
|
|
|
(defpart 1128
|
|
:init-specs ((:texture (new 'static 'texture-id :index #x92 :page #xc))
|
|
(:num 2.0 2 3.0)
|
|
(:scale-x (meters 2.5))
|
|
(:rot-x 4)
|
|
(:scale-y (meters 0.1))
|
|
(:r 255.0)
|
|
(:g 255.0)
|
|
(:b 255.0)
|
|
(:a 128.0)
|
|
(:omega (degrees 0.07875))
|
|
(:vel-y (meters 0.06666667) (meters 0.06666667))
|
|
(:fade-g -0.85 -1.7)
|
|
(:fade-b -8.0)
|
|
(:fade-a -0.21333334 -0.21333334)
|
|
(:accel-y (meters -0.0016666667) (meters -0.00066666666))
|
|
(:friction 0.97)
|
|
(:timer (seconds 0.167) (seconds 0.497))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3))
|
|
(:func 'sparticle-motion-blur)
|
|
(:conerot-x (degrees 0) (degrees 80))
|
|
(:conerot-y (degrees 0) (degrees 360))
|
|
)
|
|
)
|
|
|
|
(defskelgroup skel-strip-chain-crate strip-chain-crate strip-chain-crate-lod0-jg strip-chain-crate-idle-ja
|
|
((strip-chain-crate-lod0-mg (meters 999999)))
|
|
:bounds (static-spherem 0 -16.5 0 19)
|
|
:longest-edge (meters 23.3238)
|
|
:origin-joint-index 3
|
|
)
|
|
|
|
(deftype strip-chain-crate-slave (process-drawable)
|
|
((part2 sparticle-launch-control)
|
|
(path-u float)
|
|
(path-speed float)
|
|
(guide-sound-mask uint32)
|
|
(guide-num int8)
|
|
)
|
|
(:state-methods
|
|
die-fast
|
|
moving
|
|
)
|
|
(:methods
|
|
(strip-chain-crate-slave-method-22 (_type_) none)
|
|
)
|
|
)
|
|
|
|
|
|
(define *strip-chain-crate-guides* (new 'static 'vector4s-3 :data (new 'static 'array float 12
|
|
0.0827
|
|
0.1351
|
|
0.2022
|
|
0.2655
|
|
0.6085
|
|
0.6169
|
|
0.6955
|
|
0.7531
|
|
0.8589
|
|
0.9175
|
|
100.0
|
|
101.0
|
|
)
|
|
)
|
|
)
|
|
|
|
;; WARN: Return type mismatch rgbaf vs none.
|
|
(defmethod strip-chain-crate-slave-method-22 ((this strip-chain-crate-slave))
|
|
(let ((f0-0 (-> this path-u)))
|
|
(cond
|
|
((>= 0.09 f0-0)
|
|
(let ((f0-1 (* 11.111111 f0-0)))
|
|
(set-vector! (-> this draw color-mult) f0-1 f0-1 f0-1 1.0)
|
|
)
|
|
)
|
|
((>= f0-0 0.87)
|
|
(let ((f0-5 (- 1.0 (* 7.692308 (+ -0.87 f0-0)))))
|
|
(set-vector! (-> this draw color-mult) f0-5 f0-5 f0-5 1.0)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(none)
|
|
)
|
|
|
|
(defstate moving (strip-chain-crate-slave)
|
|
:virtual #t
|
|
:trans (behavior ()
|
|
(if (>= (-> self path-u) 1.0)
|
|
(go-virtual die-fast)
|
|
)
|
|
(rider-trans)
|
|
(let ((f30-0 (fmin 1.0 (+ (-> self path-u) (* (-> self path-speed) (seconds-per-frame))))))
|
|
(set! (-> self path-u) f30-0)
|
|
(strip-chain-crate-slave-method-22 self)
|
|
(let ((a0-1 (* (-> self guide-num) 2))
|
|
(v1-10 *strip-chain-crate-guides*)
|
|
)
|
|
(while (< (-> v1-10 data (+ a0-1 1)) f30-0)
|
|
(+! a0-1 2)
|
|
)
|
|
(set! (-> self guide-num) (/ a0-1 2))
|
|
(cond
|
|
((and (>= f30-0 (-> v1-10 data a0-1)) (>= (-> v1-10 data (+ a0-1 1)) f30-0))
|
|
(let ((v1-13 (-> self guide-sound-mask))
|
|
(a0-5 (ash 1 (-> self guide-num)))
|
|
)
|
|
(when (not (logtest? v1-13 a0-5))
|
|
(set! (-> self guide-sound-mask) (logior v1-13 a0-5))
|
|
(sound-play "crate-guide")
|
|
)
|
|
)
|
|
(if (zero? (rand-vu-int-count 4))
|
|
(spawn (-> self part2) (-> self root trans))
|
|
)
|
|
)
|
|
(else
|
|
(if (zero? (rand-vu-int-count 45))
|
|
(spawn (-> self part) (-> self root trans))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(get-point-at-percent-along-path! (-> self path) (-> self root trans) f30-0 'interp)
|
|
(set! (-> self root trans y) (-> self root trans y))
|
|
(let ((gp-1 (new 'stack-no-clear 'vector)))
|
|
(displacement-between-points-at-percent-normalized! (-> self path) gp-1 f30-0)
|
|
(seek-toward-heading-vec! (-> self root) gp-1 6371.5557 (seconds 0.1))
|
|
)
|
|
)
|
|
(update-trans! (-> self sound) (-> self root trans))
|
|
(update! (-> self sound))
|
|
)
|
|
:code sleep-code
|
|
:post rider-post
|
|
)
|
|
|
|
(defstate die-fast (strip-chain-crate-slave)
|
|
:virtual #t
|
|
:code nothing
|
|
)
|
|
|
|
;; WARN: Return type mismatch object vs none.
|
|
(defbehavior strip-chain-crate-slave-init-by-other strip-chain-crate-slave ((arg0 float) (arg1 float))
|
|
(set! (-> self path-u) arg0)
|
|
(let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum usually-hit-by-player))))
|
|
(set! (-> s5-0 dynam) (copy *standard-dynamics* 'process))
|
|
(set! (-> s5-0 reaction) cshape-reaction-default)
|
|
(set! (-> s5-0 no-reaction)
|
|
(the-as (function collide-shape-moving collide-query vector vector object) nothing)
|
|
)
|
|
(let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0))))
|
|
(set! (-> s4-0 prim-core collide-as) (collide-spec obstacle pusher))
|
|
(set! (-> s4-0 prim-core collide-with) (collide-spec jak player-list))
|
|
(set! (-> s4-0 prim-core action) (collide-action solid rideable pull-rider-can-collide))
|
|
(set! (-> s4-0 transform-index) 3)
|
|
(set-vector! (-> s4-0 local-sphere) 0.0 -67584.0 0.0 77824.0)
|
|
(set! (-> s5-0 total-prims) (the-as uint 1))
|
|
(set! (-> s5-0 root-prim) s4-0)
|
|
)
|
|
(pusher-init s5-0)
|
|
(set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
|
|
(let ((v1-16 (-> s5-0 root-prim)))
|
|
(set! (-> s5-0 backup-collide-as) (-> v1-16 prim-core collide-as))
|
|
(set! (-> s5-0 backup-collide-with) (-> v1-16 prim-core collide-with))
|
|
)
|
|
(set! (-> self root) s5-0)
|
|
)
|
|
(process-drawable-from-entity! self (-> self entity))
|
|
(initialize-skeleton
|
|
self
|
|
(the-as skeleton-group (art-group-get-by-name *level* "skel-strip-chain-crate" (the-as (pointer uint32) #f)))
|
|
(the-as pair 0)
|
|
)
|
|
(set! (-> self part) (create-launch-control (-> *part-group-id-table* 238) self))
|
|
(set! (-> self part2) (create-launch-control (-> *part-group-id-table* 239) self))
|
|
(set! (-> self path) (new 'process 'curve-control self 'path -1000000000.0))
|
|
(logior! (-> self path flags) (path-control-flag display draw-line draw-point draw-text))
|
|
(let ((f0-7 (total-distance (-> self path))))
|
|
(set! (-> self path-speed) (/ arg1 f0-7))
|
|
)
|
|
(get-point-in-path! (-> self path) (-> self root trans) (-> self path-u) 'interp)
|
|
(set! (-> self root trans y) (-> self root trans y))
|
|
(let ((gp-1 (new 'stack-no-clear 'vector)))
|
|
(displacement-between-points-at-percent-normalized! (-> self path) gp-1 (-> self path-u))
|
|
(set-heading-vec! (-> self root) gp-1)
|
|
)
|
|
(set! (-> self sound)
|
|
(new 'process 'ambient-sound (static-sound-spec "crate-loop" :fo-max 100) (-> self root trans))
|
|
)
|
|
(ja-channel-push! 1 0)
|
|
(ja :group! strip-chain-crate-idle-ja :num! min)
|
|
(transform-post)
|
|
(logclear! (-> self mask) (process-mask actor-pause))
|
|
(strip-chain-crate-slave-method-22 self)
|
|
(go-virtual moving)
|
|
(none)
|
|
)
|
|
|
|
(defmethod deactivate ((this strip-chain-crate-slave))
|
|
(if (nonzero? (-> this part2))
|
|
(kill-and-free-particles (-> this part2))
|
|
)
|
|
((method-of-type process-drawable deactivate) this)
|
|
(none)
|
|
)
|
|
|
|
;; WARN: Return type mismatch process-drawable vs strip-chain-crate-slave.
|
|
(defmethod relocate ((this strip-chain-crate-slave) (arg0 int))
|
|
(if (nonzero? (-> this part2))
|
|
(&+! (-> this part2) arg0)
|
|
)
|
|
(the-as strip-chain-crate-slave ((method-of-type process-drawable relocate) this arg0))
|
|
)
|
|
|
|
(deftype strip-chain-crate (process-drawable)
|
|
((spawn-pos vector :inline)
|
|
(next-spawn-time time-frame)
|
|
(spawn-delay uint32)
|
|
(spawn-offset uint32)
|
|
(dist-apart float)
|
|
(crate-speed float)
|
|
)
|
|
(:state-methods
|
|
idle
|
|
)
|
|
(:methods
|
|
(strip-chain-crate-method-21 (_type_) none)
|
|
)
|
|
)
|
|
|
|
|
|
;; WARN: Return type mismatch symbol vs none.
|
|
(defmethod strip-chain-crate-method-21 ((this strip-chain-crate))
|
|
(let ((f30-0 (total-distance (-> this path)))
|
|
(f28-0
|
|
(* (/ (the float
|
|
(mod (the-as uint (+ (current-time) (the-as time-frame (-> this spawn-offset)))) (-> this spawn-delay))
|
|
)
|
|
(the float (-> this spawn-delay))
|
|
)
|
|
(-> this dist-apart)
|
|
)
|
|
)
|
|
)
|
|
(while (>= f30-0 f28-0)
|
|
(let ((f26-0 (/ f28-0 f30-0)))
|
|
(process-spawn strip-chain-crate-slave f26-0 (-> this crate-speed) :to this)
|
|
)
|
|
(+! f28-0 (-> this dist-apart))
|
|
)
|
|
)
|
|
(none)
|
|
)
|
|
|
|
(defstate idle (strip-chain-crate)
|
|
:virtual #t
|
|
:code (behavior ()
|
|
(until #f
|
|
(when (>= (current-time) (-> self next-spawn-time))
|
|
(process-spawn strip-chain-crate-slave 0 (-> self crate-speed) :to self)
|
|
(+! (-> self next-spawn-time) (the-as time-frame (-> self spawn-delay)))
|
|
)
|
|
(suspend)
|
|
)
|
|
#f
|
|
)
|
|
)
|
|
|
|
;; WARN: Return type mismatch object vs none.
|
|
(defmethod init-from-entity! ((this strip-chain-crate) (arg0 entity-actor))
|
|
"Typically the method that does the initial setup on the process, potentially using the [[entity-actor]] provided as part of that.
|
|
This commonly includes things such as:
|
|
- stack size
|
|
- collision information
|
|
- loading the skeleton group / bones
|
|
- sounds"
|
|
(local-vars (sv-16 int))
|
|
(set! (-> this root) (new 'process 'trsqv))
|
|
(set! (-> this path) (new 'process 'curve-control this 'path -1000000000.0))
|
|
(logior! (-> this path flags) (path-control-flag display draw-line draw-point draw-text))
|
|
(let ((f28-0 53248.0)
|
|
(f26-0 131072.0)
|
|
(f30-0 0.0)
|
|
)
|
|
(set! sv-16 0)
|
|
(let ((v1-8 (res-lump-data arg0 'speed (pointer float) :tag-ptr (the-as (pointer res-tag) (& sv-16)))))
|
|
(when v1-8
|
|
(set! f28-0 (-> v1-8 0))
|
|
(set! f26-0 (-> v1-8 1))
|
|
(set! f30-0 (-> v1-8 2))
|
|
)
|
|
)
|
|
(set! (-> this crate-speed) f28-0)
|
|
(set! (-> this dist-apart) f26-0)
|
|
(set! (-> this spawn-delay) (the-as uint (the int (* 300.0 (/ f26-0 f28-0)))))
|
|
(set! (-> this spawn-offset) (the-as uint (the int (* f30-0 (the float (-> this spawn-delay))))))
|
|
)
|
|
(set! (-> this next-spawn-time)
|
|
(+ (current-time)
|
|
(the-as
|
|
time-frame
|
|
(- (-> this spawn-delay)
|
|
(mod (the-as uint (+ (current-time) (the-as time-frame (-> this spawn-offset)))) (-> this spawn-delay))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(logclear! (-> this mask) (process-mask actor-pause))
|
|
(strip-chain-crate-method-21 this)
|
|
(go (method-of-object this idle))
|
|
(none)
|
|
)
|