mirror of
https://github.com/open-goal/jak-project
synced 2026-09-06 03:08:29 -04:00
unused version of collide line sphere collide list (#1071)
This commit is contained in:
water111
+12
-1
@@ -387,7 +387,18 @@
|
||||
(vector--float*! s5-2 (-> self tpos-curr) (-> self local-down) (-> self target-height))
|
||||
(vector-float*! gp-5 (-> self tgt-rot-mat vector 2) 4915.2)
|
||||
(vector-! s5-2 s5-2 gp-5)
|
||||
(let ((f0-20 (dummy-10 *collide-cache* s5-2 gp-5 4300.8 1 (the-as process #f) s4-2 4098)))
|
||||
(let ((f0-20 (fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
s5-2
|
||||
gp-5
|
||||
4300.8
|
||||
(collide-kind background)
|
||||
(the-as process #f)
|
||||
s4-2
|
||||
4098
|
||||
)
|
||||
)
|
||||
)
|
||||
(if (and (< 0.0 f0-20) (< f0-20 1.0))
|
||||
(vector+float*! (-> self tpos-curr) (-> self tpos-curr) gp-5 (+ -1.0 f0-20))
|
||||
)
|
||||
|
||||
+59
-18
@@ -1336,12 +1336,12 @@
|
||||
(set! (-> arg0 quad) (-> s5-0 quad))
|
||||
(while #t
|
||||
(vector--float*! s4-0 arg0 (-> *camera* local-down) (-> *camera* target-height))
|
||||
(if (< (dummy-10
|
||||
(if (< (fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
(-> *camera* tpos-curr-adj)
|
||||
arg0
|
||||
(the-as float 409.6)
|
||||
#x4a09
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process #f)
|
||||
s3-0
|
||||
2
|
||||
@@ -1713,7 +1713,15 @@
|
||||
)
|
||||
0.0
|
||||
(vector-! s5-0 arg1 arg0)
|
||||
(dummy-14 s4-0 arg0 s5-0 (-> *CAM_STRING-bank* los-coll-rad2) #x4a09 (the-as process #f) (the-as int arg2))
|
||||
(fill-using-line-sphere
|
||||
s4-0
|
||||
arg0
|
||||
s5-0
|
||||
(-> *CAM_STRING-bank* los-coll-rad2)
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process-drawable #f)
|
||||
(the-as int arg2)
|
||||
)
|
||||
(let* ((f0-2 (vector-length s5-0))
|
||||
(f28-0
|
||||
(cond
|
||||
@@ -1932,7 +1940,15 @@
|
||||
(f26-0 (vector-length arg1))
|
||||
(f30-0 (vector-normalize-ret-len! s4-0 (the-as float 1.0)))
|
||||
)
|
||||
(dummy-14 s0-0 arg0 arg1 (-> *CAM_STRING-bank* los-coll-rad) #x4a09 (the-as process #f) arg3)
|
||||
(fill-using-line-sphere
|
||||
s0-0
|
||||
arg0
|
||||
arg1
|
||||
(-> *CAM_STRING-bank* los-coll-rad)
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process-drawable #f)
|
||||
arg3
|
||||
)
|
||||
(let ((s1-1 (-> s0-0 tris))
|
||||
(f28-0 (/ 2048.0 f26-0))
|
||||
(f26-1 (/ (+ -8192.0 f26-0) f26-0))
|
||||
@@ -2592,7 +2608,16 @@
|
||||
(vector--float*! s5-0 (-> *camera* tpos-curr-adj) (-> *camera* local-down) (-> *camera* target-height))
|
||||
(vector-! s5-0 s5-0 (-> self string-trans))
|
||||
(cond
|
||||
((< (dummy-10 *collide-cache* (-> self string-trans) s5-0 (the-as float 40.96) #x4a09 (the-as process #f) s4-0 2)
|
||||
((< (fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
(-> self string-trans)
|
||||
s5-0
|
||||
(the-as float 40.96)
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process #f)
|
||||
s4-0
|
||||
2
|
||||
)
|
||||
0.0
|
||||
)
|
||||
(set! (-> self time-dist-too-far) (the-as uint 0))
|
||||
@@ -2688,12 +2713,12 @@
|
||||
(cam-collision-record-save (-> self string-trans) s5-2 gp-2 'normal self)
|
||||
)
|
||||
(let ((f28-1 (if (logtest? (-> self options) 32)
|
||||
(dummy-10
|
||||
(fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
(-> self string-trans)
|
||||
s5-2
|
||||
(-> *CAMERA-bank* collide-move-rad)
|
||||
#x4a09
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process #f)
|
||||
s4-2
|
||||
2
|
||||
@@ -2993,9 +3018,17 @@
|
||||
)
|
||||
(vector--float*! s5-0 (-> *camera* tpos-curr-adj) (-> *camera* local-down) (-> *camera* target-height))
|
||||
(vector-! gp-1 (-> self string-trans) s5-0)
|
||||
(let ((f0-31
|
||||
(dummy-10 *collide-cache* s5-0 gp-1 (-> *CAMERA-bank* collide-move-rad) #x4a09 (the-as process #f) s4-0 4098)
|
||||
)
|
||||
(let ((f0-31 (fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
s5-0
|
||||
gp-1
|
||||
(-> *CAMERA-bank* collide-move-rad)
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process #f)
|
||||
s4-0
|
||||
4098
|
||||
)
|
||||
)
|
||||
)
|
||||
(when (and (< 0.0 f0-31) (< f0-31 1.0))
|
||||
(vector-float*! gp-1 gp-1 f0-31)
|
||||
@@ -3137,12 +3170,12 @@
|
||||
(+! s4-0 -1)
|
||||
(vector-float*! gp-2 (-> self velocity) f30-1)
|
||||
(let ((f28-0 (if (logtest? (-> self options) 32)
|
||||
(dummy-10
|
||||
(fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
(-> self trans)
|
||||
gp-2
|
||||
(-> *CAMERA-bank* collide-move-rad)
|
||||
#x4a09
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process #f)
|
||||
s3-0
|
||||
2
|
||||
@@ -3420,12 +3453,20 @@
|
||||
)
|
||||
(+! s5-3 -1)
|
||||
(vector-float*! gp-3 (-> self velocity) f30-2)
|
||||
(let ((f28-0
|
||||
(if (logtest? (-> self options) 32)
|
||||
(dummy-10 *collide-cache* (-> self trans) gp-3 (the-as float 4096.0) #x4a09 (the-as process #f) s4-3 2)
|
||||
-100000000.0
|
||||
)
|
||||
)
|
||||
(let ((f28-0 (if (logtest? (-> self options) 32)
|
||||
(fill-and-probe-using-line-sphere
|
||||
*collide-cache*
|
||||
(-> self trans)
|
||||
gp-3
|
||||
(the-as float 4096.0)
|
||||
(collide-kind background cak-3 wall-object ground-object cak-14)
|
||||
(the-as process #f)
|
||||
s4-3
|
||||
2
|
||||
)
|
||||
-100000000.0
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
((>= f28-0 0.0)
|
||||
|
||||
Reference in New Issue
Block a user