mirror of
https://github.com/open-goal/jak-project
synced 2026-08-19 14:03:38 -04:00
decomp: finish mud
This commit is contained in:
@@ -151,7 +151,7 @@
|
||||
(:methods
|
||||
(water-vol-idle () none 20)
|
||||
(water-vol-startup () none 21)
|
||||
(TODO-RENAME-22 (_type_) none 22)
|
||||
(TODO-RENAME-22 (_type_) ripple-wave-set 22)
|
||||
(dummy-23 () none 23)
|
||||
(dummy-24 () none 24)
|
||||
(TODO-RENAME-25 (_type_) quaternion 25)
|
||||
|
||||
@@ -1941,7 +1941,7 @@
|
||||
)
|
||||
|
||||
;; definition for method 22 of type water-anim
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
;; INFO: Return type mismatch int vs ripple-wave-set.
|
||||
(defmethod TODO-RENAME-22 water-anim ((obj water-anim))
|
||||
(with-pp
|
||||
(let ((s5-0 (-> obj look)))
|
||||
@@ -1995,7 +1995,6 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
(ja-post)
|
||||
(none)
|
||||
(the-as ripple-wave-set (ja-post))
|
||||
)
|
||||
)
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
;;-*-Lisp-*-
|
||||
(in-package goal)
|
||||
|
||||
;; definition of type mud
|
||||
(deftype mud (water-anim)
|
||||
()
|
||||
:heap-base #x70
|
||||
:method-count-assert 30
|
||||
:size-assert #xdc
|
||||
:flag-assert #x1e007000dc
|
||||
)
|
||||
|
||||
;; definition for method 3 of type mud
|
||||
(defmethod inspect mud ((obj mud))
|
||||
(let ((t9-0 (method-of-type water-anim inspect)))
|
||||
(t9-0 obj)
|
||||
)
|
||||
obj
|
||||
)
|
||||
|
||||
;; definition for symbol ripple-for-mud, type ripple-wave-set
|
||||
(define
|
||||
ripple-for-mud
|
||||
(new 'static 'ripple-wave-set
|
||||
:count 3
|
||||
:converted #f
|
||||
:normal-scale 1.0
|
||||
:wave
|
||||
(new 'static 'inline-array ripple-wave 4
|
||||
(new 'static 'ripple-wave :scale 40.0 :xdiv 1 :speed 1.5)
|
||||
(new 'static 'ripple-wave :scale 40.0 :xdiv -1 :zdiv 1 :speed 1.5)
|
||||
(new 'static 'ripple-wave :scale 20.0 :xdiv 5 :zdiv 3 :speed 0.75)
|
||||
(new 'static 'ripple-wave)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for symbol ripple-for-small-mud, type ripple-wave-set
|
||||
(define
|
||||
ripple-for-small-mud
|
||||
(new 'static 'ripple-wave-set
|
||||
:count 3
|
||||
:converted #f
|
||||
:normal-scale 1.0
|
||||
:wave
|
||||
(new 'static 'inline-array ripple-wave 4
|
||||
(new 'static 'ripple-wave :scale 20.0 :xdiv 2 :speed 0.5)
|
||||
(new 'static 'ripple-wave :scale 20.0 :xdiv -2 :zdiv 2 :speed 0.5)
|
||||
(new 'static 'ripple-wave :scale 20.0 :xdiv 5 :zdiv 3 :speed 0.75)
|
||||
(new 'static 'ripple-wave)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for method 22 of type mud
|
||||
(defmethod TODO-RENAME-22 mud ((obj mud))
|
||||
(let ((t9-0 (method-of-type water-anim TODO-RENAME-22)))
|
||||
(t9-0 obj)
|
||||
)
|
||||
(set! (-> obj flags) (logand -8388609 (-> obj flags)))
|
||||
(set! (-> obj flags) (logior #x40000 (-> obj flags)))
|
||||
(let ((gp-0 (new 'process 'ripple-control)))
|
||||
(set! (-> obj draw ripple) gp-0)
|
||||
(set! (-> gp-0 global-scale) 3072.0)
|
||||
(set! (-> gp-0 waveform) ripple-for-mud)
|
||||
(let
|
||||
((v1-9
|
||||
(the-as
|
||||
object
|
||||
((method-of-type res-lump get-property-data)
|
||||
(-> obj entity)
|
||||
'water-anim-fade-dist
|
||||
'interp
|
||||
-1000000000.0
|
||||
(the-as pointer #f)
|
||||
(the-as (pointer res-tag) #f)
|
||||
*res-static-buf*
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(when (the-as pointer v1-9)
|
||||
(set!
|
||||
(-> gp-0 close-fade-dist)
|
||||
(-> (the-as ripple-control v1-9) global-scale)
|
||||
)
|
||||
(set!
|
||||
(-> gp-0 far-fade-dist)
|
||||
(-> (the-as ripple-control v1-9) last-frame-scale)
|
||||
)
|
||||
)
|
||||
)
|
||||
(case (-> obj look)
|
||||
((21 25 29)
|
||||
(set! (-> gp-0 close-fade-dist) 4096000000.0)
|
||||
(set! (-> gp-0 far-fade-dist) 8192000000.0)
|
||||
)
|
||||
)
|
||||
(case (-> obj look)
|
||||
((22 25 24 27 26 31)
|
||||
(let ((v0-3 ripple-for-small-mud))
|
||||
(set! (-> gp-0 waveform) v0-3)
|
||||
v0-3
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user