@lovelace_lol/loom3 1.0.40 → 1.0.41

package/dist/index.d.cts

@@ -92,7 +92,7 @@ declare const CC4_PRESET: Profile;
  * - Scalars: extension wins when provided.
  * - Maps: shallow-merged by key, values cloned.
  * - Arrays: replaced when the extension provides them (except annotationRegions).
- * - annotationRegions: merged by region name, shallow field merge (extension wins).
+ * - annotationRegions: merged by region name, with nested camera/style fields preserved.
  */
 declare function extendPresetWithProfile(base: Profile, extension?: Partial<Profile>): Profile;
 
@@ -224,7 +224,7 @@ declare const FISH_AU_MAPPING_CONFIG: {
  * Loom3 - Preset Exports
  *
  * All AU presets are exported from here.
- * Frontend passes a presetType string and Loom3 looks up the preset internally.
+ * Frontend passes a presetType string and Loom3 looks up or extends the preset internally.
  */
 
 /**
@@ -2058,10 +2058,9 @@ declare function applyCharacterProfileToPreset(config: CharacterConfig): Profile
  *
  * Precedence:
  * 1. preset defaults
- * 2. saved `config.regions` overrides, or fallbacks when `annotationRegions`
- *    is present
+ * 2. canonical flattened `annotationRegions` / top-level profile overrides
  * 3. legacy nested `config.profile` overrides (compatibility only)
- * 4. flattened top-level profile overrides
+ * 4. legacy `config.regions` fallback only when canonical annotation overrides are absent
  */
 declare function extendCharacterConfigWithPreset(config: CharacterConfig): CharacterConfig;
 

package/dist/index.d.ts

@@ -92,7 +92,7 @@ declare const CC4_PRESET: Profile;
  * - Scalars: extension wins when provided.
  * - Maps: shallow-merged by key, values cloned.
  * - Arrays: replaced when the extension provides them (except annotationRegions).
- * - annotationRegions: merged by region name, shallow field merge (extension wins).
+ * - annotationRegions: merged by region name, with nested camera/style fields preserved.
  */
 declare function extendPresetWithProfile(base: Profile, extension?: Partial<Profile>): Profile;
 
@@ -224,7 +224,7 @@ declare const FISH_AU_MAPPING_CONFIG: {
  * Loom3 - Preset Exports
  *
  * All AU presets are exported from here.
- * Frontend passes a presetType string and Loom3 looks up the preset internally.
+ * Frontend passes a presetType string and Loom3 looks up or extends the preset internally.
  */
 
 /**
@@ -2058,10 +2058,9 @@ declare function applyCharacterProfileToPreset(config: CharacterConfig): Profile
  *
  * Precedence:
  * 1. preset defaults
- * 2. saved `config.regions` overrides, or fallbacks when `annotationRegions`
- *    is present
+ * 2. canonical flattened `annotationRegions` / top-level profile overrides
  * 3. legacy nested `config.profile` overrides (compatibility only)
- * 4. flattened top-level profile overrides
+ * 4. legacy `config.regions` fallback only when canonical annotation overrides are absent
  */
 declare function extendCharacterConfigWithPreset(config: CharacterConfig): CharacterConfig;
 

package/dist/index.js

@@ -3552,7 +3552,7 @@ var mergeAnnotationRegion = (base, override) => {
   merged.meshes = override.meshes ? [...override.meshes] : base.meshes ? [...base.meshes] : void 0;
   merged.objects = override.objects ? [...override.objects] : base.objects ? [...base.objects] : void 0;
   merged.children = override.children ? [...override.children] : base.children ? [...base.children] : void 0;
-  merged.cameraOffset = override.cameraOffset ? { ...override.cameraOffset } : base.cameraOffset ? { ...base.cameraOffset } : void 0;
+  merged.cameraOffset = override.cameraOffset ? { ...base.cameraOffset, ...override.cameraOffset } : base.cameraOffset ? { ...base.cameraOffset } : void 0;
   merged.style = override.style ? {
     ...base.style,
     ...override.style,
@@ -6391,22 +6391,32 @@ function mergeRegionsByName(base, override) {
   }
   return Array.from(merged.values());
 }
+function getAnnotationRegions(value) {
+  return Array.isArray(value) ? value : void 0;
+}
+function getLegacyNestedOverrides(config) {
+  return isPlainObject2(config.profile) ? config.profile : {};
+}
+function getLegacyRuntimeRegions(config) {
+  return Array.isArray(config.regions) && config.regions.length > 0 ? config.regions : void 0;
+}
+function getCanonicalAnnotationOverrides(config) {
+  return mergeRegionsByName(
+    getAnnotationRegions(getLegacyNestedOverrides(config).annotationRegions),
+    getAnnotationRegions(config.annotationRegions)
+  );
+}
 function extractProfileOverrides(config) {
   const topLevelConfig = config;
-  const legacyNestedOverrides = isPlainObject2(config.profile) ? config.profile : {};
+  const legacyNestedOverrides = getLegacyNestedOverrides(config);
+  const canonicalAnnotationOverrides = getCanonicalAnnotationOverrides(config);
+  const legacyRuntimeRegions = getLegacyRuntimeRegions(config);
+  const annotationOverrides = canonicalAnnotationOverrides ?? (legacyRuntimeRegions ? legacyRuntimeRegions.map((region) => cloneRegion(region)) : void 0);
   const overrides = {};
   for (const key of PROFILE_OVERRIDE_KEYS) {
     if (key === "annotationRegions") {
-      const topLevelAnnotationRegions = Array.isArray(topLevelConfig.annotationRegions) ? topLevelConfig.annotationRegions : void 0;
-      const legacyAnnotationRegions = Array.isArray(legacyNestedOverrides.annotationRegions) ? legacyNestedOverrides.annotationRegions : void 0;
-      const legacyRegionFallback = Array.isArray(config.regions) && config.regions.length > 0 ? config.regions : void 0;
-      const legacyProfileRegions = mergeRegionsByName(legacyRegionFallback, legacyAnnotationRegions);
-      const regions = mergeRegionsByName(
-        legacyProfileRegions,
-        topLevelAnnotationRegions
-      );
-      if (regions) {
-        overrides.annotationRegions = regions.map((region) => cloneRegion(region));
+      if (annotationOverrides) {
+        overrides.annotationRegions = annotationOverrides.map((region) => cloneRegion(region));
       }
       continue;
     }
@@ -6419,13 +6429,6 @@ function extractProfileOverrides(config) {
   }
   return overrides;
 }
-function hasCanonicalAnnotationRegionOverrides(config) {
-  const topLevelConfig = config;
-  if (Array.isArray(topLevelConfig.annotationRegions)) {
-    return true;
-  }
-  return isPlainObject2(config.profile) && Array.isArray(config.profile.annotationRegions);
-}
 function applyCharacterProfileToPreset(config) {
   const presetType = config.auPresetType;
   if (!presetType) {
@@ -6457,24 +6460,34 @@ function extendCharacterConfigWithPreset(config) {
   if (!presetType || presetType === "custom") {
     return config;
   }
+  const canonicalAnnotationOverrides = getCanonicalAnnotationOverrides(config);
+  const legacyRuntimeRegions = getLegacyRuntimeRegions(config);
   const profileOverrides = extractProfileOverrides(config);
   const extendedPresetProfile = applyCharacterProfileToPreset(config);
   if (!extendedPresetProfile) {
     return config;
   }
-  const presetRegions = extendedPresetProfile.annotationRegions;
-  const mergedRegions = hasCanonicalAnnotationRegionOverrides(config) ? mergeRegionsByName(config.regions, presetRegions) : mergeRegionsByName(presetRegions, config.regions);
-  const normalizedRegions = normalizeRegionTree(
-    mergedRegions,
+  const presetRegionNames = new Set(
+    (getPreset(presetType).annotationRegions ?? []).map((region) => region.name)
+  );
+  const extendedAnnotationRegions = normalizeRegionTree(
+    extendedPresetProfile.annotationRegions,
+    profileOverrides.disabledRegions
+  );
+  const extendedRegionNames = new Set((extendedAnnotationRegions ?? []).map((region) => region.name));
+  const legacyExtraRegions = canonicalAnnotationOverrides && legacyRuntimeRegions ? legacyRuntimeRegions.filter((region) => !presetRegionNames.has(region.name) && !extendedRegionNames.has(region.name)).map((region) => cloneRegion(region)) : void 0;
+  const mergedRegions = normalizeRegionTree(
+    mergeRegionsByName(extendedAnnotationRegions, legacyExtraRegions),
     profileOverrides.disabledRegions
   );
   const extendedRegions = orderExtendedRegions(
-    normalizedRegions,
-    [config.regions, profileOverrides.annotationRegions, presetRegions]
+    mergedRegions,
+    canonicalAnnotationOverrides ? [extendedAnnotationRegions, legacyExtraRegions] : [legacyRuntimeRegions, extendedAnnotationRegions]
   );
   return {
     ...config,
     ...extendedPresetProfile,
+    annotationRegions: extendedRegions ?? extendedAnnotationRegions,
     regions: extendedRegions ?? config.regions
   };
 }