@lovelace_lol/loom3 1.0.28 → 1.0.29

package/README.md

@@ -349,13 +349,13 @@ const loom = new Loom3({
 
 `annotationRegions` is the Loom3 field for camera/marker region defaults and profile overrides.
 
-If your app fetches a full saved `CharacterConfig` from Firestore or another backend, use `resolveCharacterConfig(...)` to build the runtime shape before handing that config to camera/marker tooling:
+If your app fetches a full saved `CharacterConfig` from Firestore or another backend, use `extendCharacterConfigWithPreset(...)` to build the runtime shape before handing that config to camera/marker tooling:
 
 ```typescript
-import { resolveCharacterConfig } from '@lovelace_lol/loom3';
+import { extendCharacterConfigWithPreset } from '@lovelace_lol/loom3';
 
 const savedConfig = await fetchCharacterConfig();
-const runtimeConfig = resolveCharacterConfig(savedConfig);
+const runtimeConfig = extendCharacterConfigWithPreset(savedConfig);
 ```
 
 For the current runtime-oriented documentation, including:

package/dist/index.cjs

@@ -1887,7 +1887,17 @@ var CC4_BONE_NODES = {
   NECK: "NeckTwist01",
   NECK_TWIST: "NeckTwist02",
   JAW: "JawRoot",
-  TONGUE: "Tongue01"
+  TONGUE: "Tongue01",
+  SPINE_01: "Spine01",
+  SPINE_02: "Spine02",
+  CLAVICLE_L: "L_Clavicle",
+  CLAVICLE_R: "R_Clavicle",
+  HAND_L: "L_Hand",
+  HAND_R: "R_Hand",
+  FOOT_L: "L_Foot",
+  FOOT_R: "R_Foot",
+  TOEBASE_L: "L_ToeBase",
+  TOEBASE_R: "R_ToeBase"
 };
 var CC4_EYE_MESH_NODES = {
   LEFT: "CC_Base_Eye",
@@ -2125,7 +2135,7 @@ var CC4_PRESET = {
     },
     {
       name: "head",
-      bones: ["CC_Base_Head", "CC_Base_JawRoot"],
+      bones: ["HEAD", "JAW"],
       paddingFactor: 1.5,
       children: ["face", "left_eye", "right_eye", "mouth"],
       expandAnimation: "staggered",
@@ -2133,66 +2143,66 @@ var CC4_PRESET = {
     },
     {
       name: "face",
-      bones: ["CC_Base_Head"],
+      bones: ["HEAD"],
       // meshes: populated by user selection in wizard - varies per character
       paddingFactor: 1.3,
       parent: "head"
     },
     {
       name: "left_eye",
-      bones: ["CC_Base_L_Eye"],
+      bones: ["EYE_L"],
       paddingFactor: 0.9,
       parent: "head"
     },
     {
       name: "right_eye",
-      bones: ["CC_Base_R_Eye"],
+      bones: ["EYE_R"],
       paddingFactor: 0.9,
       parent: "head"
     },
     {
       name: "mouth",
-      bones: ["CC_Base_JawRoot"],
+      bones: ["JAW"],
       paddingFactor: 1.5,
       parent: "head"
     },
     {
       name: "upper_body",
       bones: [
-        "CC_Base_Spine02",
-        "CC_Base_Head",
-        "CC_Base_L_Clavicle",
-        "CC_Base_R_Clavicle"
+        "SPINE_02",
+        "HEAD",
+        "CLAVICLE_L",
+        "CLAVICLE_R"
       ],
       paddingFactor: 1.6
     },
     {
       name: "back",
-      bones: ["CC_Base_Spine01", "CC_Base_Spine02"],
+      bones: ["SPINE_01", "SPINE_02"],
       paddingFactor: 1.8,
       cameraAngle: 180
     },
     {
       name: "left_hand",
-      bones: ["CC_Base_L_Hand"],
+      bones: ["HAND_L"],
       paddingFactor: 1.3,
       cameraAngle: 270
     },
     {
       name: "right_hand",
-      bones: ["CC_Base_R_Hand"],
+      bones: ["HAND_R"],
       paddingFactor: 1.3,
       cameraAngle: 90
     },
     {
       name: "left_foot",
-      bones: ["CC_Base_L_Foot", "CC_Base_L_ToeBase"],
+      bones: ["FOOT_L", "TOEBASE_L"],
       paddingFactor: 2.5,
       cameraAngle: 270
     },
     {
       name: "right_foot",
-      bones: ["CC_Base_R_Foot", "CC_Base_R_ToeBase"],
+      bones: ["FOOT_R", "TOEBASE_R"],
       paddingFactor: 2.5,
       cameraAngle: 90
     }
@@ -5447,13 +5457,6 @@ function mergeRegion(base, override) {
     } : void 0
   };
 }
-function mergeStringRecord(base, override) {
-  if (!base && !override) return void 0;
-  return {
-    ...base ? { ...base } : {},
-    ...override ? { ...override } : {}
-  };
-}
 function mergeRegionsByName(base, override) {
   if (!base && !override) return void 0;
   const merged = /* @__PURE__ */ new Map();
@@ -5519,7 +5522,7 @@ function orderResolvedRegions(resolvedRegions, prioritizedLists) {
   }
   return orderedNames.map((name) => resolvedByName.get(name)).filter((region) => Boolean(region));
 }
-function resolveCharacterConfig(config) {
+function extendCharacterConfigWithPreset(config) {
   const presetType = config.auPresetType;
   if (!presetType || presetType === "custom") {
     return config;
@@ -5537,13 +5540,13 @@ function resolveCharacterConfig(config) {
   );
   return {
     ...config,
-    bonePrefix: config.bonePrefix ?? presetResolvedProfile.bonePrefix,
-    boneSuffix: config.boneSuffix ?? presetResolvedProfile.boneSuffix,
-    boneNodes: mergeStringRecord(presetResolvedProfile.boneNodes, config.boneNodes),
-    suffixPattern: config.suffixPattern ?? presetResolvedProfile.suffixPattern,
+    ...presetResolvedProfile,
     regions: resolvedRegions ?? config.regions
   };
 }
+function resolveCharacterConfig(config) {
+  return extendCharacterConfigWithPreset(config);
+}
 var DEFAULT_HEAD_BONE_NAMES = ["CC_Base_Head", "Head", "head", "Bip01_Head"];
 var DEFAULT_REFERENCE_HEIGHT = 1.8;
 var DEFAULT_FORWARD_OFFSET = 0.08;
@@ -5731,23 +5734,32 @@ function detectFacingDirection(model, eyeBoneNames = {
 function normalizeLooseName(value) {
   return value.replace(/\./g, "");
 }
-function resolveBoneName(semanticName, config) {
-  if (!config) return semanticName;
+function resolveBoneNameCandidates(semanticName, config) {
+  if (!config) return [semanticName];
   const { bonePrefix, boneSuffix, boneNodes } = config;
   if (!boneNodes || !boneNodes[semanticName]) {
-    return semanticName;
+    return [semanticName];
   }
   const baseName = boneNodes[semanticName];
-  if (baseName.includes("_") || baseName.includes(".")) {
-    return baseName;
-  }
   const prefix = bonePrefix || "";
   const suffix = boneSuffix || "";
-  return prefix + baseName + suffix;
+  if (!prefix && !suffix) {
+    return [baseName];
+  }
+  const prefixedBase = prefix && baseName.startsWith(prefix) ? baseName : prefix + baseName;
+  const fullyAffixed = suffix && !prefixedBase.endsWith(suffix) ? `${prefixedBase}${suffix}` : prefixedBase;
+  return Array.from(/* @__PURE__ */ new Set([fullyAffixed, baseName]));
+}
+function resolveBoneName(semanticName, config) {
+  return resolveBoneNameCandidates(semanticName, config)[0] ?? semanticName;
 }
 function resolveBoneNames(names, config) {
   if (!names || names.length === 0) return [];
-  return names.map((name) => resolveBoneName(name, config));
+  return Array.from(
+    new Set(
+      names.flatMap((name) => resolveBoneNameCandidates(name, config))
+    )
+  );
 }
 function fuzzyNameMatch(objectName, targetName, suffixPattern) {
   if (objectName === targetName) return true;
@@ -6884,6 +6896,7 @@ exports.applyCharacterProfileToPreset = applyCharacterProfileToPreset;
 exports.applyProfileToPreset = applyProfileToPreset;
 exports.collectMorphMeshes = collectMorphMeshes;
 exports.detectFacingDirection = detectFacingDirection;
+exports.extendCharacterConfigWithPreset = extendCharacterConfigWithPreset;
 exports.extractFromGLTF = extractFromGLTF;
 exports.extractModelData = extractModelData;
 exports.extractProfileOverrides = extractProfileOverrides;