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

Fix camera-other (#3843)

Browse Source 
There's a feature to draw levels with a different camera matrix. This
uses `camera-temp-other`, `camera-rot-other`, etc instead of
`camera-temp`, `camera-rot`... I assumed that `trans-other` was the
"other" version of `trans`, but it turns out this isn't true -
`trans-other` is combined with `quat-other` and the original camera
matrix.

This fixes the issue by using the translation part of
`inv-camera-rot-other` for othercam levels only. (it works in all cases,
but I didn't want to use it for normal levels since I think it will be
less accurate)

Co-authored-by: water111 <awaterford1111445@gmail.com>
This commit is contained in:
water111
2025-01-18 17:44:38 -05:00
committed by GitHub
parent ee0600cdbf
commit 341f6117d5
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak2/engine/gfx/background/background.gc
+11 -2
View File
@@ -240,7 +240,9 @@
)
;; first 4 quadwords are planes, then itimes
(let ((data-ptr (the-as (pointer uint128) (-> dma-buf base))))
(let ((data-ptr (the-as (pointer uint128) (-> dma-buf base)))
(vec-ptr (the-as (inline-array vector) (-> dma-buf base)))
)
;; the "use-camera-other" flag is set to "move" entire levels,
;; like the rotating city below in the throne room.
(cond
@@ -263,13 +265,19 @@
(set! (-> vec y) (-> *math-camera* fog-min))
(set! (-> vec z) (-> *math-camera* fog-max))
)
(set! (-> data-ptr 14) (-> *math-camera* trans-other quad))
;; the "other" version of trans doesn't have the same meaning as the normal one.
;; but inv-camera-rot-other is right, and we can just pull the translation from there.
;; I'm not certain the most accurate way to get this - either way there is an extra rotation to do.
(set! (-> data-ptr 14) (-> *math-camera* inv-camera-rot-other vector 3 quad))
(set! (-> vec-ptr 14 w) 1.0)
(set! (-> data-ptr 15) (-> *math-camera* camera-rot-other vector 0 quad))
(set! (-> data-ptr 16) (-> *math-camera* camera-rot-other vector 1 quad))
(set! (-> data-ptr 17) (-> *math-camera* camera-rot-other vector 2 quad))
(set! (-> data-ptr 18) (-> *math-camera* camera-rot-other vector 3 quad))
(set! (-> data-ptr 19) (-> *math-camera* perspective vector 0 quad))
(set! (-> data-ptr 20) (-> *math-camera* perspective vector 1 quad))
(set! (-> data-ptr 21) (-> *math-camera* perspective vector 2 quad))
@@ -295,6 +303,7 @@
(set! (-> vec y) (-> *math-camera* fog-min))
(set! (-> vec z) (-> *math-camera* fog-max))
)
;; use the camera-trans used to derive the camera matrix.
(set! (-> data-ptr 14) (-> *math-camera* trans quad))
(set! (-> data-ptr 15) (-> *math-camera* camera-rot vector 0 quad))
goal_src/jak3/engine/gfx/background/background.gc
+9 -2
View File
@@ -15,7 +15,9 @@
)
;; first 4 quadwords are planes, then itimes
(let ((data-ptr (the-as (pointer uint128) (-> dma-buf base))))
(let ((data-ptr (the-as (pointer uint128) (-> dma-buf base)))
(vec-ptr (the-as (inline-array vector) (-> dma-buf base)))
)
;; the "use-camera-other" flag is set to "move" entire levels,
;; like the rotating city below in the throne room.
(cond
@@ -38,7 +40,11 @@
(set! (-> vec y) (-> *math-camera* fog-min))
(set! (-> vec z) (-> *math-camera* fog-max))
)
(set! (-> data-ptr 14) (-> *math-camera* trans-other quad))
;; the "other" version of trans doesn't have the same meaning as the normal one.
;; but inv-camera-rot-other is right, and we can just pull the translation from there.
;; I'm not certain the most accurate way to get this - either way there is an extra rotation to do.
(set! (-> data-ptr 14) (-> *math-camera* inv-camera-rot-other vector 3 quad))
(set! (-> vec-ptr 14 w) 1.0)
(set! (-> data-ptr 15) (-> *math-camera* camera-rot-other vector 0 quad))
(set! (-> data-ptr 16) (-> *math-camera* camera-rot-other vector 1 quad))
@@ -70,6 +76,7 @@
(set! (-> vec y) (-> *math-camera* fog-min))
(set! (-> vec z) (-> *math-camera* fog-max))
)
;; use the camera-trans used to derive the camera matrix.
(set! (-> data-ptr 14) (-> *math-camera* trans quad))
(set! (-> data-ptr 15) (-> *math-camera* camera-rot vector 0 quad))