Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

rename joint node and art element macros (#3111)

Browse source
This commit is contained in:
ManDude 2023-11-01 23:16:00 +00:00 committed by GitHub
parent 5587593204
commit a949dada93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
139 changed files with 447 additions and 494 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
decompiler/IR2/FormExpressionAnalysis.cpp
View file

@ -3993,8 +3993,7 @@ GenericElement* DerefElement::try_as_joint_node_index(const Env& env, FormPool&
if (joint_name) {
args.push_back(pool.form<ConstantTokenElement>(joint_name.value()));
return pool.alloc_element<GenericElement>(
GenericOperator::make_function(pool.form<ConstantTokenElement>("joint-node-index")),
args);
GenericOperator::make_function(pool.form<ConstantTokenElement>("joint-node")), args);
} else {
lg::error("function `{}`: did not find joint node {} in {}", env.func->name(),
mr.maps.ints.at(0), env.joint_geo());

16
goal_src/jak1/engine/data/art-h.gc
View file

@ -318,7 +318,7 @@
)
;; look up the index of an art element in an art group.
(desfun art-elt->index (ag-name elt-name)
(desfun art-elt-index (ag-name elt-name)
(if (number? elt-name)
elt-name
(let ((ag-info (hash-table-try-ref *art-info* (symbol->string ag-name))))
@ -334,7 +334,7 @@
)
)
(defmacro joint-name->index (jg-name name)
(defmacro joint-node-index (jg-name name)
(let ((jg-info (hash-table-try-ref *jg-info* (symbol->string jg-name))))
(if (not (car jg-info))
-1
@ -347,8 +347,8 @@
)
)
(defmacro joint-node-index (jg name)
`(-> self node-list data (joint-name->index ,jg ,name))
(defmacro joint-node (jg name)
`(-> self node-list data (joint-node-index ,jg ,name))
)
(defmacro defskelgroup (name art-name joint-geom joint-anim lods
@ -368,18 +368,18 @@
:longest-edge ,longest-edge
:version ,version
:max-lod ,(- (length lods) 1)
:shadow ,(art-elt->index (string->symbol-format "{}-ag" art-name) shadow)
:shadow ,(art-elt-index (string->symbol-format "{}-ag" art-name) shadow)
:texture-level ,texture-level
:sort ,sort
)))
;; set joint geometry and joint bones
(set! (-> skel jgeo) ,(art-elt->index (string->symbol-format "{}-ag" art-name) joint-geom))
(set! (-> skel janim) ,(art-elt->index (string->symbol-format "{}-ag" art-name) joint-anim))
(set! (-> skel jgeo) ,(art-elt-index (string->symbol-format "{}-ag" art-name) joint-geom))
(set! (-> skel janim) ,(art-elt-index (string->symbol-format "{}-ag" art-name) joint-anim))
;; set lods
,@(apply-i (lambda (x i)
`(begin
(set! (-> skel mgeo ,i) ,(art-elt->index (string->symbol-format "{}-ag" art-name) (car x)))
(set! (-> skel mgeo ,i) ,(art-elt-index (string->symbol-format "{}-ag" art-name) (car x)))
(set! (-> skel lod-dist ,i) ,(cadr x))
)
) lods)

4
goal_src/jak1/engine/game/powerups.gc
View file

@ -520,7 +520,7 @@
(not (time-elapsed? (-> self control unknown-dword11) (seconds 0.05)))
)
)
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg RbigToe))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg RbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-0 (-> self control trans))
@ -533,7 +533,7 @@
(launch-particles :system *sp-particle-system-3d* (-> *part-id-table* 2391) gp-0)
)
)
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg LbigToe))))
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg LbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))

10
goal_src/jak1/engine/target/logic-target.gc
View file

@ -1397,7 +1397,7 @@
((and (= (-> self next-state name) 'target-clone-anim)
(not (logtest? (-> self draw status) (draw-status hidden)))
(begin
(vector<-cspace! gp-0 (joint-node-index eichar-lod0-jg main))
(vector<-cspace! gp-0 (joint-node eichar-lod0-jg main))
(+! (-> gp-0 y) -5896.192)
(< (fabs (- (-> gp-0 y) (-> self control trans y))) 8192.0)
)
@ -2005,10 +2005,10 @@
(set! (-> self draw lod-set max-lod) 0)
(logior! (-> self skel status) (janim-status inited eye))
(set! (-> self draw shadow-ctrl) *target-shadow-control*)
(set! (-> self control unknown-cspace00 parent) (joint-node-index eichar-lod0-jg lindA))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node-index eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node-index eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace10 parent) (joint-node-index eichar-lod0-jg LshoulderPad))
(set! (-> self control unknown-cspace00 parent) (joint-node eichar-lod0-jg lindA))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace10 parent) (joint-node eichar-lod0-jg LshoulderPad))
(set! (-> self neck) (new 'process 'joint-mod (joint-mod-handler-mode look-at) self 7))
(set! (-> self fact)
(new 'process 'fact-info-target self (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc))

2
goal_src/jak1/engine/target/target.gc
View file

@ -2135,7 +2135,7 @@
(create-splash
(-> self water)
(the-as float 0.6)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg mouth))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg mouth))
0
(-> self control transv)
)

8
goal_src/jak1/engine/target/target2.gc
View file

@ -1355,7 +1355,7 @@
gp-1
projectile-init-by-other
(-> self entity)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg sk_rhand))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg sk_rhand))
s5-2
(if (>= (-> self fact eco-level) (-> *FACT-bank* eco-level-max))
25
@ -1828,7 +1828,7 @@
(create-splash
(-> self water)
(the-as float 0.2)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg Rtoes))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg Rtoes))
0
(vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
)
@ -1838,7 +1838,7 @@
(create-splash
(-> self water)
(the-as float 0.2)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg Ltoes))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg Ltoes))
0
(vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
)
@ -2700,7 +2700,7 @@
:exit (behavior ()
(send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
(send-event (ppointer->process (-> self sidekick)) 'shadow #t)
(let ((gp-0 (joint-node-index eichar-lod0-jg main))
(let ((gp-0 (joint-node eichar-lod0-jg main))
(a1-2 (&-> (-> self control) unknown-qword00))
)
(cond

2
goal_src/jak1/levels/beach/beach-obs.gc
View file

@ -36,7 +36,7 @@
)
:trans (behavior ()
(rider-trans)
(let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index windmill-one-lod0-jg big))))
(let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node windmill-one-lod0-jg big))))
(if (!= (+ (-> t2-0 x) (-> t2-0 y) (-> t2-0 z)) 0.0)
(sound-play "gears-rumble" :id (-> self sound-id) :position (the-as symbol t2-0))
)

10
goal_src/jak1/levels/beach/beach-rocks.gc
View file

@ -319,31 +319,31 @@
(if (and (< 200.0 f30-0) (< f30-0 275.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg Lrocklrg))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg Lrocklrg))
)
)
(if (and (< 270.0 f30-0) (< f30-0 333.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg platformrock))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg platformrock))
)
)
(if (and (< (-> self prev-frame) 333.0) (>= f30-0 333.0))
(spawn
(-> self part-landing)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg platformrock))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg platformrock))
)
)
(if (and (< 169.0 f30-0) (< f30-0 202.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg Rrocklrg))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg Rrocklrg))
)
)
(if (and (< 240.0 f30-0) (< f30-0 270.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg smlrock))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg smlrock))
)
)
(set! (-> self prev-frame) f30-0)

2
goal_src/jak1/levels/finalboss/final-door.gc
View file

@ -312,7 +312,7 @@
(ja :num! (seek! (ja-aframe 18.0 0)))
)
(let ((s4-3 (-> (handle->process (the-as handle arg0)) entity))
(s3-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg neckB)))
(s3-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg neckB)))
)
(dotimes (s2-0 50)
(when (handle->process (the-as handle arg0))

2
goal_src/jak1/levels/finalboss/robotboss-misc.gc
View file

@ -421,7 +421,7 @@
(defbehavior robotboss-manipy-trans-hook robotboss ()
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg blue_eco_piece))
(spawn (-> self part) gp-0)
)
0

2
goal_src/jak1/levels/finalboss/robotboss-weapon.gc
View file

@ -330,7 +330,7 @@
)
(when (ja-group? darkecobomb-spin-cycle-ja)
(let ((gp-2 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-2 (joint-node-index darkecobomb-lod0-jg particles))
(vector<-cspace! gp-2 (joint-node darkecobomb-lod0-jg particles))
(spawn (-> self part) gp-2)
)
)

30
goal_src/jak1/levels/finalboss/robotboss.gc
View file

@ -57,7 +57,7 @@
(gp-1 (-> self node-list data 88 bone scale))
)
(let ((s4-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! s4-1 (joint-node-index robotboss-basic-lod0-jg camera))
(vector<-cspace! s4-1 (joint-node robotboss-basic-lod0-jg camera))
(set! (-> *camera-other-trans* quad) (-> s4-1 quad))
)
(vector-normalize-copy!
@ -88,21 +88,21 @@
(defbehavior robotboss-always-trans robotboss ((arg0 (state robotboss)))
(when (-> self blue-smoke)
(let ((s5-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-0 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
(vector<-cspace! s5-0 (joint-node robotboss-basic-lod0-jg blue_eco_piece))
(spawn (-> self particle 2) s5-0)
)
)
(when (-> self red-smoke)
(let ((s5-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-1 (joint-node-index robotboss-basic-lod0-jg rArmTopWireC))
(vector<-cspace! s5-1 (joint-node robotboss-basic-lod0-jg rArmTopWireC))
(spawn (-> self particle 3) s5-1)
(vector<-cspace! s5-1 (joint-node-index robotboss-basic-lod0-jg rArmBotWireC))
(vector<-cspace! s5-1 (joint-node robotboss-basic-lod0-jg rArmBotWireC))
(spawn (-> self particle 3) s5-1)
)
)
(when (-> self yellow-smoke)
(let ((s5-2 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-2 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(vector<-cspace! s5-2 (joint-node robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(spawn (-> self particle 4) s5-2)
)
)
@ -200,7 +200,7 @@
)
((-> self use-interesting)
(let ((s5-10 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-10 (joint-node-index robotboss-basic-lod0-jg interesting))
(vector<-cspace! s5-10 (joint-node robotboss-basic-lod0-jg interesting))
(send-event *camera* 'point-of-interest s5-10)
)
)
@ -325,7 +325,7 @@
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(let ((s4-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg darkbombD))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg darkbombD))
(set! (-> s4-0 quad) (-> self entity extra trans quad))
(vector+! s4-0 s4-0 arg0)
(process-spawn darkecobomb gp-0 s4-0 61440.0 300 arg1 :to self)
@ -838,7 +838,7 @@
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(let ((s5-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(set! (-> gp-0 y) 1972633.6)
(if *target*
(set! (-> s5-0 quad) (-> (target-pos 0) quad))
@ -981,7 +981,7 @@
(ja :group! robotboss-yellow-last-hit-ja)
(set! (-> self yellow-smoke) #t)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(process-spawn
part-tracker
:init part-tracker-init
@ -1018,7 +1018,7 @@
)
(let ((gp-2 (new 'stack-no-clear 'vector)))
(update! (-> self looping-sound 3))
(vector<-cspace! gp-2 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(vector<-cspace! gp-2 (joint-node robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(spawn (-> self particle 6) gp-2)
)
)
@ -1366,7 +1366,7 @@
(let ((s5-0 arg1))
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg red_ecoTip))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg red_ecoTip))
(let ((s4-0 (get-process *default-dead-pool* redshot #x4000)))
(when s4-0
(let ((t9-2 (method-of-type redshot activate)))
@ -1557,7 +1557,7 @@
(ja :group! robotboss-red-last-hit-ja)
(set! (-> self red-smoke) #t)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg rArmBotWireC))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg rArmBotWireC))
(process-spawn
part-tracker
:init part-tracker-init
@ -1625,7 +1625,7 @@
(until (ja-done? 0)
(update! (-> self looping-sound 2))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg red_ecoTip))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg red_ecoTip))
(spawn (-> self particle 5) gp-0)
)
(if (robotboss-is-red-hit)
@ -1839,7 +1839,7 @@
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(let ((s2-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg green_eco))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg green_eco))
(set! (-> s2-0 quad) (-> self entity extra trans quad))
(+! (-> s2-0 y) -40960.0)
(vector+! s2-0 s2-0 arg0)
@ -2499,7 +2499,7 @@
(sound-play "explod-eye")
(set! (-> self blue-smoke) #t)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
(vector<-cspace! gp-1 (joint-node robotboss-basic-lod0-jg blue_eco_piece))
(process-spawn
part-tracker
:init part-tracker-init

4
goal_src/jak1/levels/flut_common/target-flut.gc
View file

@ -1252,7 +1252,7 @@
(create-splash
(-> self water)
(the-as float 0.6)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg mouth))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg mouth))
0
(-> self control transv)
)
@ -1936,7 +1936,7 @@
)
(rot->dir-targ! (-> self control))
(ja-post)
(vector<-cspace! gp-0 (joint-node-index eichar-lod0-jg main))
(vector<-cspace! gp-0 (joint-node eichar-lod0-jg main))
(+! (-> gp-0 y) -5896.192)
(move-to-point! (-> self control) gp-0)
)

8
goal_src/jak1/levels/jungle/fisher.gc
View file

@ -1727,13 +1727,13 @@
:trans (behavior ()
(when (-> self training)
(let ((gp-0 (new-stack-vector0)))
(vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg mainA))
(vector<-cspace! gp-0 (joint-node fisher-lod0-jg mainA))
(launch-particles (-> *part-id-table* 2001) gp-0)
(fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 75 bone transform vector 1))))
(vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg mainB))
(vector<-cspace! gp-0 (joint-node fisher-lod0-jg mainB))
(launch-particles (-> *part-id-table* 2001) gp-0)
(fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 78 bone transform vector 1))))
(vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg top))
(vector<-cspace! gp-0 (joint-node fisher-lod0-jg top))
(launch-particles (-> *part-id-table* 828) gp-0)
(launch-particles (-> *part-id-table* 2013) gp-0)
(fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 80 bone transform vector 1))))
@ -2045,7 +2045,7 @@
)
(let ((v1-35 (-> self manipy 0 node-list data)))
(set! (-> v1-35 0 param0) cspace<-cspace+quaternion!)
(set! (-> v1-35 0 param1) (the-as basic (joint-node-index eichar-lod0-jg sk_rhand)))
(set! (-> v1-35 0 param1) (the-as basic (joint-node eichar-lod0-jg sk_rhand)))
(set! (-> v1-35 0 param2) (the-as basic (-> self control quat)))
)
)

6
goal_src/jak1/levels/lavatube/lavatube-energy.gc
View file

@ -982,15 +982,15 @@
((handle->process (-> self ball))
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapa))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node energyarm-lod0-jg zapa))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapb))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node energyarm-lod0-jg zapb))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapc))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node energyarm-lod0-jg zapc))
)
)
((!= (-> self ball) #f)

8
goal_src/jak1/levels/maincave/gnawer.gc
View file

@ -852,11 +852,11 @@
(ja-no-eval :group! gnawer-up-to-chew-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(let ((gp-3 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-3 (joint-node-index gnawer-lod0-jg nandibleR))
(vector<-cspace! gp-3 (joint-node gnawer-lod0-jg nandibleR))
(spawn (-> self part2) gp-3)
)
(let ((gp-4 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-4 (joint-node-index gnawer-lod0-jg mandibleL))
(vector<-cspace! gp-4 (joint-node gnawer-lod0-jg mandibleL))
(spawn (-> self part2) gp-4)
)
(suspend)
@ -869,11 +869,11 @@
(ja-no-eval :group! gnawer-chew-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
(until (ja-done? 0)
(let ((s4-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! s4-1 (joint-node-index gnawer-lod0-jg nandibleR))
(vector<-cspace! s4-1 (joint-node gnawer-lod0-jg nandibleR))
(spawn (-> self part2) s4-1)
)
(let ((s4-2 (new 'stack-no-clear 'vector)))
(vector<-cspace! s4-2 (joint-node-index gnawer-lod0-jg mandibleL))
(vector<-cspace! s4-2 (joint-node gnawer-lod0-jg mandibleL))
(spawn (-> self part2) s4-2)
)
(update! (-> self sound2))

6
goal_src/jak1/levels/maincave/mother-spider.gc
View file

@ -1007,7 +1007,7 @@
(go mother-spider-traveling (the-as uint 0))
)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index mother-spider-lod0-jg bodA))
(vector<-cspace! gp-0 (joint-node mother-spider-lod0-jg bodA))
(if (or (logtest? (-> *target* state-flags)
(state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying)
)
@ -1045,7 +1045,7 @@
(set! (-> gp-2 quad) (-> self root trans quad))
(set! (-> gp-2 w) 4096.0)
(when (sphere-in-view-frustum? (the-as sphere gp-2))
(vector<-cspace! gp-2 (joint-node-index mother-spider-lod0-jg jaw))
(vector<-cspace! gp-2 (joint-node mother-spider-lod0-jg jaw))
(set! (-> s5-2 quad) (-> (target-pos 0) quad))
(+! (-> s5-2 y) 4915.2)
(cond
@ -1145,7 +1145,7 @@
(s5-0 (new 'stack-no-clear 'vector))
(s2-0 (new 'stack-no-clear 'vector))
)
(vector<-cspace! s4-0 (joint-node-index mother-spider-lod0-jg jaw))
(vector<-cspace! s4-0 (joint-node mother-spider-lod0-jg jaw))
(set! (-> s5-0 quad) (-> (target-pos 0) quad))
(+! (-> s5-0 y) 4915.2)
(when (< 24576.0 (vector-vector-distance s5-0 s4-0))

2
goal_src/jak1/levels/misty/quicksandlurker.gc
View file

@ -671,7 +671,7 @@
(let ((gp-0 (new-stack-vector0)))
(let ((s5-0 (new-stack-vector0)))
(set! (-> gp-0 quad)
(-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index quicksandlurker-lod0-jg jawEND)) quad)
(-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node quicksandlurker-lod0-jg jawEND)) quad)
)
(vector-! s5-0 (target-pos 5) gp-0)
(let ((f1-0 (vector-xz-length s5-0)))

2
goal_src/jak1/levels/racer_common/racer-states.gc
View file

@ -1248,7 +1248,7 @@
)
(rot->dir-targ! (-> self control))
(ja-post)
(vector<-cspace! gp-1 (joint-node-index eichar-lod0-jg main))
(vector<-cspace! gp-1 (joint-node eichar-lod0-jg main))
(+! (-> gp-1 y) -5896.192)
(move-to-point! (-> self control) gp-1)
)

2
goal_src/jak1/levels/rolling/rolling-obs.gc
View file

@ -533,7 +533,7 @@
(when gp-3
(send-event gp-3 'stop-cloning)
(let ((s5-4 (new-stack-vector0)))
(vector<-cspace! s5-4 (joint-node-index happy-plant-lod0-jg fuelcell))
(vector<-cspace! s5-4 (joint-node happy-plant-lod0-jg fuelcell))
(send-event gp-3 'trans s5-4)
)
)

18
goal_src/jak1/levels/snow/ice-cube.gc
View file

@ -810,9 +810,9 @@
:event ice-cube-default-event-handler
:code (behavior ()
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-0 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-0)
(vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-0 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-0)
)
(ja-channel-push! 1 (seconds 0.1))
@ -954,9 +954,9 @@
)
(label cfg-26)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-1)
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-1)
)
(ja-no-eval :group! ice-cube-appear-land-ja :num! (seek!) :frame-num 0.0)
@ -1087,9 +1087,9 @@
)
(label cfg-26)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-1)
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-1)
)
(ja-no-eval :group! ice-cube-turn-on-player-land-ja :num! (seek!) :frame-num 0.0)
@ -1199,9 +1199,9 @@
)
(when (zero? (nav-enemy-rnd-int-count 45))
(let ((gp-3 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-3 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-3 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-3)
(vector<-cspace! gp-3 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-3 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-3)
)
)
@ -1334,7 +1334,7 @@
:code (behavior ()
(logclear! (-> self mask) (process-mask actor-pause))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg main))
(vector<-cspace! gp-0 (joint-node ice-cube-lod0-jg main))
(spawn (-> self part3) gp-0)
)
(drop-pickup (-> self enemy-info) #t *entity-pool* (-> self enemy-info) 0)

2
goal_src/jak1/levels/snow/snow-ram-boss.gc
View file

@ -1787,7 +1787,7 @@
(ja-no-eval :group! ram-boss-lose-shield-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index ram-boss-lod0-jg shield))
(vector<-cspace! gp-1 (joint-node ram-boss-lod0-jg shield))
(spawn (-> self part) gp-1)
)
(suspend)

4
goal_src/jak1/levels/village1/assistant.gc
View file

@ -230,7 +230,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek!))
@ -239,7 +239,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek! 0.0))

6
goal_src/jak1/levels/village1/fishermans-boat.gc
View file

@ -708,7 +708,7 @@
(f28-0 (+ -1.0 (* 2.0 (-> self engine-sound-envelope))))
(gp-0 (new 'stack-no-clear 'vector))
)
(vector<-cspace! gp-0 (joint-node-index fishermans-boat-lod0-jg prop))
(vector<-cspace! gp-0 (joint-node fishermans-boat-lod0-jg prop))
(sound-play
"boat-engine"
:id (-> self engine-sound-id)
@ -1402,7 +1402,7 @@
(send-event *target* 'blend-shape #f)
(ja-channel-set! 1)
(ja :group! fishermans-boat-idle-ja)
(vector<-cspace! (-> self root-overlay trans) (joint-node-index fishermans-boat-lod0-jg main))
(vector<-cspace! (-> self root-overlay trans) (joint-node fishermans-boat-lod0-jg main))
(matrix->quaternion (-> self root-overlay quat) (-> self node-list data 3 bone transform))
(fishermans-boat-reset-physics)
(transform-post)
@ -1520,7 +1520,7 @@
(send-event *target* 'blend-shape #f)
(ja-channel-set! 1)
(ja :group! fishermans-boat-idle-ja)
(vector<-cspace! (-> self root-overlay trans) (joint-node-index fishermans-boat-lod0-jg main))
(vector<-cspace! (-> self root-overlay trans) (joint-node fishermans-boat-lod0-jg main))
(matrix->quaternion (-> self root-overlay quat) (-> self node-list data 3 bone transform))
(fishermans-boat-reset-physics)
(transform-post)

6
goal_src/jak1/levels/village2/assistant-village2.gc
View file

@ -539,7 +539,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-village2-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek!))
@ -548,7 +548,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-village2-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek! 0.0))
@ -559,7 +559,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-village2-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek!))

16
goal_src/jak1/levels/village2/village2-obs.gc
View file

@ -473,27 +473,27 @@
(when (>= (ja-aframe-num 0) 500.0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 1))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 1))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 2))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 2))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 3))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 3))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 4))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 4))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 5))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 5))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 6))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 6))
)
)
)
@ -577,7 +577,7 @@
(defbehavior fireboulder-hover-stuff fireboulder ()
(local-vars (v0-1 object))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index fireboulder-lod0-jg bouldercenter))
(vector<-cspace! gp-0 (joint-node fireboulder-lod0-jg bouldercenter))
(cond
((handle->process (-> self tracker))
(let ((v1-6 (-> (the-as (pointer part-tracker) (-> self tracker process)) 0)))
@ -619,7 +619,7 @@
(ja-post)
(logclear! (-> self skel status) (janim-status inited))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index fireboulder-lod0-jg bouldercenter))
(vector<-cspace! gp-0 (joint-node fireboulder-lod0-jg bouldercenter))
(vector-! (-> self draw bounds) gp-0 (-> self root trans))
)
(set! (-> self draw bounds w) 24576.0)

2
goal_src/jak1/levels/village3/minecart.gc
View file

@ -51,7 +51,7 @@
(ja :num-func num-func-identity
:frame-num (* (get-current-phase (-> self sync)) (the float (+ (-> (ja-group) data 0 length) -1)))
)
(let ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index minecartsteel-lod0-jg cart))))
(let ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node minecartsteel-lod0-jg cart))))
(update-trans! (-> self sound) a1-1)
)
(update! (-> self sound))

2
goal_src/jak1/levels/village3/miners.gc
View file

@ -251,7 +251,7 @@
(defbehavior minershort-trans-hook minershort ()
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index minershort-lod0-jg candle))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node minershort-lod0-jg candle))
)
(none)
)

4
goal_src/jak1/levels/village3/village3-obs.gc
View file

@ -129,7 +129,7 @@
(loop
(when (and *target*
(and (< (vector-vector-distance
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index gondola-lod0-jg main))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node gondola-lod0-jg main))
(target-pos 0)
)
81920.0
@ -150,7 +150,7 @@
)
(let ((s3-0 (get-reminder (get-task-control (game-task village3-button)) 2))
(s4-1 (and *cheat-mode* (cpad-hold? 0 l3)))
(s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index gondola-lod0-jg main)))
(s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node gondola-lod0-jg main)))
)
(cond
((not (or s4-1 (task-closed? (game-task village3-button) (task-status need-hint))))

4
goal_src/jak2/engine/common_objs/powerups.gc
View file

@ -821,7 +821,7 @@
(not (time-elapsed? (-> self control last-time-on-surface) (seconds 0.05)))
)
)
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg RbigToe))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg RbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-0 (-> self control trans))
@ -834,7 +834,7 @@
(launch-particles :system *sp-particle-system-3d* (-> *part-id-table* 165) gp-0)
)
)
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg LbigToe))))
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg LbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))

16
goal_src/jak2/engine/data/art-h.gc
View file

@ -339,7 +339,7 @@
;; og:preserve-this
;; look up the index of an art element in an art group.
(desfun art-elt->index (ag-name elt-name)
(desfun art-elt-index (ag-name elt-name)
(if (number? elt-name)
elt-name
(let ((ag-info (hash-table-try-ref *art-info* (symbol->string ag-name))))
@ -355,7 +355,7 @@
)
)
(defmacro joint-name->index (jg-name name)
(defmacro joint-node-index (jg-name name)
(let ((jg-info (hash-table-try-ref *jg-info* (symbol->string jg-name))))
(if (not (car jg-info))
-1
@ -368,8 +368,8 @@
)
)
(defmacro joint-node-index (jg name)
`(-> self node-list data (joint-name->index ,jg ,name))
(defmacro joint-node (jg name)
`(-> self node-list data (joint-node-index ,jg ,name))
)
(defmacro defskelgroup (name ag-name joint-geom joint-anim lods
@ -394,7 +394,7 @@
:longest-edge ,longest-edge
:version ,version
:max-lod ,(- (length lods) 1)
:shadow ,(art-elt->index (string->symbol-format "{}-ag" ag-name) shadow)
:shadow ,(art-elt-index (string->symbol-format "{}-ag" ag-name) shadow)
:texture-level ,texture-level
:sort ,sort
:origin-joint-index ,origin-joint-index
@ -402,13 +402,13 @@
:light-index ,light-index
)))
;; set joint geometry and joint bones
(set! (-> skel jgeo) ,(art-elt->index (string->symbol-format "{}-ag" ag-name) joint-geom))
(set! (-> skel janim) ,(art-elt->index (string->symbol-format "{}-ag" ag-name) joint-anim))
(set! (-> skel jgeo) ,(art-elt-index (string->symbol-format "{}-ag" ag-name) joint-geom))
(set! (-> skel janim) ,(art-elt-index (string->symbol-format "{}-ag" ag-name) joint-anim))
;; set lods
,@(apply-i (lambda (x i)
`(begin
(set! (-> skel mgeo ,i) ,(art-elt->index (string->symbol-format "{}-ag" ag-name) (car x)))
(set! (-> skel mgeo ,i) ,(art-elt-index (string->symbol-format "{}-ag" ag-name) (car x)))
(set! (-> skel lod-dist ,i) ,(cadr x))
)
) lods)

2
goal_src/jak2/engine/target/board/board-states.gc
View file

@ -2360,7 +2360,7 @@
(suspend)
(ja :num! (seek! (ja-aframe 19.0 0)))
)
(let ((a1-5 (joint-node-index jakb-lod0-jg extra))
(let ((a1-5 (joint-node jakb-lod0-jg extra))
(s5-2 (new 'stack-no-clear 'projectile-init-by-other-params))
)
(let ((a0-7 (handle->process arg0)))

4
goal_src/jak2/engine/target/gun/gun-util.gc
View file

@ -733,7 +733,7 @@
)
)
)
(vector<-cspace! (-> (the-as target gp-0) gun fire-point) (joint-node-index gun-lod0-jg muzzle))
(vector<-cspace! (-> (the-as target gp-0) gun fire-point) (joint-node gun-lod0-jg muzzle))
(set! (-> (the-as target gp-0) gun fire-dir 1 quad) (-> (the-as target gp-0) gun fire-dir 0 quad))
(cond
((and (handle->process (-> (the-as target gp-0) gun track-target 0 handle))
@ -765,7 +765,7 @@
)
)
)
(vector<-cspace! (-> (the-as target gp-0) gun laser-point) (joint-node-index gun-lod0-jg laser))
(vector<-cspace! (-> (the-as target gp-0) gun laser-point) (joint-node gun-lod0-jg laser))
(set! (-> (the-as target gp-0) gun laser-dir 1 quad) (-> (the-as target gp-0) gun laser-dir 0 quad))
(set! (-> (the-as target gp-0) gun laser-dir 0 quad) (-> (the-as target gp-0) gun fire-dir-out quad))
(if s5-0

4
goal_src/jak2/engine/target/logic-target.gc
View file

@ -2279,7 +2279,7 @@
((and (and (-> self next-state) (= (-> self next-state name) 'target-clone-anim))
(and (not (logtest? (-> self draw status) (draw-control-status no-draw)))
(begin
(vector<-cspace! s5-0 (joint-node-index jakb-lod0-jg main))
(vector<-cspace! s5-0 (joint-node jakb-lod0-jg main))
(+! (-> s5-0 y) -5896.192)
(< (fabs (- (-> s5-0 y) (-> self control trans y))) 8192.0)
)
@ -2305,7 +2305,7 @@
)
(set! (-> s5-0 y) (- (-> self water surface-height) (-> self water swim-height)))
)
(vector<-cspace! gp-0 (joint-node-index jakb-lod0-jg chest))
(vector<-cspace! gp-0 (joint-node jakb-lod0-jg chest))
(cond
((>= (+ (current-time) (seconds -2)) (-> self control unknown-time-frame26))
(set! (-> self control camera-pos quad) (-> s5-0 quad))

4
goal_src/jak2/engine/target/mech/mech-states.gc
View file

@ -2586,7 +2586,7 @@
(until (ja-done? 0)
(when (< 51.0 (ja-aframe-num 0))
(logior! (-> self state-flags) (state-flags sf6))
(vector<-cspace! (-> self alt-cam-pos) (joint-node-index jakb-lod0-jg Rankle))
(vector<-cspace! (-> self alt-cam-pos) (joint-node jakb-lod0-jg Rankle))
)
(suspend)
(ja :num! (seek!))
@ -2603,7 +2603,7 @@
(rot->dir-targ! (-> self control))
(ja-post)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index jakb-lod0-jg main))
(vector<-cspace! gp-1 (joint-node jakb-lod0-jg main))
(+! (-> gp-1 y) -9011.2)
(move-to-point! (-> self control) gp-1)
)

4
goal_src/jak2/engine/target/target-darkjak.gc
View file

@ -1183,7 +1183,7 @@
(activate! *camera-smush-control* 819.2 15 75 1.0 0.9 (-> *display* camera-clock))
(target-start-attack)
(target-danger-set! 'bomb #f)
(set! sv-80 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg sk_lhand)))
(set! sv-80 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg sk_lhand)))
(set! sv-84 (lambda :behavior target
()
(set-vector! (-> self draw color-mult) 0.0 0.0 0.0 1.0)
@ -1586,7 +1586,7 @@
(set! sv-40 0)
(set! sv-48 0)
(set! sv-56
(the-as sphere (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg main)))
(the-as sphere (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg main)))
)
(set! sv-60
(new 'static 'array handle 128

2
goal_src/jak2/engine/target/target-gun.gc
View file

@ -1187,7 +1187,7 @@
(>= (current-time) (-> self gun track-target-hold-time))
)
(target-gun-build-track-list)
(let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg neckB))))
(let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg neckB))))
(+! (-> t2-0 y) 2048.0)
(cond
((logtest? (surface-flag gun-strafe) (-> self control current-surface flags))

4
goal_src/jak2/engine/target/target-swim.gc
View file

@ -295,7 +295,7 @@
(spawn-ripples
(-> self water)
0.2
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg Rtoes))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg Rtoes))
0
(vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
#f
@ -306,7 +306,7 @@
(spawn-ripples
(-> self water)
0.2
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg Ltoes))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg Ltoes))
0
(vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
#f

4
goal_src/jak2/engine/target/target-turret.gc
View file

@ -2377,7 +2377,7 @@ This commonly includes things such as:
)
(rot->dir-targ! (-> self control))
(if (< 86.0 (ja-aframe-num 0))
(vector<-cspace! (-> self alt-cam-pos) (joint-node-index jakb-lod0-jg Rankle))
(vector<-cspace! (-> self alt-cam-pos) (joint-node jakb-lod0-jg Rankle))
)
(suspend)
(ja :num! (seek!))
@ -2385,7 +2385,7 @@ This commonly includes things such as:
(rot->dir-targ! (-> self control))
(ja-post)
(let ((gp-4 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-4 (joint-node-index jakb-lod0-jg main))
(vector<-cspace! gp-4 (joint-node jakb-lod0-jg main))
(+! (-> gp-4 y) -9011.2)
(move-to-point! (-> self control) gp-4)
)

2
goal_src/jak2/engine/target/target.gc
View file

@ -2379,7 +2379,7 @@
(spawn-ripples
(-> self water)
0.6
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg neckB))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg neckB))
0
(-> self control transv)
#f

