fix(paint3d): refine rotation logic for Y-up/Z-up conversion

Update the rotation handling in the _bounds_axis_swap_x_rad function to clarify the axis swap logic between Y-tall and Z-tall meshes. Adjust comments for better understanding of the rotation conventions and ensure consistent behavior when restoring Y-up orientation. This change enhances the accuracy of mesh orientation adjustments during processing.

Author: maikramer

Paint3D/src/paint3d/painter.py

@@ -207,11 +207,11 @@ def _bounds_axis_swap_x_rad(
     yz_after = extent_after[1] / extent_after[2]
     # Toleramos ±10% (mesh de saída pode ter pequenas variações por remesh).
     if yz_before > 1.0 and yz_after < 1.0 and abs(yz_before - 1.0 / yz_after) < max(yz_before, 1.0 / yz_after) * 0.30:
-        # Input era Y-tall, output é Z-tall → mesh rodou -90° X (Y foi para Z).
-        # Para repor, rodamos +90° em X.
-        return float(np.pi / 2.0)
-    if yz_before < 1.0 and yz_after > 1.0 and abs(1.0 / yz_before - yz_after) < max(1.0 / yz_before, yz_after) * 0.30:
+        # Input era Y-tall, output é Z-tall → Hunyuan rodou +90° em X
+        # ((0,1,0)→(0,0,1)); para repor a convenção Y-up rodamos -90° em X.
         return float(-np.pi / 2.0)
+    if yz_before < 1.0 and yz_after > 1.0 and abs(1.0 / yz_before - yz_after) < max(1.0 / yz_before, yz_after) * 0.30:
+        return float(np.pi / 2.0)
     return 0.0
 
 

Rigging3D/src/rigging3d/unirig/src/inference/merge.py

@@ -214,10 +214,19 @@ def get_correct_orientation_kdtree(
                         for y in [1, -1] 
                         for z in [1, -1]]
     if fix_up_axis is not None:
-        # Apenas permutações onde o eixo "up" se mapeia a si mesmo, e
-        # restrigimos sign(up) a +1 — evita inversão cabeça/pés.
-        axis_permutations = [p for p in axis_permutations if p[fix_up_axis] == fix_up_axis]
-        sign_combinations = [s for s in sign_combinations if s[fix_up_axis] == 1]
+        # Quando o "up" está fixo confiamos na convenção do pipeline
+        # (Y-up, +Z forward) e desligamos a procura: identidade pura.
+        # Para reactivar a procura completa do KDTree, exporta
+        # ``RIGGING3D_FIX_UP_AXIS=auto``.
+        # Alternativa intermédia (procura restringida ao eixo up apenas):
+        # ``RIGGING3D_ORIENT_SEARCH=relaxed``.
+        mode = os.environ.get("RIGGING3D_ORIENT_SEARCH", "").strip().lower()
+        if mode == "relaxed":
+            axis_permutations = [p for p in axis_permutations if p[fix_up_axis] == fix_up_axis]
+            sign_combinations = [s for s in sign_combinations if s[fix_up_axis] == 1]
+        else:
+            # Modo "lock" (default): nada de procura — devolve a, bones intactos.
+            return a, bones
     _bones = bones.copy()
     # Use a deterministic sample for stability across runs.
     rng = np.random.default_rng(seed=12345)