From 425f143fccada9e38b35633bd298b5b64c6ca6e8 Mon Sep 17 00:00:00 2001 From: Matt Dallmeyer Date: Mon, 13 Jul 2026 19:32:00 -0700 Subject: [PATCH] Update `def-actor` to version 8 for jak3 (#4342) v7 is copy/paste from jak2 https://github.com/open-goal/jak-project/blob/697337166da69af6515e97c5a9894b8ba2abc93c/goal_src/jak2/engine/data/art-h.gc#L423 https://github.com/open-goal/jak-project/blob/697337166da69af6515e97c5a9894b8ba2abc93c/goal_src/jak2/engine/load/file-io.gc#L109 but jak 3 uses v8 https://github.com/open-goal/jak-project/blob/697337166da69af6515e97c5a9894b8ba2abc93c/goal_src/jak3/engine/load/file-io.gc#L198-L199 --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> --- goal_src/jak2/engine/data/art-h.gc | 2 +- goal_src/jak3/engine/data/art-h.gc | 4 ++-- goal_src/jakx/engine/data/art-h.gc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/goal_src/jak2/engine/data/art-h.gc b/goal_src/jak2/engine/data/art-h.gc index 4512ebb787..ed351728f9 100644 --- a/goal_src/jak2/engine/data/art-h.gc +++ b/goal_src/jak2/engine/data/art-h.gc @@ -420,7 +420,7 @@ ) ) -(defmacro def-actor (name &key (idle #f) &key (lods #f) &key (art (idle-ja)) &key (joints ()) &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0) &key (version 7) &key (origin-joint-index 0) &key (shadow-joint-index 0) &key (light-index 0)) +(defmacro def-actor (name &key (idle #f) &key (lods #f) &key (art (idle-ja)) &key (joints ()) &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0) &key (version ART_GROUP_FILE_VERSION) &key (origin-joint-index 0) &key (shadow-joint-index 0) &key (light-index 0)) `(begin (def-art-elt ,(string->symbol-format "{}-ag" name) ,(string->symbol-format "{}-lod0-jg" name) 0) (def-art-elt ,(string->symbol-format "{}-ag" name) ,(string->symbol-format "{}-lod0-mg" name) 1) diff --git a/goal_src/jak3/engine/data/art-h.gc b/goal_src/jak3/engine/data/art-h.gc index 1f3b271eb9..83afba87a6 100644 --- a/goal_src/jak3/engine/data/art-h.gc +++ b/goal_src/jak3/engine/data/art-h.gc @@ -486,7 +486,7 @@ Each process-drawable has a draw-control." ) ) -(defmacro def-actor (name &key (idle #f) &key (lods #f) &key (art (idle-ja)) &key (joints ()) &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0) &key (version 7) &key (origin-joint-index 0) &key (shadow-joint-index 0) &key (light-index 0) &key (global-effects 0) &key (clothing ())) +(defmacro def-actor (name &key (idle #f) &key (lods #f) &key (art (idle-ja)) &key (joints ()) &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0) &key (version ART_GROUP_FILE_VERSION) &key (origin-joint-index 0) &key (shadow-joint-index 0) &key (light-index 0) &key (global-effects 0) &key (clothing ())) `(begin (def-art-elt ,(string->symbol-format "{}-ag" name) ,(string->symbol-format "{}-lod0-jg" name) 0) (def-art-elt ,(string->symbol-format "{}-ag" name) ,(string->symbol-format "{}-lod0-mg" name) 1) @@ -515,4 +515,4 @@ Each process-drawable has a draw-control." (import "goal_src/jak3/engine/data/art-elts.gc") (import "goal_src/jak3/engine/data/joint-nodes.gc") -(import "goal_src/jak3/engine/data/part-groups.gc") \ No newline at end of file +(import "goal_src/jak3/engine/data/part-groups.gc") diff --git a/goal_src/jakx/engine/data/art-h.gc b/goal_src/jakx/engine/data/art-h.gc index 76c5796b85..a033dc42fb 100644 --- a/goal_src/jakx/engine/data/art-h.gc +++ b/goal_src/jakx/engine/data/art-h.gc @@ -454,7 +454,7 @@ This stores settings like the name of the art-group, shadow/level-of-detail sett ) ) -(defmacro def-actor (name &key (idle #f) &key (lods #f) &key (art (idle-ja)) &key (joints ()) &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0) &key (version 7) &key (origin-joint-index 0) &key (shadow-joint-index 0) &key (light-index 0) &key (global-effects 0) &key (clothing ())) +(defmacro def-actor (name &key (idle #f) &key (lods #f) &key (art (idle-ja)) &key (joints ()) &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0) &key (version ART_GROUP_FILE_VERSION) &key (origin-joint-index 0) &key (shadow-joint-index 0) &key (light-index 0) &key (global-effects 0) &key (clothing ())) `(begin (def-art-elt ,(string->symbol-format "{}-ag" name) ,(string->symbol-format "{}-lod0-jg" name) 0) (def-art-elt ,(string->symbol-format "{}-ag" name) ,(string->symbol-format "{}-lod0-mg" name) 1)