unitytk 0.2.1__tar.gz → 0.2.2__tar.gz

{unitytk-0.2.1/unitytk.egg-info → unitytk-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitytk
-Version: 0.2.1
+Version: 0.2.2
 Summary: A modular Python toolkit for Unity interaction.
 Author-email: Ryan Simpson <m3trik@outlook.com>
 License: MIT

{unitytk-0.2.1 → unitytk-0.2.2}/test/test_asset_delivery.py

@@ -1,6 +1,7 @@
 # !/usr/bin/python
 # coding=utf-8
 """Tests for unitytk.CopyToAssetsDeliverer -- copy-to-Assets hand-off Strategy (no DCC)."""
+
 import json
 import os
 import struct
@@ -20,6 +21,7 @@ class _Logger:
         self.errors = []
         self.warnings = []
         self.infos = []
+        self.debugs = []
 
     def error(self, m, *args):
         self.errors.append(m % args if args else m)
@@ -30,6 +32,9 @@ class _Logger:
     def info(self, m, *args):
         self.infos.append(m % args if args else m)
 
+    def debug(self, m, *args):
+        self.debugs.append(m % args if args else m)
+
 
 def _carrier_fbx(path: str, channels) -> str:
     """A binary FBX (7700 layout) whose ``data_export`` carrier holds
@@ -108,7 +113,9 @@ def _payload(fbx, default_name="Export"):
 
 class SanitizeTest(unittest.TestCase):
     def test_strips_invalid_and_paths(self):
-        self.assertEqual(CopyToAssetsDeliverer.sanitize_asset_name("my/model:v2"), "my_model_v2")
+        self.assertEqual(
+            CopyToAssetsDeliverer.sanitize_asset_name("my/model:v2"), "my_model_v2"
+        )
 
     def test_collapses_and_trims(self):
         self.assertEqual(CopyToAssetsDeliverer.sanitize_asset_name("  a   b  "), "a b")
@@ -193,7 +200,9 @@ class DeliveryTest(unittest.TestCase):
         )
 
     def test_explicit_asset_name_overrides_and_sanitizes(self):
-        _bridge, result = self._deliver({"ASSET_NAME": "Hero/Mesh:01"}, default_name="Cube")
+        _bridge, result = self._deliver(
+            {"ASSET_NAME": "Hero/Mesh:01"}, default_name="Cube"
+        )
         self.assertEqual(os.path.basename(result["asset"]), "Hero_Mesh_01.fbx")
 
     def test_launch_mode_open_invokes_windowed_launch(self):
@@ -282,6 +291,7 @@ class DeliveryTest(unittest.TestCase):
         orig = ad.CopyToAssetsDeliverer._launch_editor
         # Patch UnityLauncher inside the real hook (deferred import target).
         import unitytk.launcher as launcher_mod
+
         real = launcher_mod.UnityLauncher
         launcher_mod.UnityLauncher = _FakeLauncher
         try:
@@ -344,15 +354,14 @@ class DeliveryTest(unittest.TestCase):
             )
             # Genuinely under Assets/ (no drive escape).
             assets = os.path.realpath(os.path.join(self.project, "Assets"))
-            self.assertTrue(
-                os.path.realpath(dest).startswith(assets), f"raw={raw!r}"
-            )
+            self.assertTrue(os.path.realpath(dest).startswith(assets), f"raw={raw!r}")
 
     def test_explicit_subdir_reducing_to_nothing_drops_into_assets_root(self):
         for raw in (".", "/", "../.."):
             _bridge, result = self._deliver({"ASSETS_SUBDIR": raw}, default_name="Cube")
             self.assertEqual(
-                result["asset"], os.path.join(self.project, "Assets", "Cube.fbx"),
+                result["asset"],
+                os.path.join(self.project, "Assets", "Cube.fbx"),
                 f"raw={raw!r}",
             )
             self.assertEqual(result["subdir"], "")
@@ -388,7 +397,11 @@ class SelfContainedDeliveryTest(unittest.TestCase):
         "lightmap_metadata": {
             "version": 1,
             "objects": [{"name": "Crate", "map": "Crate_Lightmap.exr", "uvIndex": 1}],
-            "probe": {"map": "Room_Probe.exr", "position": [0, 0, 0], "unit_scale": 0.01},
+            "probe": {
+                "map": "Room_Probe.exr",
+                "position": [0, 0, 0],
+                "unit_scale": 0.01,
+            },
         },
         "shadow_metadata": {
             "version": 2,
@@ -411,7 +424,12 @@ class SelfContainedDeliveryTest(unittest.TestCase):
         self.maps = os.path.join(self.tmp, "sourceimages")
         os.makedirs(self.maps)
         self.bytes = {}
-        for name in ("Crate_Lightmap.exr", "Room_Probe.exr", "Crate_shadow.png", "Crate_horizon.png"):
+        for name in (
+            "Crate_Lightmap.exr",
+            "Room_Probe.exr",
+            "Crate_shadow.png",
+            "Crate_horizon.png",
+        ):
             self.bytes[name] = name.encode() * 8
             with open(os.path.join(self.maps, name), "wb") as fh:
                 fh.write(self.bytes[name])

{unitytk-0.2.1 → unitytk-0.2.2}/test/test_audio_events_integration.py

@@ -24,6 +24,7 @@ Requires:
     - Maya 2025 installed (mayapy.exe)
     - Unity Hub with at least one editor installed
 """
+
 import os
 import json
 import shutil
@@ -34,7 +35,15 @@ import logging
 logger = logging.getLogger(__name__)
 
 import base_test  # noqa: F401 — sys.path bootstrap for the sibling repos
-from base_test import EnvSkip, MayaEnv, TempProjects, UnityEnv, UserPropsProbe
+from base_test import (
+    BlenderEnv,
+    CarrierFbx,
+    EnvSkip,
+    MayaEnv,
+    TempProjects,
+    UnityEnv,
+    UserPropsProbe,
+)
 
 scripts_dir = base_test.SCRIPTS_ROOT
 
@@ -471,9 +480,7 @@ class TestAudioEventsIntegration(unittest.TestCase):
             events,
             {("", 9, "footstep"), ("", 29, "jump"), ("", 44, "land")},
         )
