mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-10 19:17:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup settings stuff (#1444)

Browse Source 
* rename `setting-control` methods

* macros around settings stuff

* fix some `process-spawn`s

* update source 1

* update remaining stuff + fix silly bug

* clang

* AGH
This commit is contained in:
ManDude
2022-06-12 17:23:08 +01:00
committed by GitHub
parent 7bf19759d3
commit df991470f7
110 changed files with 2678 additions and 2666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/game/task/process-taskable_REF.gc
Generated Vendored
+60 -69
View File
@@ -152,56 +152,54 @@
;; definition for method 46 of type process-taskable
;; INFO: Return type mismatch int vs none.
(defmethod dummy-46 process-taskable ((obj process-taskable))
(with-pp
(when (nonzero? (-> obj sound-flava))
(let ((s5-1 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
(when (nonzero? (-> obj sound-flava))
(let ((s5-1 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
)
(set! (-> s5-1 y) (* 4.0 (-> s5-1 y)))
(cond
((< (vector-length s5-1) 102400.0)
(when (not (-> obj have-flava))
(set! (-> obj have-flava) #t)
(set-setting! *setting-control* pp 'sound-flava #f 20.0 (the-as int (-> obj sound-flava)))
)
)
((-> obj have-flava)
(clear-pending-settings-from-process *setting-control* pp 'sound-flava)
(set! (-> obj have-flava) #f)
)
)
)
(set! (-> s5-1 y) (* 4.0 (-> s5-1 y)))
(cond
((< (vector-length s5-1) 102400.0)
(when (not (-> obj have-flava))
(set! (-> obj have-flava) #t)
(set-setting! 'sound-flava #f 20.0 (-> obj sound-flava))
)
)
((-> obj have-flava)
(remove-setting! 'sound-flava)
(set! (-> obj have-flava) #f)
)
)
)
(when (-> obj music)
(let ((s5-3 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
)
)
(set! (-> s5-3 y) (* 4.0 (-> s5-3 y)))
(cond
((< (vector-length s5-3) 102400.0)
(when (not (-> obj have-music))
(set! (-> obj have-music) #t)
(set-setting! *setting-control* pp 'music (-> obj music) 0.0 0)
)
)
((-> obj have-music)
(clear-pending-settings-from-process *setting-control* pp 'music)
(set! (-> obj have-music) #f)
)
)
)
)
0
(none)
)
(when (-> obj music)
(let ((s5-3 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
)
)
(set! (-> s5-3 y) (* 4.0 (-> s5-3 y)))
(cond
((< (vector-length s5-3) 102400.0)
(when (not (-> obj have-music))
(set! (-> obj have-music) #t)
(set-setting! 'music (-> obj music) 0.0 0)
)
)
((-> obj have-music)
(remove-setting! 'music)
(set! (-> obj have-music) #f)
)
)
)
)
0
(none)
)
;; definition for method 31 of type process-taskable
@@ -454,16 +452,9 @@
(send-event (ppointer->process (-> *target* sidekick)) 'matrix 'play-anim)
(send-event *target* 'blend-shape #t)
)
(push-setting! *setting-control* self 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(push-setting! *setting-control* self 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(push-setting!
*setting-control*
self
'ambient-volume
'rel
(-> *setting-control* current ambient-volume-movie)
0
)
(add-setting! 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(add-setting! 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(add-setting! 'ambient-volume 'rel (-> *setting-control* current ambient-volume-movie) 0)
(if (-> self blend-on-exit)
(set! (-> self blend-on-exit) arg0)
)
@@ -481,9 +472,9 @@
(the-as (function process-drawable symbol) false-func)
)
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(clear-pending-settings-from-process *setting-control* self 'ambient-volume)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'ambient-volume)
(send-event *target* 'blend-shape #f)
)
(else
@@ -666,8 +657,8 @@
(defbehavior process-taskable-clean-up-after-talking process-taskable ()
(logclear! (-> self draw status) (draw-status hidden))
(logclear! (-> self skel status) (janim-status inited))
(clear-pending-settings-from-process *setting-control* self 'border-mode)
(clear-pending-settings-from-process *setting-control* self 'talking)
(remove-setting! 'border-mode)
(remove-setting! 'talking)
(none)
)
@@ -938,9 +929,9 @@
(logior! (-> self skel status) (janim-status inited))
(logclear! (-> self mask) (process-mask actor-pause))
(process-entity-status! self (entity-perm-status bit-3) #t)
(set-setting! *setting-control* self 'border-mode #f 0.0 0)
(set-setting! *setting-control* self 'talking (the-as symbol (process->ppointer self)) 0.0 0)
(copy-settings-from-target! *setting-control*)
(set-setting! 'border-mode #f 0.0 0)
(set-setting! 'talking (process->ppointer self) 0.0 0)
(apply-settings *setting-control*)
)
)
(none)
@@ -1235,10 +1226,10 @@
(('logo)
)
(else
(push-setting! *setting-control* self 'process-mask 'set 0.0 (-> self mask-to-clear))
(push-setting! *setting-control* self 'movie (process->ppointer self) 0.0 0)
(add-setting! 'process-mask 'set 0.0 (-> self mask-to-clear))
(add-setting! 'movie (process->ppointer self) 0.0 0)
(if (not (-> self border-value))
(push-setting! *setting-control* self 'border-mode (-> self border-value) 0.0 0)
(add-setting! 'border-mode (-> self border-value) 0.0 0)
)
)
)
@@ -1252,12 +1243,12 @@
(vector-normalize-copy! (-> self old-mat-z) (-> v1-19 vector 2) -1.0)
)
)
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
(none)
)
:exit (behavior ()
(clear-pending-settings-from-process *setting-control* self 'process-mask)
(copy-settings-from-target! *setting-control*)
(remove-setting! 'process-mask)
(apply-settings *setting-control*)
(none)
)
:code (behavior ()