mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-07 03:30:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

decompile goal code for ocean mid (#1231)

Browse Source
This commit is contained in:
water111
2022-03-12 12:58:04 -05:00
committed by GitHub
parent bb85eaf167
commit b2131d43e3
18 changed files with 6822 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/gfx/ocean/ocean-h_REF.gc
Generated Vendored
+22 -22
View File
@@ -370,7 +370,7 @@
(corner-array ocean-corner 25 :inline :offset-assert 80)
(corner-count int32 :offset-assert 2080)
(temp-vecs vector 4 :inline :offset-assert 2096)
(mid-mask-ptrs (pointer int32) 36 :offset-assert 2160)
(mid-mask-ptrs (pointer int64) 36 :offset-assert 2160)
(mid-camera-masks uint64 36 :offset-assert 2304)
(trans-mask-ptrs (pointer int32) 64 :offset-assert 2592)
(trans-camera-masks ocean-trans-mask 16 :inline :offset-assert 2848)
@@ -540,27 +540,27 @@
;; definition of type ocean-mid-constants
(deftype ocean-mid-constants (structure)
((hmge-scale vector :inline :offset-assert 0)
(inv-hmge-scale vector :inline :offset-assert 16)
(hvdf-offset vector :inline :offset-assert 32)
(fog vector :inline :offset-assert 48)
(constants vector :inline :offset-assert 64)
(constants2 vector :inline :offset-assert 80)
(drw-fan qword :inline :offset-assert 96)
(env-fan qword :inline :offset-assert 112)
(drw-adgif qword :inline :offset-assert 128)
(drw-texture adgif-shader :inline :offset-assert 144)
(drw-strip-0 qword :inline :offset-assert 224)
(drw-strip-1 qword :inline :offset-assert 240)
(env-adgif qword :inline :offset-assert 256)
(env-texture adgif-shader :inline :offset-assert 272)
(env-strip qword :inline :offset-assert 352)
(env-color vector :inline :offset-assert 368)
(index-table uint128 8 :offset-assert 384)
(pos0 vector :inline :offset-assert 512)
(pos1 vector :inline :offset-assert 528)
(pos2 vector :inline :offset-assert 544)
(pos3 vector :inline :offset-assert 560)
((hmge-scale vector :inline :offset-assert 0)
(inv-hmge-scale vector :inline :offset-assert 16)
(hvdf-offset vector :inline :offset-assert 32)
(fog vector :inline :offset-assert 48)
(constants vector :inline :offset-assert 64)
(constants2 vector :inline :offset-assert 80)
(drw-fan gs-gif-tag :inline :offset-assert 96)
(env-fan gs-gif-tag :inline :offset-assert 112)
(drw-adgif gs-gif-tag :inline :offset-assert 128)
(drw-texture adgif-shader :inline :offset-assert 144)
(drw-strip-0 gs-gif-tag :inline :offset-assert 224)
(drw-strip-1 gs-gif-tag :inline :offset-assert 240)
(env-adgif gs-gif-tag :inline :offset-assert 256)
(env-texture adgif-shader :inline :offset-assert 272)
(env-strip gs-gif-tag :inline :offset-assert 352)
(env-color vector :inline :offset-assert 368)
(index-table vector4w 8 :inline :offset-assert 384)
(pos0 vector :inline :offset-assert 512)
(pos1 vector :inline :offset-assert 528)
(pos2 vector :inline :offset-assert 544)
(pos3 vector :inline :offset-assert 560)
)
:method-count-assert 9
:size-assert #x240
test/decompiler/reference/engine/gfx/ocean/ocean-mid_REF.gc
Generated Vendored
+1164
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/engine/gfx/ocean/ocean-transition_REF.gc
Generated Vendored
+6 -6
View File
@@ -142,8 +142,8 @@
(set! (-> a1-2 z) (+ (-> v1-1 z) (* 98304.0 (the float arg1))))
)
(set! (-> a1-2 w) 1.0)
(ocean-mid-add-matrices arg0 a1-2)
)
(ocean-mid-add-matrices arg0)
(let* ((a1-3 9)
(v1-3 arg0)
(a0-3 (the-as object (-> v1-3 base)))
@@ -333,8 +333,8 @@
(set! (-> a1-1 z) (+ (-> v1-1 z) (* 393216.0 (the float arg1))))
)
(set! (-> a1-1 w) 1.0)
(ocean-mid-add-matrices arg0 a1-1)
)
(ocean-mid-add-matrices arg0)
(let* ((a1-2 9)
(v1-3 arg0)
(a0-2 (the-as object (-> v1-3 base)))
@@ -756,8 +756,8 @@
(s2-0 sv-33)
)
(while (>= s2-0 s3-0)
(when (not (ocean-mid-mask-ptrs-bit? s5-0))
(when (ocean-mid-camera-masks-bit? s5-0)
(when (not (ocean-mid-mask-ptrs-bit? s5-0 s3-0))
(when (ocean-mid-camera-masks-bit? s5-0 s3-0)
(set! (-> sv-36 x) (+ 196608.0 (* 393216.0 (the float s3-0)) (-> *ocean-map* start-corner x)))
(set! (-> sv-36 z) (+ 196608.0 (* 393216.0 (the float s5-0)) (-> *ocean-map* start-corner z)))
(if (sphere-cull sv-36)
@@ -835,8 +835,8 @@
(s2-1 sv-33)
)
(while (>= s2-1 s3-1)
(when (not (ocean-mid-mask-ptrs-bit? s5-1))
(when (ocean-mid-camera-masks-bit? s5-1)
(when (not (ocean-mid-mask-ptrs-bit? s5-1 s3-1))
(when (ocean-mid-camera-masks-bit? s5-1 s3-1)
(let ((v1-43 (-> *ocean-map* ocean-trans-indices data (+ (* (the-as uint 48) s5-1) s3-1))))
(when (>= (-> v1-43 parent) 0)
(set! sv-44 (+ (* (- s5-1 sv-34) 4) (- s3-1 sv-32)))