Skip to content

Commit

Permalink
Run Formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
Zedb0T committed Dec 10, 2024
1 parent 04a3818 commit edda13f
Show file tree
Hide file tree
Showing 131 changed files with 4,158 additions and 517 deletions.
7 changes: 0 additions & 7 deletions goal_src/jak1/engine/anim/joint-exploder.gc
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@
(:methods
(new (symbol type int) _type_)))


(deftype joint-exploder-static-joint-params (structure)
((joint-index int16)
(parent-joint-index int16)))


(deftype joint-exploder-static-params (basic)
((joints (array joint-exploder-static-joint-params))))


(deftype joint-exploder-joint (structure)
((next int16)
(prev int16)
Expand All @@ -41,21 +38,18 @@
(transv vector :inline)
(prev-pos vector :inline)))


(deftype joint-exploder-joints (basic)
((num-joints int32)
(joint joint-exploder-joint :inline :dynamic :offset 16))
(:methods
(new (symbol type joint-exploder-static-params) _type_)))


(deftype joint-exploder-list (structure)
((head int32)
(pre-moved? symbol)
(bbox-valid? symbol)
(bbox bounding-box :inline)))


(deftype joint-exploder (process-drawable)
((parent-override (pointer process-drawable) :overlay-at parent)
(die-if-below-y float)
Expand All @@ -79,7 +73,6 @@
(:states
joint-exploder-shatter))


(defmethod asize-of ((this joint-exploder-joints))
(the-as int (+ (-> this type size) (* 176 (-> this num-joints)))))

Expand Down
11 changes: 0 additions & 11 deletions goal_src/jak1/engine/camera/cam-layout.gc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
(debug-t float)
(debug-step float)))


(define *CAM_LAYOUT-bank*
(new 'static
'cam-layout-bank
Expand All @@ -35,7 +34,6 @@

(deftype clm-basic (basic) ())


(deftype clm-item-action (structure)
((button uint64)
(options uint64)
Expand All @@ -45,13 +43,11 @@
(parm1-basic basic :offset 24)
(parm1 symbol :overlay-at parm1-basic)))


(deftype clm-item (clm-basic)
((description string)
(button-symbol symbol)
(action clm-item-action :inline)))


(deftype clm-list-item (basic)
((description string)
(track-val symbol)
Expand All @@ -62,18 +58,15 @@
(val-parm1 symbol :overlay-at val-parm1-basic)
(actions (array clm-item-action))))


(deftype clm-list (clm-basic)
((tracker symbol)
(cur-list-item int32)
(items (array clm-list-item))))


(deftype clm (basic)
((title string)
(items (array clm-basic))))


(define *volume-point-current* 0)

(define *volume-point* (new 'debug 'vector-array 1000))
Expand All @@ -85,7 +78,6 @@
(deftype volume-descriptor-array (inline-array-class)
((data plane-volume :inline :dynamic :offset 16)))


(set! (-> volume-descriptor-array heap-base) (the-as uint 24))

(define *volume-descriptor-current* 0)
Expand All @@ -105,7 +97,6 @@
(:states
cam-layout-active))


(defun cam-layout-print ((arg0 int) (arg1 int) (arg2 string))
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) frame debug-buf))
(gp-0 (-> s5-0 base)))
Expand Down Expand Up @@ -299,7 +290,6 @@
(axis vector)
(disp string)))


(defun interp-test ((arg0 (function vector vector vector float vector float none)) (arg1 interp-test-info))
(let ((s3-0 (new-stack-vector0))
(gp-0 (new-stack-vector0)))
Expand Down Expand Up @@ -1446,7 +1436,6 @@
(force-on int32)
(force-off int32)))


(defbehavior clmf-cam-flag-toggle cam-layout ((arg0 int) (arg1 int))
(let ((s4-0 (/ arg0 8))
(gp-0 (new 'stack 'clmf-cam-flag-toggle-info)))
Expand Down
2 changes: 0 additions & 2 deletions goal_src/jak1/engine/camera/cam-master.gc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
(down-move-to-pitch-on-ground float)
(pitch-off-blend float)))