-        self.assertEqual(
-            sorted(r["tracks"]), ["footstep", "jump", "land"]
-        )
+        self.assertEqual(sorted(r["tracks"]), ["footstep", "jump", "land"])
 
     # ------------------------------------------------------------------
     # Step 2: Unity import and readback
@@ -552,17 +559,26 @@ class TestAudioEventsIntegration(unittest.TestCase):
                 full_log = f.read()
             # Surface AudioEvent / error / warning lines for analysis
             relevant = [
-                ln for ln in full_log.splitlines()
-                if any(s in ln for s in (
-                    "AudioEvent", "ERROR", "Error", "Warning",
-                    "NullReferenceException", "Failed",
-                ))
+                ln
+                for ln in full_log.splitlines()
+                if any(
+                    s in ln
+                    for s in (
+                        "AudioEvent",
+                        "ERROR",
+                        "Error",
+                        "Warning",
+                        "NullReferenceException",
+                        "Failed",
+                    )
+                )
             ]
             self.__class__.unity_log_relevant = relevant
             if relevant:
                 logger.info(
                     "Unity log relevant lines (%d):\n  %s",
-                    len(relevant), "\n  ".join(relevant[-40:])
+                    len(relevant),
+                    "\n  ".join(relevant[-40:]),
                 )
             else:
                 logger.info("Unity log: no AudioEvent/Warning/Error lines.")
@@ -571,8 +587,7 @@ class TestAudioEventsIntegration(unittest.TestCase):
         with open(results_path) as f:
             self.__class__.unity_results = json.load(f)
 
-        postproc_path = os.path.join(
-            self.temp_dir, UserPropsProbe.RESULTS_FILENAME)
+        postproc_path = os.path.join(self.temp_dir, UserPropsProbe.RESULTS_FILENAME)
         if os.path.exists(postproc_path):
             with open(postproc_path) as f:
                 self.__class__.postproc = json.load(f)
@@ -608,7 +623,8 @@ class TestAudioEventsIntegration(unittest.TestCase):
             f"in postprocessor results: {list(postproc)}",
         )
         self.assertIn(
-            "audio_manifest", props,
+            "audio_manifest",
+            props,
             f"audio_manifest user-property missing on {name}; saw: {list(props)}",
         )
         manifest = props["audio_manifest"]
@@ -655,7 +671,8 @@ class TestAudioEventsIntegration(unittest.TestCase):
 
         # (d) AnimationEvents injected on the imported clip
         self.assertGreaterEqual(
-            unity.get("clip_count", 0), 1,
+            unity.get("clip_count", 0),
+            1,
             "Expected at least one AnimationClip in the imported FBX",
         )
         events = unity.get("animation_events", [])
@@ -676,8 +693,8 @@ class TestAudioEventsIntegration(unittest.TestCase):
         # In Unity-frame terms the events are at clip-relative frames 9,
         # 29, 44 — which is what AnimationEvent.time * frameRate yields.
         self.assertEqual(events_by_name.get("footstep"), 9)
-        self.assertEqual(events_by_name.get("jump"),    29)
-        self.assertEqual(events_by_name.get("land"),    44)
+        self.assertEqual(events_by_name.get("jump"), 29)
+        self.assertEqual(events_by_name.get("land"), 44)
 
         # (e) Reimport idempotency.  Two probes injected before the
         # reimport tell us about both correctness and Unity behavior:
@@ -721,6 +738,140 @@ class TestAudioEventsIntegration(unittest.TestCase):
             )
 
 
