Merge pull request #746 from xTVaser/decomp/twister

decomp: finish `twister`

decompiler/config/all-types.gc

@@ -23307,37 +23307,40 @@
 
 ;; - Types
 
-; (deftype twist-joint (structure)
-;   ((ry      float  :offset-assert 0)
-;    (max-dry float  :offset-assert 4)
-;    )
-;   :method-count-assert 9
-;   :size-assert         #x8
-;   :flag-assert         #x900000008
-;   )
+(deftype twist-joint (structure)
+  ((ry      float  :offset-assert 0)
+   (max-dry float  :offset-assert 4)
+   )
+  :allow-misaligned
+  :method-count-assert 9
+  :size-assert         #x8
+  :flag-assert         #x900000008
+  )
 
-; (deftype twister (basic)
-;   ((num-joints   int32            :offset-assert 4)
-;    (first-joint  int32            :offset-assert 8)
-;    (last-joint   int32            :offset-assert 12)
-;    (max-speed    float            :offset-assert 16)
-;    (smoothing    float            :offset-assert 20)
-;    (min-dist     float            :offset-assert 24)
-;    (target       float            :offset-assert 28)
-;    (ry           float            :offset-assert 32)
-;    (max-speed-ry float            :offset-assert 36)
-;    (data         UNKNOWN :dynamic :offset-assert 40)
-;    )
-;   :method-count-assert 13
-;   :size-assert         #x28
-;   :flag-assert         #xd00000028
-;   (:methods
-;     (dummy-9 () none 9)
-;     (dummy-10 () none 10)
-;     (dummy-11 () none 11)
-;     (dummy-12 () none 12)
-;     )
-;   )
+(deftype twister (basic)
+  ((num-joints   int32            :offset-assert 4)
+   (first-joint  int32            :offset-assert 8)
+   (last-joint   int32            :offset-assert 12)
+   (something    uint16           :offset 12)
+   (max-speed    float            :offset-assert 16)
+   (smoothing    float            :offset-assert 20)
+   (min-dist     float            :offset-assert 24)
+   (target       float            :offset-assert 28)
+   (ry           float            :offset-assert 32)
+   (max-speed-ry float            :offset-assert 36)
+   (data         twist-joint :inline :dynamic :offset-assert 40)
+   )
+  :method-count-assert 13
+  :size-assert         #x28
+  :flag-assert         #xd00000028
+  (:methods
+    (new (symbol _type_ int int float float float float) _type_ 0)
+    (TODO-RENAME-9 (_type_ int int float) none 9)
+    (set-target! (_type_ float) none 10)
+    (TODO-RENAME-11 (_type_) none 11)
+    (TODO-RENAME-12 (_type_ process-drawable) none 12)
+    )
+  )
 
 
 ;; ----------------------

decompiler/config/jak1_ntsc_black_label/label_types.jsonc

@@ -1433,6 +1433,10 @@
     ["L6", "float", true]
   ],
 
+  "twister": [
+    ["L20", "float", true]
+  ],
+
   // please do not add things after this entry! git is dumb.
   "object-file-that-doesnt-actually-exist-and-i-just-put-this-here-to-prevent-merge-conflicts-with-this-file": []
 }

decompiler/config/jak1_ntsc_black_label/stack_structures.jsonc

@@ -820,7 +820,8 @@
   "draw-ocean-transition-seams": [
     [16, "sphere"]
   ],
-    "(method 10 tippy)": [
+  
+  "(method 10 tippy)": [
     [16, "vector"]
   ],
   
@@ -843,7 +844,10 @@
   "(method 12 wobbler)": [
     [16, "vector"]
   ],
-  
+
+  "(method 12 twister)": [
+    [16, "matrix"]
+  ],
 
   "placeholder-do-not-add-below!": []
 }

decompiler/config/jak1_ntsc_black_label/type_casts.jsonc

@@ -1792,5 +1792,18 @@
     [46, "v1", "collide-shape-prim"] // `event-other` from collide-shape
   ],
 
