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

d/jak2: finish task-arrow | carry-h | projectile | gun-[red|yellow|blue]-shot (#1864)

Browse Source
This commit is contained in:
Tyler Wilding
2022-10-29 15:22:57 -04:00
committed by GitHub
parent 43b93cc204
commit 84497712ff
86 changed files with 5848 additions and 1760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc
Generated Vendored
+6 -26
View File
@@ -856,7 +856,7 @@
;; definition for function dm-vu1-user-all-pick-func
(defun dm-vu1-user-all-pick-func ((arg0 symbol) (arg1 debug-menu-msg))
(let ((v1-1 (-> (new 'static 'array uint64 1 #x5fffffff8) 0)))
(let ((v1-1 (the-as uint #x5fffffff8)))
(if (= arg1 (debug-menu-msg press))
(set! (-> *display* vu1-enable-user-menu) (the-as vu1-renderer-mask v1-1))
)
@@ -1746,11 +1746,7 @@
(when (= arg1 (debug-menu-msg press))
(let ((a1-8 (the-as object (* (the-as adgif-shader (-> a0-3 next (-> v1-1 index) shader)) 16))))
(while (nonzero? (the-as int a1-8))
(set! (-> (the-as adgif-shader a1-8) tex1)
(logior (logand (-> (the-as adgif-shader a1-8) tex1) (-> (new 'static 'array uint64 1 #xfffff000ffffffff) 0))
(shr (shl (the-as int arg2) 52) 20)
)
)
(set! (-> (the-as adgif-shader a1-8) tex1 k) (the-as int arg2))
(set! a1-8 (* (-> (the-as adgif-shader a1-8) next shader) 16))
)
)
@@ -1948,11 +1944,7 @@
(when (= arg1 (debug-menu-msg press))
(let ((a1-8 (the-as object (* (the-as adgif-shader (-> a0-3 next (-> v1-1 index) shader)) 16))))
(while (nonzero? (the-as int a1-8))
(set! (-> (the-as adgif-shader a1-8) tex0)
(logior (logand (-> (the-as adgif-shader a1-8) tex0) (-> (new 'static 'array uint64 1 #xffffffe7ffffffff) 0))
(shr (shl (the-as int arg2) 62) 27)
)
)
(set! (-> (the-as adgif-shader a1-8) tex0 tfx) (the-as int arg2))
(set! a1-8 (* (-> (the-as adgif-shader a1-8) next shader) 16))
)
)
@@ -2150,11 +2142,7 @@
(when (= arg1 (debug-menu-msg press))
(let ((a1-8 (the-as object (* (the-as adgif-shader (-> a0-3 next (-> v1-1 index) shader)) 16))))
(while (nonzero? (the-as int a1-8))
(set! (-> (the-as adgif-shader a1-8) tex0)
(logior (logand (-> (the-as adgif-shader a1-8) tex0) (-> (new 'static 'array uint64 1 #xfffffffc3fffffff) 0))
(shr (shl (the-as int arg2) 60) 30)
)
)
(set! (-> (the-as adgif-shader a1-8) tex0 th) (the-as int arg2))
(set! a1-8 (* (-> (the-as adgif-shader a1-8) next shader) 16))
)
)
@@ -2450,11 +2438,7 @@
(when (= arg1 (debug-menu-msg press))
(let ((a1-8 (the-as object (* (the-as adgif-shader (-> a0-3 next (-> v1-1 index) shader)) 16))))
(while (nonzero? (the-as int a1-8))
(set! (-> (the-as adgif-shader a1-8) clamp)
(logior (logand (-> (the-as adgif-shader a1-8) clamp) (-> (new 'static 'array uint64 1 #xfffffffc00ffffff) 0))
(shr (shl (the-as int arg2) 54) 30)
)
)
(set! (-> (the-as adgif-shader a1-8) clamp minv) (the-as int arg2))
(set! a1-8 (* (-> (the-as adgif-shader a1-8) next shader) 16))
)
)
@@ -2505,11 +2489,7 @@
(when (= arg1 (debug-menu-msg press))
(let ((a1-8 (the-as object (* (the-as adgif-shader (-> a0-3 next (-> v1-1 index) shader)) 16))))
(while (nonzero? (the-as int a1-8))
(set! (-> (the-as adgif-shader a1-8) clamp)
(logior (logand (-> (the-as adgif-shader a1-8) clamp) (-> (new 'static 'array uint64 1 #xfffff003ffffffff) 0))
(shr (shl (the-as int arg2) 54) 20)
)
)
(set! (-> (the-as adgif-shader a1-8) clamp maxv) (the-as int arg2))
(set! a1-8 (* (-> (the-as adgif-shader a1-8) next shader) 16))
)
)
test/decompiler/reference/jak2/engine/debug/editable_REF.gc
Generated Vendored
+20 -25
View File
@@ -118,7 +118,7 @@
(defmethod editable-region-method-11 editable-region ((obj editable-region) (arg0 vector) (arg1 int))
(local-vars (sv-32 vector2h))
(set! sv-32 (new 'stack 'vector2h))
(add-debug-x #t (bucket-id debug-no-zbuf1) arg0 (the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0)))
(add-debug-x #t (bucket-id debug-no-zbuf1) arg0 (new 'static 'rgba :r #xff :g #xff :a #x80))
(let ((s3-0 add-debug-text-3d)
(s2-0 #t)
(s1-0 318)
@@ -298,25 +298,25 @@
((and (logtest? (-> obj flags) (editable-flag selected))
(< (mod (-> *display* real-clock frame-counter) 60) 30)
)
(the-as int (-> (new 'static 'array uint64 1 #x80ffffff) 0))
(the-as int (the-as uint #x80ffffff))
)
((logtest? (-> obj flags) (editable-flag no-save))
(shl #x80ff 16)
)
((= (-> obj type) editable-point)
(the-as int (-> (new 'static 'array uint64 1 #x800080ff) 0))
(the-as int (the-as uint #x800080ff))
)
((= (-> obj type) editable-sample)
(the-as int (-> (new 'static 'array uint64 1 #x80ff8000) 0))
(the-as int (the-as uint #x80ff8000))
)
((= (-> obj type) editable-light)
(the-as int (-> (new 'static 'array uint64 1 #x80ff0080) 0))
(the-as int (the-as uint #x80ff0080))
)
((= (-> obj type) editable-entity)
(the-as int (-> (new 'static 'array uint64 1 #x80ff00ff) 0))
(the-as int (the-as uint #x80ff00ff))
)
(else
(the-as int (-> (new 'static 'array uint64 1 #x800000ff) 0))
(the-as int (the-as uint #x800000ff))
)
)
)
@@ -329,15 +329,10 @@
(let ((s5-0 (new 'stack-no-clear 'vector)))
(when (editable-method-11 obj s5-0)
(set! (-> s5-0 y) (-> s5-0 y))
(add-debug-x #t (bucket-id debug-no-zbuf1) s5-0 (the-as rgba (-> (new 'static 'array uint64 1 #x80ffffff) 0)))
(add-debug-x #t (bucket-id debug-no-zbuf1) s5-0 (new 'static 'rgba :r #xff :g #xff :b #xff :a #x80))
)
)
(add-debug-x
#t
(bucket-id debug-no-zbuf1)
(edit-get-trans obj)
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
)
(add-debug-x #t (bucket-id debug-no-zbuf1) (edit-get-trans obj) (new 'static 'rgba :r #xff :g #xff :a #x80))
)
0
(none)
@@ -1018,7 +1013,7 @@
(edit-get-trans obj)
(-> obj direction)
(* -1.2 (-> obj radius))
(the-as rgba (-> (new 'static 'array uint64 1 #x80ff00ff) 0))
(new 'static 'rgba :r #xff :b #xff :a #x80)
)
)
(when (-> *editable* 0 light-names)
@@ -1395,7 +1390,7 @@
(edit-get-trans obj)
s1-0
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
)
(when (logtest? (-> obj flags) (editable-flag selected))
@@ -1424,12 +1419,12 @@
gp-0
sv-112
(if (logtest? (-> obj flags) (editable-flag orient))
(the-as rgba (-> (new 'static 'array uint64 1 #x800000ff) 0))
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
(new 'static 'rgba :r #xff :a #x80)
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
(if (not (logtest? (-> obj flags) (editable-flag orient)))
(the-as rgba (-> (new 'static 'array uint64 1 #x800000ff) 0))
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
(new 'static 'rgba :r #xff :a #x80)
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
(if (logtest? (-> obj flags) (editable-flag selected))
1
@@ -1780,7 +1775,7 @@
(bucket-id debug-no-zbuf1)
(edit-get-trans (-> obj vertex 0))
(edit-get-trans (-> obj vertex 1))
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
(new 'static 'rgba :r #xff :g #xff :a #x80)
#f
(the-as rgba -1)
)
@@ -1789,12 +1784,12 @@
(the-as (inline-array vector) gp-0)
s4-0
(if (logtest? (-> obj flags) (editable-flag orient))
(the-as rgba (-> (new 'static 'array uint64 1 #x800000ff) 0))
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
(new 'static 'rgba :r #xff :a #x80)
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
(if (not (logtest? (-> obj flags) (editable-flag orient)))
(the-as rgba (-> (new 'static 'array uint64 1 #x800000ff) 0))
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
(new 'static 'rgba :r #xff :a #x80)
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
(if (logtest? (-> obj flags) (editable-flag selected))
1
test/decompiler/reference/jak2/engine/debug/stats-h_REF.gc
Generated Vendored
+4 -19
View File
@@ -300,25 +300,15 @@
;; definition for method 11 of type perf-stat
;; WARN: Return type mismatch int vs none.
;; ERROR: Unsupported inline assembly instruction kind - [mtc0 Perf, r0]
;; ERROR: Unsupported inline assembly instruction kind - [sync.l]
;; ERROR: Unsupported inline assembly instruction kind - [sync.p]
;; ERROR: Unsupported inline assembly instruction kind - [mtpc pcr0, r0]
;; ERROR: Unsupported inline assembly instruction kind - [mtpc pcr1, r0]
;; ERROR: Unsupported inline assembly instruction kind - [sync.l]
;; ERROR: Unsupported inline assembly instruction kind - [sync.p]
;; ERROR: Unsupported inline assembly instruction kind - [mtc0 Perf, v1]
;; ERROR: Unsupported inline assembly instruction kind - [sync.l]
;; ERROR: Unsupported inline assembly instruction kind - [sync.p]
(defmethod reset! perf-stat ((obj perf-stat))
(let ((v1-0 (-> obj ctrl)))
(+! (-> obj count) 1)
(b! (zero? v1-0) cfg-2 :delay (nop!))
(.mtc0 Perf r0)
(.mtc0 Perf 0)
(.sync.l)
(.sync.p)
(.mtpc pcr0 r0)
(.mtpc pcr1 r0)
(.mtpc pcr0 0)
(.mtpc pcr1 0)
(.sync.l)
(.sync.p)
(.mtc0 Perf v1-0)
@@ -332,15 +322,10 @@
;; definition for method 12 of type perf-stat
;; WARN: Return type mismatch int vs none.
;; ERROR: Unsupported inline assembly instruction kind - [mtc0 Perf, r0]
;; ERROR: Unsupported inline assembly instruction kind - [sync.l]
;; ERROR: Unsupported inline assembly instruction kind - [sync.p]
;; ERROR: Unsupported inline assembly instruction kind - [mfpc v1, pcr0]
;; ERROR: Unsupported inline assembly instruction kind - [mfpc v1, pcr1]
(defmethod read! perf-stat ((obj perf-stat))
(local-vars (v1-1 int) (v1-3 int))
(b! (zero? (-> obj ctrl)) cfg-2 :delay (nop!))
(.mtc0 Perf r0)
(.mtc0 Perf 0)
(.sync.l)
(.sync.p)
(.mfpc v1-1 pcr0)