+# ======================================================================
+# Carrier precedence: one audio_manifest per model, the scene's own first
+# ======================================================================
+
+CARRIER_VERIFIER_CS = r"""
+using UnityEngine;
+using UnityEditor;
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+
+public class AudioCarrierVerifier
+{
+    static string Q(string s) { return "\"" + (s ?? "").Replace("\\", "\\\\").Replace("\"", "\\\"") + "\""; }
+
+    public static void Verify()
+    {
+        var o = new List<string>();
+        try
+        {
+            // Again, now the clips are in the database: the startup import
+            // may have met the model before the audio.
+            AssetDatabase.ImportAsset("__FBX__",
+                ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport);
+            AssetDatabase.Refresh();
+            var prefab = AssetDatabase.LoadAssetAtPath<GameObject>("__FBX__");
+            o.Add("\"prefab\":" + (prefab != null ? "true" : "false"));
+            var nodes = prefab != null
+                ? prefab.GetComponentsInChildren<Transform>(true).Select(t => Q(t.name))
+                : Enumerable.Empty<string>();
+            o.Add("\"nodes\":[" + string.Join(",", nodes) + "]");
+            var ctrl = prefab != null ? prefab.GetComponent<AudioEventController>() : null;
+            o.Add("\"controller\":" + (ctrl != null ? "true" : "false"));
+            var clips = ctrl != null ? ctrl.clips : new List<AudioClip>();
+            o.Add("\"clips\":[" + string.Join(",", clips.Select(c => Q(c != null ? c.name : ""))) + "]");
+        }
+        catch (Exception e) { o.Add("\"error\":" + Q(e.GetType().Name + ": " + e.Message)); }
+        File.WriteAllText(@"__RESULTS__", "{" + string.Join(",\n", o) + "}");
+        EditorApplication.Exit(0);
+    }
+}
+"""
+
+
+class TestAudioCarrierPrecedence(unittest.TestCase):
+    """An FBX carrying ``audio_manifest`` on several carriers plays the
+    scene's own only.
+
+    An assembly ships a stray ``data_export1`` (and a module's
+    ``NS:data_export``) beside the scene's own, each holding the events as
+    last exported alone -- measured on an assembly, 2026-10-13. The scene's
+    own record is re-derived from the whole merged scene, so every reader
+    takes ONE carrier per channel, the scene's own first: the other
+    importers (``CarrierImport.Collect``), the GLB applier, and pythontk's
+    ``FbxMedia.audio_events``. The audio importer concatenated every
+    carrier's events instead, so the stray's stale event was bound and fired.
+
+    The fixture is a real FBX with both carriers (``base_test.CarrierFbx``,
+    written by a fresh Blender); pythontk's ``FbxMedia.audio_events`` pins the
+    same rule on the same shape (``test_fbx_media``).
+    """
+
+    FBX = "Assets/Delivered/assembly.fbx"
+
+    @classmethod
+    def setUpClass(cls):
+        cls.temp_dir = TempProjects.allocate("audio_carrier_precedence")
+
+    @BlenderEnv.skip_unless_available()
+    @EnvSkip.unless(_unity_available(), "no Unity editor found")
+    def test_the_scenes_own_carrier_wins(self):
+        own = {"version": 2, "events": [{"clip": "", "frame": 0, "name": "footstep"}]}
+        stray = {"version": 2, "events": [{"clip": "", "frame": 3, "name": "door"}]}
+        fixture = CarrierFbx.build(
+            os.path.join(self.temp_dir, "assembly.fbx"),
+            {
+                "data_export": {"audio_manifest": own},
+                "data_export1": {"audio_manifest": stray},
+            },
+        )
+
+        launcher = UnityLauncher()
+        project = os.path.join(self.temp_dir, "UnityProject")
+        if not launcher.create_project(project, batch_mode=True):
+            self.skipTest(UnityEnv.project_creation_reason())
+        delivered = os.path.join(project, "Assets", "Delivered")
+        os.makedirs(delivered, exist_ok=True)
+        shutil.copy2(fixture, os.path.join(delivered, "assembly.fbx"))
+        # Both tracks resolve, so only the carrier rule decides what binds.
+        for name in ("footstep", "door"):
+            CarrierFbx.wav(
+                os.path.join(project, "Assets", "Audio", f"{name}.wav"), name.encode()
+            )
+        TemplateDeployer.deploy_package(project, components=["audio_event"])
+        results = os.path.join(self.temp_dir, "unity_results.json")
+        editor_dir = os.path.join(project, "Assets", "Editor")
+        os.makedirs(editor_dir, exist_ok=True)
+        with open(
+            os.path.join(editor_dir, "AudioCarrierVerifier.cs"), "w", encoding="utf-8"
+        ) as fh:
+            fh.write(
+                CARRIER_VERIFIER_CS.replace("__FBX__", self.FBX).replace(
+                    "__RESULTS__", results
+                )
+            )
+        log = os.path.join(self.temp_dir, "unity_log.txt")
+        launcher.project_path = project
+        proc = launcher.launch_editor(
+            batch_mode=True,
+            execute_method="AudioCarrierVerifier.Verify",
+            log_file=log,
+            extra_args=["-quit"],
+            detached=False,
+        )
+        returncode = None
+        if proc:
+            try:
+                returncode = proc.wait(timeout=900)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+                raise TimeoutError("Unity timed out")
+        UnityEnv.require_results(self, results, returncode, log)
+        with open(results) as fh:
+            unity = json.load(fh)
+        logger.info(f"Unity results:\n{json.dumps(unity, indent=2)}")
+        self.assertNotIn("error", unity, unity.get("error"))
+        self.assertTrue(unity["prefab"], unity)
+        # Premise: both carriers reached the import.
+        self.assertTrue({"data_export", "data_export1"} <= set(unity["nodes"]), unity)
+        self.assertTrue(unity["controller"], unity)
+        self.assertEqual(unity["clips"], ["footstep"], unity)
+
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
     unittest.main()

{unitytk-0.2.1 → unitytk-0.2.2}/test/test_embedded_dependencies_integration.py

@@ -38,7 +38,7 @@ import subprocess
 import unittest
 
 import base_test  # noqa: F401 -- sys.path bootstrap for the sibling repos
-from base_test import EnvSkip, MayaEnv, TempProjects, UnityEnv
+from base_test import BlenderEnv, CarrierFbx, EnvSkip, MayaEnv, TempProjects, UnityEnv
 
 from unitytk import TemplateDeployer, UnityFinder, UnityLauncher
 
@@ -456,6 +456,188 @@ class TestEmbeddedDependenciesIntegration(unittest.TestCase):
         self.assertTrue(unity["reexport_still_lightmap"], unity)
 
 
