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: ![Screenshot 2024-05-25 132900](https://github.com/open-goal/jak-project/assets/13153231/015e6f20-8d19-49b7-9951-97fa88ddc6c2) > 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: ![image](https://github.com/open-goal/jak-project/assets/13153231/0edfaba1-6d36-40f5-ab23-0642209867c4)
35 lines
1.4 KiB
Common Lisp
35 lines
1.4 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "BEA.DGO")
|
|
(require "engine/math/vector-h.gc")
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype air-box (structure)
|
|
((vecs vector 2 :inline)
|
|
(x-pos float :overlay-at (-> vecs 0 x))
|
|
(height-level float :overlay-at (-> vecs 0 y))
|
|
(z-pos float :overlay-at (-> vecs 0 z))
|
|
(cos-angle float :overlay-at (-> vecs 0 w))
|
|
(x-length float :offset 16)
|
|
(z-length float :offset 24)
|
|
(sin-angle float :offset 28)))
|
|
|
|
(defun point-in-air-box-area? ((arg0 float) (arg1 float) (arg2 air-box))
|
|
(let ((v0-0 #f))
|
|
(let ((f0-2 (+ (* arg0 (-> arg2 cos-angle)) (* arg1 (-> arg2 sin-angle))))
|
|
(f1-5 (- (* arg1 (-> arg2 cos-angle)) (* arg0 (-> arg2 sin-angle)))))
|
|
(if (and (>= f0-2 0.0) (>= f1-5 0.0) (< f0-2 (-> arg2 x-length)) (< f1-5 (-> arg2 z-length))) (set! v0-0 #t)))
|
|
v0-0))
|
|
|
|
(defun point-in-air-box? ((arg0 vector) (arg1 air-box))
|
|
(when (< (-> arg1 height-level) (-> arg0 y))
|
|
(let ((f1-2 (- (-> arg0 x) (the-as float (-> arg1 x-pos))))
|
|
(f2-1 (- (-> arg0 z) (-> arg1 z-pos)))
|
|
(v1-0 arg1)
|
|
(v0-0 #f))
|
|
(let ((f0-5 (+ (* f1-2 (-> v1-0 cos-angle)) (* f2-1 (-> v1-0 sin-angle))))
|
|
(f1-4 (- (* f2-1 (-> v1-0 cos-angle)) (* f1-2 (-> v1-0 sin-angle)))))
|
|
(if (and (>= f0-5 0.0) (>= f1-4 0.0) (< f0-5 (-> v1-0 x-length)) (< f1-4 (-> v1-0 z-length))) (set! v0-0 #t)))
|
|
v0-0)))
|