mirror of
https://github.com/open-goal/jak-project
synced 2026-09-06 11:20:54 -04:00
d/jak2: finish glist | glist-h | camera | cam-interface | cam-states-dbg | cam-combiner | cam-debug | cam-start (#1829)
* d/jak2: finish `glist` and `glist-h` partially done `time-of-day` * d/jak2: finish `camera` and `cam-interface` * d/jak2: partially finish `cam-master` `cam-states`, and `cam-update` finish `cam-states-dbg` `cam-combiner` `cam-debug` and `cam-start` * tests: update ref tests * scripts: add scripts to automatically update gsrc files * d/jak2: update gsrc
This commit is contained in:
+33
-33
@@ -41,40 +41,40 @@
|
||||
)
|
||||
|
||||
;; definition for function dm-cam-settings-func
|
||||
(defun dm-cam-settings-func ((arg0 camera-slave-options) (arg1 debug-menu-msg))
|
||||
(defun dm-cam-settings-func ((arg0 cam-slave-options) (arg1 debug-menu-msg))
|
||||
(when (and (= arg1 (debug-menu-msg press)) *camera*)
|
||||
(cond
|
||||
((zero? arg0)
|
||||
(send-event *camera* 'toggle-slave-option 1)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam))
|
||||
((= arg0 (cam-slave-options BUTT_CAM))
|
||||
(send-event *camera* 'toggle-slave-option 2)
|
||||
)
|
||||
((= arg0 (camera-slave-options same-side))
|
||||
((= arg0 (cam-slave-options SAME_SIDE))
|
||||
(send-event *camera* 'toggle-slave-option 4)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam same-side))
|
||||
((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE))
|
||||
(send-event *camera* 'toggle-slave-option 128)
|
||||
)
|
||||
((= arg0 (camera-slave-options move-spherical))
|
||||
((= arg0 (cam-slave-options MOVE_SPHERICAL))
|
||||
(send-event *camera* 'toggle-slave-option 8)
|
||||
)
|
||||
((= arg0 (camera-slave-options same-side move-spherical))
|
||||
((= arg0 (cam-slave-options SAME_SIDE MOVE_SPHERICAL))
|
||||
(set-setting-by-param *setting-control* 'slave-options 'clear 0 16)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam same-side move-spherical))
|
||||
((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE MOVE_SPHERICAL))
|
||||
(send-event *camera* 'toggle-slave-option 64)
|
||||
)
|
||||
((= arg0 (camera-slave-options allow-z-rot))
|
||||
((= arg0 (cam-slave-options ALLOW_Z_ROT))
|
||||
(send-event *camera* 'toggle-slave-option 32)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam allow-z-rot))
|
||||
((= arg0 (cam-slave-options BUTT_CAM ALLOW_Z_ROT))
|
||||
(send-event *camera* 'toggle-slave-option 512)
|
||||
)
|
||||
((= arg0 (camera-slave-options same-side allow-z-rot))
|
||||
((= arg0 (cam-slave-options SAME_SIDE ALLOW_Z_ROT))
|
||||
(send-event *camera* 'toggle-slave-option #x4000)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam same-side allow-z-rot))
|
||||
((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE ALLOW_Z_ROT))
|
||||
(send-event *camera* 'toggle-slave-option #x8000)
|
||||
)
|
||||
)
|
||||
@@ -85,34 +85,34 @@
|
||||
((zero? arg0)
|
||||
(logtest? (-> *camera* slave-options) 1)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam))
|
||||
((= arg0 (cam-slave-options BUTT_CAM))
|
||||
(logtest? (-> *camera* slave-options) 2)
|
||||
)
|
||||
((= arg0 (camera-slave-options same-side))
|
||||
((= arg0 (cam-slave-options SAME_SIDE))
|
||||
(logtest? (-> *camera* slave-options) 4)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam same-side))
|
||||
((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE))
|
||||
(logtest? (-> *camera* slave-options) 128)
|
||||
)
|
||||
((= arg0 (camera-slave-options move-spherical))
|
||||
((= arg0 (cam-slave-options MOVE_SPHERICAL))
|
||||
(logtest? (-> *camera* slave-options) 8)
|
||||
)
|
||||
((= arg0 (camera-slave-options same-side move-spherical))
|
||||
((= arg0 (cam-slave-options SAME_SIDE MOVE_SPHERICAL))
|
||||
(not (setting-control-method-14 *setting-control* 'slave-options))
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam same-side move-spherical))
|
||||
((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE MOVE_SPHERICAL))
|
||||
(logtest? (-> *camera* slave-options) 64)
|
||||
)
|
||||
((= arg0 (camera-slave-options allow-z-rot))
|
||||
((= arg0 (cam-slave-options ALLOW_Z_ROT))
|
||||
(logtest? (-> *camera* slave-options) 32)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam allow-z-rot))
|
||||
((= arg0 (cam-slave-options BUTT_CAM ALLOW_Z_ROT))
|
||||
(logtest? (-> *camera* slave-options) 512)
|
||||
)
|
||||
((= arg0 (camera-slave-options same-side allow-z-rot))
|
||||
((= arg0 (cam-slave-options SAME_SIDE ALLOW_Z_ROT))
|
||||
(logtest? (-> *camera* slave-options) #x4000)
|
||||
)
|
||||
((= arg0 (camera-slave-options butt-cam same-side allow-z-rot))
|
||||
((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE ALLOW_Z_ROT))
|
||||
(logtest? (-> *camera* slave-options) #x8000)
|
||||
)
|
||||
(else
|
||||
@@ -1253,18 +1253,18 @@
|
||||
(format #t " (set! (-> pos y) ~12F)~%" (-> *math-camera* trans y))
|
||||
(format #t " (set! (-> pos z) ~12F)~%" (-> *math-camera* trans z))
|
||||
(format #t " (set! (-> pos w) 1.0)~%")
|
||||
(format #t " (set! (-> rot data 0) ~12F)~%" (-> *math-camera* inv-camera-rot data 0))
|
||||
(format #t " (set! (-> rot data 1) ~12F)~%" (-> *math-camera* inv-camera-rot data 1))
|
||||
(format #t " (set! (-> rot data 2) ~12F)~%" (-> *math-camera* inv-camera-rot data 2))
|
||||
(format #t " (set! (-> rot data 3) ~12F)~%" (-> *math-camera* inv-camera-rot data 3))
|
||||
(format #t " (set! (-> rot data 4) ~12F)~%" (-> *math-camera* inv-camera-rot data 4))
|
||||
(format #t " (set! (-> rot data 5) ~12F)~%" (-> *math-camera* inv-camera-rot data 5))
|
||||
(format #t " (set! (-> rot data 6) ~12F)~%" (-> *math-camera* inv-camera-rot data 6))
|
||||
(format #t " (set! (-> rot data 7) ~12F)~%" (-> *math-camera* inv-camera-rot data 7))
|
||||
(format #t " (set! (-> rot data 8) ~12F)~%" (-> *math-camera* inv-camera-rot data 8))
|
||||
(format #t " (set! (-> rot data 9) ~12F)~%" (-> *math-camera* inv-camera-rot data 9))
|
||||
(format #t " (set! (-> rot data 10) ~12F)~%" (-> *math-camera* inv-camera-rot data 10))
|
||||
(format #t " (set! (-> rot data 11) ~12F)~%" (-> *math-camera* inv-camera-rot data 11))
|
||||
(format #t " (set! (-> rot data 0) ~12F)~%" (-> *math-camera* inv-camera-rot vector 0 x))
|
||||
(format #t " (set! (-> rot data 1) ~12F)~%" (-> *math-camera* inv-camera-rot vector 0 y))
|
||||
(format #t " (set! (-> rot data 2) ~12F)~%" (-> *math-camera* inv-camera-rot vector 0 z))
|
||||
(format #t " (set! (-> rot data 3) ~12F)~%" (-> *math-camera* inv-camera-rot vector 0 w))
|
||||
(format #t " (set! (-> rot data 4) ~12F)~%" (-> *math-camera* inv-camera-rot vector 1 x))
|
||||
(format #t " (set! (-> rot data 5) ~12F)~%" (-> *math-camera* inv-camera-rot vector 1 y))
|
||||
(format #t " (set! (-> rot data 6) ~12F)~%" (-> *math-camera* inv-camera-rot vector 1 z))
|
||||
(format #t " (set! (-> rot data 7) ~12F)~%" (-> *math-camera* inv-camera-rot vector 1 w))
|
||||
(format #t " (set! (-> rot data 8) ~12F)~%" (-> *math-camera* inv-camera-rot vector 2 x))
|
||||
(format #t " (set! (-> rot data 9) ~12F)~%" (-> *math-camera* inv-camera-rot vector 2 y))
|
||||
(format #t " (set! (-> rot data 10) ~12F)~%" (-> *math-camera* inv-camera-rot vector 2 z))
|
||||
(format #t " (set! (-> rot data 11) ~12F)~%" (-> *math-camera* inv-camera-rot vector 2 w))
|
||||
(format #t " (set! (-> rot data 12) ~12F)~%" 0)
|
||||
(format #t " (set! (-> rot data 13) ~12F)~%" 0)
|
||||
(format #t " (set! (-> rot data 14) ~12F)~%" 0)
|
||||
|
||||
Reference in New Issue
Block a user