(define *CAMERA_MASTER-bank*
(new 'static
'camera-master-bank
Expand Down Expand Up @@ -958,7 +957,6 @@
(deftype list-keeper (process)
((dummy float)))


(defstate list-keeper-active (camera-master)
:code
(behavior ()
Expand Down
5 changes: 0 additions & 5 deletions goal_src/jak1/engine/camera/cam-states-dbg.gc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
((speed float)
(rot-speed degrees)))


(define *CAM_POINT_WATCH-bank* (new 'static 'cam-point-watch-bank :speed 1600.0 :rot-speed (degrees 0.6)))

(defstate cam-point-watch (camera-slave)
Expand Down Expand Up @@ -64,7 +63,6 @@
((speed float)
(rot-speed degrees)))


(define *CAM_FREE-bank* (new 'static 'cam-free-bank :speed 1600.0 :rot-speed (degrees 0.6)))

(defun cam-free-floating-input ((arg0 vector) (arg1 vector) (arg2 symbol) (arg3 int))
Expand Down Expand Up @@ -253,7 +251,6 @@
(up vector :inline)
(tm matrix :inline)))


(defun cam-free-floating-move ((arg0 matrix) (arg1 vector) (arg2 vector) (arg3 int))
(if (logtest? (-> *cpad-list* cpads arg3 valid) 128) (return (the-as vector #f)))
(if (= *master-mode* 'menu) (return (the-as vector #f)))
Expand Down Expand Up @@ -301,14 +298,12 @@
(orbit-off vector :inline)
(radius-lerp float)))


(deftype CAM_ORBIT-bank (basic)
((RADIUS_MAX float)
(RADIUS_MIN float)
(TARGET_OFF_ADJUST float)
(ORBIT_OFF_ADJUST float)))


(define *CAM_ORBIT-bank*
(new 'static 'CAM_ORBIT-bank :RADIUS_MAX 61440.0 :RADIUS_MIN 409.6 :TARGET_OFF_ADJUST 81.92 :ORBIT_OFF_ADJUST 81.92))

Expand Down
8 changes: 0 additions & 8 deletions goal_src/jak1/engine/camera/cam-states.gc
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@
(max-fov float)
(min-fov float)))


(define *CAM_EYE-bank*
(new 'static 'cam-eye-bank :rot-speed 364.0889 :max-degrees 12743.111 :max-fov 11650.845 :min-fov 6189.511))

Expand Down Expand Up @@ -354,7 +353,6 @@
((rot-speed float)
(tilt-degrees float)))


(define *CAM_BILLY-bank* (new 'static 'cam-billy-bank :rot-speed 364.0889 :tilt-degrees -1820.4445))

(defstate cam-billy (camera-slave)
Expand Down Expand Up @@ -750,7 +748,6 @@
((los-coll-rad meters)
(los-coll-rad2 meters)))


(define *CAM_STRING-bank* (new 'static 'cam-string-bank :los-coll-rad (meters 1) :los-coll-rad2 (meters 0.5)))

(defun cam-string-find-position-rel! ((arg0 vector))
Expand Down Expand Up @@ -820,7 +817,6 @@
(lat-dist float)
(vert-dist float)))


(deftype collide-los-dist-info (structure)
((min-par float)
(max-par float)
Expand All @@ -832,7 +828,6 @@
(max-vn float)
(count int32)))


(defun dist-info-init ((arg0 collide-los-dist-info))
(set! (-> arg0 min-par) 1.0)
(set! (-> arg0 max-par) 0.0)
Expand Down Expand Up @@ -898,7 +893,6 @@
(straddle collide-los-dist-info :inline)
(lateral-valid symbol)))


(defun los-cw-ccw ((arg0 (inline-array collide-cache-tri))
(arg1 vector)
(arg2 vector)
Expand Down Expand Up @@ -1735,7 +1729,6 @@
(max-y meters)
(min-y meters)))


(define *CAM_STICK-bank*
(new 'static 'cam-stick-bank :max-z (meters 30) :min-z (meters 5) :max-y (meters 15) :min-y (meters 2)))

Expand Down Expand Up @@ -1873,7 +1866,6 @@
(max-y meters)
(min-y meters)))


(define *CAM_BIKE-bank*
(new 'static 'cam-bike-bank :max-z (meters 6) :min-z (meters 10) :max-y (meters 3) :min-y (meters 5)))

Expand Down
17 changes: 0 additions & 17 deletions goal_src/jak1/engine/common-obs/collectables.gc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
(initialize (_type_) _type_)
(initialize-params (_type_ time-frame float) none)))


