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

[game] music player (#1416)

Browse Source 
* music flava hack toggle

* fix hint subtitles not being considered offscreen

* music player works

* fixes + citadel, maincave, lavatube music

* add remaining tracks

* fix test

* fixes

* fix lib
This commit is contained in:
ManDude
2022-06-04 19:53:49 +01:00
committed by GitHub
parent 0c16d3c3d8
commit d01c16f451
28 changed files with 856 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/engine/ui/progress/progress-draw.gc
+5 -20
View File
@@ -1462,26 +1462,11 @@
(none)
)
(defun draw-percent-bar ((arg0 int) (arg1 int) (arg2 float) (arg3 int))
(let* ((s2-0 (-> *display* frames (-> *display* on-screen) frame global-buf))
(gp-0 (-> s2-0 base))
)
(defun draw-percent-bar ((arg0 int) (arg1 int) (arg2 float) (arg3 rgba))
(with-dma-buffer-add-bucket ((s2-0 (-> (current-frame) global-buf))
(bucket-id sprite))
(draw-sprite2d-xy s2-0 arg0 arg1 255 14 (new 'static 'rgba :a #x60))
(draw-sprite2d-xy s2-0 arg0 (+ arg1 2) (the int (* 255.0 arg2)) 10 (the-as rgba arg3))
(let ((a3-3 (-> s2-0 base)))
(let ((v1-3 (the-as dma-packet (-> s2-0 base))))
(set! (-> v1-3 dma) (new 'static 'dma-tag :id (dma-tag-id next)))
(set! (-> v1-3 vif0) (new 'static 'vif-tag))
(set! (-> v1-3 vif1) (new 'static 'vif-tag))
(set! (-> s2-0 base) (&+ (the-as pointer v1-3) 16))
)
(dma-bucket-insert-tag
(-> *display* frames (-> *display* on-screen) frame bucket-group)
(bucket-id sprite)
gp-0
(the-as (pointer dma-tag) a3-3)
)
)
(draw-sprite2d-xy s2-0 arg0 (+ arg1 2) (the int (* 255.0 arg2)) 10 arg3)
)
0
(none)
@@ -1572,7 +1557,7 @@
(a0-34 (logior (logand v1-82 -256) (shr (shl (the int (+ 64.0 (* 191.0 f0-12))) 56) 56)))
(a3-5 (logior (logand a0-34 -65281) (shr (shl (shr (shl a0-34 56) 56) 56) 48)))
)
(draw-percent-bar (- 75 (-> obj left-x-offset)) (+ s2-1 8) f0-12 (the-as int a3-5))
(draw-percent-bar (- 75 (-> obj left-x-offset)) (+ s2-1 8) f0-12 (the-as rgba a3-5))
)
(set! option-str (string-format "~D" (the int (-> (the-as (pointer float) (-> s3-0 s0-0 value-to-modify))))))
(set! x-off (+ (the int (* 2.5 (-> (the-as (pointer float) (-> s3-0 s0-0 value-to-modify))))) -100))
goal_src/engine/ui/progress/progress.gc
+3
View File
@@ -872,6 +872,9 @@
(= v1-2 (progress-screen gfx-ps2-options))
(= v1-2 (progress-screen resolution))
(= v1-2 (progress-screen aspect-ratio))
(= v1-2 (progress-screen secrets))
(= v1-2 (progress-screen music-player))
(= v1-2 (progress-screen flava-player))
)
)
)