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

regressions

Browse Source
This commit is contained in:
Hat Kid
2026-04-18 23:22:41 +02:00
parent bf42802763
commit e4667607f9
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak2/engine/anim/joint.gc
+19 -4
View File
@@ -2046,10 +2046,25 @@
(def-mips2c calc-animation-from-spr (function joint-anim-frame int none))
(defun create-interpolated-joint-animation-frame ((dst joint-anim-frame) (num-joints int) (jc joint-control))
(flatten-joint-control-to-spr jc)
(make-joint-jump-tables)
(calc-animation-from-spr dst num-joints)
;; og:preserve-this
(defun create-interpolated-joint-animation-frame ((output-frame joint-anim-frame) (arg1 int) (arg2 joint-control))
(let ((start (get-cpu-clock)))
(cond
(*use-new-decompressor*
(new-joint-decompressor output-frame arg1 arg2)
)
(else
(flatten-joint-control-to-spr arg2)
(make-joint-jump-tables)
(calc-animation-from-spr output-frame arg1)
)
)
(+! (-> *new-joint-decompressor-stats* total-time)
(the int (* 1000000. (cpu-ticks-to-seconds (- (get-cpu-clock) start))))
)
)
0
)
goal_src/jak2/engine/debug/default-menu.gc
+5 -4
View File
@@ -2682,10 +2682,11 @@
(logtest? (continue-flags test) (-> (the-as continue-point v1-2) flags))
#t
)
(set! s5-0 (cons
(cons 'flag (cons
;; og:preserve-this cons -> dcons
(set! s5-0 (dcons
(dcons 'flag (dcons
(-> (the-as continue-point v1-2) name)
(cons (-> (the-as continue-point v1-2) name) (cons 'dm-current-continue '()))
(dcons (-> (the-as continue-point v1-2) name) (dcons 'dm-current-continue '()))
)
)
s5-0
@@ -2710,7 +2711,7 @@
)
)
;; og:preserve-this cons -> dcons
(dcons 'menu (cons (symbol->string arg1) a3-5))
(dcons 'menu (dcons (symbol->string arg1) a3-5))
)
)
)
goal_src/jak2/engine/gfx/ocean/ocean-mid.gc
+2 -1
View File
@@ -1012,7 +1012,8 @@
(while (>= s1-0 s2-0)
(set! (-> sv-36 x) (+ 196608.0 (* 393216.0 (the float s2-0)) (-> this start-corner x)))
(set! (-> sv-36 z) (+ 196608.0 (* 393216.0 (the float s4-0)) (-> this start-corner z)))
(when (sphere-cull sv-36)
;; og:preserve-this
(when (sphere-cull-for-ocean sv-36)
(cond
((= s4-0 sv-34)
(ocean-mid-add-upload-top this arg0 s4-0 s2-0)