2
goal_src/jak2/engine/target/target2.gc
View file

@ -1466,7 +1466,7 @@
:exit (behavior ()
(send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
(send-event (ppointer->process (-> self sidekick)) 'shadow #t)
(let ((gp-0 (joint-node-index jakb-lod0-jg main))
(let ((gp-0 (joint-node jakb-lod0-jg main))
(a1-2 (-> self control camera-pos))
)
(cond

4
goal_src/jak2/levels/castle/boss/castle-baron.gc
View file

@ -2874,8 +2874,8 @@ For example for an elevator pre-compute the distance between the first and last
(let ((gp-6 (new 'stack-no-clear 'projectile-init-by-other-params)))
(let ((s4-0 (new 'stack-no-clear 'vector)))
(set! (-> s4-0 quad) (-> (get-trans a0-40 0) quad))
(let ((s2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index krew-lowres-lod0-jg lightC)))
(s5-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index krew-lowres-lod0-jg lightEnd)))
(let ((s2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node krew-lowres-lod0-jg lightC)))
(s5-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node krew-lowres-lod0-jg lightEnd)))
)
(let ((s3-0 (new 'stack-no-clear 'vector)))
0.0

10
goal_src/jak2/levels/castle/castle-obs.gc
View file

@ -1185,14 +1185,14 @@ For example for an elevator pre-compute the distance between the first and last
(sound-play
"track-plat-loop"
:id (-> self sound-id)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node cas-rot-bridge-lod0-jg b))
)
(set! (-> self sound-flag) #t)
)
((-> self sound-flag)
(sound-play
"track-plat-stop"
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node cas-rot-bridge-lod0-jg b))
)
(sound-stop (-> self sound-id))
(set! (-> self sound-flag) #f)
@ -1205,14 +1205,14 @@ For example for an elevator pre-compute the distance between the first and last
(sound-play
"track-plat-loop"
:id (-> self sound-id)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node cas-rot-bridge-lod0-jg b))
)
(set! (-> self sound-flag) #t)
)
((-> self sound-flag)
(sound-play
"track-plat-stop"
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node cas-rot-bridge-lod0-jg b))
)
(sound-stop (-> self sound-id))
(set! (-> self sound-flag) #f)
@ -1856,7 +1856,7 @@ This commonly includes things such as:
(sound-play
"cas-arm-blade"
:id (-> self sound-id)
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-blade-lod0-jg blade))
:position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node cas-rot-blade-lod0-jg blade))
)
)
:code (behavior ()

28
goal_src/jak2/levels/city/farm/ctyfarm-obs.gc
View file

@ -1062,7 +1062,7 @@
(set! (-> v1-10 0 amplitude) 1820.4445)
(set! (-> v1-10 0 y-amplitude) 0.0)
)
(let ((a0-17 (joint-node-index farm-marrow-lod0-jg marrow_a)))
(let ((a0-17 (joint-node farm-marrow-lod0-jg marrow_a)))
(set! (-> a0-17 param0) farm-marrow-callback)
(set! (-> a0-17 param1) self)
(set! (-> a0-17 param2) (the-as basic 0))
@ -1075,7 +1075,7 @@
(set! (-> v1-13 amplitude) 1820.4445)
(set! (-> v1-13 y-amplitude) 0.0)
)
(let ((v1-15 (joint-node-index farm-marrow-lod0-jg marrow_b)))
(let ((v1-15 (joint-node farm-marrow-lod0-jg marrow_b)))
(set! (-> v1-15 param0) farm-marrow-callback)
(set! (-> v1-15 param1) self)
(set! (-> v1-15 param2) (the-as basic 1))
@ -1088,7 +1088,7 @@
(set! (-> v1-16 amplitude) 1820.4445)
(set! (-> v1-16 y-amplitude) 0.0)
)
(let ((v1-18 (joint-node-index farm-marrow-lod0-jg marrow_c)))
(let ((v1-18 (joint-node farm-marrow-lod0-jg marrow_c)))
(set! (-> v1-18 param0) farm-marrow-callback)
(set! (-> v1-18 param1) self)
(set! (-> v1-18 param2) (the-as basic 2))
@ -1103,7 +1103,7 @@
(set! (-> v1-19 y-freq) 150.0)
(set! (-> v1-19 y-amplitude) -1820.4445)
)
(let ((v1-21 (joint-node-index farm-marrow-lod0-jg leaves_a)))
(let ((v1-21 (joint-node farm-marrow-lod0-jg leaves_a)))
(set! (-> v1-21 param0) farm-marrow-callback)
(set! (-> v1-21 param1) self)
(set! (-> v1-21 param2) (the-as basic 3))
@ -1117,7 +1117,7 @@
(set! (-> v1-22 y-amplitude) 0.0)
)
)
(let ((v0-0 (the-as object (joint-node-index farm-marrow-lod0-jg leaves_b))))
(let ((v0-0 (the-as object (joint-node farm-marrow-lod0-jg leaves_b))))
(set! (-> (the-as cspace v0-0) param0) farm-marrow-callback)
(set! (-> (the-as cspace v0-0) param1) self)
(set! (-> (the-as cspace v0-0) param2) (the-as basic 4))
@ -1350,7 +1350,7 @@ This commonly includes things such as:
(set! (-> v1-10 0 amplitude) 1820.4445)
(set! (-> v1-10 0 y-amplitude) 0.0)
)
(let ((a0-17 (joint-node-index farm-beetree-lod0-jg bulb)))
(let ((a0-17 (joint-node farm-beetree-lod0-jg bulb)))
(set! (-> a0-17 param0) farm-beetree-callback)
(set! (-> a0-17 param1) self)
(set! (-> a0-17 param2) (the-as basic 0))
@ -1366,7 +1366,7 @@ This commonly includes things such as:
(set! (-> v1-13 y-amplitude) 3640.889)
)
)
(let ((v0-0 (the-as object (joint-node-index farm-beetree-lod0-jg leaves))))
(let ((v0-0 (the-as object (joint-node farm-beetree-lod0-jg leaves))))
(set! (-> (the-as cspace v0-0) param0) farm-beetree-callback)
(set! (-> (the-as cspace v0-0) param1) self)
(set! (-> (the-as cspace v0-0) param2) (the-as basic 1))
@ -1593,7 +1593,7 @@ This commonly includes things such as:
(set! (-> v1-10 0 amplitude) 1820.4445)
(set! (-> v1-10 0 y-amplitude) 0.0)
)
(let ((a0-17 (joint-node-index farm-cabbage-lod0-jg cabbage)))
(let ((a0-17 (joint-node farm-cabbage-lod0-jg cabbage)))
(set! (-> a0-17 param0) farm-cabbage-callback)
(set! (-> a0-17 param1) self)
(set! (-> a0-17 param2) (the-as basic 0))
@ -1609,7 +1609,7 @@ This commonly includes things such as:
(set! (-> v1-13 y-amplitude) 910.2222)
)
)
(let ((v0-0 (the-as object (joint-node-index farm-cabbage-lod0-jg leaves))))
(let ((v0-0 (the-as object (joint-node farm-cabbage-lod0-jg leaves))))
(set! (-> (the-as cspace v0-0) param0) farm-cabbage-callback)
(set! (-> (the-as cspace v0-0) param1) self)
(set! (-> (the-as cspace v0-0) param2) (the-as basic 1))
@ -1839,7 +1839,7 @@ This commonly includes things such as:
(set! (-> v1-10 0 y-amplitude) 0.0)
)
)
(let ((v0-0 (the-as object (joint-node-index farm-small-cabbage-lod0-jg cabbage))))
(let ((v0-0 (the-as object (joint-node farm-small-cabbage-lod0-jg cabbage))))
(set! (-> (the-as cspace v0-0) param0) farm-small-cabbage-callback)
(set! (-> (the-as cspace v0-0) param1) self)
(set! (-> (the-as cspace v0-0) param2) (the-as basic 0))
@ -2068,7 +2068,7 @@ This commonly includes things such as:
(set! (-> v1-10 0 amplitude) 1820.4445)
(set! (-> v1-10 0 y-amplitude) 0.0)
)
(let ((a0-17 (joint-node-index farm-chilirots-lod0-jg chili_a)))
(let ((a0-17 (joint-node farm-chilirots-lod0-jg chili_a)))
(set! (-> a0-17 param0) farm-chilirots-callback)
(set! (-> a0-17 param1) self)
(set! (-> a0-17 param2) (the-as basic 0))
@ -2083,7 +2083,7 @@ This commonly includes things such as:
(set! (-> v1-13 y-freq) 150.0)
(set! (-> v1-13 y-amplitude) 1820.4445)
)
(let ((v1-15 (joint-node-index farm-chilirots-lod0-jg chili_b)))
(let ((v1-15 (joint-node farm-chilirots-lod0-jg chili_b)))
(set! (-> v1-15 param0) farm-chilirots-callback)
(set! (-> v1-15 param1) self)
(set! (-> v1-15 param2) (the-as basic 1))
@ -2098,7 +2098,7 @@ This commonly includes things such as:
(set! (-> v1-16 y-freq) 150.0)
(set! (-> v1-16 y-amplitude) 1820.4445)
)
(let ((v1-18 (joint-node-index farm-chilirots-lod0-jg chili_c)))
(let ((v1-18 (joint-node farm-chilirots-lod0-jg chili_c)))
(set! (-> v1-18 param0) farm-chilirots-callback)
(set! (-> v1-18 param1) self)
(set! (-> v1-18 param2) (the-as basic 2))
@ -2114,7 +2114,7 @@ This commonly includes things such as:
(set! (-> v1-19 y-amplitude) 1820.4445)
)
)
(let ((v0-0 (the-as object (joint-node-index farm-chilirots-lod0-jg chili_d))))
(let ((v0-0 (the-as object (joint-node farm-chilirots-lod0-jg chili_d))))
(set! (-> (the-as cspace v0-0) param0) farm-chilirots-callback)
(set! (-> (the-as cspace v0-0) param1) self)
(set! (-> (the-as cspace v0-0) param2) (the-as basic 3))

2
goal_src/jak2/levels/city/port/ctyport-part.gc
View file

@ -3545,7 +3545,7 @@ This commonly includes things such as:
:post (behavior ()
(ja-post)
(if (nonzero? (-> self part))
(spawn-with-cspace (-> self part) (joint-node-index farthy-lod0-jg halo))
(spawn-with-cspace (-> self part) (joint-node farthy-lod0-jg halo))
)
)
)

2
goal_src/jak2/levels/common/enemy/grenadier.gc
View file

@ -758,7 +758,7 @@
(('event-attack)
(let ((s4-0 (handle->process (-> self focus handle))))
(when s4-0
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index grenadier-lod0-jg bomb))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node grenadier-lod0-jg bomb))))
(let ((s5-1 (vector-! (new 'stack-no-clear 'vector) (get-trans (the-as process-focusable s4-0) 0) gp-0)))
(let ((s4-1 (new 'stack-no-clear 'vector)))
(let ((f0-0 (vector-length s5-1)))

4
goal_src/jak2/levels/common/enemy/hover/flamer.gc
View file

@ -844,7 +844,7 @@
0
(set! (-> self flit-joint twist-min-y) (the-as float #f))
(vector-reset! (-> self flit-joint target))
(vector<-cspace! (-> self main-joint-pos) (joint-node-index flamer-lod0-jg main))
(vector<-cspace! (-> self main-joint-pos) (joint-node flamer-lod0-jg main))
(vector-reset! (-> self main-joint-vel))
(vector-reset! (-> self main-joint-acc))
(set! (-> self main-acceleration) 0.0)
@ -1056,7 +1056,7 @@
(('event-attack)
(let ((s5-0 (handle->process (-> self focus handle))))
(when s5-0
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index flamer-lod0-jg tailF))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node flamer-lod0-jg tailF))))
(let ((a2-1 (get-trans (the-as process-focusable s5-0) 3))
(s5-1 (new 'stack-no-clear 'vector))
)

2
goal_src/jak2/levels/common/enemy/spyder.gc
View file

@ -1056,7 +1056,7 @@
(let ((f28-0 0.0))
(dotimes (s4-0 8)
(let* ((f26-0 (fmin (-> self root trans y) (-> gp-0 y)))
(s3-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index spyder-lod0-jg shoot)))
(s3-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node spyder-lod0-jg shoot)))
(f0-11 (fmin 40960.0 (+ -16384.0 (vector-vector-distance s3-0 gp-0))))
(s2-1 (vector-! (new 'stack-no-clear 'vector) s3-0 gp-0))
)

4
goal_src/jak2/levels/common/warp-gate.gc
View file

@ -1212,8 +1212,8 @@ This commonly includes things such as:
(* 450.56 (cos (* 42.25403 (the float (mod (current-time) 1551)))))
)
)
(spawn-with-cspace (-> self part-exhaust-left) (joint-node-index air-train-lod0-jg thruster_l))
(spawn-with-cspace (-> self part-exhaust-right) (joint-node-index air-train-lod0-jg thruster_r))
(spawn-with-cspace (-> self part-exhaust-left) (joint-node air-train-lod0-jg thruster_l))
(spawn-with-cspace (-> self part-exhaust-right) (joint-node air-train-lod0-jg thruster_r))
(let ((f0-9 (-> self dust-y)))
(when (!= f0-9 (the-as float #x7f800000))
(let ((a1-2 (new 'stack-no-clear 'vector)))

10
goal_src/jak2/levels/dig/dig-digger.gc
View file

@ -1266,7 +1266,7 @@ This commonly includes things such as:
)
(when (< f0-0 (* f1-0 f1-0))
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index dig-digger-lod0-jg smoke1))
(vector<-cspace! gp-1 (joint-node dig-digger-lod0-jg smoke1))
(sound-play "digger-motor" :id (-> self motor-sound) :position gp-1)
)
(sound-play "digger-bit" :id (-> self bit-sound) :position (-> self root trans))
@ -1302,10 +1302,10 @@ This commonly includes things such as:
(update! (-> self y-offset) (-> self y-offset-kicker value))
(set! (-> self root trans y) (+ (-> self start-y) (* 4096.0 (-> self y-offset osc value))))
(when (nonzero? (-> self smoke-part))
(spawn-with-cspace (-> self smoke-part) (joint-node-index dig-digger-lod0-jg smoke))
(spawn-with-cspace (-> self smoke-part) (joint-node-index dig-digger-lod0-jg smoke1))
(spawn-with-cspace (-> self smoke-part) (joint-node-index dig-digger-lod0-jg smoke2))
(spawn-with-cspace (-> self smoke-part) (joint-node-index dig-digger-lod0-jg smoke3))
(spawn-with-cspace (-> self smoke-part) (joint-node dig-digger-lod0-jg smoke))
(spawn-with-cspace (-> self smoke-part) (joint-node dig-digger-lod0-jg smoke1))
(spawn-with-cspace (-> self smoke-part) (joint-node dig-digger-lod0-jg smoke2))
(spawn-with-cspace (-> self smoke-part) (joint-node dig-digger-lod0-jg smoke3))
)
(if (nonzero? (-> self part))
(spawn (-> self part) (-> self root trans))

2
goal_src/jak2/levels/dig/dig1-obs.gc
View file

@ -1001,7 +1001,7 @@ This commonly includes things such as:
:virtual #t
:code (behavior ()
(sound-play "dig-air-lifter")
(let ((s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index dig-jump-pad-lod0-jg main)))
(let ((s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node dig-jump-pad-lod0-jg main)))
(gp-1 (get-process *default-dead-pool* part-tracker #x4000))
)
(when gp-1

12
goal_src/jak2/levels/drill/drill-baron.gc
View file

@ -1862,24 +1862,24 @@ This commonly includes things such as:
((zero? (-> self info mesh))
(cond
((not (logtest? (-> self shot-counter) 1))
(vector<-cspace! (-> gp-0 pos) (joint-node-index drill-barons-ship-turret-lod0-jg Lgun))
(vector<-cspace! (-> gp-0 pos) (joint-node drill-barons-ship-turret-lod0-jg Lgun))
(calculate-ship-projectile-velocity gp-0 f30-0)
(spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*)
)
(else
(vector<-cspace! (-> gp-0 pos) (joint-node-index drill-barons-ship-turret-lod0-jg Rgun))
(vector<-cspace! (-> gp-0 pos) (joint-node drill-barons-ship-turret-lod0-jg Rgun))
(calculate-ship-projectile-velocity gp-0 f30-0)
(spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*)
)
)
)
((not (logtest? (-> self shot-counter) 1))
(vector<-cspace! (-> gp-0 pos) (joint-node-index drill-barons-ship-turret-lod0-jg shaft_d))
(vector<-cspace! (-> gp-0 pos) (joint-node drill-barons-ship-turret-lod0-jg shaft_d))
(calculate-ship-projectile-velocity gp-0 f30-0)
(spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*)
)
(else
(vector<-cspace! (-> gp-0 pos) (joint-node-index drill-barons-ship-turret-lod0-jg gun_left))
(vector<-cspace! (-> gp-0 pos) (joint-node drill-barons-ship-turret-lod0-jg gun_left))
(calculate-ship-projectile-velocity gp-0 f30-0)
(spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*)
)
@ -1909,12 +1909,12 @@ This commonly includes things such as:
(set! (-> gp-0 timeout) (seconds 4))
(cond
((not (logtest? (-> self shot-counter) 1))
(vector<-cspace! (-> gp-0 pos) (joint-node-index drill-barons-ship-turret-lod0-jg shaft_a))
(vector<-cspace! (-> gp-0 pos) (joint-node drill-barons-ship-turret-lod0-jg shaft_a))
(calculate-ship-projectile-velocity gp-0 0.0)
(spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*)
)
(else
(vector<-cspace! (-> gp-0 pos) (joint-node-index drill-barons-ship-turret-lod0-jg R_hatch))
(vector<-cspace! (-> gp-0 pos) (joint-node drill-barons-ship-turret-lod0-jg R_hatch))
(calculate-ship-projectile-velocity gp-0 0.0)
(spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*)
)

2
goal_src/jak2/levels/forest/forest-obs.gc
View file

@ -104,7 +104,7 @@ This commonly includes things such as:
(vector-v++! (-> self root transv) (compute-acc-due-to-gravity (-> self root) (new-stack-vector0) 1.0))
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index youngsamos-highres-lod0-jg main))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node youngsamos-highres-lod0-jg main))
)
)
(let ((gp-4 (-> self root)))

2
goal_src/jak2/levels/fortress/dump/fort-robotank.gc
View file

@ -303,7 +303,7 @@
)
(fort-robotank-method-25 self)
(seek! (-> self roller-jmod twist y) (-> self roller-spin-rate) (* 16384.0 (seconds-per-frame)))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index fort-robotank-lod0-jg rollerrot)))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node fort-robotank-lod0-jg rollerrot)))
(s4-0 (get-field-spec-by-id (-> *part-id-table* 2474) (sp-field-id spt-num)))
(s5-0 (new 'stack-no-clear 'matrix))
)

2
goal_src/jak2/levels/fortress/fort-turret.gc
View file

@ -916,7 +916,7 @@
(sound-play "turret-explode")
(suspend)
(ja-channel-set! 0)
(let ((gp-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index fort-turret-lod0-jg headrotate)))
(let ((gp-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node fort-turret-lod0-jg headrotate)))
(s5-2 (current-time))
)
(until (time-elapsed? s5-2 (seconds 2))

4
goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc
View file

@ -204,8 +204,8 @@ This commonly includes things such as:
)
)
(+! (-> self path-u) (* (-> self path-du) (seconds-per-frame)))
(let ((s3-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index fort-elec-belt-lod0-jg raya_)))
(s2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index fort-elec-belt-lod0-jg rayb_)))
(let ((s3-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node fort-elec-belt-lod0-jg raya_)))
(s2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node fort-elec-belt-lod0-jg rayb_)))
)
(let ((t2-0 (new 'stack-no-clear 'vector)))
(vector+! t2-0 s3-0 s2-0)

4
goal_src/jak2/levels/hiphog/whack.gc
View file

@ -1568,8 +1568,8 @@
(case (-> self mode)
((10)
(when (rand-vu-percent? 0.4)
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index hip-mole-lod0-jg head)))
(s5-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index hip-mole-lod0-jg head)))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node hip-mole-lod0-jg head)))
(s5-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node hip-mole-lod0-jg head)))
)
(+! (-> gp-0 x) (rand-vu-float-range -1638.4 819.2))
(+! (-> s5-0 x) (rand-vu-float-range -1638.4 819.2))

