Skip to content

jak1: fix high fps ripples + frozen ripples #4067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

jak1: fix high fps ripples + frozen ripples #4067

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae92960
Updated ripple.gc
gratefulforest Nov 1, 2025
5848ece
Updated ripple.gc
gratefulforest Nov 1, 2025
9da3000
Updated ripple.gc
gratefulforest Nov 1, 2025
9cf3723
Updated ripple.gc
gratefulforest Nov 5, 2025
0ac328f
Merge branch 'open-goal:master' into fps-ripple
gratefulforest Nov 11, 2025
f4511a9
Updated ripple.gc
gratefulforest Nov 21, 2025
383ebe3
Merge branch 'open-goal:master' into fps-ripple
gratefulforest Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions goal_src/jak1/engine/gfx/foreground/ripple.gc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
(when (!= f0-1 0.0)
(dotimes (v1-4 (-> arg0 count))
(let ((a1-4 (-> arg0 wave v1-4)))
(+! (-> a1-4 offs) (* f0-1 (-> a1-4 delta)))
(+! (-> a1-4 offs) (* f0-1 (* DISPLAY_FPS_RATIO (-> a1-4 delta)))) ;; changed for high fps
(set! (-> a1-4 offs) (the float (logand (the int (-> a1-4 offs)) #xffff)))))
(set! (-> arg0 frame-save) (the-as uint (-> *display* integral-frame-counter)))))
0
Expand All @@ -66,7 +66,11 @@
(when (-> s4-0 gp-0 waveform)
(let ((s3-0 gp-0)
(s2-0 (-> s4-0 gp-0 waveform)))
(ripple-create-wave-table (the-as ripple-wave-set s2-0))
;; og:preserve-this changed for high fps, use ntsc for table
(protect ((-> *setting-control* current video-mode))
(when (= (-> *setting-control* current video-mode) 'custom)
(set! (-> *setting-control* current video-mode) 'ntsc))
(ripple-create-wave-table (the-as ripple-wave-set s2-0)))
(while (!= s3-0 s5-0)
(when (= s2-0 (-> s4-0 s3-0 waveform))
(ripple-apply-wave-table (-> s4-0 s3-0 effect))
Expand Down
Loading