mirror of
https://github.com/open-goal/jak-project
synced 2026-08-11 11:33:51 -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: 
58 lines
1.8 KiB
Common Lisp
58 lines
1.8 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
(require "engine/draw/drawable-h.gc")
|
|
(require "kernel/gstate.gc")
|
|
(defenum align-flags
|
|
:bitfield #t
|
|
:type uint32
|
|
(disabled) ;; set by aligner if it determined it shouldn't perform alignment.
|
|
)
|
|
|
|
(defenum align-opts
|
|
:bitfield #t
|
|
:type uint32
|
|
(adjust-x-vel) ;; adjust x
|
|
(adjust-y-vel) ;; adjust y
|
|
(adjust-xz-vel) ;; adjust both x and z. (don't set this with adjust-x)
|
|
(keep-other-velocities) ;; if set, keep xz plane velocities if their alignment isn't requested
|
|
(adjust-quat) ;; adjust the orientation
|
|
(alop0)
|
|
(alop1)
|
|
(alop2)
|
|
(alop3)
|
|
(alop4)
|
|
(alop5)
|
|
(no-gravity) ;; do not apply any gravity
|
|
(ignore-y-if-zero) ;; if set and the alignment velocity is 0 in y, don't apply it.
|
|
)
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype align-control (basic)
|
|
((flags align-flags)
|
|
(process process-drawable)
|
|
(frame-group art-joint-anim)
|
|
(frame-num float)
|
|
(matrix matrix 2 :inline)
|
|
(transform transform 2 :inline)
|
|
(delta transformq :inline)
|
|
(last-speed meters)
|
|
(align transformq :inline :overlay-at (-> transform 0 trans x)))
|
|
(:methods
|
|
(new (symbol type process-drawable) _type_)
|
|
(compute-alignment! (_type_) transformq)
|
|
(align! (_type_ align-opts float float float) trsqv)
|
|
(align-vel-and-quat-only! (_type_ align-opts vector int float float) trsqv)
|
|
(first-transform (_type_) transform)
|
|
(snd-transform (_type_) transform)))
|
|
|
|
(defmethod new align-control ((allocation symbol) (type-to-make type) (proc process-drawable))
|
|
"Create a new align-control."
|
|
(let ((this (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
|
|
(when (zero? this)
|
|
(go process-drawable-art-error "memory")
|
|
(return (the align-control 0)))
|
|
(set! (-> this process) proc)
|
|
this))
|