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

[jak2] fill in a lot of flags for decomp + mouse macros (#2927)

Browse Source 
Also changed the default type of enums to `int64` (same as `int`).
This commit is contained in:
ManDude
2023-08-22 16:39:52 +01:00
committed by GitHub
parent 16af1837d1
commit 04269ffa86
104 changed files with 2472 additions and 1778 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc
Generated Vendored
+54 -59
View File
@@ -1539,7 +1539,7 @@
(nav-graph-editor-method-34 obj)
(nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index))
(cond
((not (logtest? (-> *mouse* button0-abs 0) 1))
((not (mouse-hold? left))
(let ((a0-4 (nav-graph-editor-method-49 obj)))
(vector-!
(-> a0-4 move-vec)
@@ -1590,12 +1590,12 @@
(defstate adjust-plane (nav-graph-editor)
:virtual #t
:trans (behavior ()
(if (logtest? (-> *mouse* button0-abs 0) 1)
(if (mouse-hold? left)
(go-virtual move-plane)
)
(when (and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> self selected-index) 0))
(logand! (-> *mouse* button0-abs 0) -5)
(logand! (-> *mouse* button0-rel 0) -5)
(when (and (mouse-hold? middle) (>= (-> self selected-index) 0))
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons middle))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons middle))
(set! (-> self plane-height) (-> self nav-graph node-array data (-> self selected-index) position y))
)
(nav-graph-editor-method-41 self)
@@ -1622,7 +1622,7 @@
(none)
)
:trans (behavior ()
(if (not (logtest? (-> *mouse* button0-abs 0) 1))
(if (not (mouse-hold? left))
(go-virtual adjust-plane)
)
(none)
@@ -1668,12 +1668,13 @@
)
)
(cond
((and (logtest? (-> *mouse* button0-rel 0) 1)
(begin (logand! (-> *mouse* button0-abs 0) -2) (let ((v1-20 (logand -2 (-> *mouse* button0-rel 0))))
(set! (-> *mouse* button0-rel 0) v1-20)
(and v1-20 (!= (-> obj selected-index) (-> obj edge-src)))
)
)
((and (mouse-pressed? left) (begin
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons left))
(let ((v1-20 (logclear (-> *mouse* button0-rel 0) (mouse-buttons left))))
(set! (-> *mouse* button0-rel 0) v1-20)
(and v1-20 (!= (-> obj selected-index) (-> obj edge-src)))
)
)
)
(cond
((>= (-> obj selected-index) 0)
@@ -1692,12 +1693,12 @@
(nav-graph-editor-method-47 obj)
(set! (-> obj edge-src) (-> obj edge-dst))
)
((logtest? (-> *mouse* button0-rel 0) 2)
((mouse-pressed? right)
(if (= (-> obj edge-dst) -2)
(nav-graph-editor-method-58 obj)
)
(logand! (-> *mouse* button0-abs 0) -3)
(logand! (-> *mouse* button0-rel 0) -3)
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons right))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons right))
(go (method-of-object obj create))
)
)
@@ -1742,15 +1743,12 @@
(nav-graph-editor-method-43 obj)
(nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index))
(cond
((logtest? (-> *mouse* button0-rel 0) 1)
(logand! (-> *mouse* button0-abs 0) -2)
(logand! (-> *mouse* button0-rel 0) -2)
((mouse-pressed? left)
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons left))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons left))
(go (method-of-object obj create-edge))
)
((and (logtest? (-> *mouse* button0-rel 0) 2)
(>= (-> obj selected-index) 0)
(not (-> obj selected-node-edge?))
)
((and (mouse-pressed? right) (>= (-> obj selected-index) 0) (not (-> obj selected-node-edge?)))
)
(else
(nav-graph-editor-method-59 obj)
@@ -1798,19 +1796,19 @@
(nav-graph-editor-method-42 self)
(nav-graph-editor-method-32 self (-> self selected-node-edge?) (-> self selected-index))
(cond
((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> self selected-index) 0))
(logand! (-> *mouse* button0-abs 0) -2)
(logand! (-> *mouse* button0-rel 0) -2)
((and (mouse-hold? left) (>= (-> self selected-index) 0))
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons left))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons left))
(nav-graph-editor-method-53 self (-> self edge-visibility) (-> self selected-index))
)
((and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> self selected-index) 0))
(logand! (-> *mouse* button0-abs 0) -5)
(logand! (-> *mouse* button0-rel 0) -5)
((and (mouse-hold? middle) (>= (-> self selected-index) 0))
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons middle))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons middle))
(nav-graph-editor-method-57 self (-> self edge-visibility) (-> self selected-index))
)
((logtest? (-> *mouse* button0-abs 0) 2)
(logand! (-> *mouse* button0-abs 0) -3)
(logand! (-> *mouse* button0-rel 0) -3)
((mouse-hold? right)
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons right))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons right))
(go-virtual adjust-minimap)
)
)
@@ -1830,7 +1828,7 @@
(nav-graph-editor-method-28 self)
(nav-graph-editor-method-34 self)
(cond
((not (logtest? (-> *mouse* button0-abs 0) 1))
((not (mouse-hold? left))
(go-virtual adjust-it)
)
(else
@@ -1857,7 +1855,7 @@
(nav-graph-editor-method-28 self)
(nav-graph-editor-method-34 self)
(cond
((not (logtest? (-> *mouse* button0-abs 0) 2))
((not (mouse-hold? right))
(go-virtual adjust-it)
)
(else
@@ -1887,7 +1885,7 @@
(nav-graph-editor-method-28 self)
(nav-graph-editor-method-34 self)
(cond
((not (logtest? (-> *mouse* button0-abs 0) 2))
((not (mouse-hold? right))
(go-virtual adjust-it)
)
(else
@@ -1918,7 +1916,7 @@
(nav-graph-editor-method-34 self)
(nav-graph-editor-method-32 self (-> self selected-node-edge?) (-> self selected-index))
(cond
((not (logtest? (-> *mouse* button0-abs 0) 4))
((not (mouse-hold? middle))
(go-virtual adjust-it)
)
(else
@@ -1954,21 +1952,18 @@
)
)
(cond
((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0))
((and (mouse-hold? left) (>= (-> obj selected-index) 0))
(if (-> obj selected-node-edge?)
(go (method-of-object obj adjust-node-angle))
)
)
((and (logtest? (-> *mouse* button0-abs 0) 2) (>= (-> obj selected-index) 0))
((and (mouse-hold? right) (>= (-> obj selected-index) 0))
(if (-> obj selected-node-edge?)
(go (method-of-object obj adjust-node-radius))
(go (method-of-object obj adjust-edge-width))
)
)
((and (logtest? (-> *mouse* button0-abs 0) 4)
(>= (-> obj selected-index) 0)
(not (-> obj selected-node-edge?))
)
((and (mouse-hold? middle) (>= (-> obj selected-index) 0) (not (-> obj selected-node-edge?)))
(go (method-of-object obj adjust-edge-density))
)
(else
@@ -2016,14 +2011,14 @@
(nav-graph-editor-method-30 obj (-> obj selected-index))
)
(cond
((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0))
(logand! (-> *mouse* button0-abs 0) -2)
(logand! (-> *mouse* button0-rel 0) -2)
((and (mouse-hold? left) (>= (-> obj selected-index) 0))
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons left))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons left))
(go (method-of-object obj adjust-edge-visibility))
)
((logtest? (-> *mouse* button0-abs 0) 2)
(logand! (-> *mouse* button0-abs 0) -3)
(logand! (-> *mouse* button0-rel 0) -3)
((mouse-hold? right)
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons right))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons right))
(go (method-of-object obj draw-closest-minimap))
)
(else
@@ -2096,9 +2091,9 @@
)
)
(cond
((logtest? (-> *mouse* button0-abs 0) 2)
(logand! (-> *mouse* button0-abs 0) -3)
(logand! (-> *mouse* button0-rel 0) -3)
((mouse-hold? right)
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons right))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons right))
(go-virtual adjust-minimap)
)
(else
@@ -2118,19 +2113,19 @@
(nav-graph-editor-method-43 obj)
(nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index))
(cond
((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0) (-> obj selected-node-edge?))
(logand! (-> *mouse* button0-abs 0) -2)
(logand! (-> *mouse* button0-rel 0) -2)
((and (mouse-hold? left) (>= (-> obj selected-index) 0) (-> obj selected-node-edge?))
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons left))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons left))
(go (method-of-object obj move-node))
)
((logtest? (-> *mouse* button0-abs 0) 2)
(logand! (-> *mouse* button0-abs 0) -3)
(logand! (-> *mouse* button0-rel 0) -3)
((mouse-hold? right)
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons right))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons right))
(go (method-of-object obj create-edge))
)
((and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> obj selected-index) 0))
(logand! (-> *mouse* button0-abs 0) -5)
(logand! (-> *mouse* button0-rel 0) -5)
((and (mouse-hold? middle) (>= (-> obj selected-index) 0))
(logclear! (-> *mouse* button0-abs 0) (mouse-buttons middle))
(logclear! (-> *mouse* button0-rel 0) (mouse-buttons middle))
(if (-> obj selected-node-edge?)
(nav-graph-editor-method-55 obj (-> obj selected-index))
(nav-graph-editor-method-56 obj (-> obj selected-index))