mirror of
https://github.com/open-goal/jak-project
synced 2026-07-03 04:53:35 -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: 
116 lines
4.7 KiB
Common Lisp
116 lines
4.7 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
(require "engine/draw/drawable-h.gc")
|
|
(require "engine/game/main-h.gc")
|
|
(require "engine/entity/actor-link-h.gc")
|
|
(defenum path-control-flag
|
|
:bitfield #t
|
|
:type uint32
|
|
(display 0)
|
|
(draw-line 1) ;; TODO - only seen it used to control debug drawing so far
|
|
(draw-point 2) ;; TODO - only seen it used to control debug drawing so far
|
|
(draw-text 3) ;; TODO - only seen it used to control debug drawing so far
|
|
(not-found 4))
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
;; A path-control is a curve that can be loaded from res-lump/entities.
|
|
(deftype path-control (basic)
|
|
((flags path-control-flag)
|
|
(name symbol)
|
|
(process process-drawable)
|
|
(curve curve :inline)
|
|
(num-cverts int32 :overlay-at (-> curve num-cverts))
|
|
(cverts (inline-array vector) :overlay-at (-> curve cverts)))
|
|
(:methods
|
|
(new (symbol type process symbol float) _type_)
|
|
(debug-draw (_type_) none)
|
|
(eval-path-curve-div! (_type_ vector float symbol) vector)
|
|
(get-random-point (_type_ vector) vector)
|
|
(path-control-method-12 (_type_ vector float) vector)
|
|
(eval-path-curve! (_type_ vector float symbol) vector)
|
|
(path-control-method-14 (_type_ vector float) vector)
|
|
(length-as-float (_type_) float)
|
|
(path-distance (_type_) float)
|
|
(get-num-verts (_type_) int)
|
|
(should-display? (_type_) symbol)
|
|
(path-control-method-19 (_type_) float)
|
|
(path-control-method-20 (_type_) float)))
|
|
|
|
;; A curve-control is very similar, but also gets knots.
|
|
(deftype curve-control (path-control) ()
|
|
(:methods
|
|
(new (symbol type process symbol float) _type_)))
|
|
|
|
(defmethod new path-control ((allocation symbol) (type-to-make type) (proc process) (name symbol) (time float))
|
|
(local-vars (tag res-tag))
|
|
(let ((this (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
|
|
(when (zero? this)
|
|
;; allocation failed.
|
|
(go process-drawable-art-error "memory")
|
|
(set! this (the-as path-control 0))
|
|
(goto cfg-9))
|
|
(set! (-> this process) (the-as process-drawable proc))
|
|
(set! (-> this name) name)
|
|
(let ((ent (-> proc entity)))
|
|
(when (= name 'path)
|
|
;; if we are a path, try to look up the path-actor.
|
|
(let ((lookup-entity (entity-actor-lookup (the-as res-lump ent) 'path-actor 0)))
|
|
(if lookup-entity (set! ent lookup-entity))))
|
|
;; look up the curve data
|
|
(set! tag (new 'static 'res-tag))
|
|
(let ((data (res-lump-data ent name pointer :tag-ptr (& tag) :time time)))
|
|
(cond
|
|
(data
|
|
;; success, we got some data
|
|
(set! (-> this cverts) (the-as (inline-array vector) data))
|
|
(set! (-> this curve num-cverts) (the-as int (-> tag elt-count))))
|
|
(else
|
|
;; did not find the data. Set flags and zero stuff
|
|
(logior! (-> this flags) (path-control-flag not-found))
|
|
(set! (-> this cverts) (the-as (inline-array vector) #f))
|
|
(set! (-> this curve num-cverts) 0)
|
|
0))))
|
|
(label cfg-9)
|
|
(the-as path-control this)))
|
|
|
|
(defmethod should-display? ((this path-control))
|
|
"Should we display path marks?"
|
|
(and *display-path-marks* (logtest? (-> this flags) (path-control-flag display))))
|
|
|
|
(defmethod length-as-float ((this path-control))
|
|
"Get the number of edges as a float"
|
|
(the float (+ (-> this curve num-cverts) -1)))
|
|
|
|
(defmethod get-num-verts ((this path-control))
|
|
"Get the number of vertices"
|
|
(-> this curve num-cverts))
|
|
|
|
(defmethod new curve-control ((allocation symbol) (type-to-make type) (proc process) (name symbol) (time float))
|
|
(let ((this (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
|
|
(set! (-> this process) (the-as process-drawable proc))
|
|
(set! (-> this name) name)
|
|
(let* ((ent (-> proc entity))
|
|
(v1-2 name)
|
|
(s2-0 (cond
|
|
((= v1-2 'path)
|
|
'path-k ;; for knots?
|
|
)
|
|
(else
|
|
;; appends a -k to the symbol name.
|
|
(let ((s2-1 string->symbol)) (format (clear *temp-string*) "~A-k" name) (s2-1 *temp-string*))))))
|
|
(let ((lookup-entity (entity-actor-lookup ent 'path-actor 0))) (if lookup-entity (set! ent lookup-entity)))
|
|
(when (not (get-curve-data! ent (-> this curve) name s2-0 time))
|
|
(cond
|
|
((> (-> this curve num-cverts) 0)
|
|
;; downgrade us to a path-control, we got cverts but no knots.
|
|
(set! (-> this type) path-control))
|
|
(else
|
|
;; couldn't get anything, mark as bad.
|
|
(logior! (-> this flags) (path-control-flag not-found))
|
|
(set! (-> this cverts) (the-as (inline-array vector) #f))
|
|
(set! (-> this curve num-cverts) 0)
|
|
0))))
|
|
this))
|