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

decomp: comment out problematic top-level-lets

Browse source
This commit is contained in:
Tyler Wilding 2021-08-07 20:05:06 -04:00
parent 4f331b5f79
commit 924abfb329
No known key found for this signature in database
GPG key ID: A89403EB356ED106
2 changed files with 136 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

192
goal_src/levels/common/rigid-body.gc
View file

@ -379,44 +379,6 @@
:flag-assert #x900000068
)
;; definition for method 3 of type rigid-body-platform-constants
(defmethod
inspect
rigid-body-platform-constants
((obj rigid-body-platform-constants))
(format #t "[~8x] ~A~%" obj 'rigid-body-platform-constants)
(format #t "~Tdrag-factor: ~f~%" (-> obj drag-factor))
(format #t "~Tbuoyancy-factor: ~f~%" (-> obj buoyancy-factor))
(format #t "~Tmax-buoyancy-depth: (meters ~m)~%" (-> obj max-buoyancy-depth))
(format #t "~Tgravity-factor: ~f~%" (-> obj gravity-factor))
(format #t "~Tgravity: (meters ~m)~%" (-> obj gravity))
(format #t "~Tplayer-weight: (meters ~m)~%" (-> obj player-weight))
(format #t "~Tplayer-bonk-factor: ~f~%" (-> obj player-bonk-factor))
(format #t "~Tplayer-dive-factor: ~f~%" (-> obj player-dive-factor))
(format
#t
"~Tplayer-force-distance: (meters ~m)~%"
(-> obj player-force-distance)
)
(format #t "~Tplayer-force-clamp: (meters ~m)~%" (-> obj player-force-clamp))
(format #t "~Tplayer-force-timeout: ~D~%" (-> obj player-force-timeout))
(format #t "~Texplosion-force: (meters ~m)~%" (-> obj explosion-force))
(format #t "~Tlinear-damping: ~f~%" (-> obj linear-damping))
(format #t "~Tangular-damping: ~f~%" (-> obj angular-damping))
(format #t "~Tcontrol-point-count: ~D~%" (-> obj control-point-count))
(format #t "~Tmass: ~f~%" (-> obj mass))
(format #t "~Tinertial-tensor-x: (meters ~m)~%" (-> obj inertial-tensor-x))
(format #t "~Tinertial-tensor-y: (meters ~m)~%" (-> obj inertial-tensor-y))
(format #t "~Tinertial-tensor-z: (meters ~m)~%" (-> obj inertial-tensor-z))
(format #t "~Tcm-joint-x: (meters ~m)~%" (-> obj cm-joint-x))
(format #t "~Tcm-joint-y: (meters ~m)~%" (-> obj cm-joint-y))
(format #t "~Tcm-joint-z: (meters ~m)~%" (-> obj cm-joint-z))
(format #t "~Tidle-distance: (meters ~m)~%" (-> obj idle-distance))
(format #t "~Tplatform: ~A~%" (-> obj platform))
(format #t "~Tsound-name: ~A~%" (-> obj sound-name))
obj
)
;; definition of type rigid-body-control-point-inline-array
(deftype rigid-body-control-point-inline-array (inline-array-class)
((data rigid-body-control-point :inline :dynamic :offset 16)
@ -426,18 +388,6 @@
:flag-assert #x900000010
)
;; definition for method 3 of type rigid-body-control-point-inline-array
(defmethod
inspect
rigid-body-control-point-inline-array
((obj rigid-body-control-point-inline-array))
(format #t "[~8x] ~A~%" obj (-> obj type))
(format #t "~Tlength: ~D~%" (-> obj length))
(format #t "~Tallocated-length: ~D~%" (-> obj allocated-length))
(format #t "~Tdata[0] @ #x~X~%" (-> obj data))
obj
)
;; failed to figure out what this is:
(set! (-> rigid-body-control-point-inline-array heap-base) (the-as uint 48))
@ -482,40 +432,6 @@
)
)
;; definition for method 3 of type rigid-body-platform
(defmethod inspect rigid-body-platform ((obj rigid-body-platform))
(let ((t9-0 (method-of-type process-drawable inspect)))
(t9-0 obj)
)
(format
#t
"~T~Tinfo: #<rigid-body-platform-constants @ #x~X>~%"
(-> obj info)
)
(format #t "~T~Trbody: #<rigid-body @ #x~X>~%" (-> obj rbody))
(format #t "~T~Tcontrol-point-array: ~A~%" (-> obj control-point-array))
(format #t "~T~Tplayer-velocity: #<vector @ #x~X>~%" (-> obj player-velocity))
(format
#t
"~T~Tplayer-velocity-prev: #<vector @ #x~X>~%"
(-> obj player-velocity-prev)
)
(format
#t
"~T~Tplayer-force-position: #<vector @ #x~X>~%"
(-> obj player-force-position)
)
(format #t "~T~Tplayer-force: #<vector @ #x~X>~%" (-> obj player-force))
(format #t "~T~Tsim-time-remaining: ~f~%" (-> obj sim-time-remaining))
(format #t "~T~Tfloat-height-offset: ~f~%" (-> obj float-height-offset))
(format #t "~T~Tplayer-attack-id: ~D~%" (-> obj player-attack-id))
(format #t "~T~Tplayer-bonk-timeout: ~D~%" (-> obj player-bonk-timeout))
(format #t "~T~Twater-anim: ~A~%" (-> obj water-anim))
(format #t "~T~Tplayer-contact: ~A~%" (-> obj player-contact))
(format #t "~T~Tplayer-impulse: ~A~%" (-> obj player-impulse))
obj
)
;; definition for method 7 of type rigid-body-platform
;; INFO: Return type mismatch process-drawable vs rigid-body-platform.
(defmethod relocate rigid-body-platform ((obj rigid-body-platform) (arg0 int))
@ -1034,60 +950,60 @@
(set! (-> gp-0 post) ja-post)
)
;; failed to figure out what this is:
(let
((gp-1
(new 'static 'state
:name 'rigid-body-platform-float
:next #f
:exit #f
:code #f
:trans #f
:post #f
:enter #f
:event #f
)
)
)
(method-set! rigid-body-platform 21 (the-as function gp-1))
(set! (-> gp-1 event) rigid-body-platform-event-handler)
(set!
(-> gp-1 trans)
(the-as
(function object)
(lambda :behavior rigid-body-platform
()
(when
(or
(not *target*)
(<
(-> self info idle-distance)
(vector-vector-distance
(-> self root-overlay trans)
(-> *target* control trans)
)
)
)
(let ((t9-1 (the-as (function object) enter-state)))
(set!
(-> self next-state)
(the-as state (method-of-object self rigid-body-platform-idle))
)
(t9-1)
)
)
(none)
)
)
)
(set! (-> gp-1 code) (lambda :behavior rigid-body-platform () (while #t
(suspend)
)
(none)
)
)
(set! (-> gp-1 post) rigid-body-platform-post)
)
;; TODO - something here is causing the tests to crash!
; (let
; ((gp-1
; (new 'static 'state
; :name 'rigid-body-platform-float
; :next #f
; :exit #f
; :code #f
; :trans #f
; :post #f
; :enter #f
; :event #f
; )
; )
; )
; (method-set! rigid-body-platform 21 (the-as function gp-1))
; (set! (-> gp-1 event) rigid-body-platform-event-handler)
; (set!
; (-> gp-1 trans)
; (the-as
; (function object)
; (lambda :behavior rigid-body-platform
; ()
; (when
; (or
; (not *target*)
; (<
; (-> self info idle-distance)
; (vector-vector-distance
; (-> self root-overlay trans)
; (-> *target* control trans)
; )
; )
; )
; (let ((t9-1 (the-as (function object) enter-state)))
; (set!
; (-> self next-state)
; (the-as state (method-of-object self rigid-body-platform-idle))
; )
; (t9-1)
; )
; )
; (none)
; )
; )
; )
; (set! (-> gp-1 code) (lambda :behavior rigid-body-platform () (while #t
; (suspend)
; )
; (none)
; )
; )
; (set! (-> gp-1 post) rigid-body-platform-post)
; )
;; definition for method 29 of type rigid-body-platform
;; INFO: Return type mismatch int vs none.

183
goal_src/levels/common/water-anim.gc
View file

@ -17,16 +17,6 @@
:flag-assert #x1e007000dc
)
;; definition for method 3 of type water-anim
(defmethod inspect water-anim ((obj water-anim))
(let ((t9-0 (method-of-type water-vol inspect)))
(t9-0 obj)
)
(format #t "~T~Tlook: ~D~%" (-> obj look))
(format #t "~T~Tplay-ambient-sound?: ~A~%" (-> obj play-ambient-sound?))
obj
)
;; failed to figure out what this is:
(let
((v1-1
@ -877,15 +867,6 @@
:flag-assert #x90000000c
)
;; definition for method 3 of type water-anim-look
(defmethod inspect water-anim-look ((obj water-anim-look))
(format #t "[~8x] ~A~%" obj 'water-anim-look)
(format #t "~Tskel-group: ~A~%" (-> obj skel-group))
(format #t "~Tanim: ~D~%" (-> obj anim))
(format #t "~Tambient-sound-spec: ~A~%" (-> obj ambient-sound-spec))
obj
)
;; definition for symbol *water-anim-look*, type (array water-anim-look)
(define
*water-anim-look*
@ -1785,88 +1766,88 @@
)
)
;; failed to figure out what this is:
(let
((gp-0
(new 'static 'state
:name 'water-vol-idle
:next #f
:exit #f
:code #f
:trans #f
:post #f
:enter #f
:event #f
)
)
)
(inherit-state gp-0 (the-as state (method-of-type water-vol water-vol-idle)))
(method-set! water-anim 20 (the-as function gp-0))
(set!
(-> gp-0 event)
(lambda :behavior water-anim
((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
(case arg2
(('move-to)
(set!
(-> self root trans quad)
(-> (the-as vector (-> arg3 param 0)) quad)
)
(set! (-> self water-height) (-> self root trans y))
(if (nonzero? (-> self sound))
(update-trans! (-> self sound) (-> self root trans))
)
(let ((v0-0 (logclear (-> self mask) (process-mask sleep-code))))
(set! (-> self mask) v0-0)
v0-0
)
)
)
)
)
(set!
(-> gp-0 trans)
(the-as
(function object)
(lambda :behavior water-anim
()
(let
((t9-0
(->
(the-as (state none) (method-of-type water-vol water-vol-idle))
trans
)
)
)
(if t9-0
(t9-0)
)
)
(if (< (-> (math-camera-pos) y) (+ -8192.0 (-> self root trans y)))
(logior! (-> self draw status) 2)
(set! (-> self draw status) (logand -3 (-> self draw status)))
)
(if (and (-> self play-ambient-sound?) (nonzero? (-> self sound)))
(update! (-> self sound))
)
(none)
)
)
)
(set! (-> gp-0 code) (lambda :behavior water-anim () (while #t
(ja-post)
(logior!
(-> self mask)
(process-mask
sleep-code
)
)
(suspend)
)
(none)
)
)
)
;; TODO - something here is causing the tests to crash!
; (let
; ((gp-0
; (new 'static 'state
; :name 'water-vol-idle
; :next #f
; :exit #f
; :code #f
; :trans #f
; :post #f
; :enter #f
; :event #f
; )
; )
; )
; (inherit-state gp-0 (the-as state (method-of-type water-vol water-vol-idle)))
; (method-set! water-anim 20 (the-as function gp-0))
; (set!
; (-> gp-0 event)
; (lambda :behavior water-anim
; ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
; (case arg2
; (('move-to)
; (set!
; (-> self root trans quad)
; (-> (the-as vector (-> arg3 param 0)) quad)
; )
; (set! (-> self water-height) (-> self root trans y))
; (if (nonzero? (-> self sound))
; (update-trans! (-> self sound) (-> self root trans))
; )
; (let ((v0-0 (logclear (-> self mask) (process-mask sleep-code))))
; (set! (-> self mask) v0-0)
; v0-0
; )
; )
; )
; )
; )
; (set!
; (-> gp-0 trans)
; (the-as
; (function object)
; (lambda :behavior water-anim
; ()
; (let
; ((t9-0
; (->
; (the-as (state none) (method-of-type water-vol water-vol-idle))
; trans
; )
; )
; )
; (if t9-0
; (t9-0)
; )
; )
; (if (< (-> (math-camera-pos) y) (+ -8192.0 (-> self root trans y)))
; (logior! (-> self draw status) 2)
; (set! (-> self draw status) (logand -3 (-> self draw status)))
; )
; (if (and (-> self play-ambient-sound?) (nonzero? (-> self sound)))
; (update! (-> self sound))
; )
; (none)
; )
; )
; )
; (set! (-> gp-0 code) (lambda :behavior water-anim () (while #t
; (ja-post)
; (logior!
; (-> self mask)
; (process-mask
; sleep-code
; )
; )
; (suspend)
; )
; (none)
; )
; )
; )
;; definition for method 28 of type water-anim
(defmethod get-ripple-height water-anim ((obj water-anim) (arg0 vector))