mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-11 07:25:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak2] fix health bar color fading (#3241)

Browse Source 
Fixes #3237
This commit is contained in:
ManDude
2023-12-03 09:42:01 +00:00
committed by GitHub
parent be6a6dead4
commit 2795d3aa67
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak2/levels/city/traffic/vehicle/vehicle.gc
+1 -1
View File
@@ -1323,7 +1323,7 @@
(set! x (- (+ (/ (-> screen-pos x) 16) -1792) (/ w 2)))
(set! y (+ (+ (/ (-> screen-pos y) 16) -1855) 20))
(draw-health-bar x y w h (-> this hit-points) (bucket-id debug-no-zbuf1))
(draw-health-bar x y w h (-> this hit-points) 1.0 (bucket-id debug-no-zbuf1))
)))
)
)
goal_src/jak2/pc/damage-number.gc
+15 -13
View File
@@ -174,30 +174,32 @@
(defun draw-health-bar ((x int) (y int) (width int) (height int) (percentage float) (bucket bucket-id))
(defun draw-health-bar ((x int) (y int) (width int) (height int) (hit-points float) (hit-points-max float) (bucket bucket-id))
"Draw a rectangular health bar at the given location. color fades from green to yellow to red."
(let* ((color (static-rgba 0 0 0 #x80))
(bar-w (the int (* percentage (max 0 (+ width -4)))))
(bar-w (the int (* (/ hit-points hit-points-max) (max 0 (+ width -4)))))
(x2 (+ x width))
(bx2 (+ x 2 bar-w)))
(bx2 (+ x 2 bar-w))
(color-fade (if (<= hit-points-max 1.0)
(/ hit-points hit-points-max)
(/ (1- hit-points) (1- hit-points-max)))))
(cond
((>= percentage 0.6)
((>= color-fade 0.5)
;; fade from green -> yellow
(set! (-> color r) (the int (lerp-scale (the float (-> *color-green* r)) (the float (-> *color-yellow* r)) percentage 1.0 0.55)))
(set! (-> color g) (the int (lerp-scale (the float (-> *color-green* g)) (the float (-> *color-yellow* g)) percentage 1.0 0.55)))
(set! (-> color b) (the int (lerp-scale (the float (-> *color-green* b)) (the float (-> *color-yellow* b)) percentage 1.0 0.55)))
(set! (-> color r) (the int (lerp-scale (the float (-> *color-green* r)) (the float (-> *color-yellow* r)) color-fade 1.0 0.5)))
(set! (-> color g) (the int (lerp-scale (the float (-> *color-green* g)) (the float (-> *color-yellow* g)) color-fade 1.0 0.5)))
(set! (-> color b) (the int (lerp-scale (the float (-> *color-green* b)) (the float (-> *color-yellow* b)) color-fade 1.0 0.5)))
)
(else
;; fade from yellow -> red
(set! (-> color r) (the int (lerp-scale (the float (-> *color-yellow* r)) (the float (-> *color-red* r)) percentage 0.55 0.1)))
(set! (-> color g) (the int (lerp-scale (the float (-> *color-yellow* g)) (the float (-> *color-red* g)) percentage 0.55 0.1)))
(set! (-> color b) (the int (lerp-scale (the float (-> *color-yellow* b)) (the float (-> *color-red* b)) percentage 0.55 0.1)))
(set! (-> color r) (the int (lerp-scale (the float (-> *color-yellow* r)) (the float (-> *color-red* r)) color-fade 0.5 0.0)))
(set! (-> color g) (the int (lerp-scale (the float (-> *color-yellow* g)) (the float (-> *color-red* g)) color-fade 0.5 0.0)))
(set! (-> color b) (the int (lerp-scale (the float (-> *color-yellow* b)) (the float (-> *color-red* b)) color-fade 0.5 0.0)))
)
)
(with-dma-buffer-add-bucket ((buf (-> *display* frames (-> *display* on-screen) global-buf))
bucket
)
bucket)
(cond
((< x -2)
(+! width x)
@@ -369,7 +371,7 @@
(> (meters 160) (vector-vector-distance (-> (the process-drawable (handle->process (-> self owner))) root trans) (math-camera-pos))))
(draw-health-bar (the int (-> self font origin x)) (the int (-> self font origin y))
(the int (-> self width)) (the int (-> self height))
(/ (-> self hit-points) (-> self hit-points-max))
(-> self hit-points) (-> self hit-points-max)
(bucket-id debug-no-zbuf1))
;(print-game-text (string-format "~,,0f/~,,0f" (-> self hit-points) (-> self hit-points-max)) (-> self font) #f 44 (bucket-id debug-no-zbuf1))
)