2
goal_src/jak2/levels/mountain/mountain-scenes.gc
View file

@ -2975,7 +2975,7 @@ This commonly includes things such as:
:virtual #t
:code transform-and-sleep-code
:post (behavior ()
(spawn-with-cspace (-> self part) (joint-node-index mtn-lens-floor-lod0-jg main))
(spawn-with-cspace (-> self part) (joint-node mtn-lens-floor-lod0-jg main))
)
)

36
goal_src/jak2/levels/nest/boss/metalkor-extras.gc
View file

@ -2161,7 +2161,7 @@ This commonly includes things such as:
(set! sv-432 *launch-matrix*)
(set! sv-416 (-> sv-432 trans))
(let ((v1-27
(-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg head)) quad)
(-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg head)) quad)
)
)
(set! (-> sv-416 quad) v1-27)
@ -2185,71 +2185,71 @@ This commonly includes things such as:
(when (< 40.0 (ja-aframe-num 0))
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo1))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo1))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo2))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo2))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo3))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo3))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo4))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo4))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo5))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo5))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo6))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo6))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo7))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo7))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo8))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo8))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo9))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo9))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo10))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo10))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo12))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo12))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo13))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo13))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo14))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo14))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo15))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo15))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg goo16))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg goo16))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-explode-lod0-jg head))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-explode-lod0-jg head))
)
)
(if (ja-done? 0)

6
goal_src/jak2/levels/nest/boss/metalkor-states.gc
View file

@ -907,7 +907,7 @@
(set! (-> gp-0 attack-id) a0-5)
)
(set! (-> gp-0 timeout) (seconds 4))
(vector<-cspace! (-> gp-0 pos) (joint-node-index metalkor-lod0-jg head))
(vector<-cspace! (-> gp-0 pos) (joint-node metalkor-lod0-jg head))
(vector-! (-> gp-0 vel) (target-pos 0) (-> gp-0 pos))
(vector-normalize! (-> gp-0 vel) 491520.0)
(if (spawn-projectile metalkor-shot gp-0 self *default-dead-pool*)
@ -2269,7 +2269,7 @@
(metalkor-walk-the-walk 122880.0 #f)
(spawn
(-> self shot-anticipate)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-lod0-jg head))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-lod0-jg head))
)
(let* ((a0-4 metalkor-pre-shot-ja)
(f0-2
@ -2541,7 +2541,7 @@
(set-time! (-> self flitter-timer))
(spawn
(-> self shot-anticipate)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index metalkor-lod0-jg head))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node metalkor-lod0-jg head))
)
(if (zero? (mod (-> self shots-fired) (-> self stage)))
(set-nestb-purple!

4
goal_src/jak2/levels/nest/flying-spider.gc
View file

@ -436,7 +436,7 @@
:event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
(case message
(('event-attack-l)
(let* ((s5-0 (joint-node-index flying-spider-lod0-jg LgunTip))
(let* ((s5-0 (joint-node flying-spider-lod0-jg LgunTip))
(gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) s5-0))
(a0-3 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 bone transform vector 2) 163840.0))
(a2-3 (vector+! (new 'stack-no-clear 'vector) gp-0 a0-3))
@ -445,7 +445,7 @@
)
)
(('event-attack-r)
(let* ((s5-1 (joint-node-index flying-spider-lod0-jg RgunTip))
(let* ((s5-1 (joint-node flying-spider-lod0-jg RgunTip))
(gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) s5-1))
(a0-7 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-1 bone transform vector 2) -163840.0))
(a2-6 (vector+! (new 'stack-no-clear 'vector) gp-1 a0-7))

4
goal_src/jak2/levels/palace/boss/squid-setup.gc
View file

@ -1298,7 +1298,7 @@
(set! sv-64 (the-as symbol #f))
(set! sv-96 *launch-matrix*)
(set! sv-80 (-> sv-96 trans))
(let ((v1-13 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index squid-lod0-jg gunL)) quad)))
(let ((v1-13 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node squid-lod0-jg gunL)) quad)))
(set! (-> sv-80 quad) v1-13)
)
((the-as (function object object object object object object object object none) s5-0)
@ -1334,7 +1334,7 @@
(set! sv-128 (the-as symbol #f))
(set! sv-160 *launch-matrix*)
(set! sv-144 (-> sv-160 trans))
(let ((v1-25 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index squid-lod0-jg podL)) quad)))
(let ((v1-25 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node squid-lod0-jg podL)) quad)))
(set! (-> sv-144 quad) v1-25)
)
((the-as (function object object object object object object object object none) s5-1)

8
goal_src/jak2/levels/palace/boss/squid-states.gc
View file

@ -551,7 +551,7 @@
(if (time-elapsed? (-> self state-time) (seconds 3))
(go-virtual flee)
)
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index squid-lod0-jg podR)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node squid-lod0-jg podR)))
(when (>= (- (current-time) (-> self traj-timer)) 0)
(sound-play "squid-explosion")
(set! (-> self traj-timer) (+ (current-time) (the int (* 300.0 (rand-vu-float-range 0.25 0.5)))))
@ -574,7 +574,7 @@
(set! sv-96 (the-as symbol #f))
(set! sv-128 *launch-matrix*)
(set! sv-112 (-> sv-128 trans))
(let ((v1-33 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index squid-lod0-jg gunR)) quad)))
(let ((v1-33 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node squid-lod0-jg gunR)) quad)))
(set! (-> sv-112 quad) v1-33)
)
((the-as (function object object object object object object object object none) s5-3)
@ -610,7 +610,7 @@
(set! sv-160 (the-as symbol #f))
(set! sv-192 *launch-matrix*)
(set! sv-176 (-> sv-192 trans))
(let ((v1-47 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index squid-lod0-jg podR)) quad)))
(let ((v1-47 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node squid-lod0-jg podR)) quad)))
(set! (-> sv-176 quad) v1-47)
)
((the-as (function object object object object object object object object none) s5-4)
@ -645,7 +645,7 @@
(set! sv-224 (the-as symbol #f))
(set! sv-256 *launch-matrix*)
(set! sv-240 (-> sv-256 trans))
(let ((v1-59 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index squid-lod0-jg podR)) quad)))
(let ((v1-59 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node squid-lod0-jg podR)) quad)))
(set! (-> sv-240 quad) v1-59)
)
((the-as (function object object object object object object object object none) s5-5)

4
goal_src/jak2/levels/ruins/rapid-gunner.gc
View file

@ -542,7 +542,7 @@
(let ((gp-0 (new 'stack-no-clear 'vector)))
(set! (-> gp-0 quad) (-> (get-trans (the-as process-focusable a0-1) 0) quad))
(let ((s5-1 (vector-! (new 'stack-no-clear 'vector) gp-0 (-> self target-prev-pos))))
(let* ((a1-3 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index rapid-gunner-lod0-jg blast)))
(let* ((a1-3 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node rapid-gunner-lod0-jg blast)))
(f0-0 (vector-vector-distance gp-0 a1-3))
)
(vector-normalize! s5-1 (* 0.00028170072 f0-0 (vector-length s5-1)))
@ -754,7 +754,7 @@
)
((time-elapsed? (the-as int (-> self shot-timer)) (seconds 0.25))
(when (rapid-gunner-method-184 self 2184.5334)
(let* ((a1-11 (joint-node-index rapid-gunner-lod0-jg blast))
(let* ((a1-11 (joint-node rapid-gunner-lod0-jg blast))
(f30-0 (fmax 0.0 (the float (- (-> self spin-up-timer) (current-time)))))
(s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) a1-11))
(s4-2

2
goal_src/jak2/levels/sewer/sewer-obs2.gc
View file

@ -1599,7 +1599,7 @@ This commonly includes things such as:
0
)
:post (behavior ()
(let* ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index grunt-lod0-jg main)))
(let* ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node grunt-lod0-jg main)))
(f1-0 (vector-vector-xz-distance (-> self root trans) a1-1))
)
(vector-lerp!

2
goal_src/jak2/levels/stadium/skate/skatea-obs.gc
View file

@ -1713,7 +1713,7 @@ This commonly includes things such as:
:virtual #t
:code (behavior ()
(sound-play "dig-air-lifter")
(let ((s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index skatea-jump-pad-lod0-jg main)))
(let ((s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node skatea-jump-pad-lod0-jg main)))
(gp-1 (get-process *default-dead-pool* part-tracker #x4000))
)
(when gp-1

4
goal_src/jak2/levels/strip/strip-drop.gc
View file

@ -385,7 +385,7 @@
(quaternion-rotate-y! (-> self root quat) (-> self init-quat) f0-5)
)
(ja-post)
(let ((a1-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index crane-lod0-jg gamecrate))))
(let ((a1-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node crane-lod0-jg gamecrate))))
(strip-game-crate-method-22 (-> self crate 0) a1-2 (-> self root quat))
)
)
@ -398,7 +398,7 @@
(quaternion-copy! (-> self root quat) (-> self final-quat))
(when (-> self crate)
(send-event (ppointer->process (-> self crate)) 'go-final)
(let ((a1-3 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index crane-lod0-jg gamecrate))))
(let ((a1-3 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node crane-lod0-jg gamecrate))))
(strip-game-crate-method-22 (-> self crate 0) a1-3 (-> self root quat))
)
)

