Raise the NPC character budget to 24k and refine the prototype neck

tools/tests/test_blender_assets.py

@@ -9,10 +9,10 @@ class CatalogueTests(unittest.TestCase):
     def test_contract_matches_npc_pipeline(self):
         self.assertEqual(ba.SLOTS, npc_pipeline.SLOTS)
         self.assertEqual(sorted(ba.BONES), sorted(npc_pipeline.BONES))
-        # The character cap was raised to 16000/16000 for the head/face/hand
+        # The character cap was raised to 24000/24000 for the MPFB body and the head
         # overhaul; the 13 core bones stay required and extra bones are optional.
-        self.assertLessEqual(ba.CHAR_MAX_TRIS, 16000)
-        self.assertLessEqual(ba.CHAR_MAX_VERTS, 16000)
+        self.assertLessEqual(ba.CHAR_MAX_TRIS, 24000)
+        self.assertLessEqual(ba.CHAR_MAX_VERTS, 24000)
 
     def test_gear_uses_known_attach_points(self):
         for name, attach in ba.GEAR.items():
@@ -197,7 +197,7 @@ class InspectionTests(unittest.TestCase):
     def test_character_contract_failures_are_listed(self):
         stats = self.stats(mesh_nodes=["Armature"], skinned=False, unskinned=["Armature"],
                            materials=["cloth"], bones=["Head"], meshes_without_uv=1,
-                           triangles=17000, split_vertices=17000,
+                           triangles=25000, split_vertices=25000,
                            world_bounds={"min": [-0.3, -0.4, -0.2], "max": [0.3, 1.2, 0.2]})
         issues = "\n".join(ba.analyse_inspection(stats)["issues"])
         self.assertIn("no mesh node named npc_base", issues)
@@ -205,8 +205,8 @@ class InspectionTests(unittest.TestCase):
         self.assertIn("missing material slot skin", issues)
         self.assertIn("mesh not skinned", issues)
         self.assertIn("mesh(es) without UVs", issues)
-        self.assertIn(f"triangles 17000 > {ba.CHAR_MAX_TRIS}", issues)
-        self.assertIn(f"glTF vertices 17000 > {ba.CHAR_MAX_VERTS}", issues)
+        self.assertIn(f"triangles 25000 > {ba.CHAR_MAX_TRIS}", issues)
+        self.assertIn(f"glTF vertices 25000 > {ba.CHAR_MAX_VERTS}", issues)
         self.assertIn("feet not on the ground", issues)
         self.assertIn("unexpected height", issues)
 

tools/tests/test_npc_pipeline.py

@@ -13,8 +13,8 @@ class NpcContractTests(unittest.TestCase):
                      "ShoulderL", "ShoulderR", "ElbowL", "ElbowR",
                      "HandL", "HandR"]:
             self.assertIn(bone, npc_pipeline.BONES)
-        self.assertLessEqual(npc_pipeline.MAX_TRIANGLES, 16000)
-        self.assertLessEqual(npc_pipeline.MAX_VERTICES, 16000)
+        self.assertLessEqual(npc_pipeline.MAX_TRIANGLES, 24000)
+        self.assertLessEqual(npc_pipeline.MAX_VERTICES, 24000)
 
     def test_textures_exist_for_every_slot(self):
         for slot in npc_pipeline.SLOTS: