roavatar-renderer 1.5.2 → 1.5.4

package/dist/index.d.ts

@@ -3418,6 +3418,8 @@ export declare function traverseRigCFrame(instance: Instance, includeTransform?:
 
 export declare function traverseRigInstance(instance: Instance): Instance[];
 
+export declare function traverseRigInstanceOld(instance: Instance): Instance[];
+
 /** @category Mesh */
 export declare type Triangle = [Vec3, Vec3, Vec3];
 

package/dist/index.js

@@ -42206,7 +42206,7 @@ function traverseRigCFrame(instance, includeTransform = false, applyRoot = false
   }
   return finalCF;
 }
-function traverseRigInstance(instance) {
+function traverseRigInstanceOld(instance) {
   const children = [];
   let lastMotor6D = instance.FindFirstChildOfClass("Motor6D");
   if (!lastMotor6D) {
@@ -42223,6 +42223,72 @@ function traverseRigInstance(instance) {
   children.reverse();
   return children;
 }
+function traverseRigInstance(instance) {
+  const children = [];
+  let lastMotor6D = void 0;
+  if (instance.className === "Motor6D" || instance.className === "Weld") {
+    lastMotor6D = instance;
+  } else {
+    lastMotor6D = instance.FindFirstChildOfClass("Motor6D");
+    if (!lastMotor6D) {
+      lastMotor6D = instance.FindFirstChildOfClass("Weld");
+      if (!lastMotor6D) {
+        lastMotor6D = instance.FindFirstChildOfClass("ManualWeld");
+      }
+    }
+  }
+  while (lastMotor6D) {
+    children.push(lastMotor6D.parent);
+    const ogLastMotor6D = lastMotor6D;
+    const ogPart0 = ogLastMotor6D.Prop("Part0");
+    if (ogPart0 !== ogLastMotor6D.parent) {
+      lastMotor6D = ogPart0?.FindFirstChildOfClass("Motor6D");
+      if (!lastMotor6D) {
+        lastMotor6D = ogPart0?.FindFirstChildOfClass("Weld");
+        if (!lastMotor6D) {
+          lastMotor6D = ogPart0?.FindFirstChildOfClass("ManualWeld");
+        }
+      }
+      if (lastMotor6D && lastMotor6D.PropOrDefault("Part1", void 0) !== ogPart0) {
+        const descendants = ogLastMotor6D.parent?.parent?.GetDescendants() || [];
+        let foundMotor = false;
+        for (const child of descendants) {
+          if ((child.className === "Motor6D" || child.className === "Weld" || child.className === "ManualWeld") && child.PropOrDefault("Part1", void 0) === ogPart0) {
+            lastMotor6D = child;
+            foundMotor = true;
+            break;
+          }
+        }
+        if (!foundMotor) {
+          lastMotor6D = void 0;
+        }
+      }
+    } else {
+      const descendants = ogLastMotor6D.parent?.parent?.GetDescendants() || [];
+      let foundMotor = false;
+      for (const child of descendants) {
+        if ((child.className === "Motor6D" || child.className === "Weld" || child.className === "ManualWeld") && child.PropOrDefault("Part1", void 0) === ogPart0) {
+          lastMotor6D = child;
+          foundMotor = true;
+          break;
+        }
+      }
+      if (!foundMotor) {
+        lastMotor6D = void 0;
+      }
+    }
+    const part0 = lastMotor6D?.Prop("Part0");
+    const part1 = lastMotor6D?.Prop("Part1");
+    if (part0 === part1) {
+      lastMotor6D = void 0;
+    }
+    if (children.length > 20) {
+      lastMotor6D = void 0;
+    }
+  }
+  children.reverse();
+  return children;
+}
 const modelLayers = /* @__PURE__ */ new Map();
 function arrIsSameVector3(arr0, arr1) {
   if (arr0.length !== arr1.length) {
@@ -47181,9 +47247,12 @@ class AttachmentWrapper extends InstanceWrapper {
   }
   getWorldCFrame() {
     if (this.instance.parent) {
-      if (this.instance.parent.className.includes("Part")) {
+      if (this.instance.parent.w?.IsA("BasePart")) {
         const parentCF = this.instance.parent.PropOrDefault("CFrame", new CFrame());
         return parentCF.multiply(this.instance.Prop("CFrame"));
+      } else if (this.instance.parent.w?.IsA("Attachment")) {
+        const w = this.instance.parent.w;
+        return w.getWorldCFrame().multiply(this.instance.Prop("CFrame"));
       }
     }
     return this.instance.Prop("CFrame");
@@ -48155,6 +48224,11 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                       if (!FLAGS.AVATAR_JOINT_UPGRADE) {
                         moveAttachmentsToBase(child);
                       }
+                      for (const childChild of child.GetChildren()) {
+                        if (childChild.w?.IsA("Weld") || childChild.w?.IsA("AnimationConstraint")) {
+                          childChild.Destroy();
+                        }
+                      }
                       replaceBodyPart(rig, child);
                     }
                   }
@@ -51756,6 +51830,7 @@ export {
   transferSkeleton,
   traverseRigCFrame,
   traverseRigInstance,
+  traverseRigInstanceOld,
   triangleNormal,
   versionToNumber,
   vertPosToChunkPos,

package/package.json

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