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] more nav-related nan fixes (#2472)

Browse source 
Fixes citizens that disappear (permanently) when being pushed into a
"wall" which is the border of a nav mesh that is exactly aligned with
coordinate axes.
This commit is contained in:
water111 2023-04-12 19:43:31 -04:00 committed by GitHub
parent 7b2322777a
commit 6b6a565d1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
goal_src/jak2/engine/collide/collide-shape-h.gc
View file

@ -671,3 +671,21 @@
)
(define-perm *collide-rider-pool* collide-rider-pool (new 'global 'collide-rider-pool))
(defmacro normalized-heading-to-quaternion! (quat heading)
"Modified for PC. This does a clever trick, but it doesn't work if the heading is exactly
[0, 0, -1] because this tries to normalize a quaternion that's all 0's.
I think that, on ps2, something prevents the heading from being exactly 0, 0, -1,
but this doesn't happen on PC. A similar thing happened with Jak 1's punch glitch,
where some trig functions were slightly off from returning exactly 0.0 and 1.0 on ps2
rounding only."
`(begin
(if (and (= (-> ,heading x) 0.0)
(= (+ 1.0 (-> ,heading z)) 0.0)
)
(quaternion-set! ,quat 0.0 1.0 0.0 0.0)
(quaternion-set! ,quat 0.0 (-> ,heading x) 0.0 (+ 1.0 (-> ,heading z)))
)
(quaternion-normalize! ,quat)
)
)

16
goal_src/jak2/engine/nav/nav-enemy.gc
View file

@ -559,21 +559,9 @@
)
(set! (-> s5-0 y) 0.0)
(vector-normalize! s5-0 1.0)
(quaternion-set! (-> obj root-override2 quat) 0.0 (-> s5-0 x) 0.0 (+ 1.0 (-> s5-0 z)))
;; modified for PC:
;; this code is doing a clever way to go from heading vector to quaternion, but it doesn't handle the case where
;; the heading is exactly pointing along -z. So we do this manually
;; There's two possible theories for how this worked on ps2:
;; - it was just wrong, but instead of giving nans, it just points the guard in the wrong direction
;; - the code that generates the heading on PS2 can't generate (0, 0, -1) exactly.
;; (this was the case for punch glitch - the trig function acos couldn't reach 1.0 exactly with PS2
;; float rounding rules).
(when (and (= (-> s5-0 x) 0.0)
(= (+ 1.0 (-> s5-0 z)) 0.0) ;; actually the condition that causes problems
)
(quaternion-set! (-> obj root-override2 quat) 0.0 1.0 0.0 0.0)
)
;; modified for PC, see comment near definition in collide-shape-h.gc
(normalized-heading-to-quaternion! (-> obj root-override2 quat) s5-0)
)
(quaternion-normalize! (-> obj root-override2 quat))
0

4
goal_src/jak2/levels/city/common/citizen.gc
View file

@ -610,8 +610,8 @@
(let ((gp-0 (new 'stack-no-clear 'quaternion))
(s5-1 (-> obj root-override2 quat))
)
(quaternion-set! gp-0 0.0 (-> s3-0 x) 0.0 (+ 1.0 (-> s3-0 z)))
(quaternion-normalize! gp-0)
;; modified for PC, see comment near definition in collide-shape-h.gc
(normalized-heading-to-quaternion! gp-0 s3-0)
(quaternion-pseudo-seek
s5-1
s5-1

3
goal_src/jak2/levels/stadium/stadium-obs.gc
View file

@ -1777,8 +1777,7 @@ This commonly includes things such as:
)
(set! (-> s4-0 y) 0.0)
(vector-normalize! s4-0 1.0)
(quaternion-set! s5-0 0.0 (-> s4-0 x) 0.0 (+ 1.0 (-> s4-0 z)))
(quaternion-normalize! s5-0)
(normalized-heading-to-quaternion! s5-0 s4-0) ;; changed to avoid NaN issue
(quaternion-slerp!
(-> self root-override2 quat)
(-> self root-override2 quat)