mirror of
https://github.com/open-goal/jak-project
synced 2026-08-04 01:04:11 -04:00
Tyler Wilding
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: 
86 lines
3.3 KiB
Common Lisp
86 lines
3.3 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "FIC.DGO" "LAV.DGO" "MIS.DGO" "OGR.DGO" "ROL.DGO" "SNO.DGO" "SWA.DGO")
|
|
(require "engine/geometry/path.gc")
|
|
(require "engine/common-obs/process-drawable.gc")
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype blocking-plane (process-drawable) ()
|
|
(:states
|
|
blocking-plane-idle))
|
|
|
|
(defskelgroup *ef-plane-sg*
|
|
ef-plane
|
|
ef-plane-lod0-jg
|
|
ef-plane-idle-ja
|
|
((ef-plane-lod0-mg (meters 999999)))
|
|
:bounds (static-spherem 0 0 0 30))
|
|
|
|
(defstate blocking-plane-idle (blocking-plane)
|
|
:code
|
|
(behavior ()
|
|
(transform-post)
|
|
(loop
|
|
(logior! (-> self mask) (process-mask sleep))
|
|
(suspend))))
|
|
|
|
(defbehavior blocking-plane-init-by-other blocking-plane ((arg0 curve-control) (arg1 int))
|
|
(if (or (not arg0) (logtest? (-> arg0 flags) (path-control-flag not-found))) (deactivate self))
|
|
(let ((s5-0 (new 'static 'vector))
|
|
(gp-0 (new 'static 'vector)))
|
|
0.0
|
|
(eval-path-curve-div! arg0 s5-0 (the float arg1) 'exact)
|
|
(eval-path-curve-div! arg0 gp-0 (+ 1.0 (the float arg1)) 'exact)
|
|
(let ((f30-1 (* 0.5 (vector-vector-distance s5-0 gp-0)))
|
|
(s4-1 (new 'process 'collide-shape self (collide-list-enum usually-hit-by-player))))
|
|
(let ((s3-1 (new 'process 'collide-shape-prim-mesh s4-1 (the-as uint 0) (the-as uint 0))))
|
|
(set! (-> s3-1 prim-core collide-as) (collide-kind wall-object))
|
|
(set! (-> s3-1 collide-with) (collide-kind target))
|
|
(set! (-> s3-1 prim-core action) (collide-action solid))
|
|
(set! (-> s3-1 prim-core offense) (collide-offense indestructible))
|
|
(set! (-> s3-1 transform-index) 3)
|
|
(set-vector! (-> s3-1 local-sphere) 0.0 0.0 0.0 (fmax 122880.0 f30-1))
|
|
(set-root-prim! s4-1 s3-1))
|
|
(set! (-> s4-1 nav-radius) (* 0.75 (-> s4-1 root-prim local-sphere w)))
|
|
(backup-collide-with-as s4-1)
|
|
(set! (-> self root) s4-1))
|
|
(let ((s4-2 (new-stack-matrix0)))
|
|
(vector+! (-> self root trans) s5-0 gp-0)
|
|
(vector-float*! (-> self root trans) (-> self root trans) 0.5)
|
|
(+! (-> self root trans y) 61440.0)
|
|
(vector-! (the-as vector (-> s4-2 vector)) gp-0 s5-0)
|
|
(set! (-> self root scale x) (* 0.00024414062 (vector-normalize-ret-len! (the-as vector (-> s4-2 vector)) 1.0)))
|
|
(set! (-> self root scale y) 30.0)
|
|
(set! (-> self root scale z) 0.0)
|
|
(set! (-> s4-2 vector 1 quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad))
|
|
(vector-cross! (-> s4-2 vector 2) (the-as vector (-> s4-2 vector)) (-> s4-2 vector 1))
|
|
(vector-normalize! (-> s4-2 vector 2) 1.0)
|
|
(matrix->quaternion (-> self root quat) s4-2)))
|
|
(initialize-skeleton self *ef-plane-sg* '())
|
|
(logior! (-> self draw status) (draw-status skip-bones))
|
|
(go blocking-plane-idle)
|
|
(none))
|
|
|
|
(defbehavior blocking-plane-spawn process ((arg0 curve-control))
|
|
(cond
|
|
((or (not arg0) (logtest? (-> arg0 flags) (path-control-flag not-found))))
|
|
(else
|
|
(let ((s5-0 (the int (the float (+ (-> arg0 curve num-cverts) -1))))
|
|
(s4-0 0))
|
|
(while (< s4-0 s5-0)
|
|
(process-spawn blocking-plane arg0 s4-0 :to self)
|
|
(+! s4-0 2)))))
|
|
0
|
|
(none))
|
|
|
|
(defun blocking-plane-destroy ()
|
|
(with-pp
|
|
(let ((gp-0 (-> pp child)))
|
|
(while gp-0
|
|
(let ((s5-0 (ppointer->process gp-0)))
|
|
(set! gp-0 (-> gp-0 0 brother))
|
|
(if (type-type? (-> s5-0 type) blocking-plane) (deactivate s5-0)))))
|
|
0
|
|
(none)))
|