+# ======================================================================
+# When an import asks for the FBX's embedded files to be extracted
+# ======================================================================
+
+REQUEST_VERIFIER_CS = r"""
+using UnityEngine;
+using UnityEditor;
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+
+public class EmbeddedRequestVerifier
+{
+    static string Q(string s) { return "\"" + (s ?? "").Replace("\\", "\\\\").Replace("\"", "\\\"") + "\""; }
+    static string B(bool b) { return b ? "true" : "false"; }
+
+    static void Finish(List<string> o)
+    {
+        File.WriteAllText(@"__RESULTS__", "{" + string.Join(",\n", o) + "}");
+        EditorApplication.Exit(0);
+    }
+
+    // Session 1: the audio is in the database; the models arrive now.
+    public static void First()
+    {
+        var o = new List<string>();
+        try
+        {
+            foreach (var pair in new[] {
+                new[] { @"__RESOLVED_SRC__", "Assets/Resolved/resolved.fbx" },
+                new[] { @"__GHOSTED_SRC__", "Assets/Ghosted/ghosted.fbx" } })
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(pair[1]));
+                File.Copy(pair[0], pair[1], true);
+            }
+            AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+            o.Add("\"resolved_beside\":" + B(File.Exists("Assets/Resolved/footstep.wav")));
+            var prefab = AssetDatabase.LoadAssetAtPath<GameObject>("Assets/Resolved/resolved.fbx");
+            var ctrl = prefab != null ? prefab.GetComponent<AudioEventController>() : null;
+            var clip = ctrl != null && ctrl.clips.Count > 0 ? ctrl.clips[0] : null;
+            o.Add("\"resolved_clip\":" + Q(clip != null ? AssetDatabase.GetAssetPath(clip) : ""));
+            o.Add("\"hit_beside\":" + B(File.Exists("Assets/Ghosted/hit.wav")));
+        }
+        catch (Exception e) { o.Add("\"error\":" + Q(e.GetType().Name + ": " + e.Message)); }
+        Finish(o);
+    }
+
+    // Session 2: hit.wav was touched up beside the model; the model reimports.
+    public static void Second()
+    {
+        var o = new List<string>();
+        try
+        {
+            AssetDatabase.ImportAsset("Assets/Ghosted/ghosted.fbx",
+                ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport);
+            AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+            o.Add("\"touched_kept\":" + B(File.ReadAllBytes("Assets/Ghosted/hit.wav")
+                .SequenceEqual(File.ReadAllBytes(@"__TOUCHED__"))));
+        }
+        catch (Exception e) { o.Add("\"error\":" + Q(e.GetType().Name + ": " + e.Message)); }
+        Finish(o);
+    }
+}
+"""
+
+
+class TestEmbeddedRequestPolicy(unittest.TestCase):
+    """When an import asks for the FBX's embedded files to be extracted
+    beside it (``CarrierImport.RequestEmbeddedFiles``).
+
+    Two ways it overwrote what the user had:
+
+    - a name its importer finds ELSEWHERE (the audio lookup searches
+      ``Assets/Audio``) counted as missing, because only the model's own folder
+      was looked in -- so the whole FBX was extracted and the clip rebound to
+      the copy beside the model;
+    - the memo of what was already asked lived for one editor session, so a
+      model naming a file it does not embed asked again on every session's
+      reimport, and each extraction overwrote the files beside it -- a
+      touched-up clip included.
+
+    The fixture is two real FBXs (``base_test.CarrierFbx``) with their audio
+    embedded as the DCC exporters do (``ptk.FbxMedia.embed``).
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        cls.temp_dir = TempProjects.allocate("embedded_request_policy")
+
+    def _launch(self, launcher, method: str, results: str) -> dict:
+        log = os.path.join(self.temp_dir, f"unity_{method}.txt")
+        proc = launcher.launch_editor(
+            batch_mode=True,
+            execute_method=f"EmbeddedRequestVerifier.{method}",
+            log_file=log,
+            extra_args=["-quit"],
+            detached=False,
+        )
+        returncode = None
+        if proc:
+            try:
+                returncode = proc.wait(timeout=900)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+                raise TimeoutError("Unity timed out")
+        UnityEnv.require_results(self, results, returncode, log)
+        with open(results) as fh:
+            unity = json.load(fh)
+        logger.info(f"Unity {method}:\n{json.dumps(unity, indent=2)}")
+        self.assertNotIn("error", unity, unity.get("error"))
+        return unity
+
+    @BlenderEnv.skip_unless_available()
+    @EnvSkip.unless(_unity_available(), "no Unity editor found")
+    def test_found_elsewhere_or_asked_before_is_not_extracted_again(self):
+        import pythontk as ptk
+
+        def manifest(*names):
+            events = [{"clip": "", "frame": 0, "name": n} for n in names]
+            return {"data_export": {"audio_manifest": {"version": 2, "events": events}}}
+
+        staged = os.path.join(self.temp_dir, "staged")
+        os.makedirs(staged)
+        sources = {}
+        for stem, names, embed in (
+            ("resolved", ("footstep",), "footstep"),
+            # "ghost" is embedded nowhere and resolves nowhere: always missing.
+            ("ghosted", ("hit", "ghost"), "hit"),
+        ):
+            bare = CarrierFbx.build(
+                os.path.join(self.temp_dir, f"{stem}_bare.fbx"), manifest(*names)
+            )
+            clip = CarrierFbx.wav(
+                os.path.join(self.temp_dir, "sound", f"{embed}.wav"), b"embedded"
+            )
+            sources[stem] = os.path.join(staged, f"{stem}.fbx")
+            ptk.FbxMedia.embed(bare, sources[stem], files=[(f"{embed}.wav", clip)])
+
+        launcher = UnityLauncher()
+        project = os.path.join(self.temp_dir, "UnityProject")
+        if not launcher.create_project(project, batch_mode=True):
+            self.skipTest(UnityEnv.project_creation_reason())
+        CarrierFbx.wav(
+            os.path.join(project, "Assets", "Audio", "footstep.wav"), b"library"
+        )
+        touched = CarrierFbx.wav(os.path.join(self.temp_dir, "touched.wav"), b"touched")
+        TemplateDeployer.deploy_package(project, components=["audio_event"])
+        results = os.path.join(self.temp_dir, "unity_results.json")
+        editor_dir = os.path.join(project, "Assets", "Editor")
+        os.makedirs(editor_dir, exist_ok=True)
+        with open(
+            os.path.join(editor_dir, "EmbeddedRequestVerifier.cs"),
+            "w",
+            encoding="utf-8",
+        ) as fh:
+            fh.write(
+                REQUEST_VERIFIER_CS.replace("__RESULTS__", results)
+                .replace("__RESOLVED_SRC__", sources["resolved"])
+                .replace("__GHOSTED_SRC__", sources["ghosted"])
+                .replace("__TOUCHED__", touched)
+            )
+        launcher.project_path = project
+
+        first = self._launch(launcher, "First", results)
+        self.assertFalse(
+            first["resolved_beside"],
+            "a clip the lookup finds in Assets/Audio was extracted beside the model",
+        )
+        self.assertEqual(first["resolved_clip"], "Assets/Audio/footstep.wav", first)
+        self.assertTrue(first["hit_beside"], "premise: a missing clip is extracted")
+
+        # The user touches the extracted clip up; the next session reimports.
+        shutil.copy2(touched, os.path.join(project, "Assets", "Ghosted", "hit.wav"))
+        second = self._launch(launcher, "Second", results)
+        self.assertTrue(
+            second["touched_kept"],
+            "a later session's reimport extracted the FBX again over the touched-up "
+            "clip",
+        )
+
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
     unittest.main()

{unitytk-0.2.1 → unitytk-0.2.2}/unitytk/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 from .launcher import UnityLauncher, UnityFinder
 from .scene_builder import SceneBuilder

{unitytk-0.2.1 → unitytk-0.2.2}/unitytk/asset_delivery.py

@@ -290,8 +290,7 @@ class FileToUnityBridge(ptk.HandoffBridge):
     those export a live selection then deliver; this one takes a model already on
     disk. It shares the exact same delivery Strategy -- :class:`CopyToAssetsDeliverer`
     (copy into ``Assets/`` + optional Editor launch) -- so the standalone Unity
-    Workflow panel, the Blender 'Unity Bridge' (which exports the selection to FBX,
-    then hands the path here), a CLI, or a test all reuse one engine.
+    Workflow panel, a CLI, or a test all reuse one engine.
 
     Set :attr:`project_path` to the target Unity project (the folder containing
     ``Assets/``) before calling :meth:`send`::

{unitytk-0.2.1 → unitytk-0.2.2}/unitytk/templates/ArticulatedRig/ArticulationRecord.g.cs

@@ -72,7 +72,10 @@ public static partial class ArticulationRecord
             public string name;
             /// <summary>An earlier joint's index, or null for a root (its parent is the rig's space).</summary>
             public int? parent;
-            /// <summary>The rest translate in the parent's space, in the DCC's units.</summary>
+            /// <summary>
+            /// The rest translate in the parent's space, in the file's units (a runtime
+            /// measures its scale against the rest pose: ArticulationModel.scale_of).
+            /// </summary>
             public double[] t;
             /// <summary>The rest rotation (the DCC's joint orient), a quaternion x, y, z, w.</summary>
             public double[] q;
@@ -102,7 +105,7 @@ public static partial class ArticulationRecord
         {
             /// <summary>
             /// rx/ry/rz turn about the rest frame's own axes (degrees); tx/ty/tz slide along
-            /// them (the parent's units).
+            /// them (the file's units, in the parent's space).
             /// </summary>
             public string channel;
             /// <summary>The lower limit, or null for none.</summary>

{unitytk-0.2.1 → unitytk-0.2.2}/unitytk/templates/AudioEvent/AudioEventController.cs

@@ -240,10 +240,10 @@ public class AudioEventImporter : AssetPostprocessor
     {
         // Fresh-import reset. OnPostprocessModel normally cleans this up, but
         // an import that aborts between the callbacks (another postprocessor
-        // throwing) strands entries here — Step 1 ADDS to the surviving list,
-        // so the next import of this asset would inject every event twice.
-        _pendingManifests.Remove(assetPath);
-        _importedClips.Remove(assetPath);
+        // throwing) strands a manifest here — Step 1 keeps the first one it
+        // meets, so a stranded one could outrank this import's own, or
+        // resurrect on a re-export without the carrier.
+        ClearPending();
 
         // String channel: user properties arrive with Unity's default
         // importer settings (probe-verified) — nothing to configure here.
@@ -274,20 +274,49 @@ public class AudioEventImporter : AssetPostprocessor
         if (!CarrierImport.TryGetProp(propNames, values, ATTR_MANIFEST, out var manifest))
             return;
 
-        if (!_pendingManifests.ContainsKey(assetPath))
-            _pendingManifests[assetPath] = new List<ManifestEntry>();
-        _pendingManifests[assetPath].AddRange(ParseManifest(manifest, assetPath));
+        // ONE manifest per model, by the readers' precedence: the scene's own
+        // carrier, else the first met (CarrierImport.Collect, as every other
+        // channel importer and the GLB applier read). An assembly ships a
+        // stray data_export1 or a module's NS:data_export beside the scene's
+        // own, each holding its events as last exported alone, while the
+        // scene's own is re-derived from the whole merged scene: concatenated,
+        // the stale events were bound and fired.
+        CarrierImport.Collect(_pendingManifestJson, assetPath, go, manifest);
+        _pendingManifests.Remove(assetPath);  // parsed again from the one kept
     }
 
     // --- Step 2: Inject AnimationEvents onto clips ----------------------
 
-    // Per-assetPath accumulator of manifest entries discovered during
-    // OnPostprocessGameObjectWithUserProperties.  Drained by
+    // Per-assetPath manifest JSON Step 1 kept (CarrierImport.Collect), and its
+    // entries parsed once on first use (PendingEntries).  Drained by
     // OnPostprocessAnimation (per clip) and OnPostprocessModel (final
     // controller attach + cleanup).
+    static readonly Dictionary<string, string>
+        _pendingManifestJson = new Dictionary<string, string>();
     static readonly Dictionary<string, List<ManifestEntry>>
         _pendingManifests = new Dictionary<string, List<ManifestEntry>>();
 
+    /// <summary>The entries of the manifest Step 1 kept for this asset, or
+    /// null when it carries none.</summary>
+    List<ManifestEntry> PendingEntries()
+    {
+        if (_pendingManifests.TryGetValue(assetPath, out var entries))
+            return entries;
+        if (!_pendingManifestJson.TryGetValue(assetPath, out var json))
+            return null;
+        entries = ParseManifest(json, assetPath);
+        _pendingManifests[assetPath] = entries;
+        return entries;
+    }
+
+    /// <summary>Forget this asset's pending manifest, kept and parsed.</summary>
+    void ClearPending()
+    {
+        _pendingManifestJson.Remove(assetPath);
+        _pendingManifests.Remove(assetPath);
+        _importedClips.Remove(assetPath);
+    }
+
     // Per-assetPath clips this import built, by name: the sequence clip is
     // only known in OnPostprocessModel (PlaceOnSequenceClip), after every
     // clip has passed through here.
@@ -318,8 +347,8 @@ public class AudioEventImporter : AssetPostprocessor
 
         bool modified = removedStale > 0;
 
-        if (_pendingManifests.TryGetValue(assetPath, out var entries)
-            && entries.Count > 0)
+        var entries = PendingEntries();
+        if (entries != null && entries.Count > 0)
         {
             float frameRate = clip.frameRate > 0 ? clip.frameRate : 30f;
             foreach (var entry in entries)
@@ -381,13 +410,12 @@ public class AudioEventImporter : AssetPostprocessor
     {
         if (!ShouldProcess())
         {
-            _pendingManifests.Remove(assetPath);
-            _importedClips.Remove(assetPath);
+            ClearPending();
             return;
         }
 
-        bool hasEntries = _pendingManifests.TryGetValue(assetPath, out var entries)
-                          && entries.Count > 0;
+        var entries = PendingEntries();
+        bool hasEntries = entries != null && entries.Count > 0;
         var existingController = root.GetComponent<AudioEventController>();
 
         if (hasEntries)
@@ -402,10 +430,12 @@ public class AudioEventImporter : AssetPostprocessor
             // file under its event's name (pythontk
             // FbxMedia.embed_dependencies): extracted beside the model, the
             // first folder the lookup below searches, on the one reimport
-            // that brings.
+            // that brings. A clip that lookup already finds elsewhere (an
+            // Assets/Audio library) is not asked for.
             var names = new List<string>();
             foreach (var entry in entries) names.Add(entry.eventName);
-            bool extracting = CarrierImport.RequestEmbeddedFiles(assetPath, names);
+            bool extracting = CarrierImport.RequestEmbeddedFiles(
+                assetPath, names, n => FindAudioClip(n, assetPath) != null);
 
             var seen = new HashSet<string>(
                 System.StringComparer.OrdinalIgnoreCase);
@@ -434,8 +464,7 @@ public class AudioEventImporter : AssetPostprocessor
                 + root.name + "' (no audio_manifest in re-exported FBX)");
         }
 
-        _pendingManifests.Remove(assetPath);
-        _importedClips.Remove(assetPath);
+        ClearPending();
     }
 
     // --- Step 3b: shot events onto the sequence clip -------------------

{unitytk-0.2.1 → unitytk-0.2.2}/unitytk/templates/README.md

@@ -182,7 +182,7 @@ Or for objects already placed in a scene:
 |---|---|---|
 | `UnitytkSettings.cs` | — (editor-only) | The shared, compile-coupled home: the **Project Settings ▸ unitytk** page (per-channel toggles + FBX allowlist, stored in `ProjectSettings/UnitytkSettings.json`), the `ImportGate` every importer asks before doing any work, and the `CarrierImport` channel-reading helpers. |
 | `RenderEffects/RenderEffectsController.cs` | Fades object alpha via MaterialPropertyBlock. Auto-hides at zero opacity. | Detects Maya `opacity` attribute, adds component, converts visibility curves to smooth fades. Switches a fading object's material to its pipeline's alpha blend (Built-in Fade, URP Transparent/Alpha, HDRP Transparent) and drops a pulsing highlight's emission map, as the GLB route does -- a copy when an object that needs the original shares it, and a material remapped in from the project is never edited. |
-| `AudioEvent/AudioEventController.cs` | Plays audio clips from AnimationEvent callbacks. | Detects Maya `audio_manifest` attribute on the `data_export` carrier (baked from the `data_internal` authoring state), adds the component to the prefab root (where the Animator goes), injects AnimationEvents (in a Shots + Full Sequence file, each shot's events onto the whole-timeline clip too, at the shot's window -- needs the Shot Metadata component deployed), matches audio clips by name (an FBX that embeds them has them extracted beside it first). |
+| `AudioEvent/AudioEventController.cs` | Plays audio clips from AnimationEvent callbacks. | Detects Maya `audio_manifest` attribute on the `data_export` carrier (baked from the `data_internal` authoring state), adds the component to the prefab root (where the Animator goes), injects AnimationEvents (in a Shots + Full Sequence file, each shot's events onto the whole-timeline clip too, at the shot's window -- needs the Shot Metadata component deployed), matches audio clips by name (an FBX that embeds them has them extracted beside it first -- unless the lookup already finds the clip, an `Assets/Audio` library say -- once per version of the model per project). Reads the scene's own carrier only, else the first that carries a manifest, as every channel does: an assembly's stray `data_export1` holds stale events. |
 | `ShotMetadata/ShotMetadataController.cs` | Passive per-shot lookup: `GetShot(clipName)` returns the shot's description / section / object list and its `start`/`end` frames; `TryGetSequenceWindow(clipName, ...)` gives the shot's window in seconds inside `sequenceClip`, the clip cut over the whole-timeline take. | Parses the `shot_metadata` JSON off `data_export`, attaches one component to the prefab root, joins records to imported AnimationClips **by clip name** (case-insensitive). |
 | `LightmapMetadata/LightmapMetadataController.cs` | Holds Maya-baked lightmap bindings; **Tools → unitytk → Lightmaps → Apply Scene Lightmaps** binds them into `LightmapSettings` + per-renderer `lightmapScaleOffset` (objects sharing an atlas share one lightmap slot) and records what it bound on the controller, which binds it again whenever it is enabled -- Unity keeps no lightmap it did not bake itself, so a reopened scene or a player build would otherwise come up unlit (measured on 2022.3 and 6000.3). A re-run takes the previous bindings down first; a controller whose records changed since Apply (a re-imported model) binds nothing until Apply runs again. A bound renderer gives up its material's occlusion map (`_OcclusionStrength` 0, per renderer: the bake already holds the occlusion, as the GLB pipeline rules; `bakeReplacesOcclusion` off keeps the map, and URP's SRP Batcher for that renderer); a mesh with no uv2 is left unbound and named; a realtime or mixed light reaching the baked renderers is warned about (the bake already holds the scene's lighting). Apply also puts up the bake's reflection probe as a child `ReflectionProbe` of the model root ([the reflection probe](#the-lightmap-bakes-reflection-probe)). The applier pins the texture import settings HDR lightmaps need (Lightmap type, sRGB off, mips on, BC6H / ASTC-HDR per platform), turns off **Auto Generate** lighting so a Unity re-bake can't clobber the bindings, and warns on a Gamma color-space project, a non-uv2 `uvIndex`, or a duplicate record name with no hierarchy to tell it apart by (records carry the Maya hierarchy, and same-named objects -- two machine bodies both called `BODY` -- bind by it). | Parses the `lightmap_metadata` JSON off `data_export` (the probe's nested `box` by hand — JsonUtility cannot hold it), attaches the component, warns if `generateSecondaryUV` would overwrite the DCC's UV2. A re-export without a probe clears the record. |
 | `ShadowPlane/ShadowPlaneController.cs` (+ `ShadowPlane.shader`, `ShadowPlaneHorizon.hlsl`) | The runtime shadow rig (mayatk/blendertk `ShadowRig`, `shadow_metadata` v2): resolves the record's `source` and `contact` by name (exact, else the namespace-stripped leaf; an ambiguous name is refused), evaluates the projection model (pythontk `ShadowProjection.model` ported in `ShadowPlaneModel`, double precision) in `LateUpdate` while `followSource` is on and both resolve — placing the plane from a runtime light — otherwise the imported keys play; writes the per-plane block (`_Rect`, `_Mode`, `_Intensity`, the horizon uniforms, the contact frame, the source) read-modify-write beside `RenderEffectsController`'s `_BaseColor.a`. `ApplyNow()` for scripts. A horizon plane's march is cached (`cacheShadow`, on by default): marched into one shared atlas only when the source, the placement or the ground moves, and sampled at one fetch a pixel. Directional sources: a `Light` shines along its +Z, a bare DCC locator along its local -Z. | Parses the `shadow_metadata` JSON off `data_export` and joins each record to every renderer **its name** denotes (exact, else the namespace-stripped leaf), rewires every plane of a rig type to **one shared, instanced material** on `m3trik/ShadowPlane` (`ShadowPlane.shader`; Built-in and URP — HDRP, or a missing shader, falls back to the per-plane pipeline unlit-transparent rewire) bound to the silhouette / atlas / `_horizon` PNGs resolved by the recorded filenames, normalises an atlased plane's UVs and shares the first plane's mesh so instancing batches, turns off shadow casting/receiving + light/reflection probes, fills the controller from the record (plus `unit_scale`; `frame_a`/`frame_b` converted from FBX axes by the importer's X mirror; the horizon block's `max_stretch` — the scale its cotangents were **baked** with — kept apart from the plane's live placement cap, falling back to it only for a map baked before that field existed), pins `*_shadow` (`alphaIsTransparency`) and `*_horizon` (data) PNG imports, and removes stale controllers when a re-exported FBX no longer carries the channel. |

{unitytk-0.2.1 → unitytk-0.2.2}/unitytk/templates/UnitytkSettings.cs

@@ -286,10 +286,50 @@ public static class CarrierImport
     public static void RequestTextureExtraction(string assetPath)
         => _needExtractedTextures.Add(assetPath);
 
-    // Model versions (path, write time, size) this session already asked to
+    // Model versions (path, write time, size) this PROJECT already asked to
     // have extracted: a name the FBX does not carry stays missing after the
-    // extraction, and must not ask again on every reimport.
-    static readonly HashSet<string> _embeddedRequested = new HashSet<string>();
+    // extraction, and must not ask again on every reimport. Kept in Library/
+    // (per project, never versioned) rather than for one editor session: a
+    // later session's reimport (a package update, Reimport All) asked again,
+    // and each extraction overwrote the files beside the model, a touched-up
+    // one included. One line per model, its latest version; a Library rebuild
+    // forgets it and extracts once more.
+    const string EMBEDDED_REQUESTED = "Library/unitytk/embedded_requested.txt";
+    static HashSet<string> _embeddedRequested;
+
+    /// <summary>Remember that <paramref name="assetPath"/>'s version
+    /// <paramref name="key"/> asked; false when it already had.</summary>
+    static bool RememberRequest(string assetPath, string key)
+    {
+        if (_embeddedRequested == null)
+        {
+            _embeddedRequested = new HashSet<string>(StringComparer.Ordinal);
+            try
+            {
+                if (File.Exists(EMBEDDED_REQUESTED))
+                    foreach (var line in File.ReadAllLines(EMBEDDED_REQUESTED))
+                        if (line.Length > 0) _embeddedRequested.Add(line);
+            }
+            catch (IOException) { }
+            catch (UnauthorizedAccessException) { }
+        }
+        if (_embeddedRequested.Contains(key)) return false;
+        string prefix = assetPath + "|";
+        bool replaced = _embeddedRequested.RemoveWhere(
+            k => k.StartsWith(prefix, StringComparison.Ordinal)) > 0;
+        _embeddedRequested.Add(key);
+        try
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(EMBEDDED_REQUESTED));
+            if (replaced)
+                File.WriteAllLines(EMBEDDED_REQUESTED, _embeddedRequested);
+            else
+                File.AppendAllText(EMBEDDED_REQUESTED, key + "\n");
+        }
+        catch (IOException) { }
+        catch (UnauthorizedAccessException) { }
+        return true;
+    }
 
     /// <summary>
     /// The channels of the model at <paramref name="assetPath"/> name these
@@ -299,10 +339,14 @@ public static class CarrierImport
     /// when one is missing there or older than the model -- a re-export:
     /// extraction overwrites in place, keeping each file's GUID and import
     /// settings (measured, 2022.3 / 6000.3). A name with no extension (an
-    /// audio event's clip) matches the file of that stem. Once per version of
-    /// the model per session; true when this call asked.
+    /// audio event's clip) matches the file of that stem. A name missing
+    /// beside the model that <paramref name="resolves"/> finds where its
+    /// importer looks (the audio lookup's Assets/Audio) is not missing:
+    /// extracting for it rebound the asset to a copy beside the model.
+    /// Once per version of the model per project; true when this call asked.
     /// </summary>
-    public static bool RequestEmbeddedFiles(string assetPath, IEnumerable<string> names)
+    public static bool RequestEmbeddedFiles(
+        string assetPath, IEnumerable<string> names, Func<string, bool> resolves = null)
     {
         var model = new FileInfo(assetPath);
         if (!model.Exists) return false;
@@ -311,9 +355,17 @@ public static class CarrierImport
         {
             if (string.IsNullOrEmpty(name)) continue;
             var copy = Beside(model.DirectoryName, Path.GetFileName(name));
-            if (copy == null || copy.LastWriteTimeUtc < model.LastWriteTimeUtc) { stale = true; break; }
+            if (copy != null)
+            {
+                // Older than the model: a re-export, whose copy is replaced.
+                if (copy.LastWriteTimeUtc < model.LastWriteTimeUtc) { stale = true; break; }
+                continue;
+            }
+            if (resolves != null && resolves(name)) continue;
+            stale = true;
+            break;
         }
-        if (!stale || !_embeddedRequested.Add(
+        if (!stale || !RememberRequest(assetPath,
                 assetPath + "|" + model.LastWriteTimeUtc.Ticks + "|" + model.Length))
             return false;
         RequestTextureExtraction(assetPath);

{unitytk-0.2.1 → unitytk-0.2.2/unitytk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitytk
-Version: 0.2.1
+Version: 0.2.2
 Summary: A modular Python toolkit for Unity interaction.
 Author-email: Ryan Simpson <m3trik@outlook.com>
 License: MIT