mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -04:00
c162c66118
This PR does two main things: 1. Work through the main low-hanging fruit issues in the formatter keeping it from feeling mature and usable 2. Iterate and prove that point by formatting all of the Jak 1 code base. **This has removed around 100K lines in total.** - The decompiler will now format it's results for jak 1 to keep things from drifting back to where they were. This is controlled by a new config flag `format_code`. How am I confident this hasn't broken anything?: - I compiled the entire project and stored it's `out/jak1/obj` files separately - I then recompiled the project after formatting and wrote a script that md5's each file and compares it (`compare-compilation-outputs.py` - The results (eventually) were the same:  > This proves that the only difference before and after is non-critical whitespace for all code/macros that is actually in use. I'm still aware of improvements that could be made to the formatter, as well as general optimization of it's performance. But in general these are for rare or non-critical situations in my opinion and I'll work through them before doing Jak 2. The vast majority looks great and is working properly at this point. Those known issues are the following if you are curious: 
343 lines
12 KiB
Common Lisp
343 lines
12 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "GAME.CGO")
|
|
(require "engine/common-obs/water-anim.gc")
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype dark-eco-pool (water-anim) ())
|
|
|
|
(define ripple-for-misty-dark-eco-pool
|
|
(new 'static
|
|
'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 3.0
|
|
:wave
|
|
(new 'static
|
|
'inline-array
|
|
ripple-wave
|
|
4
|
|
(new 'static 'ripple-wave :scale 40.0 :xdiv 2 :speed 0.5)
|
|
(new 'static 'ripple-wave :scale 15.0 :xdiv -2 :zdiv 2 :speed 2.0)
|
|
(new 'static 'ripple-wave :scale 3.0 :xdiv 5 :zdiv 3 :speed 2.0)
|
|
(new 'static 'ripple-wave))))
|
|
|
|
(define ripple-for-maincave-dark-eco-pool
|
|
(new 'static
|
|
'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 8.57
|
|
:wave
|
|
(new 'static
|
|
'inline-array
|
|
ripple-wave
|
|
4
|
|
(new 'static 'ripple-wave :scale 14.0 :xdiv 1 :speed 1.0)
|
|
(new 'static 'ripple-wave :scale 5.25 :xdiv -1 :zdiv 1 :speed 4.0)
|
|
(new 'static 'ripple-wave :scale 0.7 :xdiv 5 :zdiv 3 :speed 2.0)
|
|
(new 'static 'ripple-wave))))
|
|
|
|
(define ripple-for-finalboss-dark-eco-pool
|
|
(new 'static
|
|
'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 4.0
|
|
:wave
|
|
(new 'static
|
|
'inline-array
|
|
ripple-wave
|
|
4
|
|
(new 'static 'ripple-wave :scale 25.0 :xdiv 2 :speed -2.0)
|
|
(new 'static 'ripple-wave :scale 15.0 :xdiv -2 :zdiv 2 :speed 3.0)
|
|
(new 'static 'ripple-wave :scale 4.0 :xdiv 5 :zdiv 3 :speed 4.0)
|
|
(new 'static 'ripple-wave))))
|
|
|
|
(define ripple-for-dark-eco-pool
|
|
(new 'static
|
|
'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 3.0
|
|
:wave
|
|
(new 'static
|
|
'inline-array
|
|
ripple-wave
|
|
4
|
|
(new 'static 'ripple-wave :scale 40.0 :xdiv 1 :speed 1.0)
|
|
(new 'static 'ripple-wave :scale 15.0 :xdiv -1 :zdiv 1 :speed 4.0)
|
|
(new 'static 'ripple-wave :scale 2.0 :xdiv 5 :zdiv 3 :speed 2.0)
|
|
(new 'static 'ripple-wave))))
|
|
|
|
(define ripple-for-sunken-dark-eco-helix-room
|
|
(new 'static
|
|
'ripple-wave-set
|
|
:count 3
|
|
:converted #f
|
|
:normal-scale 8.0
|
|
:wave
|
|
(new 'static
|
|
'inline-array
|
|
ripple-wave
|
|
4
|
|
(new 'static 'ripple-wave :scale 15.0 :xdiv 1 :speed 1.0)
|
|
(new 'static 'ripple-wave :scale 5.625 :xdiv -1 :zdiv 1 :speed 4.0)
|
|
(new 'static 'ripple-wave :scale 0.75 :xdiv 5 :zdiv 3 :speed 2.0)
|
|
(new 'static 'ripple-wave))))
|
|
|
|
(defmethod water-vol-method-25 ((this dark-eco-pool))
|
|
(let ((t9-0 (method-of-type water-anim water-vol-method-25))) (t9-0 this))
|
|
(logclear! (-> this flags) (water-flags wt23))
|
|
(logior! (-> this flags) (water-flags wt24))
|
|
(set! (-> this attack-event)
|
|
(the-as symbol
|
|
((the-as (function res-lump symbol symbol float structure (pointer res-tag) pointer object)
|
|
(method-of-type res-lump get-property-struct))
|
|
(-> this entity)
|
|
'attack-event
|
|
'interp
|
|
-1000000000.0
|
|
'dark-eco-pool
|
|
(the-as (pointer res-tag) #f)
|
|
*res-static-buf*)))
|
|
(none))
|
|
|
|
(defmethod water-vol-method-22 ((this dark-eco-pool))
|
|
(let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 this))
|
|
(let ((gp-0 (new 'process 'ripple-control)))
|
|
(set! (-> this draw ripple) gp-0)
|
|
(set! (-> gp-0 global-scale) 3072.0)
|
|
(set! (-> gp-0 close-fade-dist) 163840.0)
|
|
(set! (-> gp-0 far-fade-dist) 245760.0)
|
|
(set! (-> gp-0 waveform) ripple-for-dark-eco-pool)
|
|
(set! (-> gp-0 query) (new 'process 'ripple-merc-query 100))
|
|
(case (-> this look)
|
|
((32) (set! (-> gp-0 waveform) ripple-for-misty-dark-eco-pool))
|
|
((15 16 17 18 19 20) (set! (-> gp-0 waveform) ripple-for-maincave-dark-eco-pool))
|
|
((40) (set! (-> gp-0 waveform) ripple-for-sunken-dark-eco-helix-room))
|
|
((41) (set! (-> gp-0 waveform) ripple-for-finalboss-dark-eco-pool))))
|
|
(none))
|
|
|
|
(defpartgroup group-dark-eco-nasty
|
|
:id 444
|
|
:flags (use-local-clock)
|
|
:bounds (static-bspherem 0 0 0 8)
|
|
:parts ((sp-item 2020 :fade-after (meters 50))))
|
|
|
|
(defpart 2020
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #xf :page #x2))
|
|
(:num 1.0)
|
|
(:y (meters 0))
|
|
(:scale-x (meters 1) (meters 4))
|
|
(:scale-y (meters 0.25))
|
|
(:r 255.0)
|
|
(:g 255.0)
|
|
(:b 255.0)
|
|
(:a 96.0 32.0)
|
|
(:scalevel-x (meters 0.1875))
|
|
(:scalevel-y (meters -0.001875))
|
|
(:fade-a -3.2)
|
|
(:timer (seconds 0.035))
|
|
(:flags (bit2 bit3 bit14))
|
|
(:next-time (seconds 0.05))
|
|
(:next-launcher 2021)))
|
|
|
|
(defpart 2021
|
|
:init-specs ((:r 255.0) (:g 128.0 128.0) (:b 0.0) (:fade-a -1.28)))
|
|
|
|
(defpartgroup group-dark-eco-pool-nasty
|
|
:id 445
|
|
:duration (seconds 2)
|
|
:linger-duration (seconds 2)
|
|
:flags (use-local-clock)
|
|
:bounds (static-bspherem 0 0 0 12)
|
|
:parts
|
|
((sp-item 2056 :fade-after (meters 100) :period (seconds 2) :length (seconds 0.017))
|
|
(sp-item 2057 :fade-after (meters 100) :period (seconds 2) :length (seconds 0.017) :binding 2052)
|
|
(sp-item 2052 :flags (start-dead launch-asap) :binding 2053)
|
|
(sp-item 2053 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2052 :flags (start-dead launch-asap) :binding 2053)
|
|
(sp-item 2053 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2052 :flags (start-dead launch-asap) :binding 2053)
|
|
(sp-item 2053 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2052 :flags (start-dead launch-asap) :binding 2053)
|
|
(sp-item 2053 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2058 :fade-after (meters 100) :period (seconds 2) :length (seconds 0.017) :binding 2054)
|
|
(sp-item 2054 :flags (start-dead launch-asap) :binding 2055)
|
|
(sp-item 2055 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2054 :flags (start-dead launch-asap) :binding 2055)
|
|
(sp-item 2055 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2054 :flags (start-dead launch-asap) :binding 2055)
|
|
(sp-item 2055 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))
|
|
(sp-item 2054 :flags (start-dead launch-asap) :binding 2055)
|
|
(sp-item 2055 :fade-after (meters 80) :falloff-to (meters 100) :flags (start-dead))))
|
|
|
|
(defpart 2056
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #x12 :page #x2))
|
|
(:num 1.0)
|
|
(:scale-x (meters 8))
|
|
(:rot-z (degrees 0) (degrees 360))
|
|
(:scale-y :copy scale-x)
|
|
(:r 0.0 96.0)
|
|
(:g 0.0 32.0)
|
|
(:b 64.0 32.0)
|
|
(:a 64.0)
|
|
(:fade-a -1.8285716)
|
|
(:timer (seconds 0.18))
|
|
(:flags (bit2 bit3 bit14))))
|
|
|
|
(defpart 2057
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #x12 :page #x2))
|
|
(:num 1.0 6.0)
|
|
(:y (meters 1))
|
|
(:scale-x (meters 0.1))
|
|
(:scale-y :copy scale-x)
|
|
(:a 0.0)
|
|
(:vel-y (meters 0.04) (meters 0.02))
|
|
(:accel-y (meters -0.00083333335))
|
|
(:friction 0.94)
|
|
(:timer (seconds 0.8))
|
|
(:flags (bit3))
|
|
(:conerot-x (degrees 0) (degrees 140))
|
|
(:conerot-y (degrees 0) (degrees 360))))
|
|
|
|
(defpart 2052
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #xf :page #x2))
|
|
(:num 1.0)
|
|
(:y (meters 0) (meters 16))
|
|
(:z (meters 0.3) (meters 0.3))
|
|
(:scale-x (meters 0.4) (meters 0.3))
|
|
(:rot-z (degrees 0) (degrees 360))
|
|
(:scale-y :copy scale-x)
|
|
(:r 0.0 96.0)
|
|
(:g 0.0 32.0)
|
|
(:b 64.0 32.0)
|
|
(:a 64.0 64.0)
|
|
(:omega 0.0 65536.0)
|
|
(:vel-x (meters 0.026666667) (meters 0.10666667))
|
|
(:scalevel-x (meters -0.000909091))
|
|
(:rotvel-z (degrees -0.3) 1 (degrees 0.6))
|
|
(:scalevel-y :copy scalevel-x)
|
|
(:fade-g -0.26666668)
|
|
(:fade-a -0.19393939)
|
|
(:timer (seconds 0.2) (seconds 0.597))
|
|
(:flags (bit2 bit3 bit7 bit14))))
|
|
|
|
(defpart 2053
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #xf :page #x2))
|
|
(:num 1.0)
|
|
(:scale-x (meters 0.4) (meters 0.1))
|
|
(:scale-y :copy scale-x)
|
|
(:r 32.0 96.0)
|
|
(:g 0.0 32.0)
|
|
(:b 64.0 32.0)
|
|
(:a 32.0 32.0)
|
|
(:scalevel-x (meters -0.0006190476))
|
|
(:scalevel-y :copy scalevel-x)
|
|
(:fade-a -0.01904762)
|
|
(:accel-y (meters -0.000100000005) (meters -0.00015))
|
|
(:timer (seconds 0.1) (seconds 0.797))
|
|
(:flags (bit2 bit3 bit14))
|
|
(:next-time (seconds 0.8))
|
|
(:next-launcher 198)))
|
|
|
|
(defpart 2058
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #x12 :page #x2))
|
|
(:num 1.0 6.0)
|
|
(:y (meters 1))
|
|
(:scale-x (meters 0.1))
|
|
(:scale-y :copy scale-x)
|
|
(:a 0.0)
|
|
(:vel-y (meters 0.04) (meters 0.02))
|
|
(:accel-y (meters -0.00083333335))
|
|
(:friction 0.94)
|
|
(:timer (seconds 0.8))
|
|
(:flags (bit3))
|
|
(:conerot-x (degrees 0) (degrees 140))
|
|
(:conerot-y (degrees 0) (degrees 360))))
|
|
|
|
(defpart 2054
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #xf :page #x2))
|
|
(:num 1.0)
|
|
(:y (meters 0) (meters 16))
|
|
(:z (meters 0.3) (meters 0.3))
|
|
(:scale-x (meters 0.4) (meters 0.3))
|
|
(:rot-z (degrees 0) (degrees 360))
|
|
(:scale-y :copy scale-x)
|
|
(:r 16.0 32.0)
|
|
(:g 0.0 16.0)
|
|
(:b 192.0 64.0)
|
|
(:a 64.0 64.0)
|
|
(:omega 0.0 65536.0)
|
|
(:vel-x (meters 0.026666667) (meters 0.10666667))
|
|
(:scalevel-x (meters -0.000909091))
|
|
(:rotvel-z (degrees -0.3) 1 (degrees 0.6))
|
|
(:scalevel-y :copy scalevel-x)
|
|
(:fade-g -0.26666668)
|
|
(:fade-a -0.19393939)
|
|
(:timer (seconds 0.2) (seconds 0.597))
|
|
(:flags (bit2 bit3 bit7 bit14))))
|
|
|
|
(defpart 2055
|
|
:init-specs
|
|
((:texture (new 'static 'texture-id :index #xf :page #x2))
|
|
(:num 1.0)
|
|
(:scale-x (meters 0.4) (meters 0.1))
|
|
(:scale-y :copy scale-x)
|
|
(:r 16.0 32.0)
|
|
(:g 0.0 16.0)
|
|
(:b 192.0 64.0)
|
|
(:a 32.0 32.0)
|
|
(:scalevel-x (meters -0.0006190476))
|
|
(:scalevel-y :copy scalevel-x)
|
|
(:fade-a -0.01904762)
|
|
(:accel-y (meters -0.000100000005) (meters -0.00015))
|
|
(:timer (seconds 0.1) (seconds 0.797))
|
|
(:flags (bit2 bit3 bit14))
|
|
(:next-time (seconds 0.8))
|
|
(:next-launcher 198)))
|
|
|
|
(defstate water-vol-idle (dark-eco-pool)
|
|
:virtual #t
|
|
:trans
|
|
(behavior ()
|
|
(let ((t9-0 (-> (method-of-type water-anim water-vol-idle) trans))) (if t9-0 (t9-0)))
|
|
(let* ((gp-0 (-> self draw ripple))
|
|
(f0-1 (the float (logand (current-time) #xffff)))
|
|
(f0-3 (cos (* 5.0 f0-1)))
|
|
(f30-0 (* f0-3 f0-3)))
|
|
(let ((s5-0 (-> self draw ripple query)))
|
|
(set! (-> self draw ripple send-query) #t)
|
|
(set! (-> s5-0 start-vertex) (rand-vu-int-range 0 255))
|
|
(set! (-> s5-0 vertex-skip) 256)
|
|
(when (zero? (rand-vu-int-range 0 15))
|
|
(when (and (nonzero? (-> s5-0 vertex-count)) (< #x32000 (memory-free *nk-dead-pool*)))
|
|
(let ((s3-0 (rand-vu-int-range 0 (+ (-> s5-0 vertex-count) -1))))
|
|
(process-spawn part-tracker
|
|
:init
|
|
part-tracker-init
|
|
(-> *part-group-id-table* 445)
|
|
-1
|
|
#f
|
|
#f
|
|
#f
|
|
(-> s5-0 data s3-0)
|
|
:to
|
|
*entity-pool*)))))
|
|
(case (-> self look)
|
|
((32)
|
|
(set! (-> gp-0 global-scale) (* 4096.0 (* 1.5 (+ 1.0 f30-0))))
|
|
(set! (-> gp-0 individual-normal-scale) (+ 0.5 (* 0.5 f30-0))))
|
|
(else
|
|
(set! (-> gp-0 global-scale) (* 4096.0 (* 3.0 (+ 1.0 f30-0))))
|
|
(set! (-> gp-0 individual-normal-scale) (+ 0.5 (* 0.5 f30-0))))))))
|