+  "(method 11 twister)": [
+    [7, "s4", "twist-joint"],
+    [13, "s4", "twist-joint"],
+    [26, "s4", "twist-joint"],
+    [28, "s4", "twist-joint"],
+    [36, "s4", "twist-joint"],
+    [40, "s4", "twist-joint"],
+    [47, "s4", "twist-joint"],
+    [55, "s4", "twist-joint"],
+    [70, "s4", "twist-joint"],
+    [82, "s4", "twist-joint"]
+  ],
+
   "placeholder-do-not-add-below": []
 }

docs/gh-pages-proj/src/views/Home.vue

@@ -178,7 +178,7 @@ export default {
       const numPRs = 9;
       for (var i = 0; i < numPRs; i++) {
         var pr = data.items[i];
-        if (pr.body.length == 0) {
+        if (pr,body == null || pr.body.length == 0) {
           pr.body = "No Description";
         }
         pr.body = this.truncateString(pr.body, 250);

goal_src/levels/beach/twister.gc

@@ -5,3 +5,194 @@
 ;; name in dgo: twister
 ;; dgos: BEA, L1
 
+;; definition of type twist-joint
+(deftype twist-joint (structure)
+  ((ry      float  :offset-assert   0)
+   (max-dry float  :offset-assert   4)
+   )
+  :allow-misaligned  :method-count-assert 9
+  :size-assert         #x8
+  :flag-assert         #x900000008
+  )
+
+;; definition of type twister
+(deftype twister (basic)
+  ((num-joints   int32                        :offset-assert   4)
+   (first-joint  int32                        :offset-assert   8)
+   (last-joint   int32                        :offset-assert  12)
+   (something    uint16                       :offset         12)
+   (max-speed    float                        :offset-assert  16)
+   (smoothing    float                        :offset-assert  20)
+   (min-dist     float                        :offset-assert  24)
+   (target       float                        :offset-assert  28)
+   (ry           float                        :offset-assert  32)
+   (max-speed-ry float                        :offset-assert  36)
+   (data         twist-joint :inline :dynamic :offset-assert  40)
+   )
+  :method-count-assert 13
+  :size-assert         #x28
+  :flag-assert         #xd00000028
+  (:methods
+    (new (symbol _type_ int int float float float float) _type_ 0)
+    (TODO-RENAME-9 (_type_ int int float) none 9)
+    (set-target! (_type_ float) none 10)
+    (TODO-RENAME-11 (_type_) none 11)
+    (TODO-RENAME-12 (_type_ process-drawable) none 12)
+    )
+  )
+
+;; definition for method 0 of type twister
+(defmethod
+  new
+  twister
+  ((allocation symbol)
+   (type-to-make twister)
+   (arg0 int)
+   (arg1 int)
+   (arg2 float)
+   (arg3 float)
+   (arg4 float)
+   (arg5 float)
+   )
+  (let* ((gp-0 (+ (- 1 arg0) arg1))
+         (v0-0
+          (object-new
+           allocation
+           (the-as type type-to-make)
+           (the-as int (+ (-> type-to-make something) (* gp-0 16)))
+           )
+          )
+         )
+   (set! (-> v0-0 first-joint) arg0)
+   (set! (-> v0-0 last-joint) arg1)
+   (set! (-> v0-0 num-joints) gp-0)
+   (set! (-> v0-0 max-speed) arg2)
+   (set! (-> v0-0 smoothing) arg4)
+   (set! (-> v0-0 min-dist) arg5)
+   (set! (-> v0-0 target) 0.0)
+   (set! (-> v0-0 ry) 0.0)
+   (set! (-> v0-0 max-speed-ry) arg3)
+   (dotimes (v1-4 gp-0)
+    (set! (-> v0-0 data v1-4 ry) 0.0)
+    (set! (-> v0-0 data v1-4 max-dry) 0.0)
+    )
+   v0-0
+   )
+  )
+
+;; definition for method 5 of type twister
+(defmethod asize-of twister ((obj twister))
+  (+ (* (-> obj num-joints) 16) 40)
+  )
+
+;; definition for method 9 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  TODO-RENAME-9
+  twister
+  ((obj twister) (arg0 int) (arg1 int) (arg2 float))
+  (let ((v1-1 (- arg0 (-> obj first-joint)))
+        (a1-2 (- arg1 (-> obj first-joint)))
+        )
+   (while (>= a1-2 v1-1)
+    (set! (-> obj data v1-1 max-dry) arg2)
+    (+! v1-1 1)
+    )
+   )
+  0
+  (none)
+  )
+
+;; definition for method 10 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod set-target! twister ((obj twister) (arg0 float))
+  (set! (-> obj target) arg0)
+  0
+  (none)
+  )
+
+;; definition for method 11 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod TODO-RENAME-11 twister ((obj twister))
+  (let* ((s5-0 (+ (-> obj num-joints) -1))
+         (s4-0 (-> obj data s5-0))
+         )
+   (let ((f0-2 (deg-diff (-> s4-0 ry) (-> obj target))))
+    (+!
+     (-> s4-0 ry)
+     (seek-with-smooth
+      0.0
+      f0-2
+      (-> obj max-speed)
+      (-> obj smoothing)
+      (-> obj min-dist)
+      )
+     )
+    )
+   (let ((f30-1 (-> s4-0 ry)))
+    (while (> s5-0 0)
+     (+! s5-0 -1)
+     (let ((s4-1 (-> obj data s5-0)))
+      (let ((f0-9 (deg-diff f30-1 (-> s4-1 ry))))
+       (cond
+        ((= (-> s4-1 max-dry) 0.0)
+         (set! f0-9 0.0)
+         )
+        ((< (fabs f0-9) (-> s4-1 max-dry))
+         )
+        ((< f0-9 0.0)
+         (set!
+          f0-9
+          (seek-with-smooth
+           f0-9
+           (- (-> s4-1 max-dry))
+           (-> obj max-speed)
+           (-> obj smoothing)
+           (-> obj min-dist)
+           )
+          )
+         )
+        (else
+         (set!
+          f0-9
+          (seek-with-smooth
+           f0-9
+           (-> s4-1 max-dry)
+           (-> obj max-speed)
+           (-> obj smoothing)
+           (-> obj min-dist)
+           )
+          )
+         )
+        )
+       (+! f30-1 f0-9)
+       )
+      (set! (-> s4-1 ry) f30-1)
+      )
+     )
+    )
+   )
+  0
+  (none)
+  )
+
+;; definition for method 12 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod TODO-RENAME-12 twister ((obj twister) (arg0 process-drawable))
+  (let ((s4-0 (new 'stack-no-clear 'matrix)))
+   (dotimes (s3-0 (-> obj num-joints))
+    (let
+     ((s2-0
+       (-> arg0 node-list data (+ (-> obj first-joint) s3-0) bone transform)
+       )
+      )
+     (matrix-rotate-y! s4-0 (-> obj data s3-0 ry))
+     (vector-! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
+     (matrix*! s2-0 s2-0 s4-0)
+     (vector+! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
+     )
+    )
+   )
+  0
+  (none)
+  )

test/decompiler/reference/engine/gfx/shadow/shadow_REF.gc

@@ -161,7 +161,7 @@
       (if (!= arg2 0.0)
        (compute-and-draw-shadow
         s2-0
-        (-> s4-0 position)
+        (-> s4-0 transform vector 3)
         (-> s4-0 scale)
         (the-as vector arg2)
         arg6
@@ -169,7 +169,7 @@
         )
        )
       (if (and arg1 (!= (shr (shl (-> s4-0 cache bone-matrix) 52) 58) 3))
-       (set! (-> arg1 quad) (-> s4-0 position quad))
+       (set! (-> arg1 quad) (-> s4-0 transform vector 3 quad))
        )
       )
      (else
@@ -337,7 +337,3 @@
     )
    )
   )
