Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-19 14:47:49 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

jak3: fix mirage shot (#3501)

Browse source
This commit is contained in:
Hat Kid 2024-05-01 21:57:13 +02:00 committed by GitHub
parent 39f3549640
commit f9e0aa82bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
decompiler/config/jak3/ntsc_v1/label_types.jsonc
View file

@ -943,7 +943,7 @@
["L19", "vector"],
["L18", "vector"],
["L17", "vector"],
["L24", "vector"],
["L24", "(inline-array vector)", 2],
["L15", "vector"],
["L14", "vector"]
],

13
goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc
View file

@ -34,12 +34,13 @@
(set! (-> v1-9 fvec quad) a2-1)
(set! (-> v1-9 trans quad) a3-2)
)
(let ((v1-10 (new 'static 'vector :x 3686.4 :y 5324.8 :z 6144.0 :w 1.0)))
(vector-matrix*!
(-> gp-1 vec0)
(the-as vector (+ (the-as uint v1-10) (* (-> gp-1 barrel-idx) 16)))
(-> gp-1 mat0)
)
(let ((v1-10 (new 'static 'inline-array vector 2
(new 'static 'vector :x 3686.4 :y 5324.8 :z 6144.0 :w 1.0)
(new 'static 'vector :x -3686.4 :y 5324.8 :z 6144.0 :w 1.0)
)
)
)
(vector-matrix*! (-> gp-1 vec0) (-> v1-10 (-> gp-1 barrel-idx)) (-> gp-1 mat0))
)
0
(vector-reset! (-> gp-1 vec4))

13
test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-mirage_REF.gc generated vendored
View file

@ -43,12 +43,13 @@
(set! (-> v1-9 fvec quad) a2-1)
(set! (-> v1-9 trans quad) a3-2)
)
(let ((v1-10 (new 'static 'vector :x 3686.4 :y 5324.8 :z 6144.0 :w 1.0)))
(vector-matrix*!
(-> gp-1 vec0)
(the-as vector (+ (the-as uint v1-10) (* (-> gp-1 barrel-idx) 16)))
(-> gp-1 mat0)
)
(let ((v1-10 (new 'static 'inline-array vector 2
(new 'static 'vector :x 3686.4 :y 5324.8 :z 6144.0 :w 1.0)
(new 'static 'vector :x -3686.4 :y 5324.8 :z 6144.0 :w 1.0)
)
)
)
(vector-matrix*! (-> gp-1 vec0) (-> v1-10 (-> gp-1 barrel-idx)) (-> gp-1 mat0))
)
0
(vector-reset! (-> gp-1 vec4))