12
goal_src/jak2/levels/strip/strip-obs.gc
View file

@ -213,7 +213,7 @@ This commonly includes things such as:
((and (= gp-0 fencespikes-idle-ja) (>= f0-0 47.0) (>= 67.0 f0-0))
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index fencespikes-lod0-jg head))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node fencespikes-lod0-jg head))
)
)
((and (= gp-0 fencespikes-idle-ja) (>= f0-0 42.0) (>= 65.0 f0-0))
@ -339,7 +339,7 @@ This commonly includes things such as:
)
(update-trans!
(-> self sound)
(vector<-cspace! (new 'static 'vector) (joint-node-index pitspikes-lod0-jg rotatnode))
(vector<-cspace! (new 'static 'vector) (joint-node pitspikes-lod0-jg rotatnode))
)
(update! (-> self sound))
)
@ -349,7 +349,7 @@ This commonly includes things such as:
((the-as (function none) t9-0))
)
)
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index pitspikes-lod0-jg main))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node pitspikes-lod0-jg main))))
(let ((f0-0 (quaternion-y-angle (-> self root quat))))
(set! (-> *pitspikes-rotate-pos* quad) (-> gp-0 quad))
(set! (-> *pitspikes-rotate-pos* w) f0-0)
@ -439,7 +439,7 @@ This commonly includes things such as:
)
(update-trans!
(-> self sound)
(vector<-cspace! (new 'static 'vector) (joint-node-index curtainsaw-lod0-jg main))
(vector<-cspace! (new 'static 'vector) (joint-node curtainsaw-lod0-jg main))
)
(update! (-> self sound))
)
@ -454,7 +454,7 @@ This commonly includes things such as:
(set! (-> gp-0 y) 0.0)
(set! (-> gp-0 z) 0.0)
(set! (-> gp-0 w) 1.0)
(let ((s5-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index curtainsaw-lod0-jg main))))
(let ((s5-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node curtainsaw-lod0-jg main))))
(vector-orient-by-quat! gp-0 gp-0 (-> self root quat))
(vector+! s5-0 s5-0 gp-0)
(spawn (-> self part) s5-0)
@ -1605,7 +1605,7 @@ This commonly includes things such as:
(update! (-> self sound))
(update-trans!
(-> self plat-sound)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index drill-plat-lod0-jg plat))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node drill-plat-lod0-jg plat))
)
(update! (-> self plat-sound))
)