-
-
-
-

test/decompiler/reference/levels/beach/twister_REF.gc

@@ -0,0 +1,222 @@
+;;-*-Lisp-*-
+(in-package goal)
+
+;; definition of type twist-joint
+(deftype twist-joint (structure)
+  ((ry      float  :offset-assert   0)
+   (max-dry float  :offset-assert   4)
+   )
+  :allow-misaligned  :method-count-assert 9
+  :size-assert         #x8
+  :flag-assert         #x900000008
+  )
+
+;; definition for method 3 of type twist-joint
+(defmethod inspect twist-joint ((obj twist-joint))
+  (format #t "[~8x] ~A~%" obj 'twist-joint)
+  (format #t "~Try: ~f~%" (-> obj ry))
+  (format #t "~Tmax-dry: ~f~%" (-> obj max-dry))
+  obj
+  )
+
+;; definition of type twister
+(deftype twister (basic)
+  ((num-joints   int32                        :offset-assert   4)
+   (first-joint  int32                        :offset-assert   8)
+   (last-joint   int32                        :offset-assert  12)
+   (something    uint16                       :offset         12)
+   (max-speed    float                        :offset-assert  16)
+   (smoothing    float                        :offset-assert  20)
+   (min-dist     float                        :offset-assert  24)
+   (target       float                        :offset-assert  28)
+   (ry           float                        :offset-assert  32)
+   (max-speed-ry float                        :offset-assert  36)
+   (data         twist-joint :inline :dynamic :offset-assert  40)
+   )
+  :method-count-assert 13
+  :size-assert         #x28
+  :flag-assert         #xd00000028
+  (:methods
+    (new (symbol _type_ int int float float float float) _type_ 0)
+    (TODO-RENAME-9 (_type_ int int float) none 9)
+    (set-target! (_type_ float) none 10)
+    (TODO-RENAME-11 (_type_) none 11)
+    (TODO-RENAME-12 (_type_ process-drawable) none 12)
+    )
+  )
+
+;; definition for method 3 of type twister
+(defmethod inspect twister ((obj twister))
+  (format #t "[~8x] ~A~%" obj (-> obj type))
+  (format #t "~Tnum-joints: ~D~%" (-> obj num-joints))
+  (format #t "~Tfirst-joint: ~D~%" (-> obj first-joint))
+  (format #t "~Tlast-joint: ~D~%" (-> obj last-joint))
+  (format #t "~Tmax-speed: ~f~%" (-> obj max-speed))
+  (format #t "~Tsmoothing: ~f~%" (-> obj smoothing))
+  (format #t "~Tmin-dist: ~f~%" (-> obj min-dist))
+  (format #t "~Ttarget: ~f~%" (-> obj target))
+  (format #t "~Try: ~f~%" (-> obj ry))
+  (format #t "~Tmax-speed-ry: ~f~%" (-> obj max-speed-ry))
+  (format #t "~Tdata[0] @ #x~X~%" (-> obj data))
+  obj
+  )
+
+;; definition for method 0 of type twister
+(defmethod
+  new
+  twister
+  ((allocation symbol)
+   (type-to-make twister)
+   (arg0 int)
+   (arg1 int)
+   (arg2 float)
+   (arg3 float)
+   (arg4 float)
+   (arg5 float)
+   )
+  (let* ((gp-0 (+ (- 1 arg0) arg1))
+         (v0-0
+          (object-new
+           allocation
+           (the-as type type-to-make)
+           (the-as int (+ (-> type-to-make something) (* gp-0 16)))
+           )
+          )
+         )
+   (set! (-> v0-0 first-joint) arg0)
+   (set! (-> v0-0 last-joint) arg1)
+   (set! (-> v0-0 num-joints) gp-0)
+   (set! (-> v0-0 max-speed) arg2)
+   (set! (-> v0-0 smoothing) arg4)
+   (set! (-> v0-0 min-dist) arg5)
+   (set! (-> v0-0 target) 0.0)
+   (set! (-> v0-0 ry) 0.0)
+   (set! (-> v0-0 max-speed-ry) arg3)
+   (dotimes (v1-4 gp-0)
+    (set! (-> v0-0 data v1-4 ry) 0.0)
+    (set! (-> v0-0 data v1-4 max-dry) 0.0)
+    )
+   v0-0
+   )
+  )
+
+;; definition for method 5 of type twister
+(defmethod asize-of twister ((obj twister))
+  (+ (* (-> obj num-joints) 16) 40)
+  )
+
+;; definition for method 9 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod
+  TODO-RENAME-9
+  twister
+  ((obj twister) (arg0 int) (arg1 int) (arg2 float))
+  (let ((v1-1 (- arg0 (-> obj first-joint)))
+        (a1-2 (- arg1 (-> obj first-joint)))
+        )
+   (while (>= a1-2 v1-1)
+    (set! (-> obj data v1-1 max-dry) arg2)
+    (+! v1-1 1)
+    )
+   )
+  0
+  (none)
+  )
+
+;; definition for method 10 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod set-target! twister ((obj twister) (arg0 float))
+  (set! (-> obj target) arg0)
+  0
+  (none)
+  )
+
+;; definition for method 11 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod TODO-RENAME-11 twister ((obj twister))
+  (let* ((s5-0 (+ (-> obj num-joints) -1))
+         (s4-0 (-> obj data s5-0))
+         )
+   (let ((f0-2 (deg-diff (-> s4-0 ry) (-> obj target))))
+    (+!
+     (-> s4-0 ry)
+     (seek-with-smooth
+      0.0
+      f0-2
+      (-> obj max-speed)
+      (-> obj smoothing)
+      (-> obj min-dist)
+      )
+     )
+    )
+   (let ((f30-1 (-> s4-0 ry)))
+    (while (> s5-0 0)
+     (+! s5-0 -1)
+     (let ((s4-1 (-> obj data s5-0)))
+      (let ((f0-9 (deg-diff f30-1 (-> s4-1 ry))))
+       (cond
+        ((= (-> s4-1 max-dry) 0.0)
+         (set! f0-9 0.0)
+         )
+        ((< (fabs f0-9) (-> s4-1 max-dry))
+         )
+        ((< f0-9 0.0)
+         (set!
+          f0-9
+          (seek-with-smooth
+           f0-9
+           (- (-> s4-1 max-dry))
+           (-> obj max-speed)
+           (-> obj smoothing)
+           (-> obj min-dist)
+           )
+          )
+         )
+        (else
+         (set!
+          f0-9
+          (seek-with-smooth
+           f0-9
+           (-> s4-1 max-dry)
+           (-> obj max-speed)
+           (-> obj smoothing)
+           (-> obj min-dist)
+           )
+          )
+         )
+        )
+       (+! f30-1 f0-9)
+       )
+      (set! (-> s4-1 ry) f30-1)
+      )
+     )
+    )
+   )
+  0
+  (none)
+  )
+
+;; definition for method 12 of type twister
+;; INFO: Return type mismatch int vs none.
+(defmethod TODO-RENAME-12 twister ((obj twister) (arg0 process-drawable))
+  (let ((s4-0 (new 'stack-no-clear 'matrix)))
+   (dotimes (s3-0 (-> obj num-joints))
+    (let
+     ((s2-0
+       (-> arg0 node-list data (+ (-> obj first-joint) s3-0) bone transform)
+       )
+      )
+     (matrix-rotate-y! s4-0 (-> obj data s3-0 ry))
+     (vector-! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
+     (matrix*! s2-0 s2-0 s4-0)
+     (vector+! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
+     )
+    )
+   )
+  0
+  (none)
+  )
+
+
+
+