mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-05-30 00:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak2] fix blerc profile bar issue (#2307)

Browse Source 
Fix so the profile bar doesn't do something silly when
`merc-blend-shape` returns early, skipping the part where `end-time` is
set.
This commit is contained in:
water111
2023-03-09 21:10:43 -05:00
committed by GitHub
parent 15bf281377
commit 9c7b86c595
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak2/engine/gfx/merc/merc-blend-shape.gc
+5 -2
View File
@@ -170,7 +170,8 @@
(setup-blerc-chains a0-13 a1-2 (-> *display* frames (-> *display* on-screen) global-buf))
)
(logior! (-> arg0 skel status) (joint-control-status blend-shape-valid))
(return (the-as object #f))
;;(return (the-as object #f))
(goto end) ;; modified so we don't skip the profiler bar end
)
(else
(let ((t2-0 (-> a3-0 blend-shape-anim)))
@@ -206,7 +207,8 @@
(setup-blerc-chains a0-15 a1-2 (-> *display* frames (-> *display* on-screen) global-buf))
)
(logior! (-> arg0 skel status) (joint-control-status blend-shape-valid))
(return (the-as object #f))
;; (return (the-as object #f))
(goto end) ;; modified so we don't skip the profiler bar end
)
)
)
@@ -221,6 +223,7 @@
(-> *display* frames (-> *display* on-screen) global-buf)
)
)
(label end)
(when *debug-segment*
(let ((gp-1 (-> *display* frames (-> *display* on-screen) profile-array data 0)))
(when (and *dproc* *debug-segment*)