decomp: collide-frag (#618)

* decomp: Good portion of `collide-frag`

* decomp: Remove redundant method declarations for drawable types

* decomp: Finish `collide-frag`

Co-authored-by: water111 <48171810+water111@users.noreply.github.com>

test/decompiler/reference/engine/collide/collide-frag_REF.gc

@@ -0,0 +1,220 @@
+;;-*-Lisp-*-
+(in-package goal)
+
+;; definition for method 9 of type drawable-tree-collide-fragment
+(defmethod
+  dummy-9
+  drawable-tree-collide-fragment
+  ((obj drawable-tree-collide-fragment))
+  obj
+  )
+
+;; definition for method 10 of type drawable-tree-collide-fragment
+(defmethod
+  dummy-10
+  drawable-tree-collide-fragment
+  ((obj drawable-tree-collide-fragment) (arg0 drawable) (arg1 display-frame))
+  (when *display-render-collision*
+   (dotimes (s4-0 (-> obj length))
+    (dummy-10 (-> obj data s4-0) (-> obj data s4-0) arg1)
+    )
+   )
+  0
+  )
+
+;; definition for method 16 of type drawable-tree-collide-fragment
+(defmethod
+  dummy-16
+  drawable-tree-collide-fragment
+  ((obj drawable-tree-collide-fragment) (arg0 object) (arg1 object))
+  arg1
+  )
+
+;; definition for method 11 of type drawable-tree-collide-fragment
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  dummy-11
+  drawable-tree-collide-fragment
+  ((obj drawable-tree-collide-fragment) (arg0 int))
+  (dummy-11 (-> obj data 0) (-> obj length))
+  (let ((v0-1 0))
+   )
+  (none)
+  )
+
+;; definition for method 12 of type drawable-tree-collide-fragment
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  dummy-12
+  drawable-tree-collide-fragment
+  ((obj drawable-tree-collide-fragment) (arg0 int))
+  (dummy-12 (-> obj data 0) (-> obj length))
+  (let ((v0-1 0))
+   )
+  (none)
+  )
+
+;; definition for method 13 of type drawable-tree-collide-fragment
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  dummy-13
+  drawable-tree-collide-fragment
+  ((obj drawable-tree-collide-fragment) (arg0 int))
+  (dummy-13 (-> obj data 0) (-> obj length))
+  (let ((v0-1 0))
+   )
+  (none)
+  )
+
+;; definition for method 8 of type collide-fragment
+;; INFO: Return type mismatch int vs collide-fragment.
+(defmethod
+  mem-usage
+  collide-fragment
+  ((obj collide-fragment) (arg0 memory-usage-block) (arg1 int))
+  (let ((s5-0 (if (nonzero? (logand arg1 1))
+               53
+               50
+               )
+         )
+        (s4-0 (-> obj mesh))
+        )
+   (set! (-> arg0 data s5-0 name) (symbol->string 'collide-fragment))
+   (set! (-> arg0 data s5-0 count) (+ (-> arg0 data s5-0 count) 1))
+   (let ((v1-11 (+ (asize-of obj) (asize-of s4-0))))
+    (set! (-> arg0 data s5-0 used) (+ (-> arg0 data s5-0 used) v1-11))
+    (set!
+     (-> arg0 data s5-0 total)
+     (+ (-> arg0 data s5-0 total) (logand -16 (+ v1-11 15)))
+     )
+    )
+   (set! (-> arg0 data (+ s5-0 1) name) "collision-poly")
+   (set!
+    (-> arg0 data (+ s5-0 1) count)
+    (+ (-> arg0 data (+ s5-0 1) count) (the-as int (-> s4-0 poly-count)))
+    )
+   (let ((v1-22 (+ (-> s4-0 strip-data-len) (-> s4-0 poly-count))))
+    (set!
+     (-> arg0 data (+ s5-0 1) used)
+     (+ (-> arg0 data (+ s5-0 1) used) (the-as int v1-22))
+     )
+    (set!
+     (-> arg0 data (+ s5-0 1) total)
+     (+ (-> arg0 data (+ s5-0 1) total) (the-as int v1-22))
+     )
+    )
+   (set! (-> arg0 data (+ s5-0 2) name) "collision-vertex")
+   (set!
+    (-> arg0 data (+ s5-0 2) count)
+    (+ (-> arg0 data (+ s5-0 2) count) (the-as int (-> s4-0 vertex-count)))
+    )
+   (let ((v1-31 (* (-> s4-0 vertex-data-qwc) 16)))
+    (set!
+     (-> arg0 data (+ s5-0 2) used)
+     (+ (-> arg0 data (+ s5-0 2) used) (the-as int v1-31))
+     )
+    (let ((v0-2 (+ (-> arg0 data (+ s5-0 2) total) (the-as int v1-31))))
+     (set! (-> arg0 data (+ s5-0 2) total) v0-2)
+     (the-as collide-fragment v0-2)
+     )
+    )
+   )
+  )
+
+;; definition for method 9 of type drawable-inline-array-collide-fragment
+(defmethod
+  dummy-9
+  drawable-inline-array-collide-fragment
+  ((obj drawable-inline-array-collide-fragment))
+  obj
+  )
+
+;; definition for method 10 of type collide-fragment
+(defmethod
+  dummy-10
+  collide-fragment
+  ((obj collide-fragment) (arg0 drawable) (arg1 display-frame))
+  0
+  )
+
+;; definition for method 10 of type drawable-inline-array-collide-fragment
+(defmethod
+  dummy-10
+  drawable-inline-array-collide-fragment
+  ((obj drawable-inline-array-collide-fragment)
+   (arg0 drawable)
+   (arg1 display-frame)
+   )
+  (dotimes (s4-0 (-> obj length))
+   (let ((s3-0 (-> obj data s4-0)))
+    (if (sphere-cull (-> s3-0 bsphere))
+     (dummy-10 s3-0 s3-0 arg1)
+     )
+    )
+   )
+  0
+  )
+
+;; definition for method 11 of type drawable-inline-array-collide-fragment
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  dummy-11
+  drawable-inline-array-collide-fragment
+  ((obj drawable-inline-array-collide-fragment) (arg0 int))
+  (dummy-11 (the-as collide-fragment (-> obj data)) (-> obj length))
+  (let ((v0-1 0))
+   )
+  (none)
+  )
+
+;; definition for method 12 of type drawable-inline-array-collide-fragment
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  dummy-12
+  drawable-inline-array-collide-fragment
+  ((obj drawable-inline-array-collide-fragment) (arg0 int))
+  (dummy-12 (the-as collide-fragment (-> obj data)) (-> obj length))
+  (let ((v0-1 0))
+   )
+  (none)
+  )
+
+;; definition for method 13 of type drawable-inline-array-collide-fragment
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  dummy-13
+  drawable-inline-array-collide-fragment
+  ((obj drawable-inline-array-collide-fragment) (arg0 int))
+  (dummy-13 (the-as collide-fragment (-> obj data)) (-> obj length))
+  (let ((v0-1 0))
+   )
+  (none)
+  )
+
+;; definition for method 8 of type drawable-inline-array-collide-fragment
+(defmethod
+  mem-usage
+  drawable-inline-array-collide-fragment
+  ((obj drawable-inline-array-collide-fragment)
+   (arg0 memory-usage-block)
+   (arg1 int)
+   )
+  (set! (-> arg0 length) (max 1 (-> arg0 length)))
+  (set! (-> arg0 data 0 name) (symbol->string 'drawable-group))
+  (set! (-> arg0 data 0 count) (+ (-> arg0 data 0 count) 1))
+  (let ((v1-7 32))
+   (set! (-> arg0 data 0 used) (+ (-> arg0 data 0 used) v1-7))
+   (set!
+    (-> arg0 data 0 total)
+    (+ (-> arg0 data 0 total) (logand -16 (+ v1-7 15)))
+    )
+   )
+  (dotimes (s3-0 (-> obj length))
+   (mem-usage (-> obj data s3-0) arg0 arg1)
+   )
+  obj
+  )
+
+
+
+

test/decompiler/reference/engine/draw/drawable-actor-h_REF.gc

@@ -38,6 +38,9 @@
   )
 
 ;; definition for method 10 of type drawable-tree-actor
-(defmethod dummy-10 drawable-tree-actor ((obj drawable-tree-actor))
+(defmethod
+  dummy-10
+  drawable-tree-actor
+  ((obj drawable-tree-actor) (arg0 drawable) (arg1 display-frame))
   0
   )

test/decompiler/reference/engine/draw/drawable-ambient-h_REF.gc

@@ -41,7 +41,10 @@
   )
 
 ;; definition for method 10 of type drawable-tree-ambient
-(defmethod dummy-10 drawable-tree-ambient ((obj drawable-tree-ambient))
+(defmethod
+  dummy-10
+  drawable-tree-ambient
+  ((obj drawable-tree-ambient) (arg0 drawable) (arg1 display-frame))
   0
   )
 

test/decompiler/reference/engine/draw/drawable-h_REF.gc

@@ -11,10 +11,10 @@
   :flag-assert         #x1200000020
   (:methods
     (dummy-9 (_type_) _type_ 9)
-    (dummy-10 (_type_) int 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
+    (dummy-10 (_type_ drawable display-frame) int 10)
+    (dummy-11 (_type_ int) none 11)
+    (dummy-12 (_type_ int) none 12)
+    (dummy-13 (_type_ int) none 13)
     (dummy-14 () none 14)
     (dummy-15 () none 15)
     (dummy-16 (_type_ object object) object 16)