roavatar-renderer 1.9.0 → 1.9.2

package/dist/index.d.ts

@@ -72,6 +72,11 @@ export declare class AccessoryWrapper extends InstanceWrapper {
     static requiredProperties: string[];
     setup(): void;
     created(): void;
+    /**
+     *
+     * @returns [bodyAttachment, handleAttachment] or undefined
+     */
+    getBodyAccessoryAttachmentPair(): [Instance, Instance] | undefined;
     AccessoryBuildWeld(): void;
 }
 
@@ -1894,7 +1899,7 @@ export declare function getOffsetArray(inner: FileMesh, outer: FileMesh): ([Vec3
 
 export declare function getOriginalAttachmentOrientation(attachment: Instance): Vector3;
 
-export declare function getOriginalAttachmentPosition(attachment: Instance): Vector3;
+export declare function getOriginalAttachmentPosition(attachment: Instance, currentScale: Vector3): Vector3;
 
 export declare function getOriginalSize(part: Instance): Vector3;
 

package/dist/index.js

@@ -44164,8 +44164,12 @@ class AccessoryWrapper extends InstanceWrapper {
       this.AccessoryBuildWeld();
     });
   }
-  AccessoryBuildWeld() {
-    if (this.instance.parent && this.instance.className === "Accessory") {
+  /**
+   * 
+   * @returns [bodyAttachment, handleAttachment] or undefined
+   */
+  getBodyAccessoryAttachmentPair() {
+    if (this.instance.parent) {
       const humanoid = this.instance.parent.FindFirstChildOfClass("Humanoid");
       if (humanoid) {
         const handle = this.instance.FindFirstChild("Handle");
@@ -44184,11 +44188,24 @@ class AccessoryWrapper extends InstanceWrapper {
               }
             }
           }
+          if (bodyAttachment && accessoryAttachment) return [bodyAttachment, accessoryAttachment];
+        }
+      }
+    }
+  }
+  AccessoryBuildWeld() {
+    if (this.instance.parent && this.instance.className === "Accessory") {
+      const humanoid = this.instance.parent.FindFirstChildOfClass("Humanoid");
+      if (humanoid) {
+        const handle = this.instance.FindFirstChild("Handle");
+        if (handle) {
+          const attachmentPair = this.getBodyAccessoryAttachmentPair();
           const oldAccessoryWeld = handle.FindFirstChild("AccessoryWeld");
           if (oldAccessoryWeld) {
             oldAccessoryWeld.Destroy();
           }
-          if (bodyAttachment && accessoryAttachment) {
+          if (attachmentPair) {
+            const [bodyAttachment, accessoryAttachment] = attachmentPair;
             const weld = new Instance("Weld");
             weld.addProperty(new Property("Name", DataType.String), "AccessoryWeld");
             weld.addProperty(new Property("Archivable", DataType.Bool), true);
@@ -44475,9 +44492,9 @@ function getOriginalSize(part) {
   }
   return originalSize;
 }
-function scaleChildrenOfPart(part, scaleVector, scaleAttachment = true) {
+function scaleChildrenOfPart(part, scaleVector, alreadyScaledAttachment) {
   for (const child of part.GetDescendants()) {
-    if (child.className === "Attachment" && scaleAttachment) {
+    if (child.className === "Attachment" && child !== alreadyScaledAttachment) {
       let originalPosition = child.Prop("Position");
       originalPosition = originalPosition.multiply(scaleVector);
       const newCF = child.Prop("CFrame").clone();
@@ -44491,10 +44508,11 @@ function scaleChildrenOfPart(part, scaleVector, scaleAttachment = true) {
     }
   }
 }
-function originalChildrenOfPart(part) {
+function originalChildrenOfPart(part, originalSize, currentSize) {
+  const currentScale = currentSize.divide(originalSize);
   for (const child of part.GetDescendants()) {
     if (child.className === "Attachment") {
-      const originalPosition = getOriginalAttachmentPosition(child);
+      const originalPosition = getOriginalAttachmentPosition(child, currentScale);
       const originalOrientation = getOriginalAttachmentOrientation(child);
       const newCF = child.Prop("CFrame").clone();
       newCF.Position = [originalPosition.X, originalPosition.Y, originalPosition.Z];
@@ -44502,7 +44520,7 @@ function originalChildrenOfPart(part) {
       child.setProperty("CFrame", newCF);
     } else if (child.className === "SpecialMesh") {
       if (child.Prop("MeshType") !== MeshType.Head) {
-        const orignalScale = getOriginalMeshScale(child);
+        const orignalScale = getOriginalMeshScale(child, currentScale);
         child.setProperty("Scale", orignalScale);
       }
     }
@@ -44593,32 +44611,37 @@ function ScaleAccessory(accessory, bodyScaleVector, headScaleVector, bodyTypeSca
   } else {
     warn(false, "Failed to find attached part for accessory:", accessory);
   }
-  originalChildrenOfPart(handle);
   const originalSize = getOriginalSize(handle);
-  let hasAdjusted = false;
+  originalChildrenOfPart(handle, originalSize, handle.Prop("Size"));
+  let hasAdjusted = void 0;
+  let attachmentPair = void 0;
+  const beforeAdjustmentResultScale = resultScale.clone();
   const accessoryDescs = humanoidDescription.GetChildren();
   for (const accessoryDesc of accessoryDescs) {
     if (accessoryDesc.className === "AccessoryDescription") {
-      if (accessoryDesc.Prop("Instance") === accessory) {
-        const attachment = handle.FindFirstChildOfClass("Attachment");
-        if (attachment) {
-          hasAdjusted = true;
-          adjustAttachment(attachment, accessoryDesc.Prop("Position"), accessoryDesc.Prop("Rotation"), accessoryDesc.Prop("Scale"), resultScale);
+      if (accessoryDesc.Prop("Instance") === accessory && accessory.IsA("Accessory")) {
+        const accessoryW = accessory.w;
+        attachmentPair = accessoryW.getBodyAccessoryAttachmentPair();
+        if (attachmentPair) {
+          const handleAttachment = attachmentPair[1];
+          hasAdjusted = handleAttachment;
+          adjustAttachment(handleAttachment, accessoryDesc.Prop("Position"), accessoryDesc.Prop("Rotation"), accessoryDesc.Prop("Scale"), resultScale);
         }
         const adjustScale = accessoryDesc.Prop("Scale");
         resultScale = resultScale.multiply(adjustScale);
       }
     }
   }
-  scaleChildrenOfPart(handle, resultScale, !hasAdjusted);
+  scaleChildrenOfPart(handle, beforeAdjustmentResultScale, hasAdjusted);
   handle.setProperty("Size", originalSize.multiply(resultScale));
   if (accessory.className === "Accessory") {
     const accessoryWrapper = new AccessoryWrapper(accessory);
     accessoryWrapper.AccessoryBuildWeld();
   }
 }
-function getOriginalMeshScale(mesh) {
+function getOriginalMeshScale(mesh, currentScale) {
   let originalScale = mesh.Prop("Scale");
+  originalScale = originalScale.divide(currentScale);
   const originalScaleValue = mesh.FindFirstChild(originalSizeName);
   if (originalScaleValue) {
     originalScale = originalScaleValue.Prop("Value");
@@ -44630,12 +44653,13 @@ function getOriginalMeshScale(mesh) {
   }
   return originalScale;
 }
-function getOriginalAttachmentPosition(attachment) {
+function getOriginalAttachmentPosition(attachment, currentScale) {
   const originalPosition = attachment.FindFirstChild(originalPositionName);
   if (originalPosition) {
     return originalPosition.Prop("Value");
   }
-  const position = attachment.Prop("Position");
+  let position = attachment.Prop("Position");
+  position = position.divide(currentScale);
   const attachmentLocationValue = new Instance("Vector3Value");
   attachmentLocationValue.addProperty(new Property("Name", DataType.String), originalPositionName);
   attachmentLocationValue.addProperty(new Property("Value", DataType.Vector3), position);
@@ -44656,7 +44680,9 @@ function getOriginalAttachmentOrientation(attachment) {
 }
 function ScaleCharacterPart(part, bodyScaleVector, headScaleVector, anthroPercent, wideToNarrow) {
   const partName = part.Prop("Name");
+  const currentSize = part.Prop("Size");
   const originalSize = getOriginalSize(part);
+  const currentScale = currentSize.divide(originalSize);
   let newScaleVector = bodyScaleVector;
   if (partName == "Head") {
     newScaleVector = headScaleVector;
@@ -44706,7 +44732,7 @@ function ScaleCharacterPart(part, bodyScaleVector, headScaleVector, anthroPercen
       if (mesh.Prop("MeshType") == MeshType.Head) {
         headScale = Vector3.new(1, 1, 1);
       }
-      const originalScale = getOriginalMeshScale(mesh);
+      const originalScale = getOriginalMeshScale(mesh, currentScale);
       if (mesh.Prop("MeshType") !== MeshType.Head) {
         mesh.setProperty("Scale", originalScale.multiply(scale).multiply(headScale));
       }
@@ -44736,7 +44762,7 @@ function ScaleCharacterPart(part, bodyScaleVector, headScaleVector, anthroPercen
   part.setProperty("Size", originalSize.multiply(scale).multiply(newScaleVector));
   for (const child of part.GetDescendants()) {
     if (child.className === "Attachment") {
-      const originalAttachment = getOriginalAttachmentPosition(child);
+      const originalAttachment = getOriginalAttachmentPosition(child, currentScale);
       const ogCF = child.Prop("CFrame").clone();
       const newPos = originalAttachment.multiply(scale).multiply(newScaleVector);
       ogCF.Position = [newPos.X, newPos.Y, newPos.Z];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roavatar-renderer",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "A renderer for Roblox avatars, used by the RoAvatar extension.",
   "author": "steinan",
   "type": "module",