Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[jak2] fix bad blerc on objects with warp (#2907)

Browse source 
fixes the weird mirror offset stuff

![image](https://github.com/open-goal/jak-project/assets/48171810/9a36c0bd-7350-46d7-b14f-d2f876582b03)
This commit is contained in:
water111 2023-08-15 22:10:33 -04:00 committed by GitHub
parent 0c5e01643e
commit bf7a2161b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
goal_src/jak2/engine/game/main.gc
View file

@ -875,11 +875,7 @@
; ;; Run blerc to modify foreground models
(with-profiler 'merc *profile-merc-color*
;; with FP blerc, the vertices are modified in the PC renderer, so we can just skip
;; this call to save time.
(unless *use-fp-blerc*
(blerc-execute)
)
(blerc-init)
)

42
goal_src/jak2/engine/gfx/foreground/merc/merc-blend-shape.gc
View file

@ -128,6 +128,31 @@
(def-mips2c blerc-execute (function none))
(defun process-drawable-might-need-blerc? ((pd process-drawable))
"Annoyingly, some warp object have blend shape anims, like the hiphog mirror.
These are never drawn with PC-merc (it doesn't support warp), so we still
need to the PS2-style blerc for generic. This function sees if this process-drawable
might be warp."
(let ((draw (-> pd draw)))
(if (or (zero? draw) (not draw))
(return #f)
)
(let ((geo (-> draw mgeo)))
(if (or (zero? geo) (not geo))
(return #f)
)
(dotimes (effect-idx (-> geo header effect-count))
(when (= (-> geo effect effect-idx texture-index) (tpage-category warp))
(return #t)
)
)
)
)
#f
)
;; WARN: Return type mismatch int vs object.
(defun merc-blend-shape ((arg0 process-drawable))
(when *debug-segment*
@ -152,9 +177,17 @@
)
0
)
(let* ((a2-0 (-> arg0 skel root-channel 0))
(a3-0 (-> a2-0 frame-group))
(a1-2 (new 'stack-no-clear 'array 'int16 128))
;; don't bother with blerc math if we don't need it.
;; even if we don't need blerc math, we should still run this function to update flags.
(disable-blerc
(and *use-fp-blerc*
(not (process-drawable-might-need-blerc? arg0)))
)
)
(when (and a3-0
(> (-> arg0 skel active-channels) 0)
@ -171,8 +204,10 @@
(set! (-> a1-2 a3-1) (the int (* 8192.0 (-> a2-2 (+ a3-1 1)))))
)
)
(when (not disable-blerc)
(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))
(goto end) ;; modified so we don't skip the profiler bar end
@ -208,8 +243,10 @@
)
)
)
(when (not disable-blerc)
(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))
(goto end) ;; modified so we don't skip the profiler bar end
@ -218,15 +255,18 @@
)
)
)
)
(when (logtest? (-> arg0 skel status) (joint-control-status blend-shape-valid))
(logclear! (-> arg0 skel status) (joint-control-status blend-shape-valid))
(when (not disable-blerc)
(setup-blerc-chains
(-> arg0 draw lod-set lod 0 geo)
(new 'static 'array int16 40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
(-> *display* frames (-> *display* on-screen) global-buf)
)
)
)
)
(label end)
(when *debug-segment*
(let ((gp-1 (-> *display* frames (-> *display* on-screen) profile-array data 0)))