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

[jak3] Fix defskelgroup (#3460)

Browse Source 
Fixes https://github.com/open-goal/jak-project/issues/3459
This commit is contained in:
water111
2024-04-07 13:07:30 -04:00
committed by GitHub
parent 1394c5c00d
commit 5299bc441f
36 changed files with 136 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak3/engine/common-obs/collectables_REF.gc
Generated Vendored
+3 -3
View File
@@ -19,14 +19,14 @@
(defskelgroup skel-gun-yellow-up yellow-barrel yellow-barrel-lod0-jg yellow-barrel-idle-ja
((yellow-barrel-lod0-mg (meters 999999)))
:bounds (static-spherem 0 1 0 1.6)
:shadow-joint-index 3
:origin-joint-index 3
)
;; failed to figure out what this is:
(defskelgroup skel-gun-dark-up dark-barrel 0 2
((1 (meters 999999)))
:bounds (static-spherem 0 1 0 1.6)
:shadow-joint-index 3
:origin-joint-index 3
)
;; failed to figure out what this is:
@@ -38,7 +38,7 @@
:bounds (static-spherem 0 0 0 0.6)
:shadow collectables-skill-shadow-mg
:texture-level 10
:origin-joint-index 3
:shadow-joint-index 3
)
;; definition of type collectable
test/decompiler/reference/jak3/engine/common-obs/generic-obs_REF.gc
Generated Vendored
+1 -1
View File
@@ -11,7 +11,7 @@
(defskelgroup skel-spotlight spotlight spotlight-lod0-jg -1
((spotlight-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 10)
:shadow-joint-index 5
:origin-joint-index 5
)
;; definition for function entity-lookup-part-group
test/decompiler/reference/jak3/engine/common-obs/voicebox_REF.gc
Generated Vendored
+1 -1
View File
@@ -111,7 +111,7 @@
((talk-box-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 4)
:texture-level 10
:light-index 1
:sort 1
)
;; definition for method 24 of type remote
test/decompiler/reference/jak3/engine/common-obs/warp-gate_REF.gc
Generated Vendored
+2 -2
View File
@@ -462,7 +462,7 @@
(defskelgroup skel-warp-gate warp-gate warp-gate-lod0-jg warp-gate-idle-ja
((warp-gate-lod0-mg (meters 999999)))
:bounds (static-spherem 0 3 0 4)
:shadow-joint-index 3
:origin-joint-index 3
)
;; definition of type warp-gate
@@ -1111,7 +1111,7 @@
(defskelgroup skel-air-train air-train air-train-lod0-jg air-train-idle-ja
((air-train-lod0-mg (meters 999999)))
:bounds (static-spherem 0 2 -2 12.5)
:shadow-joint-index 3
:origin-joint-index 3
)
;; definition of type air-train
test/decompiler/reference/jak3/engine/gfx/foreground/foreground_REF.gc
Generated Vendored
+17 -9
View File
@@ -1517,7 +1517,15 @@
;; WARN: Return type mismatch int vs none.
;; ERROR: Unsupported inline assembly instruction kind - [lui at, 28672]
(defun foreground-draw-hud ((arg0 draw-control) (arg1 dma-buffer) (arg2 float))
(local-vars (at-0 int) (a0-2 (pointer uint128)) (t2-8 object) (t3-3 uint) (t3-4 uint) (t3-5 uint) (t3-6 uint))
(local-vars
(at-0 foreground-work)
(a0-2 (pointer uint128))
(t2-8 object)
(t3-3 uint)
(t3-4 uint)
(t3-5 uint)
(t3-6 uint)
)
(.lui at-0 28672)
(let* ((a2-1 (-> arg1 base))
(v1-0 (the-as object (&+ a2-1 64)))
@@ -1553,14 +1561,14 @@
(let ((t3-0 (-> t5-0 joint-ptr))
(t4-0 (-> t5-0 bone-ptr))
(t5-1 (-> t5-0 num-bones))
(t6-0 t0-2)
(t6-0 (the-as bone-calculation t0-2))
)
(set! (-> (the-as (pointer int16) t6-0)) t2-5)
(s.h! (+ t6-0 2) t5-1)
(s.w! (+ t6-0 4) t1-5)
(s.w! (+ t6-0 8) t3-0)
(s.w! (+ t6-0 12) t4-0)
(s.w! (+ t6-0 32) 0)
(set! (-> t6-0 flags) (the-as bone-calc-flags t2-5))
(set! (-> t6-0 num-bones) t5-1)
(set! (-> t6-0 matrix-area) (the-as (inline-array pris-mtx) t1-5))
(set! (-> t6-0 joints) t3-0)
(set! (-> t6-0 bones) t4-0)
(set! (-> t6-0 next) (the-as bone-calculation 0))
)
(if (nonzero? (-> a1-6 next))
(set! (-> a1-6 next next) (the-as bone-calculation t0-2))
@@ -1572,7 +1580,7 @@
)
(&+ a2-1 48)
(let ((a1-8 (the-as object (+ (the-as uint v1-0) a3-3))))
(s.w! (+ at-0 36) v1-0)
(set! (-> at-0 regs mtxs) (the-as (inline-array pris-mtx) v1-0))
(let ((v1-3 (-> *foreground* merc-bucket-info)))
(when (= (-> arg0 data-format) (draw-control-data-format merc))
(let ((a2-4 (-> arg0 lod-set lod 0 geo))
test/decompiler/reference/jak3/engine/target/board/board-h_REF.gc
Generated Vendored
+2 -2
View File
@@ -512,8 +512,8 @@
((board-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 3.5)
:shadow board-shadow-mg
:shadow-joint-index 3
:light-index 1
:sort 1
:origin-joint-index 3
)
;; definition for symbol *board-shadow-control*, type shadow-control
test/decompiler/reference/jak3/engine/target/flut/flut-h_REF.gc
Generated Vendored
+1 -5
View File
@@ -106,12 +106,8 @@
((flut-saddle-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 3.5)
:shadow flut-saddle-shadow-mg
:light-index 1
:sort 1
)
;; failed to figure out what this is:
0
test/decompiler/reference/jak3/engine/target/gun/gun-dark-shot_REF.gc
Generated Vendored
+1 -1
View File
@@ -196,7 +196,7 @@
((gun-nuke-sphere-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 30)
:texture-level 10
:light-index 4
:sort 4
)
;; definition of type gun-dark-3-sphere
test/decompiler/reference/jak3/engine/target/gun/gun-h_REF.gc
Generated Vendored
+6 -6
View File
@@ -375,8 +375,8 @@
((gun-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 1.5)
:shadow gun-shadow-mg
:shadow-joint-index 3
:light-index 1
:sort 1
:origin-joint-index 3
)
;; definition for symbol *gun-shadow-control*, type shadow-control
@@ -395,7 +395,7 @@
((gun-ammo-yellow-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 1)
:texture-level 10
:light-index 1
:sort 1
)
;; failed to figure out what this is:
@@ -403,7 +403,7 @@
((gun-ammo-red-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 1)
:texture-level 10
:light-index 1
:sort 1
)
;; failed to figure out what this is:
@@ -411,7 +411,7 @@
((gun-ammo-blue-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 1)
:texture-level 10
:light-index 1
:sort 1
)
;; failed to figure out what this is:
@@ -419,7 +419,7 @@
((gun-ammo-dark-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 1)
:texture-level 10
:light-index 1
:sort 1
)
;; failed to figure out what this is:
test/decompiler/reference/jak3/engine/target/gun/gun-red-shot_REF.gc
Generated Vendored
+1 -1
View File
@@ -1355,7 +1355,7 @@
((gun-red-sphere-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 30)
:texture-level 10
:light-index 4
:sort 4
)
;; definition of type red-2-ring
test/decompiler/reference/jak3/engine/target/gun/gun-yellow-shot_REF.gc
Generated Vendored
+1 -5
View File
@@ -490,7 +490,7 @@
((gun-saucer-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 4096)
:texture-level 10
:light-index 1
:sort 1
)
;; definition for method 30 of type gun-yellow-3-saucer
@@ -2388,7 +2388,3 @@
0
(none)
)
test/decompiler/reference/jak3/engine/target/mech/mech-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -135,7 +135,7 @@
(defskelgroup skel-mech-explode mech mech-explode-lod0-jg mech-explode-idle-ja
((mech-explode-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 4.5)
:shadow-joint-index 3
:origin-joint-index 3
)
;; failed to figure out what this is:
test/decompiler/reference/jak3/engine/target/sidekick_REF.gc
Generated Vendored
+2 -2
View File
@@ -8,9 +8,9 @@
:longest-edge (meters 1)
:shadow daxter-shadow-mg
:texture-level 10
:sort 1
:origin-joint-index 6
:shadow-joint-index 6
:light-index 1
)
;; failed to figure out what this is:
@@ -19,9 +19,9 @@
:bounds (static-spherem 0 0 0 3)
:longest-edge (meters 1)
:shadow daxter-highres-shadow-mg
:sort 1
:origin-joint-index 6
:shadow-joint-index 6
:light-index 1
)
;; definition for symbol *sidekick-remap*, type pair
test/decompiler/reference/jak3/engine/target/target-invisible_REF.gc
Generated Vendored
+1 -1
View File
@@ -365,7 +365,7 @@
(defskelgroup skel-dark-maker-idol dark-maker-idol dark-maker-idol-lod0-jg dark-maker-idol-idle-ja
((dark-maker-idol-lod0-mg (meters 999999)))
:bounds (static-spherem 0 1 0 2)
:shadow-joint-index 3
:origin-joint-index 3
)
;; failed to figure out what this is:
test/decompiler/reference/jak3/engine/target/target-util_REF.gc
Generated Vendored
+11 -12
View File
@@ -7,9 +7,9 @@
:bounds (static-spherem 0 0 0 3.2)
:longest-edge (meters 1)
:texture-level 10
:sort 1
:origin-joint-index 3
:shadow-joint-index 3
:light-index 1
)
;; failed to figure out what this is:
@@ -19,9 +19,9 @@
:longest-edge (meters 1)
:shadow jak-ext-geo-c+0-jakclod0-sash-cg
:texture-level 10
:sort 1
:origin-joint-index 3
:shadow-joint-index 3
:light-index 1
)
;; failed to figure out what this is:
@@ -30,9 +30,9 @@
:bounds (static-spherem 0 0 0 3.2)
:longest-edge (meters 1)
:texture-level 10
:sort 1
:origin-joint-index 3
:shadow-joint-index 3
:light-index 1
)
;; failed to figure out what this is:
@@ -42,9 +42,9 @@
:longest-edge (meters 1)
:shadow jakb-c-shadow-mg
:texture-level 10
:sort 1
:origin-joint-index 3
:shadow-joint-index 3
:light-index 1
:clothing (((mesh 10)
(gravity-constant (meters 16))
(wind-constant 0.5)
@@ -106,10 +106,9 @@
:longest-edge (meters 1)
:shadow jakb-walk-down-ja
:texture-level 10
:sort 2
:sort 4
:origin-joint-index 3
:shadow-joint-index 3
:light-index 4
)
;; failed to figure out what this is:
@@ -118,8 +117,8 @@
:bounds (static-spherem 0 0 0 3.2)
:longest-edge (meters 1)
:texture-level 10
:shadow-joint-index 3
:light-index 5
:sort 5
:origin-joint-index 3
)
;; definition for symbol *target-shadow-control*, type shadow-control
@@ -139,9 +138,9 @@
:bounds (static-spherem 0 0 0 3.2)
:longest-edge (meters 1)
:shadow jak-highres-shadow-mg
:sort 1
:origin-joint-index 3
:shadow-joint-index 3
:light-index 1
)
;; failed to figure out what this is:
@@ -205,7 +204,7 @@
((collectables-generic-blast-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 50)
:texture-level 10
:light-index 4
:sort 4
)
;; failed to figure out what this is:
@@ -213,7 +212,7 @@
((collectables-generic-ripples-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 6)
:texture-level 10
:light-index 4
:sort 4
)
;; failed to figure out what this is:
@@ -221,7 +220,7 @@
((collectables-bomb-blast-lod0-mg (meters 999999)))
:bounds (static-spherem 0 0 0 50)
:texture-level 10
:light-index 4
:sort 4
)
;; definition of type target-bank