6
goal_src/jak2/levels/tomb/widow-baron.gc
View file

@ -952,7 +952,7 @@ This commonly includes things such as:
(set! sv-240 (the-as symbol #f))
(set! sv-272 *launch-matrix*)
(set! sv-256 (-> sv-272 trans))
(let ((v1-16 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index widow-lod0-jg Lwrist)) quad)))
(let ((v1-16 (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node widow-lod0-jg Lwrist)) quad)))
(set! (-> sv-256 quad) v1-16)
)
((the-as (function object object object object object object object object none) s5-0)
@ -1033,7 +1033,7 @@ This commonly includes things such as:
)
(when (and (not (-> self flying)) (< (-> self bomb-hits) 4))
(let* ((s4-2 (-> arg3 param 0))
(v0-9 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index widow-lod0-jg main)))
(v0-9 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node widow-lod0-jg main)))
(s5-2 (-> self node-list data 3 bone transform))
(s4-3 (vector-normalize! (vector-! (new 'stack-no-clear 'vector) (the-as vector s4-2) v0-9) 1.0))
(f30-0 (vector-dot s4-3 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-2 vector 2) 1.0)))
@ -1076,7 +1076,7 @@ This commonly includes things such as:
((begin
(ja-channel-push! 1 (seconds 0.03))
(let* ((gp-3 (-> arg3 param 0))
(v0-28 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index widow-lod0-jg main)))
(v0-28 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node widow-lod0-jg main)))
(s5-8 (-> self node-list data 3 bone transform))
(f0-20 (vector-dot
(vector-normalize! (vector-! (new 'stack-no-clear 'vector) (the-as vector gp-3) v0-28) 1.0)

8
goal_src/jak2/levels/tomb/widow-extras.gc
View file

@ -759,7 +759,7 @@ This commonly includes things such as:
(+! (-> self x-rotate) 1092.2667)
(+! (-> self y-rotate) 728.1778)
(widow-bomb-method-34 self)
(spawn-with-cspace (-> self part) (joint-node-index widow-bomb-lod0-jg main))
(spawn-with-cspace (-> self part) (joint-node widow-bomb-lod0-jg main))
(cond
((time-elapsed? (-> self state-time) (seconds 4))
(go-virtual explode)
@ -844,7 +844,7 @@ This commonly includes things such as:
)
)
)
(spawn-with-cspace (-> self part) (joint-node-index widow-bomb-lod0-jg main))
(spawn-with-cspace (-> self part) (joint-node widow-bomb-lod0-jg main))
)
)
(ja :num! (loop!))
@ -1140,7 +1140,7 @@ This commonly includes things such as:
)
)
)
(spawn-with-cspace (-> self trail-part) (joint-node-index widow-bomb-lod0-jg main))
(spawn-with-cspace (-> self trail-part) (joint-node widow-bomb-lod0-jg main))
(when (zero? (-> self which-trajectory))
(update-from-cspace (-> self impact))
(when (time-elapsed? (-> self state-time) (seconds 0.05))
@ -1470,7 +1470,7 @@ This commonly includes things such as:
)
:trans (behavior ()
(if (not (time-elapsed? (-> self state-time) (seconds 1)))
(spawn-with-cspace (-> self explode-part) (joint-node-index tomb-boss-pillar-lod0-jg a))
(spawn-with-cspace (-> self explode-part) (joint-node tomb-boss-pillar-lod0-jg a))
)
(let ((v1-9 (ja-group)))
(cond

16
test/decompiler/reference/jak1/decompiler-macros.gc generated vendored
View file

@ -951,7 +951,7 @@
)
;; art-h
(desfun art-elt->index (ag-name elt-name)
(desfun art-elt-index (ag-name elt-name)
(if (number? elt-name)
elt-name
(let ((ag-info (hash-table-try-ref *art-info* (symbol->string ag-name))))
@ -967,7 +967,7 @@
)
)
(defmacro joint-name->index (jg-name name)
(defmacro joint-node-index (jg-name name)
(let ((jg-info (hash-table-try-ref *jg-info* (symbol->string jg-name))))
(if (not (car jg-info))
-1
@ -980,8 +980,8 @@
)
)
(defmacro joint-node-index (jg name)
`(-> self node-list data (joint-name->index ,jg ,name))
(defmacro joint-node (jg name)
`(-> self node-list data (joint-node-index ,jg ,name))
)
(defmacro defskelgroup (name art-name joint-geom joint-anim lods
@ -1001,18 +1001,18 @@
:longest-edge ,longest-edge
:version ,version
:max-lod ,(- (length lods) 1)
:shadow ,(art-elt->index (string->symbol-format "{}-ag" art-name) shadow)
:shadow ,(art-elt-index (string->symbol-format "{}-ag" art-name) shadow)
:texture-level ,texture-level
:sort ,sort
)))
;; set joint geometry and joint bones
(set! (-> skel jgeo) ,(art-elt->index (string->symbol-format "{}-ag" art-name) joint-geom))
(set! (-> skel janim) ,(art-elt->index (string->symbol-format "{}-ag" art-name) joint-anim))
(set! (-> skel jgeo) ,(art-elt-index (string->symbol-format "{}-ag" art-name) joint-geom))
(set! (-> skel janim) ,(art-elt-index (string->symbol-format "{}-ag" art-name) joint-anim))
;; set lods
,@(apply-i (lambda (x i)
`(begin
(set! (-> skel mgeo ,i) ,(art-elt->index (string->symbol-format "{}-ag" art-name) (car x)))
(set! (-> skel mgeo ,i) ,(art-elt-index (string->symbol-format "{}-ag" art-name) (car x)))
(set! (-> skel lod-dist ,i) ,(cadr x))
)
) lods)

4
test/decompiler/reference/jak1/engine/game/powerups_REF.gc generated vendored
View file

@ -548,7 +548,7 @@
(not (time-elapsed? (-> self control unknown-dword11) (seconds 0.05)))
)
)
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg RbigToe))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg RbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-0 (-> self control trans))
@ -561,7 +561,7 @@
(launch-particles :system *sp-particle-system-3d* (-> *part-id-table* 2391) gp-0)
)
)
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg LbigToe))))
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg LbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))

10
test/decompiler/reference/jak1/engine/target/logic-target_REF.gc generated vendored
View file

@ -1440,7 +1440,7 @@
((and (= (-> self next-state name) 'target-clone-anim)
(not (logtest? (-> self draw status) (draw-status hidden)))
(begin
(vector<-cspace! gp-0 (joint-node-index eichar-lod0-jg main))
(vector<-cspace! gp-0 (joint-node eichar-lod0-jg main))
(+! (-> gp-0 y) -5896.192)
(< (fabs (- (-> gp-0 y) (-> self control trans y))) 8192.0)
)
@ -2067,10 +2067,10 @@
(set! (-> self draw lod-set max-lod) 0)
(logior! (-> self skel status) (janim-status inited eye))
(set! (-> self draw shadow-ctrl) *target-shadow-control*)
(set! (-> self control unknown-cspace00 parent) (joint-node-index eichar-lod0-jg lindA))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node-index eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node-index eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace10 parent) (joint-node-index eichar-lod0-jg LshoulderPad))
(set! (-> self control unknown-cspace00 parent) (joint-node eichar-lod0-jg lindA))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node eichar-lod0-jg rindA)))
(set! (-> self control unknown-cspace10 parent) (joint-node eichar-lod0-jg LshoulderPad))
(set! (-> self neck) (new 'process 'joint-mod (joint-mod-handler-mode look-at) self 7))
(set! (-> self fact)
(new 'process 'fact-info-target self (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc))

8
test/decompiler/reference/jak1/engine/target/target2_REF.gc generated vendored
View file

@ -1394,7 +1394,7 @@
gp-1
projectile-init-by-other
(-> self entity)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg sk_rhand))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg sk_rhand))
s5-2
(if (>= (-> self fact eco-level) (-> *FACT-bank* eco-level-max))
25
@ -1872,7 +1872,7 @@
(create-splash
(-> self water)
(the-as float 0.2)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg Rtoes))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg Rtoes))
0
(vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
)
@ -1882,7 +1882,7 @@
(create-splash
(-> self water)
(the-as float 0.2)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg Ltoes))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg Ltoes))
0
(vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
)
@ -2756,7 +2756,7 @@
:exit (behavior ()
(send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
(send-event (ppointer->process (-> self sidekick)) 'shadow #t)
(let ((gp-0 (joint-node-index eichar-lod0-jg main))
(let ((gp-0 (joint-node eichar-lod0-jg main))
(a1-2 (&-> (-> self control) unknown-qword00))
)
(cond

2
test/decompiler/reference/jak1/engine/target/target_REF.gc generated vendored
View file

@ -2094,7 +2094,7 @@
(create-splash
(-> self water)
(the-as float 0.6)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg mouth))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg mouth))
0
(-> self control transv)
)

2
test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc generated vendored
View file

@ -40,7 +40,7 @@
)
:trans (behavior ()
(rider-trans)
(let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index windmill-one-lod0-jg big))))
(let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node windmill-one-lod0-jg big))))
(if (!= (+ (-> t2-0 x) (-> t2-0 y) (-> t2-0 z)) 0.0)
(sound-play "gears-rumble" :id (-> self sound-id) :position (the-as symbol t2-0))
)

10
test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc generated vendored
View file

@ -342,31 +342,31 @@
(if (and (< 200.0 f30-0) (< f30-0 275.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg Lrocklrg))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg Lrocklrg))
)
)
(if (and (< 270.0 f30-0) (< f30-0 333.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg platformrock))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg platformrock))
)
)
(if (and (< (-> self prev-frame) 333.0) (>= f30-0 333.0))
(spawn
(-> self part-landing)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg platformrock))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg platformrock))
)
)
(if (and (< 169.0 f30-0) (< f30-0 202.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg Rrocklrg))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg Rrocklrg))
)
)
(if (and (< 240.0 f30-0) (< f30-0 270.0))
(spawn
(-> self part-falling)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg smlrock))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node lrocklrg-lod0-jg smlrock))
)
)
(set! (-> self prev-frame) f30-0)

2
test/decompiler/reference/jak1/levels/finalboss/final-door_REF.gc generated vendored
View file

@ -389,7 +389,7 @@
(ja :num! (seek! (ja-aframe 18.0 0)))
)
(let ((s4-3 (-> (handle->process (the-as handle arg0)) entity))
(s3-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg neckB)))
(s3-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg neckB)))
)
(dotimes (s2-0 50)
(when (handle->process (the-as handle arg0))

2
test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc generated vendored
View file

@ -466,7 +466,7 @@
;; INFO: Return type mismatch int vs none.
(defbehavior robotboss-manipy-trans-hook robotboss ()
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg blue_eco_piece))
(spawn (-> self part) gp-0)
)
0

2
test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc generated vendored
View file

@ -383,7 +383,7 @@
)
(when (ja-group? darkecobomb-spin-cycle-ja)
(let ((gp-2 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-2 (joint-node-index darkecobomb-lod0-jg particles))
(vector<-cspace! gp-2 (joint-node darkecobomb-lod0-jg particles))
(spawn (-> self part) gp-2)
)
)

30
test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc generated vendored
View file

@ -60,7 +60,7 @@
(gp-1 (-> self node-list data 88 bone scale))
)
(let ((s4-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! s4-1 (joint-node-index robotboss-basic-lod0-jg camera))
(vector<-cspace! s4-1 (joint-node robotboss-basic-lod0-jg camera))
(set! (-> *camera-other-trans* quad) (-> s4-1 quad))
)
(vector-normalize-copy!
@ -93,21 +93,21 @@
(defbehavior robotboss-always-trans robotboss ((arg0 (state robotboss)))
(when (-> self blue-smoke)
(let ((s5-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-0 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
(vector<-cspace! s5-0 (joint-node robotboss-basic-lod0-jg blue_eco_piece))
(spawn (-> self particle 2) s5-0)
)
)
(when (-> self red-smoke)
(let ((s5-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-1 (joint-node-index robotboss-basic-lod0-jg rArmTopWireC))
(vector<-cspace! s5-1 (joint-node robotboss-basic-lod0-jg rArmTopWireC))
(spawn (-> self particle 3) s5-1)
(vector<-cspace! s5-1 (joint-node-index robotboss-basic-lod0-jg rArmBotWireC))
(vector<-cspace! s5-1 (joint-node robotboss-basic-lod0-jg rArmBotWireC))
(spawn (-> self particle 3) s5-1)
)
)
(when (-> self yellow-smoke)
(let ((s5-2 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-2 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(vector<-cspace! s5-2 (joint-node robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(spawn (-> self particle 4) s5-2)
)
)
@ -205,7 +205,7 @@
)
((-> self use-interesting)
(let ((s5-10 (new 'stack-no-clear 'vector)))
(vector<-cspace! s5-10 (joint-node-index robotboss-basic-lod0-jg interesting))
(vector<-cspace! s5-10 (joint-node robotboss-basic-lod0-jg interesting))
(send-event *camera* 'point-of-interest s5-10)
)
)
@ -335,7 +335,7 @@
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(let ((s4-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg darkbombD))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg darkbombD))
(set! (-> s4-0 quad) (-> self entity extra trans quad))
(vector+! s4-0 s4-0 arg0)
(process-spawn darkecobomb gp-0 s4-0 61440.0 300 arg1 :to self)
@ -853,7 +853,7 @@
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(let ((s5-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(set! (-> gp-0 y) 1972633.6)
(if *target*
(set! (-> s5-0 quad) (-> (target-pos 0) quad))
@ -999,7 +999,7 @@
(ja :group! robotboss-yellow-last-hit-ja)
(set! (-> self yellow-smoke) #t)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg Lyellow_ecoTubeA))
(process-spawn
part-tracker
:init part-tracker-init
@ -1035,7 +1035,7 @@
)
(let ((gp-2 (new 'stack-no-clear 'vector)))
(update! (-> self looping-sound 3))
(vector<-cspace! gp-2 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(vector<-cspace! gp-2 (joint-node robotboss-basic-lod0-jg Lyellow_ecoBarrell))
(spawn (-> self particle 6) gp-2)
)
)
@ -1407,7 +1407,7 @@
(let ((s5-0 arg1))
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg red_ecoTip))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg red_ecoTip))
(let ((s4-0 (get-process *default-dead-pool* redshot #x4000)))
(when s4-0
(let ((t9-2 (method-of-type redshot activate)))
@ -1600,7 +1600,7 @@
(ja :group! robotboss-red-last-hit-ja)
(set! (-> self red-smoke) #t)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg rArmBotWireC))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg rArmBotWireC))
(process-spawn
part-tracker
:init part-tracker-init
@ -1667,7 +1667,7 @@
(until (ja-done? 0)
(update! (-> self looping-sound 2))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg red_ecoTip))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg red_ecoTip))
(spawn (-> self particle 5) gp-0)
)
(if (robotboss-is-red-hit)
@ -1887,7 +1887,7 @@
(+! (-> self children-spawned) 1)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(let ((s2-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg green_eco))
(vector<-cspace! gp-0 (joint-node robotboss-basic-lod0-jg green_eco))
(set! (-> s2-0 quad) (-> self entity extra trans quad))
(+! (-> s2-0 y) -40960.0)
(vector+! s2-0 s2-0 arg0)
@ -2558,7 +2558,7 @@
(sound-play "explod-eye")
(set! (-> self blue-smoke) #t)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
(vector<-cspace! gp-1 (joint-node robotboss-basic-lod0-jg blue_eco_piece))
(process-spawn
part-tracker
:init part-tracker-init

4
test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc generated vendored
View file

@ -1295,7 +1295,7 @@
(create-splash
(-> self water)
(the-as float 0.6)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg mouth))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node eichar-lod0-jg mouth))
0
(-> self control transv)
)
@ -1986,7 +1986,7 @@
)
(rot->dir-targ! (-> self control))
(ja-post)
(vector<-cspace! gp-0 (joint-node-index eichar-lod0-jg main))
(vector<-cspace! gp-0 (joint-node eichar-lod0-jg main))
(+! (-> gp-0 y) -5896.192)
(move-to-point! (-> self control) gp-0)
)

8
test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc generated vendored
View file

@ -1800,13 +1800,13 @@
:trans (behavior ()
(when (-> self training)
(let ((gp-0 (new-stack-vector0)))
(vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg mainA))
(vector<-cspace! gp-0 (joint-node fisher-lod0-jg mainA))
(launch-particles (-> *part-id-table* 2001) gp-0)
(fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 75 bone transform vector 1))))
(vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg mainB))
(vector<-cspace! gp-0 (joint-node fisher-lod0-jg mainB))
(launch-particles (-> *part-id-table* 2001) gp-0)
(fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 78 bone transform vector 1))))
(vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg top))
(vector<-cspace! gp-0 (joint-node fisher-lod0-jg top))
(launch-particles (-> *part-id-table* 828) gp-0)
(launch-particles (-> *part-id-table* 2013) gp-0)
(fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 80 bone transform vector 1))))
@ -2125,7 +2125,7 @@
)
(let ((v1-35 (-> self manipy 0 node-list data)))
(set! (-> v1-35 0 param0) cspace<-cspace+quaternion!)
(set! (-> v1-35 0 param1) (the-as basic (joint-node-index eichar-lod0-jg sk_rhand)))
(set! (-> v1-35 0 param1) (the-as basic (joint-node eichar-lod0-jg sk_rhand)))
(set! (-> v1-35 0 param2) (the-as basic (-> self control quat)))
)
)

15
test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc generated vendored
View file

@ -1084,18 +1084,9 @@
(energyarm-trans)
(cond
((handle->process (-> self ball))
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapa))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapb))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapc))
)
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node energyarm-lod0-jg zapa)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node energyarm-lod0-jg zapb)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node energyarm-lod0-jg zapc)))
)
((!= (-> self ball) #f)
(set! (-> self ball) (the-as handle #f))

8
test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc generated vendored
View file

@ -948,11 +948,11 @@
(ja-no-eval :group! gnawer-up-to-chew-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(let ((gp-3 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-3 (joint-node-index gnawer-lod0-jg nandibleR))
(vector<-cspace! gp-3 (joint-node gnawer-lod0-jg nandibleR))
(spawn (-> self part2) gp-3)
)
(let ((gp-4 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-4 (joint-node-index gnawer-lod0-jg mandibleL))
(vector<-cspace! gp-4 (joint-node gnawer-lod0-jg mandibleL))
(spawn (-> self part2) gp-4)
)
(suspend)
@ -965,11 +965,11 @@
(ja-no-eval :group! gnawer-chew-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
(until (ja-done? 0)
(let ((s4-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! s4-1 (joint-node-index gnawer-lod0-jg nandibleR))
(vector<-cspace! s4-1 (joint-node gnawer-lod0-jg nandibleR))
(spawn (-> self part2) s4-1)
)
(let ((s4-2 (new 'stack-no-clear 'vector)))
(vector<-cspace! s4-2 (joint-node-index gnawer-lod0-jg mandibleL))
(vector<-cspace! s4-2 (joint-node gnawer-lod0-jg mandibleL))
(spawn (-> self part2) s4-2)
)
(update! (-> self sound2))

6
test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc generated vendored
View file

@ -1033,7 +1033,7 @@
(go mother-spider-traveling (the-as uint 0))
)
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index mother-spider-lod0-jg bodA))
(vector<-cspace! gp-0 (joint-node mother-spider-lod0-jg bodA))
(if (or (logtest? (-> *target* state-flags)
(state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying)
)
@ -1071,7 +1071,7 @@
(set! (-> gp-2 quad) (-> self root trans quad))
(set! (-> gp-2 w) 4096.0)
(when (sphere-in-view-frustum? (the-as sphere gp-2))
(vector<-cspace! gp-2 (joint-node-index mother-spider-lod0-jg jaw))
(vector<-cspace! gp-2 (joint-node mother-spider-lod0-jg jaw))
(set! (-> s5-2 quad) (-> (target-pos 0) quad))
(+! (-> s5-2 y) 4915.2)
(cond
@ -1173,7 +1173,7 @@
(s5-0 (new 'stack-no-clear 'vector))
(s2-0 (new 'stack-no-clear 'vector))
)
(vector<-cspace! s4-0 (joint-node-index mother-spider-lod0-jg jaw))
(vector<-cspace! s4-0 (joint-node mother-spider-lod0-jg jaw))
(set! (-> s5-0 quad) (-> (target-pos 0) quad))
(+! (-> s5-0 y) 4915.2)
(when (< 24576.0 (vector-vector-distance s5-0 s4-0))

2
test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc generated vendored
View file

@ -732,7 +732,7 @@
(let ((gp-0 (new-stack-vector0)))
(let ((s5-0 (new-stack-vector0)))
(set! (-> gp-0 quad)
(-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index quicksandlurker-lod0-jg jawEND)) quad)
(-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node quicksandlurker-lod0-jg jawEND)) quad)
)
(vector-! s5-0 (target-pos 5) gp-0)
(let ((f1-0 (vector-xz-length s5-0)))

2
test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc generated vendored
View file

@ -1254,7 +1254,7 @@
)
(rot->dir-targ! (-> self control))
(ja-post)
(vector<-cspace! gp-1 (joint-node-index eichar-lod0-jg main))
(vector<-cspace! gp-1 (joint-node eichar-lod0-jg main))
(+! (-> gp-1 y) -5896.192)
(move-to-point! (-> self control) gp-1)
)

2
test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc generated vendored
View file

@ -645,7 +645,7 @@
(when gp-3
(send-event gp-3 'stop-cloning)
(let ((s5-4 (new-stack-vector0)))
(vector<-cspace! s5-4 (joint-node-index happy-plant-lod0-jg fuelcell))
(vector<-cspace! s5-4 (joint-node happy-plant-lod0-jg fuelcell))
(send-event gp-3 'trans s5-4)
)
)

18
test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc generated vendored
View file

@ -867,9 +867,9 @@
:event ice-cube-default-event-handler
:code (behavior ()
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-0 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-0)
(vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-0 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-0)
)
(ja-channel-push! 1 (seconds 0.1))
@ -1015,9 +1015,9 @@
)
(label cfg-26)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-1)
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-1)
)
(ja-no-eval :group! ice-cube-appear-land-ja :num! (seek!) :frame-num 0.0)
@ -1152,9 +1152,9 @@
)
(label cfg-26)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-1)
(vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-1 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-1)
)
(ja-no-eval :group! ice-cube-turn-on-player-land-ja :num! (seek!) :frame-num 0.0)
@ -1265,9 +1265,9 @@
)
(when (zero? (nav-enemy-rnd-int-count 45))
(let ((gp-3 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-3 (joint-node-index ice-cube-lod0-jg Rball))
(vector<-cspace! gp-3 (joint-node ice-cube-lod0-jg Rball))
(spawn (-> self part4) gp-3)
(vector<-cspace! gp-3 (joint-node-index ice-cube-lod0-jg Lball))
(vector<-cspace! gp-3 (joint-node ice-cube-lod0-jg Lball))
(spawn (-> self part4) gp-3)
)
)
@ -1404,7 +1404,7 @@
:code (behavior ()
(logclear! (-> self mask) (process-mask actor-pause))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg main))
(vector<-cspace! gp-0 (joint-node ice-cube-lod0-jg main))
(spawn (-> self part3) gp-0)
)
(drop-pickup (-> self enemy-info) #t *entity-pool* (-> self enemy-info) 0)

2
test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc generated vendored
View file

@ -1900,7 +1900,7 @@
(ja-no-eval :group! ram-boss-lose-shield-ja :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(let ((gp-1 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-1 (joint-node-index ram-boss-lod0-jg shield))
(vector<-cspace! gp-1 (joint-node ram-boss-lod0-jg shield))
(spawn (-> self part) gp-1)
)
(suspend)

10
test/decompiler/reference/jak1/levels/village1/assistant_REF.gc generated vendored
View file

@ -240,19 +240,13 @@
(countdown (gp-2 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-77)))) 4))
(ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-lod0-jg torchTIP))
)
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-lod0-jg torchTIP)))
(suspend)
(ja :num! (seek!))
)
(ja-no-eval :group! (ja-group) :num! (seek! 0.0) :frame-num max)
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-lod0-jg torchTIP))
)
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-lod0-jg torchTIP)))
(suspend)
(ja :num! (seek! 0.0))
)

6
test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc generated vendored
View file

@ -827,7 +827,7 @@
(f28-0 (+ -1.0 (* 2.0 (-> self engine-sound-envelope))))
(gp-0 (new 'stack-no-clear 'vector))
)
(vector<-cspace! gp-0 (joint-node-index fishermans-boat-lod0-jg prop))
(vector<-cspace! gp-0 (joint-node fishermans-boat-lod0-jg prop))
(sound-play
"boat-engine"
:id (-> self engine-sound-id)
@ -1546,7 +1546,7 @@
(send-event *target* 'blend-shape #f)
(ja-channel-set! 1)
(ja :group! fishermans-boat-idle-ja)
(vector<-cspace! (-> self root-overlay trans) (joint-node-index fishermans-boat-lod0-jg main))
(vector<-cspace! (-> self root-overlay trans) (joint-node fishermans-boat-lod0-jg main))
(matrix->quaternion (-> self root-overlay quat) (-> self node-list data 3 bone transform))
(fishermans-boat-reset-physics)
(transform-post)
@ -1665,7 +1665,7 @@
(send-event *target* 'blend-shape #f)
(ja-channel-set! 1)
(ja :group! fishermans-boat-idle-ja)
(vector<-cspace! (-> self root-overlay trans) (joint-node-index fishermans-boat-lod0-jg main))
(vector<-cspace! (-> self root-overlay trans) (joint-node fishermans-boat-lod0-jg main))
(matrix->quaternion (-> self root-overlay quat) (-> self node-list data 3 bone transform))
(fishermans-boat-reset-physics)
(transform-post)

6
test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc generated vendored
View file

@ -558,7 +558,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-village2-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek!))
@ -567,7 +567,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-village2-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek! 0.0))
@ -578,7 +578,7 @@
(until (ja-done? 0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node assistant-village2-lod0-jg torchTIP))
)
(suspend)
(ja :num! (seek!))

34
test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc generated vendored
View file

@ -543,30 +543,12 @@
)
:trans (behavior ()
(when (>= (ja-aframe-num 0) 500.0)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 1))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 2))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 3))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 4))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 5))
)
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 6))
)
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 1)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 2)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 3)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 4)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 5)))
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node allpontoons-lod0-jg 6)))
)
)
:code (behavior ((arg0 handle))
@ -667,7 +649,7 @@
(defbehavior fireboulder-hover-stuff fireboulder ()
(local-vars (v0-1 object))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index fireboulder-lod0-jg bouldercenter))
(vector<-cspace! gp-0 (joint-node fireboulder-lod0-jg bouldercenter))
(cond
((handle->process (-> self tracker))
(let ((v1-6 (-> (the-as (pointer part-tracker) (-> self tracker process)) 0)))
@ -710,7 +692,7 @@
(ja-post)
(logclear! (-> self skel status) (janim-status inited))
(let ((gp-0 (new 'stack-no-clear 'vector)))
(vector<-cspace! gp-0 (joint-node-index fireboulder-lod0-jg bouldercenter))
(vector<-cspace! gp-0 (joint-node fireboulder-lod0-jg bouldercenter))
(vector-! (-> self draw bounds) gp-0 (-> self root trans))
)
(set! (-> self draw bounds w) 24576.0)

2
test/decompiler/reference/jak1/levels/village3/minecart_REF.gc generated vendored
View file

@ -58,7 +58,7 @@
(ja :num-func num-func-identity
:frame-num (* (get-current-phase (-> self sync)) (the float (+ (-> (ja-group) data 0 length) -1)))
)
(let ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index minecartsteel-lod0-jg cart))))
(let ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node minecartsteel-lod0-jg cart))))
(update-trans! (-> self sound) a1-1)
)
(update! (-> self sound))

5
test/decompiler/reference/jak1/levels/village3/miners_REF.gc generated vendored
View file

@ -281,10 +281,7 @@
;; definition for function minershort-trans-hook
;; INFO: Return type mismatch object vs none.
(defbehavior minershort-trans-hook minershort ()
(spawn
(-> self part)
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index minershort-lod0-jg candle))
)
(spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node minershort-lod0-jg candle)))
(none)
)

25
test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc generated vendored
View file

@ -148,22 +148,21 @@
)
(transform-post)
(loop
(when (and *target*
(and (< (vector-vector-distance
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index gondola-lod0-jg main))
(target-pos 0)
)
81920.0
)
(not (movie?))
(not (level-hint-displayed?))
(time-elapsed? (-> self state-time) (seconds 3))
(file-status *art-control* (-> self anim name) 0)
)
(when (and *target* (and (< (vector-vector-distance
(vector<-cspace! (new 'stack-no-clear 'vector) (joint-node gondola-lod0-jg main))
(target-pos 0)
)
81920.0
)
(not (movie?))
(not (level-hint-displayed?))
(time-elapsed? (-> self state-time) (seconds 3))
(file-status *art-control* (-> self anim name) 0)
)
)
(let ((s3-0 (get-reminder (get-task-control (game-task village3-button)) 2))
(s4-1 (and *cheat-mode* (cpad-hold? 0 l3)))
(s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index gondola-lod0-jg main)))
(s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node gondola-lod0-jg main)))
)
(cond
((not (or s4-1 (task-closed? (game-task village3-button) (task-status need-hint))))

16
test/decompiler/reference/jak2/decompiler-macros.gc generated vendored
View file

@ -1266,7 +1266,7 @@
)
;; art-h
(desfun art-elt->index (ag-name elt-name)
(desfun art-elt-index (ag-name elt-name)
(if (number? elt-name)
elt-name
(let ((ag-info (hash-table-try-ref *art-info* (symbol->string ag-name))))
@ -1282,7 +1282,7 @@
)
)
(defmacro joint-name->index (jg-name name)
(defmacro joint-node-index (jg-name name)
(let ((jg-info (hash-table-try-ref *jg-info* (symbol->string jg-name))))
(if (not (car jg-info))
-1
@ -1295,8 +1295,8 @@
)
)
(defmacro joint-node-index (jg name)
`(-> self node-list data (joint-name->index ,jg ,name))
(defmacro joint-node (jg name)
`(-> self node-list data (joint-node-index ,jg ,name))
)
(defmacro defskelgroup (name ag-name joint-geom joint-anim lods
@ -1321,7 +1321,7 @@
:longest-edge ,longest-edge
:version ,version
:max-lod ,(- (length lods) 1)
:shadow ,(art-elt->index (string->symbol-format "{}-ag" ag-name) shadow)
:shadow ,(art-elt-index (string->symbol-format "{}-ag" ag-name) shadow)
:texture-level ,texture-level
:sort ,sort
:origin-joint-index ,origin-joint-index
@ -1329,13 +1329,13 @@
:light-index ,light-index
)))
;; set joint geometry and joint bones
(set! (-> skel jgeo) ,(art-elt->index (string->symbol-format "{}-ag" ag-name) joint-geom))
(set! (-> skel janim) ,(art-elt->index (string->symbol-format "{}-ag" ag-name) joint-anim))
(set! (-> skel jgeo) ,(art-elt-index (string->symbol-format "{}-ag" ag-name) joint-geom))
(set! (-> skel janim) ,(art-elt-index (string->symbol-format "{}-ag" ag-name) joint-anim))
;; set lods
,@(apply-i (lambda (x i)
`(begin
(set! (-> skel mgeo ,i) ,(art-elt->index (string->symbol-format "{}-ag" ag-name) (car x)))
(set! (-> skel mgeo ,i) ,(art-elt-index (string->symbol-format "{}-ag" ag-name) (car x)))
(set! (-> skel lod-dist ,i) ,(cadr x))
)
) lods)

4
test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc generated vendored
View file

@ -856,7 +856,7 @@
(not (time-elapsed? (-> self control last-time-on-surface) (seconds 0.05)))
)
)
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg RbigToe))))
(let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg RbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-0 (-> self control trans))
@ -869,7 +869,7 @@
(launch-particles :system *sp-particle-system-3d* (-> *part-id-table* 165) gp-0)
)
)
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg LbigToe))))
(let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node jakb-lod0-jg LbigToe))))
(if (and (< (fabs (vector-dot
(-> self control dynam gravity-normal)
(vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))

Some files were not shown because too many files have changed in this diff Show more