mirror of
https://github.com/open-goal/jak-project
synced 2026-05-28 16:32:18 -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: 
83 lines
3.5 KiB
Common Lisp
83 lines
3.5 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
(require "engine/math/vector-h.gc")
|
|
(require "engine/debug/debug-h.gc")
|
|
(require "engine/math/math.gc")
|
|
(defconstant DEBUG_SPHERE_SEC_AMT (#if (user? dass) 5 10))
|
|
|
|
(defconstant DEBUG_SPHERE_SEC_H DEBUG_SPHERE_SEC_AMT)
|
|
|
|
(defconstant DEBUG_SPHERE_SEC_W DEBUG_SPHERE_SEC_AMT)
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype debug-sphere-table (basic)
|
|
((point vector 300 :inline)))
|
|
|
|
(defun make-debug-sphere-table ((arg0 debug-sphere-table))
|
|
(local-vars (sv-80 int))
|
|
(let ((s5-0 (new-stack-vector0))
|
|
(f30-0 1.0)
|
|
(s4-0 0))
|
|
(set-vector! s5-0 0.0 0.0 0.0 1.0)
|
|
(dotimes (s3-0 DEBUG_SPHERE_SEC_H)
|
|
(let ((f28-0 (* f30-0 (sin (* (degrees (/ 180 DEBUG_SPHERE_SEC_H)) (the float s3-0)))))
|
|
(f26-0 (* f30-0 (sin (* (degrees (/ 180 DEBUG_SPHERE_SEC_H)) (the float (+ s3-0 1))))))
|
|
(s2-0 (new-stack-vector0))
|
|
(s1-0 (new-stack-vector0))
|
|
(s0-0 (new-stack-vector0)))
|
|
(set! (-> s2-0 y) (+ (-> s5-0 y) (* (cos (* (degrees (/ 180 DEBUG_SPHERE_SEC_H)) (the float s3-0))) f30-0)))
|
|
(set! (-> s1-0 y) (-> s2-0 y))
|
|
(set! (-> s0-0 y) (+ (-> s5-0 y) (* (cos (* (degrees (/ 180 DEBUG_SPHERE_SEC_H)) (the float (+ s3-0 1)))) f30-0)))
|
|
(set! sv-80 0)
|
|
(while (< sv-80 DEBUG_SPHERE_SEC_W)
|
|
(set! (-> s2-0 x) (+ (-> s5-0 x) (* (cos (* (degrees (/ 360 DEBUG_SPHERE_SEC_W)) (the float sv-80))) f28-0)))
|
|
(set! (-> s2-0 z) (+ (-> s5-0 z) (* (sin (* (degrees (/ 360 DEBUG_SPHERE_SEC_W)) (the float sv-80))) f28-0)))
|
|
(set! (-> s1-0 x) (+ (-> s5-0 x) (* (cos (* (degrees (/ 360 DEBUG_SPHERE_SEC_W)) (the float (+ sv-80 1)))) f28-0)))
|
|
(set! (-> s1-0 z) (+ (-> s5-0 z) (* (sin (* (degrees (/ 360 DEBUG_SPHERE_SEC_W)) (the float (+ sv-80 1)))) f28-0)))
|
|
(set! (-> s0-0 x) (+ (-> s5-0 x) (* (cos (* (degrees (/ 360 DEBUG_SPHERE_SEC_W)) (the float sv-80))) f26-0)))
|
|
(set! (-> s0-0 z) (+ (-> s5-0 z) (* (sin (* (degrees (/ 360 DEBUG_SPHERE_SEC_W)) (the float sv-80))) f26-0)))
|
|
(set! (-> arg0 point s4-0 quad) (-> s2-0 quad))
|
|
(set! (-> arg0 point (+ s4-0 1) quad) (-> s1-0 quad))
|
|
(set! (-> arg0 point (+ s4-0 2) quad) (-> s0-0 quad))
|
|
(+! s4-0 3)
|
|
(set! sv-80 (+ sv-80 1))))))
|
|
(none))
|
|
|
|
(define *debug-sphere-table* (new 'static 'debug-sphere-table))
|
|
|
|
(make-debug-sphere-table *debug-sphere-table*)
|
|
|
|
(defun add-debug-sphere-from-table ((arg0 bucket-id) (arg1 vector) (arg2 float) (arg3 rgba))
|
|
"Draw a wireframe sphere"
|
|
(rlet ((vf1 :class vf)
|
|
(vf2 :class vf)
|
|
(vf3 :class vf)
|
|
(vf4 :class vf)
|
|
(vf5 :class vf))
|
|
(let ((s4-0 (new-stack-vector0))
|
|
(s3-0 (new-stack-vector0))
|
|
(s2-0 (new-stack-vector0))
|
|
(points (-> *debug-sphere-table* point)))
|
|
(.lvf vf1 (&-> arg1 quad))
|
|
(.mov vf2 arg2)
|
|
(dotimes (s0-0 (* DEBUG_SPHERE_SEC_W DEBUG_SPHERE_SEC_H))
|
|
(.lvf vf3 (&-> points 0 quad))
|
|
(.lvf vf4 (&-> points 1 quad))
|
|
(.lvf vf5 (&-> points 2 quad))
|
|
(set! points (the-as (inline-array vector) (-> points 3)))
|
|
(.mul.x.vf vf3 vf3 vf2)
|
|
(.mul.x.vf vf4 vf4 vf2)
|
|
(.mul.x.vf vf5 vf5 vf2)
|
|
(.add.vf vf3 vf3 vf1)
|
|
(.add.vf vf4 vf4 vf1)
|
|
(.add.vf vf5 vf5 vf1)
|
|
(.svf (&-> s4-0 quad) vf3)
|
|
(.svf (&-> s3-0 quad) vf4)
|
|
(.svf (&-> s2-0 quad) vf5)
|
|
(add-debug-line #t arg0 s4-0 s3-0 arg3 #f (the-as rgba -1))
|
|
(add-debug-line #t arg0 s4-0 s2-0 arg3 #f (the-as rgba -1))))
|
|
0
|
|
(none)))
|