mirror of
https://github.com/open-goal/jak-project
synced 2026-06-18 23:37:22 -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: 
86 lines
3.2 KiB
Common Lisp
86 lines
3.2 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
(require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
|
|
(require "engine/debug/debug.gc")
|
|
(#when PC_PORT
|
|
(define *part-tester-id* 105))
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
;; this file is debug only
|
|
(declare-file (debug))
|
|
|
|
(defpartgroup group-part-tester
|
|
:id 105
|
|
:bounds (static-bspherem 0 0 0 1)
|
|
:parts ((sp-item 56) (sp-item 57)))
|
|
|
|
(deftype part-tester (process)
|
|
((root trsqv)
|
|
(part sparticle-launch-control)
|
|
(old-group sparticle-launch-group))
|
|
:heap-base #x100)
|
|
|
|
(define-extern *part-tester* part-tester)
|
|
|
|
(define *part-tester-name* (the-as string #f))
|
|
|
|
(defmethod deactivate ((this part-tester))
|
|
(if (nonzero? (-> this part)) (kill-and-free-particles (-> this part)))
|
|
((method-of-type process deactivate) this)
|
|
(none))
|
|
|
|
(defstate part-tester-idle (part-tester)
|
|
:code
|
|
(behavior ()
|
|
(loop
|
|
(let ((gp-0 (entity-by-name *part-tester-name*)))
|
|
(when gp-0
|
|
(let ((s5-0 (-> gp-0 extra process)))
|
|
(if (and s5-0 (type-type? (-> s5-0 type) process-drawable) (nonzero? (-> (the-as process-drawable s5-0) root)))
|
|
(set! (-> self root trans quad) (-> (the-as process-drawable s5-0) root trans quad))
|
|
(set! (-> self root trans quad) (-> gp-0 extra trans quad))))))
|
|
(add-debug-x #t
|
|
(bucket-id debug-no-zbuf)
|
|
(-> self root trans)
|
|
(the-as rgba (new 'static 'rgba :r #xff :g #xff :b #xff :a #x80)))
|
|
;; og:preserve-this
|
|
;; change this line to change the particle group to test
|
|
;; notes:
|
|
;; - particles that use aux list won't work (warp parts)
|
|
;; - some particles may have callbacks that won't work yet
|
|
(let ((gp-1 (-> *part-group-id-table* 105)))
|
|
(#when PC_PORT
|
|
(if (nonzero? (-> *part-group-id-table* *part-tester-id*)) (set! gp-1 (-> *part-group-id-table* *part-tester-id*))))
|
|
(let ((s5-1 (-> self root trans)))
|
|
(when (!= gp-1 (-> self old-group))
|
|
(when (nonzero? (-> self part))
|
|
(kill-and-free-particles (-> self part))
|
|
(set! (-> self heap-cur) (&-> (-> self part) type)))
|
|
(set! (-> self part) (create-launch-control gp-1 self)))
|
|
(if (nonzero? (-> self part))
|
|
(spawn (-> self part)
|
|
(cond
|
|
((logtest? (-> gp-1 flags) (sp-group-flag screen-space)) *zero-vector*)
|
|
(else (empty) s5-1)))))
|
|
(set! (-> self old-group) gp-1))
|
|
(suspend))))
|
|
|
|
(defbehavior part-tester-init-by-other process-drawable ((arg0 vector))
|
|
(set! (-> self root) (new 'process 'trsqv))
|
|
(set! (-> self root trans quad) (-> arg0 quad))
|
|
(set! *part-tester* (the-as part-tester (process->ppointer self)))
|
|
(go part-tester-idle)
|
|
(none))
|
|
|
|
(define-perm *debug-part-dead-pool* dead-pool (new 'debug 'dead-pool 1 #x10000 '*debug-part-dead-pool*))
|
|
|
|
(defun start-part ()
|
|
(kill-by-type part-tester *active-pool*)
|
|
(process-spawn part-tester
|
|
(if *anim-tester* (-> *anim-tester* 0 root trans) (target-pos 0))
|
|
:from
|
|
*debug-part-dead-pool*)
|
|
(none))
|