(defmethod initialize-params ((this collectable) (arg0 time-frame) (arg1 float))
(logclear! (-> this mask) (process-mask crate enemy platform ambient))
(logior! (-> this mask) (process-mask collectable))
Expand Down Expand Up @@ -102,7 +101,6 @@
(animate (_type_) none)
(blocked () _type_ :state)))


(defmethod initialize ((this eco-collectable))
(stack-size-set! (-> this main-thread) 192) ;; og:preserve-this hack increased from 128
(logior! (-> this mask) (process-mask actor-pause))
Expand Down Expand Up @@ -537,7 +535,6 @@

(deftype eco (eco-collectable) ())


(defmethod animate ((this eco))
(let ((a0-1 (-> this part))
(a1-0 (-> this root root-prim prim-core)))
Expand Down Expand Up @@ -576,28 +573,24 @@

(deftype eco-yellow (eco) ())


(defmethod init-from-entity! ((this eco-yellow) (arg0 entity-actor))
(initialize-eco this arg0 (pickup-type eco-yellow) (-> *FACT-bank* eco-single-inc))
(none))

(deftype eco-red (eco) ())


(defmethod init-from-entity! ((this eco-red) (arg0 entity-actor))
(initialize-eco this arg0 (pickup-type eco-red) (-> *FACT-bank* eco-single-inc))
(none))

(deftype eco-blue (eco) ())


(defmethod init-from-entity! ((this eco-blue) (arg0 entity-actor))
(initialize-eco this arg0 (pickup-type eco-blue) (-> *FACT-bank* eco-single-inc))
(none))

(deftype health (eco-collectable) ())


(defmethod animate ((this health))
(let ((a0-1 (-> this part))
(a1-0 (-> this root root-prim prim-core)))
Expand All @@ -612,7 +605,6 @@

(deftype eco-pill (eco-collectable) ())


(defmethod animate ((this eco-pill))
(let ((a0-1 (-> this part))
(a1-0 (-> this root root-prim prim-core)))
Expand Down Expand Up @@ -669,7 +661,6 @@

(deftype money (eco-collectable) ())


(defmethod run-logic? ((this money))
(or (not (logtest? (-> this mask) (process-mask actor-pause)))
(or (and (nonzero? (-> this draw))
Expand Down Expand Up @@ -823,7 +814,6 @@
(:states (fuel-cell-clone-anim handle)
(fuel-cell-spline-slider handle float float)))


(defun fuel-cell-pick-anim ((arg0 process-drawable))
(let* ((gp-0 (-> arg0 entity extra trans))
(a0-2 (res-lump-value (-> arg0 entity) 'movie-mask uint128 :time (the-as float -1000000000.0)))
Expand Down Expand Up @@ -1230,7 +1220,6 @@
(deftype buzzer (eco-collectable)
((victory-anim spool-anim)))


(defmethod animate ((this buzzer))
(quaternion-rotate-y! (-> this root quat) (-> this root quat) (* 40049.777 (seconds-per-frame)))
(let ((a0-2 (-> this skel root-channel 0)))
Expand Down Expand Up @@ -1576,7 +1565,6 @@
(:states
ecovalve-idle))


(defskelgroup *ecovalve-sg*
ecovalve
ecovalve-geo-jg
Expand Down Expand Up @@ -1648,7 +1636,6 @@
(vent-pickup handle)
vent-wait-for-touch))


(defmethod initialize ((this vent) (arg0 entity-actor) (arg1 pickup-type))
(stack-size-set! (-> this main-thread) 128)
(logior! (-> this mask) (process-mask actor-pause))
Expand Down Expand Up @@ -1790,28 +1777,24 @@

(deftype ventyellow (vent) ())


(defmethod init-from-entity! ((this ventyellow) (arg0 entity-actor))
(initialize this arg0 (pickup-type eco-yellow))
(none))

(deftype ventred (vent) ())


(defmethod init-from-entity! ((this ventred) (arg0 entity-actor))
(initialize this arg0 (pickup-type eco-red))
(none))

(deftype ventblue (vent) ())


(defmethod init-from-entity! ((this ventblue) (arg0 entity-actor))
(initialize this arg0 (pickup-type eco-blue))
(none))

(deftype ecovent (vent) ())


(defmethod init-from-entity! ((this ecovent) (arg0 entity-actor))
(initialize this arg0 (pickup-type eco-blue))
(none))
Loading

0 comments on commit edda13f

Please sign in to comment.