[decomp] flags for continue points (#1303)

* make flags!

* finish flags

* refs

* Update game.gp

* fix target decomp

* Update target.gc
This commit is contained in:
ManDude
2022-04-15 23:06:24 +01:00
committed by GitHub
parent ab063bf7b0
commit 5300a7fc2b
21 changed files with 3349 additions and 3269 deletions
+107 -132
View File
@@ -362,9 +362,9 @@
(when (!= s1-0 sv-272)
(vector-float*! sv-192 (-> s3-0 sv-272) (-> s3-0 sv-272 w))
(vector-cross! sv-208 (-> s3-0 sv-272) (-> s3-0 s1-0))
(vector-normalize! sv-208 (-> (new 'static 'array float 1 1.0) 0))
(vector-normalize! sv-208 (the-as float 1.0))
(vector-cross! sv-224 sv-208 (-> s3-0 sv-272))
(vector-normalize! sv-224 (-> (new 'static 'array float 1 1.0) 0))
(vector-normalize! sv-224 (the-as float 1.0))
(let ((f0-6 (cam-layout-intersect-dist (-> s3-0 s1-0) sv-192 sv-224)))
(when (!= f0-6 409600000.0)
(vector+float*! sv-240 sv-192 sv-224 f0-6)
@@ -416,7 +416,7 @@
(else
(dotimes (v1-87 (the-as int (-> sv-16 elt-count)))
(when (and (!= v1-87 s1-0) (!= v1-87 sv-272))
(if (< (-> (new 'static 'array float 1 4096.0) 0) (- (vector-dot sv-160 (-> s3-0 v1-87)) (-> s3-0 v1-87 w)))
(if (< 4096.0 (- (vector-dot sv-160 (-> s3-0 v1-87)) (-> s3-0 v1-87 w)))
(goto cfg-47)
)
)
@@ -446,7 +446,7 @@
(set! sv-272 (+ sv-272 1))
)
(when (nonzero? sv-256)
(vector-float*! s0-0 s0-0 (/ (-> (new 'static 'array float 1 1.0) 0) (the float sv-256)))
(vector-float*! s0-0 s0-0 (/ 1.0 (the float sv-256)))
(cond
((>= *volume-normal-current* 599)
(format 0 "ERROR <GMJ>: camera editing out of volume normals~%")
@@ -535,20 +535,20 @@
0.0
0.0
(cond
((< (-> (new 'static 'array float 1 1.0) 0) arg3)
(set! arg3 (-> (the-as (pointer float) (new 'static 'array float 1 1.0)) 0))
((< 1.0 arg3)
(set! arg3 (the-as float 1.0))
)
((< arg3 0.0)
(set! arg3 (-> (the-as (pointer float) (new 'static 'array float 1 0.0)) 0))
(set! arg3 (the-as float 0.0))
)
)
(vector-normalize-copy! s2-0 arg1 (-> (new 'static 'array float 1 1.0) 0))
(vector-normalize-copy! s1-0 arg2 (-> (new 'static 'array float 1 1.0) 0))
(vector-normalize-copy! s2-0 arg1 (the-as float 1.0))
(vector-normalize-copy! s1-0 arg2 (the-as float 1.0))
(vector-cross! s0-0 s2-0 s1-0)
(let* ((f30-0 (vector-length s0-0))
(f28-0 (asin f30-0))
)
(vector-float*! arg0 arg1 (/ (sin (* (- (-> (new 'static 'array float 1 1.0) 0) arg3) f28-0)) f30-0))
(vector-float*! arg0 arg1 (/ (sin (* (- 1.0 arg3) f28-0)) f30-0))
(vector+float*! arg0 arg0 arg2 (/ (sin (* arg3 f28-0)) f30-0))
)
)
@@ -586,36 +586,15 @@
(let ((s3-0 (new-stack-vector0))
(gp-0 (new-stack-vector0))
)
(arg0
s3-0
(-> arg1 from)
(-> arg1 to)
(-> (new 'static 'array float 1 0.0) 0)
(-> arg1 axis)
(-> (new 'static 'array float 1 65536.0) 0)
)
(arg0 s3-0 (-> arg1 from) (-> arg1 to) (the-as float 0.0) (-> arg1 axis) (the-as float 65536.0))
(vector+! s3-0 s3-0 (-> arg1 origin))
(dotimes (s2-0 10)
(set! (-> gp-0 quad) (-> s3-0 quad))
(arg0
s3-0
(-> arg1 from)
(-> arg1 to)
(* 0.1 (+ (-> (new 'static 'array float 1 1.0) 0) (the float s2-0)))
(-> arg1 axis)
(-> (new 'static 'array float 1 65536.0) 0)
)
(arg0 s3-0 (-> arg1 from) (-> arg1 to) (* 0.1 (+ 1.0 (the float s2-0))) (-> arg1 axis) (the-as float 65536.0))
(vector+! s3-0 s3-0 (-> arg1 origin))
(camera-line s3-0 gp-0 (-> arg1 color))
)
(arg0
gp-0
(-> arg1 from)
(-> arg1 to)
(-> *CAM_LAYOUT-bank* debug-t)
(-> arg1 axis)
(-> (new 'static 'array float 1 65536.0) 0)
)
(arg0 gp-0 (-> arg1 from) (-> arg1 to) (-> *CAM_LAYOUT-bank* debug-t) (-> arg1 axis) (the-as float 65536.0))
(format *stdcon* "~S ~f~%" (-> arg1 disp) (vector-length gp-0))
(vector+! gp-0 gp-0 (-> arg1 origin))
(camera-line (-> arg1 origin) gp-0 (-> arg1 color))
@@ -624,7 +603,7 @@
(new 'static 'vector :z 1024.0)
gp-0
(-> arg1 color)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -635,17 +614,11 @@
(let ((s3-0 (new-stack-vector0))
(gp-0 (new-stack-vector0))
)
(arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (-> (new 'static 'array float 1 0.0) 0))
(arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (the-as float 0.0))
(vector+! s3-0 s3-0 (-> arg1 origin))
(dotimes (s2-0 10)
(set! (-> gp-0 quad) (-> s3-0 quad))
(arg0
s3-0
(-> arg1 from)
(-> arg1 to)
(-> arg1 axis)
(* 182.04445 (* 18.0 (+ (-> (new 'static 'array float 1 1.0) 0) (the float s2-0))))
)
(arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (* 182.04445 (* 18.0 (+ 1.0 (the float s2-0)))))
(vector+! s3-0 s3-0 (-> arg1 origin))
(camera-line s3-0 gp-0 (-> arg1 color))
)
@@ -658,7 +631,7 @@
(new 'static 'vector :z 1024.0)
gp-0
(-> arg1 color)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -680,8 +653,8 @@
s5-0
s4-0
(* 0.5 (cam-slave-get-fov arg0))
(-> (new 'static 'array float 1 0.75) 0)
(-> (new 'static 'array float 1 1.0) 0)
(the-as float 0.75)
(the-as float 1.0)
(new 'static 'vector4w :z #xff :w #x80)
)
)
@@ -695,7 +668,7 @@
(new 'static 'vector :z 1024.0)
s5-1
(new 'static 'vector4w :x #x80 :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -708,7 +681,7 @@
(new 'static 'vector :z 1024.0)
s5-2
(new 'static 'vector4w :y #x80 :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -721,7 +694,7 @@
(new 'static 'vector :z 1024.0)
s5-3
(new 'static 'vector4w :x #x80 :z #x80 :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -735,7 +708,7 @@
)
(cond
((cam-slave-get-vector-with-offset arg0 s4-1 'pivot)
(curve-get-pos! s5-4 (-> (new 'static 'array float 1 0.0) 0) s3-1)
(curve-get-pos! s5-4 (the-as float 0.0) s3-1)
(vector-! s4-1 s4-1 s5-4)
)
(else
@@ -757,11 +730,11 @@
)
)
)
(curve-get-pos! s5-4 (-> (new 'static 'array float 1 0.0) 0) s3-1)
(curve-get-pos! s5-4 (the-as float 0.0) s3-1)
(vector+! s5-4 s5-4 s4-1)
(dotimes (s1-1 8)
(set! (-> s2-0 quad) (-> s5-4 quad))
(curve-get-pos! s5-4 (* (-> (new 'static 'array float 1 0.125) 0) (the float (+ s1-1 1))) s3-1)
(curve-get-pos! s5-4 (* 0.125 (the float (+ s1-1 1))) s3-1)
(vector+! s5-4 s5-4 s4-1)
(camera-line s2-0 s5-4 (new 'static 'vector4w :x #xff :y #xff :w #x80))
)
@@ -772,7 +745,7 @@
(new 'static 'vector :z 1024.0)
s5-4
(new 'static 'vector4w :x #xff :y #xff :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -787,24 +760,24 @@
)
(cond
((cam-slave-get-vector-with-offset arg0 s4-2 'pivot)
(curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2)
(curve-get-pos! s5-5 (the-as float 1.0) s3-2)
(vector-! s4-2 s4-2 s5-5)
)
((get-curve-data! arg0 s1-2 'campath 'campath-k (the-as float -1000000000.0))
(curve-get-pos! s4-2 (-> (new 'static 'array float 1 0.0) 0) s1-2)
(curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2)
(curve-get-pos! s4-2 (the-as float 0.0) s1-2)
(curve-get-pos! s5-5 (the-as float 1.0) s3-2)
(vector-! s4-2 s4-2 s5-5)
)
((cam-slave-get-vector-with-offset arg0 s4-2 'trans)
(curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2)
(curve-get-pos! s5-5 (the-as float 1.0) s3-2)
(vector-! s4-2 s4-2 s5-5)
)
)
(curve-get-pos! s5-5 (-> (new 'static 'array float 1 0.0) 0) s3-2)
(curve-get-pos! s5-5 (the-as float 0.0) s3-2)
(vector+! s5-5 s5-5 s4-2)
(dotimes (s1-3 8)
(set! (-> s2-1 quad) (-> s5-5 quad))
(curve-get-pos! s5-5 (* (-> (new 'static 'array float 1 0.125) 0) (the float (+ s1-3 1))) s3-2)
(curve-get-pos! s5-5 (* 0.125 (the float (+ s1-3 1))) s3-2)
(vector+! s5-5 s5-5 s4-2)
(camera-line s2-1 s5-5 (new 'static 'vector4w :z #xff :w #x80))
)
@@ -815,20 +788,20 @@
(new 'static 'vector :z 1024.0)
s5-5
(new 'static 'vector4w :z #xff :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
(curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (-> (new 'static 'array float 1 0.0) 0)) s3-2)
(curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (the-as float 0.0)) s3-2)
(vector+! s5-5 s5-5 s4-2)
(camera-cross
(new 'static 'vector :y 1024.0)
(new 'static 'vector :z 1024.0)
s5-5
(new 'static 'vector4w :z #xff :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
(let ((s2-3 (res-lump-data arg0 'campoints pointer :time (-> (new 'static 'array float 1 1.0) 0)))
(let ((s2-3 (res-lump-data arg0 'campoints pointer :time (the-as float 1.0)))
(v1-95 (res-lump-struct arg0 'campoints-offset structure :time (the-as float -1000000000.0)))
(s4-3 (new 'stack-no-clear 'vector))
(s3-3 (new 'stack-no-clear 'vector))
@@ -852,11 +825,11 @@
(new 'static 'vector :z 1024.0)
s5-6
(new 'static 'vector4w :x #xff :y #xff :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
(let ((s4-4 (res-lump-data arg0 'focalpull pointer :time (-> (new 'static 'array float 1 1.0) 0)))
(let ((s4-4 (res-lump-data arg0 'focalpull pointer :time (the-as float 1.0)))
(s5-7 (new 'static 'vector))
)
(when (and s4-4 (or (!= *camera-layout-blink* 'focalpull) (logtest? (-> *display* real-actual-frame-counter) 8)))
@@ -876,7 +849,7 @@
(new 'static 'vector :z 1024.0)
s5-7
(new 'static 'vector4w :y #xff :z #xff :w #x80)
(-> (new 'static 'array float 1 4096.0) 0)
(meters 1.0)
)
)
)
@@ -892,12 +865,12 @@
(vector-! (-> s5-8 from) (-> s5-8 from) (-> s5-8 origin))
(vector-! (-> s5-8 to) (-> s5-8 to) (-> s5-8 origin))
(vector-cross! s4-5 (-> s5-8 from) (-> s5-8 to))
(vector-normalize! s4-5 (-> (new 'static 'array float 1 8192.0) 0))
(vector-normalize! s4-5 (the-as float 8192.0))
(vector+! s4-5 s4-5 (-> s5-8 origin))
(camera-line (-> s5-8 origin) s4-5 (new 'static 'vector4w :x #x80 :y #x80 :z #x80 :w #x80))
(when (not (paused?))
(+! (-> *CAM_LAYOUT-bank* debug-t) (-> *CAM_LAYOUT-bank* debug-step))
(if (< (-> (new 'static 'array float 1 1.0) 0) (-> *CAM_LAYOUT-bank* debug-t))
(if (< 1.0 (-> *CAM_LAYOUT-bank* debug-t))
(set! (-> *CAM_LAYOUT-bank* debug-t) 0.0)
)
)
@@ -958,10 +931,10 @@
((cpad-hold? arg2 l3)
(set! (-> arg0 z) (- (-> arg0 z) (analog-input
(the-as int (-> *cpad-list* cpads arg2 rightx))
(-> (new 'static 'array float 1 128.0) 0)
(-> (new 'static 'array float 1 48.0) 0)
(-> (new 'static 'array float 1 110.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(the-as float 128.0)
(the-as float 48.0)
(the-as float 110.0)
(the-as float 1.0)
)
)
)
@@ -969,27 +942,27 @@
(else
(set! (-> arg0 y) (- (-> arg0 y) (analog-input
(the-as int (-> *cpad-list* cpads arg2 rightx))
(-> (new 'static 'array float 1 128.0) 0)
(-> (new 'static 'array float 1 48.0) 0)
(-> (new 'static 'array float 1 110.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(the-as float 128.0)
(the-as float 48.0)
(the-as float 110.0)
(the-as float 1.0)
)
)
)
(+! (-> arg0 x) (analog-input
(the-as int (-> *cpad-list* cpads arg2 righty))
(-> (new 'static 'array float 1 128.0) 0)
(-> (new 'static 'array float 1 48.0) 0)
(-> (new 'static 'array float 1 110.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(the-as float 128.0)
(the-as float 48.0)
(the-as float 110.0)
(the-as float 1.0)
)
)
(set! (-> arg1 x) (- (-> arg1 x) (analog-input
(the-as int (-> *cpad-list* cpads arg2 leftx))
(-> (new 'static 'array float 1 128.0) 0)
(-> (new 'static 'array float 1 48.0) 0)
(-> (new 'static 'array float 1 110.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(the-as float 128.0)
(the-as float 48.0)
(the-as float 110.0)
(the-as float 1.0)
)
)
)
@@ -998,9 +971,9 @@
(set! (-> arg1 y) (+ 0.5
(analog-input
(the-as int (-> *cpad-list* cpads arg2 abutton 9))
(-> (new 'static 'array float 1 0.0) 0)
(-> (new 'static 'array float 1 32.0) 0)
(-> (new 'static 'array float 1 230.0) 0)
(the-as float 0.0)
(the-as float 32.0)
(the-as float 230.0)
(the-as float 0.5)
)
(-> arg1 y)
@@ -1012,9 +985,9 @@
(if (cpad-hold? arg2 l1)
(set! (-> arg1 y) (- (-> arg1 y) (+ 0.5 (analog-input
(the-as int (-> *cpad-list* cpads arg2 abutton 8))
(-> (new 'static 'array float 1 0.0) 0)
(-> (new 'static 'array float 1 32.0) 0)
(-> (new 'static 'array float 1 230.0) 0)
(the-as float 0.0)
(the-as float 32.0)
(the-as float 230.0)
(the-as float 0.5)
)
)
@@ -1024,10 +997,10 @@
)
(set! (-> arg1 z) (- (-> arg1 z) (analog-input
(the-as int (-> *cpad-list* cpads arg2 lefty))
(-> (new 'static 'array float 1 128.0) 0)
(-> (new 'static 'array float 1 48.0) 0)
(-> (new 'static 'array float 1 110.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(the-as float 128.0)
(the-as float 48.0)
(the-as float 110.0)
(the-as float 1.0)
)
)
)
@@ -1303,11 +1276,13 @@
)
;; definition for function fov->maya
;; INFO: Return type mismatch number vs float.
(defun fov->maya ((arg0 float))
(if (= arg0 0.0)
(-> (new 'static 'array float 1 0.0) 0)
(/ 12.700255 (tan (* 0.5 arg0)))
)
(the-as float (if (= arg0 0.0)
0.0
(/ 12.700255 (tan (* 0.5 arg0)))
)
)
)
;; definition for function cam-layout-save-cam-rot
@@ -1548,7 +1523,7 @@
'fov
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1562,7 +1537,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1601,7 +1576,7 @@
'focalPull
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1615,7 +1590,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1819,7 +1794,7 @@
'intro-time
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1833,7 +1808,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1844,7 +1819,7 @@
(if arg0
(format #t "setup intro-time 0.0 (defaults to 1 sec)~%")
)
(set! f30-0 (-> (new 'static 'array float 1 1.0) 0))
(set! f30-0 1.0)
)
(arg0
(format #t "setup intro-time ~f~%" f30-0)
@@ -1872,7 +1847,7 @@
'intro-exitValue
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1886,7 +1861,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1920,7 +1895,7 @@
'interpTime
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -1934,7 +1909,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2002,7 +1977,7 @@
'spline-follow-dist-offset
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2047,7 +2022,7 @@
'tiltAdjust
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2061,7 +2036,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2092,7 +2067,7 @@
'stringMinLength
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2106,7 +2081,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2137,7 +2112,7 @@
'stringMaxLength
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2151,7 +2126,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2182,7 +2157,7 @@
'stringMinHeight
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2196,7 +2171,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2227,7 +2202,7 @@
'stringMaxHeight
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2241,7 +2216,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2272,7 +2247,7 @@
'stringCliffHeight
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2286,7 +2261,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2317,7 +2292,7 @@
'maxAngle
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2330,7 +2305,7 @@
(string->symbol *res-key-string*)
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2681,7 +2656,7 @@
arg0
'interp
(the-as float -1000000000.0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as (pointer res-tag) #f)
*res-static-buf*
)
@@ -2689,15 +2664,15 @@
(f0-0 (-> arg1 0))
)
(if (= f0-0 0.0)
(set! f0-0 (-> (new 'static 'array float 1 1.0) 0))
(set! f0-0 1.0)
)
(let ((f0-2
(+ f30-0
(analog-input
(the-as int (-> *cpad-list* cpads 0 leftx))
(-> (new 'static 'array float 1 128.0) 0)
(-> (new 'static 'array float 1 48.0) 0)
(-> (new 'static 'array float 1 110.0) 0)
(the-as float 128.0)
(the-as float 48.0)
(the-as float 110.0)
f0-0
)
)
@@ -2716,7 +2691,7 @@
;; definition for function clmf-cam-meters
(defbehavior clmf-cam-meters cam-layout ((arg0 meters) (arg1 symbol))
(let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0))))
(let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0))))
(format arg0 ": ~M" f0-0)
)
#t
@@ -2730,7 +2705,7 @@
;; definition for function clmf-cam-deg
(defbehavior clmf-cam-deg cam-layout ((arg0 degrees) (arg1 symbol))
(format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0)))
(format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0)))
#t
)
@@ -2751,7 +2726,7 @@
;; definition for function clmf-cam-float
(defbehavior clmf-cam-float cam-layout ((arg0 float) (arg1 symbol))
(format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0)))
(format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0)))
#t
)
+33 -50
View File
@@ -504,10 +504,10 @@
;; INFO: Return type mismatch object vs none.
(defun anim-tester-num-print ((arg0 basic) (arg1 float))
(cond
((= arg1 (-> (new 'static 'array float 1 -2.0) 0))
((= arg1 -2.0)
(format arg0 "max")
)
((= arg1 (-> (new 'static 'array float 1 -1.0) 0))
((= arg1 -1.0)
(format arg0 "min")
)
(else
@@ -700,8 +700,8 @@
(set! (-> (the-as anim-test-seq-item v0-0) privname) arg1)
(set! (-> (the-as anim-test-seq-item v0-0) speed) 100)
(set! (-> (the-as anim-test-seq-item v0-0) blend) 0)
(set! (-> (the-as anim-test-seq-item v0-0) first-frame) (-> (new 'static 'array float 1 -1.0) 0))
(set! (-> (the-as anim-test-seq-item v0-0) last-frame) (-> (new 'static 'array float 1 -2.0) 0))
(set! (-> (the-as anim-test-seq-item v0-0) first-frame) -1.0)
(set! (-> (the-as anim-test-seq-item v0-0) last-frame) -2.0)
(the-as anim-test-seq-item v0-0)
)
)
@@ -773,7 +773,7 @@
#t
" item ~A SP=~f BL=~d FIRST="
(-> s3-0 privname)
(* (-> (new 'static 'array float 1 0.01) 0) (the float (-> s3-0 speed)))
(* 0.01 (the float (-> s3-0 speed)))
(-> s3-0 blend)
)
(anim-tester-num-print #t (-> s3-0 first-frame))
@@ -812,7 +812,7 @@
)
(format #t "-------------~%")
(format #t "current-obj=~A~%" (-> obj current-obj))
(format #t "speed=~f~%" (* (-> (new 'static 'array float 1 0.01) 0) (the float (-> obj speed))))
(format #t "speed=~f~%" (* 0.01 (the float (-> obj speed))))
(format #t "--flags:--~%")
(the-as anim-tester (format #t " CONNECTED: ~A~%" (if (logtest? (-> obj flags) (anim-tester-flags fanimt0))
"TRUE"
@@ -960,10 +960,8 @@
(defbehavior anim-tester-update-anim-info anim-tester ((arg0 anim-test-seq-item))
(set! (-> self anim-first) (-> arg0 first-frame))
(set! (-> self anim-last) (-> arg0 last-frame))
(set! (-> self anim-gspeed) (* (-> (new 'static 'array float 1 0.01) 0) (the float (-> self speed))))
(set! (-> self anim-speed)
(* (-> (new 'static 'array float 1 0.01) 0) (-> self anim-gspeed) (the float (-> arg0 speed)))
)
(set! (-> self anim-gspeed) (* 0.01 (the float (-> self speed))))
(set! (-> self anim-speed) (* 0.01 (-> self anim-gspeed) (the float (-> arg0 speed))))
(when (< (-> self anim-speed) 0.0)
(set! (-> self anim-first) (-> arg0 last-frame))
(set! (-> self anim-last) (-> arg0 first-frame))
@@ -1010,8 +1008,8 @@
(set! (-> self draw sink-group) (-> *level* level-default foreground-sink-group 1))
(set! (-> self draw lod-set lod 0 geo) a1-4)
)
(set! (-> self draw lod-set lod 0 dist) (-> (new 'static 'array float 1 4095996000.0) 0))
(set! (-> self draw bounds w) (-> (new 'static 'array float 1 40960.0) 0))
(set! (-> self draw lod-set lod 0 dist) 4095996000.0)
(set! (-> self draw bounds w) 40960.0)
(set! (-> self draw data-format) (the-as uint 1))
(let ((v1-16 (-> (new 'static 'vector :x 1.0 :y 1.0 :z 1.0 :w 1.0) quad)))
(set! (-> self draw color-mult quad) v1-16)
@@ -1048,13 +1046,13 @@
(gp-0 (-> s3-0 base))
)
(cond
((= arg1 (-> (new 'static 'array float 1 -1.0) 0))
((= arg1 -1.0)
(let ((s2-1 draw-string-adv))
(format (clear *temp-string*) "~Smin" arg0)
(s2-1 *temp-string* s3-0 arg3)
)
)
((= arg1 (-> (new 'static 'array float 1 -2.0) 0))
((= arg1 -2.0)
(let ((s2-2 draw-string-adv))
(format (clear *temp-string*) "~Smax" arg0)
(s2-2 *temp-string* s3-0 arg3)
@@ -1630,36 +1628,37 @@
)
;; definition for function anim-tester-adjust-frame
;; INFO: Return type mismatch number vs float.
(defun anim-tester-adjust-frame ((arg0 float) (arg1 float))
(cond
((cpad-hold? 0 down)
(cond
((= arg0 (-> (new 'static 'array float 1 -2.0) 0))
(set! arg0 (+ (-> (new 'static 'array float 1 -1.0) 0) arg1))
((= arg0 -2.0)
(set! arg0 (+ -1.0 arg1))
)
((!= arg0 (-> (new 'static 'array float 1 -1.0) 0))
(set! arg0 (+ (-> (new 'static 'array float 1 -1.0) 0) arg0))
((!= arg0 -1.0)
(set! arg0 (+ -1.0 arg0))
(if (< arg0 0.0)
(set! arg0 (-> (new 'static 'array float 1 -1.0) 0))
(set! arg0 (the-as float -1.0))
)
)
)
)
((cpad-hold? 0 up)
(cond
((= arg0 (-> (new 'static 'array float 1 -1.0) 0))
(set! arg0 (-> (new 'static 'array float 1 0.0) 0))
((= arg0 -1.0)
(set! arg0 (the-as float 0.0))
)
((!= arg0 (-> (new 'static 'array float 1 -2.0) 0))
(set! arg0 (+ (-> (new 'static 'array float 1 1.0) 0) arg0))
((!= arg0 -2.0)
(set! arg0 (+ 1.0 arg0))
(if (>= arg0 arg1)
(set! arg0 (-> (new 'static 'array float 1 -2.0) 0))
(set! arg0 (the-as float -2.0))
)
)
)
)
)
arg0
(the-as float arg0)
)
;; definition for function anim-tester-pick-item-setup
@@ -1751,7 +1750,7 @@
*font-default-matrix*
(-> arg1 xpos)
(-> arg1 ypos)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as font-color (if (= (-> arg1 the-index) (-> arg1 current-index))
15
12
@@ -2592,13 +2591,13 @@
(ja-channel-set! 1)
)
(cond
((= (-> self anim-first) (-> (new 'static 'array float 1 -1.0) 0))
((= (-> self anim-first) -1.0)
(let ((s3-0 (-> self skel root-channel 0)))
(joint-control-channel-group-eval! s3-0 s4-1 num-func-identity)
(set! (-> s3-0 frame-num) 0.0)
)
)
((= (-> self anim-first) (-> (new 'static 'array float 1 -2.0) 0))
((= (-> self anim-first) -2.0)
(let ((s3-1 (-> self skel root-channel 0)))
(joint-control-channel-group-eval! s3-1 s4-1 num-func-identity)
(set! (-> s3-1 frame-num) (the float (+ (-> s4-1 data 0 length) -1)))
@@ -2615,13 +2614,7 @@
(while (and (!= (-> self skel root-channel 0) (-> self skel channel)) (logtest? (-> s5-1 flags) 2))
(when (logtest? (-> self flags) (anim-tester-flags fanimt5))
(TODO-RENAME-9 (-> self align))
(TODO-RENAME-10
(-> self align)
31
(-> (new 'static 'array float 1 1.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
)
(TODO-RENAME-10 (-> self align) 31 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0))
)
(suspend)
)
@@ -2629,21 +2622,15 @@
(until (ja-done? 0)
(when (logtest? (-> self flags) (anim-tester-flags fanimt5))
(TODO-RENAME-9 (-> self align))
(TODO-RENAME-10
(-> self align)
31
(-> (new 'static 'array float 1 1.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
(-> (new 'static 'array float 1 1.0) 0)
)
(TODO-RENAME-10 (-> self align) 31 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0))
)
(suspend)
(anim-tester-update-anim-info s5-1)
(let ((v1-73 (= (-> self anim-last) (-> (new 'static 'array float 1 -2.0) 0))))
(let ((v1-73 (= (-> self anim-last) -2.0)))
(cond
((or v1-73 (>= (-> self anim-last) (-> self anim-first)))
(cond
((= (-> self anim-last) (-> (new 'static 'array float 1 -2.0) 0))
((= (-> self anim-last) -2.0)
(let ((a0-42 (-> self skel root-channel 0)))
(set! (-> a0-42 param 0) (the float (+ (-> a0-42 frame-group data 0 length) -1)))
(set! (-> a0-42 param 1) (-> self anim-speed))
@@ -2659,7 +2646,7 @@
)
)
)
((= (-> self anim-last) (-> (new 'static 'array float 1 -1.0) 0))
((= (-> self anim-last) -1.0)
(let ((a0-44 (-> self skel root-channel 0)))
(set! (-> a0-44 param 0) 0.0)
(set! (-> a0-44 param 1) (-> self anim-speed))
@@ -2719,11 +2706,7 @@
(set! (-> self list-con list-owner) (the-as uint self))
(quaternion-identity! (-> self root quat))
(vector-identity! (-> self root scale))
(position-in-front-of-camera!
(-> self root trans)
(-> (new 'static 'array float 1 40960.0) 0)
(-> (new 'static 'array float 1 4096.0) 0)
)
(position-in-front-of-camera! (-> self root trans) (the-as float 40960.0) (the-as float 4096.0))
(set! (-> self event-hook) anim-tester-standard-event-handler)
(anim-tester-reset)
(go anim-tester-process)
+13 -13
View File
@@ -114,19 +114,19 @@
;; definition of type continue-point
(deftype continue-point (basic)
((name string :offset-assert 4)
(level symbol :offset-assert 8)
(flags uint32 :offset-assert 12)
(trans vector :inline :offset-assert 16)
(quat quaternion :inline :offset-assert 32)
(camera-trans vector :inline :offset-assert 48)
(camera-rot float 9 :offset-assert 64)
(load-commands pair :offset-assert 100)
(vis-nick symbol :offset-assert 104)
(lev0 symbol :offset-assert 108)
(disp0 symbol :offset-assert 112)
(lev1 symbol :offset-assert 116)
(disp1 symbol :offset-assert 120)
((name string :offset-assert 4)
(level symbol :offset-assert 8)
(flags continue-flags :offset-assert 12)
(trans vector :inline :offset-assert 16)
(quat quaternion :inline :offset-assert 32)
(camera-trans vector :inline :offset-assert 48)
(camera-rot float 9 :offset-assert 64)
(load-commands pair :offset-assert 100)
(vis-nick symbol :offset-assert 104)
(lev0 symbol :offset-assert 108)
(disp0 symbol :offset-assert 112)
(lev1 symbol :offset-assert 116)
(disp1 symbol :offset-assert 120)
)
:method-count-assert 10
:size-assert #x7c
+11 -11
View File
@@ -51,7 +51,7 @@
(new 'static 'continue-point
:name "training-warp"
:level 'training
:flags #x4
:flags (continue-flags warp)
:trans
(new 'static 'vector :x -5383524.0 :y 28019.098 :z 4360302.0 :w 1.0)
:quat
@@ -81,7 +81,7 @@
(new 'static 'continue-point
:name "game-start"
:level 'training
:flags #x404
:flags (continue-flags warp game-start)
:trans
(new 'static 'vector :x -5393740.5 :y 28259.533 :z 4360945.5 :w 1.0)
:quat
@@ -162,7 +162,7 @@
(new 'static 'continue-point
:name "village1-intro"
:level 'village1
:flags #x24
:flags (continue-flags warp sage-intro)
:trans
(new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0)
:quat
@@ -181,7 +181,7 @@
(new 'static 'continue-point
:name "village1-warp"
:level 'village1
:flags #x804
:flags (continue-flags warp sage-ecorocks)
:trans
(new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0)
:quat
@@ -200,7 +200,7 @@
(new 'static 'continue-point
:name "village1-demo-convo"
:level 'village1
:flags #x40
:flags (continue-flags sage-demo-convo)
:trans
(new 'static 'vector :x -542529.1 :y 189424.03 :z 847101.94 :w 1.0)
:quat
@@ -219,7 +219,7 @@
(new 'static 'continue-point
:name "intro-start"
:level 'village1
:flags #x10
:flags (continue-flags intro)
:trans
(new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0)
:quat
@@ -710,7 +710,7 @@
(new 'static 'continue-point
:name "village2-warp"
:level 'village2
:flags #x4
:flags (continue-flags warp)
:trans
(new 'static 'vector :x 1592492.9 :y 91648.0 :z -6328677.0 :w 1.0)
:quat
@@ -1312,7 +1312,7 @@
(new 'static 'continue-point
:name "village3-warp"
:level 'village3
:flags #x4
:flags (continue-flags warp)
:trans
(new 'static 'vector :x 4549776.0 :y 215375.88 :z -14285922.0 :w 1.0)
:quat
@@ -1920,7 +1920,7 @@
(new 'static 'continue-point
:name "citadel-warp"
:level 'citadel
:flags #x4
:flags (continue-flags warp)
:trans
(new 'static 'vector :x 11454895.0 :y -161791.6 :z -18204690.0 :w 1.0)
:quat
@@ -2195,7 +2195,7 @@
'((new 'static 'continue-point
:name "demo-start"
:level 'demo
:flags #x8
:flags (continue-flags demo)
:trans
(new 'static 'vector :x 66396.16 :y 29782.016 :z -919973.5 :w 1.0)
:quat (new 'static 'quaternion :w 1.0)
@@ -2243,7 +2243,7 @@
'((new 'static 'continue-point
:name "title-start"
:level 'title
:flags #x80
:flags (continue-flags title)
:trans
(new 'static 'vector :x -635598.9 :y 222551.66 :z 710496.25 :w 1.0)
:quat
+10 -10
View File
@@ -48,7 +48,7 @@
(set! (-> *load-boundary-target* 1 quad) (-> (target-pos 0) quad))
(set! (-> *load-boundary-target* 2 quad) (-> *load-boundary-target* 0 quad))
(set! (-> *load-boundary-target* 3 quad) (-> *load-boundary-target* 1 quad))
(when (zero? (logand (-> *game-info* current-continue flags) 176))
(when (zero? (logand (-> *game-info* current-continue flags) (continue-flags intro sage-intro title)))
(set! (-> *level* border?) (-> *level* play?))
(set! (-> *setting-control* default border-mode) (-> *level* play?))
)
@@ -118,7 +118,7 @@
(let ((v1-52 (lookup-level-info (-> arg0 level))))
(if (and v1-52
(= (-> *setting-control* current music) (-> v1-52 music-bank))
(zero? (logand (-> arg0 flags) 160))
(zero? (logand (-> arg0 flags) (continue-flags sage-intro title)))
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
)
@@ -195,13 +195,13 @@
(set! (-> *ACTOR-bank* birth-max) 1000)
(set-blackout-frames (seconds 0.1))
(cond
((logtest? (-> arg0 flags) 128)
((logtest? (-> arg0 flags) (continue-flags title))
(go target-title)
)
((logtest? (-> arg0 flags) 16)
((logtest? (-> arg0 flags) (continue-flags intro))
(start-sequence-a)
)
((logtest? (-> arg0 flags) 32)
((logtest? (-> arg0 flags) (continue-flags sage-intro))
(let ((s5-3 (entity-by-name "sage-23")))
(when s5-3
(set-blackout-frames (seconds 100))
@@ -216,7 +216,7 @@
)
)
)
((and (logtest? (-> arg0 flags) 2048)
((and (logtest? (-> arg0 flags) (continue-flags sage-ecorocks))
(or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint))
(= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction))
)
@@ -236,10 +236,10 @@
)
)
)
((logtest? (-> arg0 flags) 8)
((logtest? (-> arg0 flags) (continue-flags demo))
(go target-demo)
)
((logtest? (-> arg0 flags) 64)
((logtest? (-> arg0 flags) (continue-flags sage-demo-convo))
(set-blackout-frames (seconds 1))
(let ((s5-5 (get-process *default-dead-pool* process #x4000)))
(when s5-5
@@ -282,7 +282,7 @@
)
)
)
((logtest? (-> arg0 flags) 4)
((logtest? (-> arg0 flags) (continue-flags warp))
(let ((s5-6 (new 'static 'vector)))
(cond
((string= (-> arg0 name) "village1-warp")
@@ -321,7 +321,7 @@
(set-continue! *game-info* "village1-hut")
)
((or (string= (-> arg0 name) "training-warp") (string= (-> arg0 name) "game-start"))
(if (logtest? (-> arg0 flags) 1024)
(if (logtest? (-> arg0 flags) (continue-flags game-start))
(close-specific-task! (game-task intro) (task-status need-resolution))
)
(set! (-> s5-6 quad) (-> (entity-by-name "training-part-1") extra trans quad))
+2 -2
View File
@@ -42,7 +42,7 @@
(if (!= (pickup-collectable!
(-> self fact-info-target)
(the-as pickup-type s4-0)
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as handle #f)
)
(pickup-collectable! (-> self fact-info-target) (the-as pickup-type s4-0) f28-0 (process->handle arg0))
@@ -115,7 +115,7 @@
(pickup-collectable!
(-> self fact-info-target)
(the-as pickup-type (-> arg3 param 1))
(-> (new 'static 'array float 1 0.0) 0)
(the-as float 0.0)
(the-as handle #f)
)
)
+1 -1
View File
@@ -3571,7 +3571,7 @@
)
arg2
arg3
(-> (new 'static 'array float 1 143360.0) 0)
143360.0
)
(-> s3-1 ppointer)
)
+219 -287
View File
File diff suppressed because it is too large Load Diff