roavatar-renderer 1.5.8 → 1.5.9

package/dist/index.js

@@ -29099,77 +29099,35 @@ function inheritUV(to, from) {
   }
 }
 function transferSkeleton(to, from) {
-  if (from.skinning.skinnings.length < 1) {
+  if (from.skinning.numskinnings < 1) {
     warn(false, `From mesh has no skeleton that can be inherited`);
     return;
   }
   to.skinning = from.skinning.clone();
-  to.skinning.numSkinnings = to.coreMesh.numverts;
-  to.skinning.skinnings = new Array(to.skinning.numSkinnings);
+  to.skinning.numskinnings = to.coreMesh.numverts;
   const distIndexArr = getDistIndexArray(to, from);
-  const newSkinDatas = new Array(to.coreMesh.numverts);
   for (let i = 0; i < to.coreMesh.numverts; i++) {
     let closestI = distIndexArr[i];
     if (closestI === void 0) {
       warn(false, "did not find matching vert during transfer");
       closestI = 0;
     }
-    const closestSkinning = from.skinning.skinnings[closestI];
-    const closestSubsetIndex = from.skinning.getSubsetIndex(closestI);
-    newSkinDatas[i] = [closestSubsetIndex, closestSkinning, i];
+    const closestSkinning = closestI;
+    to.skinning.setIndex(i, from.skinning.getIndex(closestSkinning));
+    to.skinning.setWeight(i, from.skinning.getWeight(closestSkinning));
   }
-  newSkinDatas.sort((a, b) => {
-    return a[0] - b[0];
-  });
-  const newSubsets = [];
-  const newVerts = [];
-  const newSkinnings = [];
-  const toSubsetToFromSubsetMap = /* @__PURE__ */ new Map();
-  for (let i = 0; i < newSkinDatas.length; i++) {
-    const newSkinData = newSkinDatas[i];
-    const currentSubset = newSubsets[newSubsets.length - 1];
-    const vertSubset = from.skinning.subsets[newSkinData[0]];
-    const skinning = newSkinData[1].clone();
-    if (toSubsetToFromSubsetMap.get(currentSubset) !== vertSubset) {
-      const toPush = vertSubset.clone();
-      newSubsets.push(toPush);
-      toSubsetToFromSubsetMap.set(toPush, vertSubset);
-      toPush.vertsBegin = i;
-      toPush.vertsLength = 1;
-    } else {
-      currentSubset.vertsLength += 1;
-    }
-    newVerts.push(newSkinData[2]);
-    newSkinnings.push(skinning);
-  }
-  for (let i = 0; i < to.coreMesh.numfaces; i++) {
-    const face = to.coreMesh.getFace(i);
-    to.coreMesh.setFace(i, [
-      newVerts.indexOf(face[0]),
-      newVerts.indexOf(face[1]),
-      newVerts.indexOf(face[2])
-    ]);
-  }
-  to.coreMesh.onlyVerts(newVerts);
-  to.skinning.subsets = [];
-  for (const subset of newSubsets) {
-    to.skinning.subsets.push(subset.clone());
-  }
-  to.skinning.skinnings = newSkinnings;
   if (from.facs) {
     to.facs = from.facs.clone();
   }
 }
 function inheritSkeleton(to, from) {
-  if (from.skinning.skinnings.length < 1) {
+  if (from.skinning.numskinnings < 1) {
     warn(false, `From mesh has no skeleton that can be inherited`);
     return;
   }
   to.skinning = from.skinning.clone();
-  to.skinning.numSkinnings = to.coreMesh.numverts;
-  to.skinning.skinnings = new Array(to.skinning.numSkinnings);
+  to.skinning.numskinnings = to.coreMesh.numverts;
   const vertKD = buildVertKD(from);
-  const newSkinDatas = new Array(to.coreMesh.numverts);
   for (let i = 0; i < to.coreMesh.numverts; i++) {
     let normal = to.coreMesh.getNormal(i);
     if (isNaN(normal[0]) || isNaN(normal[1]) || isNaN(normal[2])) {
@@ -29179,49 +29137,10 @@ function inheritSkeleton(to, from) {
     const toSearch = minus(toVertPos, multiply(normal, [0, 0, 0]));
     const closest = nearestSearch(vertKD, toSearch);
     const closestI = closest.index;
-    const closestSkinning = from.skinning.skinnings[closestI];
-    const closestSubsetIndex = from.skinning.getSubsetIndex(closestI);
-    newSkinDatas[i] = [closestSubsetIndex, closestSkinning, i];
-  }
-  newSkinDatas.sort((a, b) => {
-    return a[0] - b[0];
-  });
-  const newSubsets = [];
-  const newVerts = [];
-  const newSkinnings = [];
-  const toSubsetToFromSubsetMap = /* @__PURE__ */ new Map();
-  for (let i = 0; i < newSkinDatas.length; i++) {
-    const newSkinData = newSkinDatas[i];
-    const currentSubset = newSubsets[newSubsets.length - 1];
-    const vertSubset = from.skinning.subsets[newSkinData[0]];
-    const toVertIndex = newSkinData[2];
-    const skinning = newSkinData[1].clone();
-    if (toSubsetToFromSubsetMap.get(currentSubset) !== vertSubset) {
-      const toPush = vertSubset.clone();
-      newSubsets.push(toPush);
-      toSubsetToFromSubsetMap.set(toPush, vertSubset);
-      toPush.vertsBegin = i;
-      toPush.vertsLength = 1;
-    } else {
-      currentSubset.vertsLength += 1;
-    }
-    newVerts.push(toVertIndex);
-    newSkinnings.push(skinning);
-  }
-  for (let i = 0; i < to.coreMesh.numfaces; i++) {
-    const face = to.coreMesh.getFace(i);
-    to.coreMesh.setFace(i, [
-      newVerts.indexOf(face[0]),
-      newVerts.indexOf(face[1]),
-      newVerts.indexOf(face[2])
-    ]);
-  }
-  to.coreMesh.onlyVerts(newVerts);
-  to.skinning.subsets = [];
-  for (const subset of newSubsets) {
-    to.skinning.subsets.push(subset.clone());
+    const closestSkinning = closestI;
+    to.skinning.setIndex(i, from.skinning.getIndex(closestSkinning));
+    to.skinning.setWeight(i, from.skinning.getWeight(closestSkinning));
   }
-  to.skinning.skinnings = newSkinnings;
   if (from.facs) {
     to.facs = from.facs.clone();
   }
@@ -29264,6 +29183,7 @@ function offsetMesh(mesh, cframe) {
   }
   for (const bone of mesh.skinning.bones) {
     bone.position = add(bone.position, cframe.Position);
+    bone.sourceOffset.Position = add(bone.sourceOffset.Position, cframe.Position);
   }
 }
 function scaleMesh(mesh, scale) {
@@ -29272,6 +29192,7 @@ function scaleMesh(mesh, scale) {
   }
   for (const bone of mesh.skinning.bones) {
     bone.position = new Vector32().fromVec3(bone.position).multiply(scale).toVec3();
+    bone.sourceScaled = multiply(bone.sourceScaled, scale.toVec3());
   }
 }
 function offsetMeshWithRotation(mesh, cframe) {
@@ -29282,6 +29203,7 @@ function offsetMeshWithRotation(mesh, cframe) {
   for (const bone of mesh.skinning.bones) {
     const boneCF = new CFrame(...bone.position);
     bone.position = cframe.multiply(boneCF).Position;
+    bone.sourceOffset = cframe.multiply(bone.sourceOffset);
   }
 }
 function getOffsetArray(inner, outer) {
@@ -29892,6 +29814,8 @@ const FLAGS = {
   //dom
   AVATAR_JOINT_UPGRADE: false,
   INSTANCE_GARBAGE_COLLECT: false,
+  LEGACY_WELD_BEHAVIOR: false,
+  USE_ASSEMBLY: true,
   //api
   BODYCOLOR3: true,
   ENABLE_API_CACHE: true,
@@ -29906,6 +29830,7 @@ const FLAGS = {
   API_REQUEST_PREFIX: "",
   INCLUDE_REQUEST_CREDENTIALS_OVERRIDE: "include",
   API_REQUEST_RETRY: true,
+  FETCH_FUNC: void 0,
   //assets
   ONLINE_ASSETS: false,
   ASSETS_PATH: "../assets/rbxasset/",
@@ -29933,7 +29858,6 @@ const FLAGS = {
   //does this count as anti aliasing?
   GEAR_ENABLED: true,
   AUDIO_ENABLED: true,
-  LEGACY_WELD_BEHAVIOR: false,
   USE_RENDERTARGET: true,
   AUTO_RESTORE_CONTEXT: true,
   RENDERTARGET_TO_CANVASTEXTURE: false,
@@ -29941,6 +29865,7 @@ const FLAGS = {
   ALWAYS_SHOW_ATTACHMENTS: false,
   //skeleton
   SHOW_SKELETON_HELPER: false,
+  SKELETON_HELPER_INSTANCE_NAME: void 0,
   UPDATE_SKELETON: true,
   ANIMATE_SKELETON: true,
   AUTO_SKIN_EVERYTHING: false,
@@ -30001,10 +29926,12 @@ class InstanceWrapper {
     if (this.instance.className !== this.static().className) {
       throw new Error(`Provided Instance is not a ${this.static().className}`);
     }
+    if (this.instance.wrapperInitialized) return;
     const propertyNames = this.instance.getPropertyNames();
     const hasAllProperties = this.static().requiredProperties.every((value) => propertyNames.includes(value));
     if (!hasAllProperties) {
       this.setup();
+      this.instance.wrapperInitialized = true;
       const newPropertyNames = this.instance.getPropertyNames();
       const hasAllProperties2 = this.static().requiredProperties.every((value) => newPropertyNames.includes(value));
       if (!hasAllProperties2) {
@@ -30052,7 +29979,7 @@ class InstanceWrapper {
   preRender() {
   }
 }
-const __vite_glob_0_11 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_13 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   GetWrapperForInstance,
   InstanceWrapper
@@ -30541,6 +30468,7 @@ class Instance {
   parent = void 0;
   destroyed = false;
   _hasWrappered = false;
+  wrapperInitialized = false;
   //private _canGC: boolean = true
   classID;
   //dont use this to identify instance class, it is only used during file loading
@@ -30551,6 +30479,7 @@ class Instance {
   Destroying = new Event();
   Changed = new Event();
   AncestryChanged = new Event();
+  referencedByChanged = new Event();
   constructor(className, notComplete = false) {
     this._id = lastInstanceId;
     lastInstanceId++;
@@ -30600,6 +30529,7 @@ class Instance {
     if (!this._referencedBy.includes(instance)) {
       this._referencedBy.push(instance);
     }
+    this.referencedByChanged.Fire();
   }
   removeReferencedBy(instance) {
     const index = this._referencedBy.indexOf(instance);
@@ -30613,9 +30543,13 @@ class Instance {
       }
       if (!isReferenced) {
         this._referencedBy.splice(index, 1);
+        this.referencedByChanged.Fire();
       }
     }
   }
+  getReferencedBy() {
+    return [...this._referencedBy];
+  }
   addProperty(property, value) {
     if (!property.name) {
       error(property);
@@ -30788,6 +30722,7 @@ class Instance {
     this.parent = instance;
     if (originalParent && originalParent !== instance) {
       originalParent.ChildRemoved.Fire(this);
+      originalParent.AncestryChanged.Fire(this);
     }
     if (instance) {
       instance._children.push(this);
@@ -30811,6 +30746,7 @@ class Instance {
     this.Destroying.Clear();
     this.Changed.Clear();
     this.AncestryChanged.Clear();
+    this.referencedByChanged.Clear();
     this.setParent(null);
     for (const child of this.GetChildren()) {
       child.Destroy();
@@ -30818,7 +30754,7 @@ class Instance {
     for (const property of this.getPropertyNames()) {
       this.setProperty(property, null);
     }
-    for (const instance of this._referencedBy) {
+    for (const instance of this.getReferencedBy()) {
       for (const propertyName of instance.getPropertyNames()) {
         if (instance.Property(propertyName) === this) {
           instance.setProperty(propertyName, null);
@@ -30892,6 +30828,13 @@ class Instance {
     }
     return lastChild;
   }
+  IsA(className) {
+    const wrapper = this.w;
+    if (wrapper) {
+      return wrapper.IsA(className);
+    }
+    return false;
+  }
   preRender() {
     const wrapper = GetWrapperForInstance(this);
     if (wrapper) {
@@ -34550,6 +34493,7 @@ class HSRAVIS {
   }
 }
 class FileMeshBone {
+  name;
   boneNameIndex = 0;
   //uint
   parentIndex = 0;
@@ -34561,14 +34505,24 @@ class FileMeshBone {
   rotationMatrix = [1, 0, 0, 0, 1, 0, 0, 0, 1];
   //3x3, world space, y up, -z forward
   position = [0, 0, 0];
+  //metadata so skeletondesc knows what autoskin has done
+  sourcePart;
+  sourceOffset = new CFrame();
+  sourceSize;
+  sourceScaled = [1, 1, 1];
   clone() {
     const copy = new FileMeshBone();
+    copy.name = this.name;
     copy.boneNameIndex = this.boneNameIndex;
     copy.parentIndex = this.parentIndex;
     copy.lodParentIndex = this.lodParentIndex;
     copy.culling = this.culling;
     copy.rotationMatrix = clonePrimitiveArray(this.rotationMatrix);
     copy.position = clonePrimitiveArray(this.position);
+    copy.sourcePart = this.sourcePart;
+    copy.sourceOffset = this.sourceOffset.clone();
+    if (this.sourceSize) copy.sourceSize = clonePrimitiveArray(this.sourceSize);
+    copy.sourceScaled = clonePrimitiveArray(this.sourceScaled);
     return copy;
   }
 }
@@ -34596,71 +34550,105 @@ class FileMeshSubset {
     return copy;
   }
 }
-class FileMeshSkinning {
-  subsetIndices = [0, 0, 0, 0];
-  //byte[4]
-  boneWeights = [0, 0, 0, 0];
-  //byte[4]
-  clone() {
-    const copy = new FileMeshSkinning();
-    copy.subsetIndices = clonePrimitiveArray(this.subsetIndices);
-    copy.boneWeights = clonePrimitiveArray(this.boneWeights);
-    return copy;
-  }
-}
 class SKINNING {
-  numSkinnings = 0;
-  //uint (same as numVerts)
-  skinnings = [];
-  //TODO: check if its actually here in the chunk format, im assuming MaximumADHD forgot to note it down because its not always present OR it was merged with vertices
-  numBones = 0;
-  //uint
+  _numskinnings = 0;
+  _indices = new Uint16Array();
+  _weights = new Float32Array();
   bones = [];
-  //FileMeshBone[]
-  nameTableSize = 0;
-  //uint
-  nameTable = [];
-  //string[]
-  numSubsets = 0;
-  //uint
-  subsets = [];
-  //FileMeshSubset[]
   clone() {
     const copy = new SKINNING();
-    copy.numSkinnings = this.numSkinnings;
-    copy.skinnings = new Array(this.skinnings.length);
-    for (let i = 0; i < this.skinnings.length; i++) {
-      copy.skinnings[i] = this.skinnings[i].clone();
-    }
-    copy.numBones = this.numBones;
+    copy._numskinnings = this._numskinnings;
+    copy._indices = this._indices.slice();
+    copy._weights = this._weights.slice();
     copy.bones = new Array(this.bones.length);
     for (let i = 0; i < this.bones.length; i++) {
       copy.bones[i] = this.bones[i].clone();
     }
-    copy.nameTableSize = this.nameTableSize;
-    copy.nameTable = clonePrimitiveArray(this.nameTable);
-    copy.numSubsets = this.numSubsets;
-    copy.subsets = new Array(this.subsets.length);
-    for (let i = 0; i < this.subsets.length; i++) {
-      copy.subsets[i] = this.subsets[i].clone();
-    }
     return copy;
   }
-  getBone(boneName) {
-    const boneIndex = this.nameTable.indexOf(boneName);
-    if (boneIndex > -1) {
-      return this.bones[boneIndex];
+  get numskinnings() {
+    return this._numskinnings;
+  }
+  set numskinnings(value) {
+    this._numskinnings = value;
+    this._indices = new Uint16Array(value * 4);
+    this._weights = new Float32Array(value * 4);
+  }
+  get indices() {
+    return this._indices;
+  }
+  get weights() {
+    return this._weights;
+  }
+  getIndex(i) {
+    return [
+      this._indices[i * 4 + 0],
+      this._indices[i * 4 + 1],
+      this._indices[i * 4 + 2],
+      this._indices[i * 4 + 3]
+    ];
+  }
+  setIndex(i, value) {
+    this._indices[i * 4 + 0] = value[0];
+    this._indices[i * 4 + 1] = value[1];
+    this._indices[i * 4 + 2] = value[2];
+    this._indices[i * 4 + 3] = value[3];
+  }
+  getWeight(i) {
+    return [
+      this._weights[i * 4 + 0],
+      this._weights[i * 4 + 1],
+      this._weights[i * 4 + 2],
+      this._weights[i * 4 + 3]
+    ];
+  }
+  setWeight(i, value) {
+    this._weights[i * 4 + 0] = value[0];
+    this._weights[i * 4 + 1] = value[1];
+    this._weights[i * 4 + 2] = value[2];
+    this._weights[i * 4 + 3] = value[3];
+  }
+  readSkinning(view, i) {
+    this.setIndex(i, [view.readUint8(), view.readUint8(), view.readUint8(), view.readUint8()]);
+    this.setWeight(i, [view.readUint8(), view.readUint8(), view.readUint8(), view.readUint8()]);
+  }
+  increaseSkinnings(add2) {
+    const newSize = this.numskinnings + add2;
+    const ogIndices = this._indices;
+    const ogWeights = this._weights;
+    this.numskinnings = newSize;
+    this._indices.set(ogIndices);
+    this._weights.set(ogWeights);
+  }
+  onlySkinnings(only) {
+    const newSize = only.length;
+    const ogIndices = this._indices;
+    const ogWeights = this._weights;
+    this.numskinnings = newSize;
+    for (let i = 0; i < only.length; i++) {
+      const j = only[i];
+      const ogIndex = [
+        ogIndices[j * 4 + 0],
+        ogIndices[j * 4 + 1],
+        ogIndices[j * 4 + 2],
+        ogIndices[j * 4 + 3]
+      ];
+      const ogWeight = [
+        ogWeights[j * 4 + 0],
+        ogWeights[j * 4 + 1],
+        ogWeights[j * 4 + 2],
+        ogWeights[j * 4 + 3]
+      ];
+      this.setIndex(i, ogIndex);
+      this.setWeight(i, ogWeight);
     }
   }
-  getSubsetIndex(vertIndex) {
-    for (let i = 0; i < this.subsets.length; i++) {
-      const subset = this.subsets[i];
-      if (subset.vertsBegin <= vertIndex && vertIndex < subset.vertsBegin + subset.vertsLength) {
-        return i;
+  getBone(name) {
+    for (const bone of this.bones) {
+      if (bone.name === name) {
+        return bone;
       }
     }
-    error(this);
-    throw new Error(`There is no subset for vert index ${vertIndex}`);
   }
 }
 class QuantizedMatrix {
@@ -34757,12 +34745,6 @@ function readBone(view) {
   bone.position = [view.readFloat32(), view.readFloat32(), view.readFloat32()];
   return bone;
 }
-function readSkinning(view) {
-  const skinning = new FileMeshSkinning();
-  skinning.subsetIndices = [view.readUint8(), view.readUint8(), view.readUint8(), view.readUint8()];
-  skinning.boneWeights = [view.readUint8(), view.readUint8(), view.readUint8(), view.readUint8()];
-  return skinning;
-}
 function readQuantizedMatrix(view) {
   const version = view.readUint16();
   const rows = view.readUint32();
@@ -34986,28 +34968,46 @@ class FileMesh {
   }
   readChunkSKINNING(view, version) {
     if (version !== 1) return;
-    this.skinning.numSkinnings = view.readUint32();
-    for (let i = 0; i < this.skinning.numSkinnings; i++) {
-      this.skinning.skinnings.push(readSkinning(view));
+    this.skinning.numskinnings = view.readUint32();
+    for (let i = 0; i < this.skinning.numskinnings; i++) {
+      this.skinning.readSkinning(view, i);
     }
-    this.skinning.numBones = view.readUint32();
-    for (let i = 0; i < this.skinning.numBones; i++) {
+    const numBones = view.readUint32();
+    for (let i = 0; i < numBones; i++) {
       this.skinning.bones.push(readBone(view));
     }
-    this.skinning.nameTableSize = view.readUint32();
+    const nameTableSize = view.readUint32();
+    const nameTable = [];
+    const nameTableIndex = [];
     let lastString = "";
-    for (let i = 0; i < this.skinning.nameTableSize; i++) {
+    for (let i = 0; i < nameTableSize; i++) {
       if (view.readUint8() !== 0) {
         view.viewOffset--;
         lastString += view.readUtf8String(1);
       } else {
-        this.skinning.nameTable.push(lastString);
+        nameTable.push(lastString);
+        nameTableIndex.push(i - lastString.length);
         lastString = "";
       }
     }
-    this.skinning.numSubsets = view.readUint32();
-    for (let i = 0; i < this.skinning.numSubsets; i++) {
-      this.skinning.subsets.push(readSubset(view));
+    for (const bone of this.skinning.bones) {
+      for (let i = 0; i < nameTable.length; i++) {
+        if (nameTableIndex[i] === bone.boneNameIndex) {
+          bone.name = nameTable[i];
+          break;
+        }
+      }
+    }
+    const numSubsets = view.readUint32();
+    for (let i = 0; i < numSubsets; i++) {
+      const subset = readSubset(view);
+      for (let i2 = subset.vertsBegin; i2 < subset.vertsBegin + subset.vertsLength; i2++) {
+        const indices = this.skinning.getIndex(i2);
+        const newIndices = indices.map((v) => {
+          return subset.boneIndices[v];
+        });
+        this.skinning.setIndex(i2, newIndices);
+      }
     }
   }
   readChunkHSRAVIS(view, version) {
@@ -35201,9 +35201,9 @@ class FileMesh {
         this.coreMesh.numverts = view.readUint32();
         this.coreMesh.numfaces = view.readUint32();
         this.lods.numLodOffsets = view.readUint16();
-        this.skinning.numBones = view.readUint16();
-        this.skinning.nameTableSize = view.readUint32();
-        this.skinning.numSubsets = view.readUint16();
+        const numBones = view.readUint16();
+        const nameTableSize = view.readUint32();
+        const numSubsets = view.readUint16();
         this.lods.numHighQualityLODs = view.readInt8();
         view.readInt8();
         if (version === "version 5.00\n") {
@@ -35213,9 +35213,10 @@ class FileMesh {
         for (let i = 0; i < this.coreMesh.numverts; i++) {
           this.coreMesh.readVert(i, view);
         }
-        if (this.skinning.numBones > 0) {
-          for (let i = 0; i < this.coreMesh.numverts; i++) {
-            this.skinning.skinnings.push(readSkinning(view));
+        if (numBones > 0) {
+          this.skinning.numskinnings = this.coreMesh.numverts;
+          for (let i = 0; i < this.skinning.numskinnings; i++) {
+            this.skinning.readSkinning(view, i);
           }
         }
         for (let i = 0; i < this.coreMesh.numfaces; i++) {
@@ -35224,21 +35225,39 @@ class FileMesh {
         for (let i = 0; i < this.lods.numLodOffsets; i++) {
           this.lods.lodOffsets.push(view.readUint32());
         }
-        for (let i = 0; i < this.skinning.numBones; i++) {
+        for (let i = 0; i < numBones; i++) {
           this.skinning.bones.push(readBone(view));
         }
+        const nameTable = [];
+        const nameTableIndex = [];
         let lastString = "";
-        for (let i = 0; i < this.skinning.nameTableSize; i++) {
+        for (let i = 0; i < nameTableSize; i++) {
           if (view.readUint8() !== 0) {
             view.viewOffset--;
             lastString += view.readUtf8String(1);
           } else {
-            this.skinning.nameTable.push(lastString);
+            nameTable.push(lastString);
+            nameTableIndex.push(i - lastString.length);
             lastString = "";
           }
         }
-        for (let i = 0; i < this.skinning.numSubsets; i++) {
-          this.skinning.subsets.push(readSubset(view));
+        for (const bone of this.skinning.bones) {
+          for (let i = 0; i < nameTable.length; i++) {
+            if (nameTableIndex[i] === bone.boneNameIndex) {
+              bone.name = nameTable[i];
+              break;
+            }
+          }
+        }
+        for (let i = 0; i < numSubsets; i++) {
+          const subset = readSubset(view);
+          for (let i2 = subset.vertsBegin; i2 < subset.vertsBegin + subset.vertsLength; i2++) {
+            const indices = this.skinning.getIndex(i2);
+            const newIndices = indices.map((v) => {
+              return subset.boneIndices[v];
+            });
+            this.skinning.setIndex(i2, newIndices);
+          }
         }
         if (version === "version 5.00\n" && this.facsDataFormat === 1 && this.sizeOfFacsData > 0) {
           this.facs = readFACS(view);
@@ -35259,6 +35278,9 @@ class FileMesh {
       warn(true, `Issue with parsed mesh: ${issue}`);
     }
     log(false, `Bytes left: ${view.view.byteLength - view.viewOffset}`);
+    if (this.skinning.numskinnings > 0) {
+      log(false, this.skinning);
+    }
   }
   stripLODS() {
     let facesEnd = this.coreMesh.numfaces;
@@ -35277,28 +35299,16 @@ class FileMesh {
   }
   padSkinnings() {
     const vertsLength = this.coreMesh.numverts;
-    const skinningsLength = this.skinning.skinnings.length;
+    const skinningsLength = this.skinning.numskinnings;
     const missingCount = vertsLength - skinningsLength;
-    for (let i = 0; i < missingCount; i++) {
-      this.skinning.skinnings.push(new FileMeshSkinning());
-    }
-    if (this.skinning.subsets.length === 0) {
-      const subset = new FileMeshSubset();
-      subset.boneIndices = new Array(26).fill(65535);
-      subset.boneIndices[0] = 0;
-      subset.vertsBegin = 0;
-      subset.vertsLength = this.coreMesh.numverts;
-      subset.facesBegin = 0;
-      subset.facesLength = this.coreMesh.numfaces;
-      subset.numBoneIndices = 1;
-      this.skinning.subsets.push(subset);
-    }
-    if (this.skinning.nameTable.length === 0) {
-      this.skinning.nameTable.push("Root");
-      this.skinning.nameTableSize = 4;
+    this.skinning.increaseSkinnings(missingCount);
+    for (let i = skinningsLength; i < vertsLength; i++) {
+      this.skinning.setIndex(i, [0, 0, 0, 0]);
+      this.skinning.setWeight(i, [0, 0, 0, 0]);
     }
     if (this.skinning.bones.length === 0) {
       const bone = new FileMeshBone();
+      bone.name = "Root";
       bone.boneNameIndex = 0;
       bone.lodParentIndex = 65535;
       bone.parentIndex = 65535;
@@ -35307,11 +35317,21 @@ class FileMesh {
       this.skinning.bones.push(bone);
     }
   }
+  setBoneSource(name) {
+    for (const bone of this.skinning.bones) {
+      bone.sourcePart = name;
+    }
+  }
+  setBoneSourceSize() {
+    for (const bone of this.skinning.bones) {
+      bone.sourceSize = this.size;
+    }
+  }
   combine(other) {
     this.stripLODS();
     other = other.clone();
     other.stripLODS();
-    if (this.skinning.skinnings.length > 0 || other.skinning.skinnings.length > 0) {
+    if (this.skinning.numskinnings > 0 || other.skinning.numskinnings > 0) {
       this.padSkinnings();
       other.padSkinnings();
     }
@@ -35335,8 +35355,7 @@ class FileMesh {
     }
     const boneIndexMap = /* @__PURE__ */ new Map();
     for (const bone of other.skinning.bones) {
-      const boneName = other.skinning.nameTable[other.skinning.bones.indexOf(bone)];
-      const foundBone = this.skinning.getBone(boneName);
+      const foundBone = bone.name ? this.skinning.getBone(bone.name) : void 0;
       if (bone.parentIndex >= 65535) {
         boneIndexMap.set(other.skinning.bones.indexOf(bone), 0);
         continue;
@@ -35345,8 +35364,8 @@ class FileMesh {
         boneIndexMap.set(other.skinning.bones.indexOf(bone), this.skinning.bones.indexOf(foundBone));
       } else {
         const parentBone = other.skinning.bones[bone.parentIndex];
-        const parentName = other.skinning.nameTable[other.skinning.bones.indexOf(parentBone)];
-        const foundParentBone = this.skinning.getBone(parentName);
+        const parentName = parentBone.name;
+        const foundParentBone = parentName ? this.skinning.getBone(parentName) : void 0;
         const boneCopy = bone.clone();
         boneCopy.parentIndex = 65535;
         boneCopy.lodParentIndex = 65535;
@@ -35355,31 +35374,20 @@ class FileMesh {
           boneCopy.parentIndex = foundParentIndex;
           boneCopy.lodParentIndex = foundParentIndex;
         }
-        this.skinning.nameTable.push(boneName);
         this.skinning.bones.push(boneCopy);
         boneIndexMap.set(other.skinning.bones.indexOf(bone), this.skinning.bones.length - 1);
       }
     }
-    for (const subset of other.skinning.subsets) {
-      const newSubset = subset.clone();
-      newSubset.facesBegin += facesLength;
-      newSubset.vertsBegin += vertsLength;
-      for (let i = 0; i < newSubset.boneIndices.length; i++) {
-        const index = newSubset.boneIndices[i];
-        const newIndex = boneIndexMap.get(index);
-        if (index >= 65535) {
-          continue;
-        }
-        if (newIndex === void 0) {
-          throw new Error(`Bone ${index} is missing mapping`);
-        }
-        newSubset.boneIndices[i] = newIndex;
-      }
-      this.skinning.subsets.push(newSubset);
-    }
-    for (const skinning of other.skinning.skinnings) {
-      const newSkinning = skinning.clone();
-      this.skinning.skinnings.push(newSkinning);
+    const ogSkinningsSize = this.skinning.numskinnings;
+    this.skinning.increaseSkinnings(other.skinning.numskinnings);
+    for (let i = 0; i < other.skinning.numskinnings; i++) {
+      this.skinning.setIndex(
+        ogSkinningsSize + i,
+        other.skinning.getIndex(i).map((v) => {
+          return boneIndexMap.get(v);
+        })
+      );
+      this.skinning.setWeight(ogSkinningsSize + i, other.skinning.getWeight(i));
     }
   }
   removeDuplicateVertices(distance2 = 1e-4) {
@@ -35389,9 +35397,6 @@ class FileMesh {
     for (let i = 0; i < this.coreMesh.numverts; i++) {
       const pos = this.coreMesh.getPos(i);
       const uv = this.coreMesh.getUV(i);
-      if (this.skinning.subsets.length > 0) {
-        vertToSubset[i] = this.skinning.getSubsetIndex(i);
-      }
       const hash = hashVec3(pos[0], pos[1], pos[2], distance2) + hashVec2(uv[0], uv[1]);
       const existing = posToIndex.get(hash);
       if (existing !== void 0) {
@@ -35419,10 +35424,7 @@ class FileMesh {
         newIndex.set(canonical, newVerts.length);
         newVerts.push(canonical);
         newSubsetIndices.push(vertToSubset[i]);
-        const skinning = this.skinning.skinnings[canonical];
-        if (skinning) {
-          newSkinnings.push(skinning);
-        }
+        newSkinnings.push(canonical);
       }
       remap[i] = newIndex.get(canonical);
     }
@@ -35430,22 +35432,8 @@ class FileMesh {
       const remapFace = this.coreMesh.getFace(remap[i]);
       this.coreMesh.setFace(i, clonePrimitiveArray(remapFace));
     }
-    if (this.skinning.subsets.length > 0) {
-      for (const subset of this.skinning.subsets) {
-        subset.vertsBegin = Infinity;
-        subset.vertsLength = 0;
-      }
-      for (let i = 0; i < newVerts.length; i++) {
-        const subsetIndex = newSubsetIndices[i];
-        const subset = this.skinning.subsets[subsetIndex];
-        if (subset.vertsBegin > i) {
-          subset.vertsBegin = i;
-        }
-        subset.vertsLength += 1;
-      }
-    }
     this.coreMesh.onlyVerts(newVerts);
-    this.skinning.skinnings = newSkinnings;
+    this.skinning.onlySkinnings(newSkinnings);
     return newVerts.length;
   }
   /*removeFace(index: number) {
@@ -35462,29 +35450,15 @@ class FileMesh {
   }
   basicSkin(boneNames) {
     this.skinning = new SKINNING();
-    this.skinning.skinnings = new Array(this.coreMesh.numverts);
+    this.skinning.numskinnings = this.coreMesh.numverts;
     this.skinning.bones = new Array(boneNames.length);
-    this.skinning.nameTable = boneNames.slice();
-    this.skinning.numSkinnings = this.coreMesh.numverts;
-    this.skinning.numSubsets = 1;
-    this.skinning.numBones = boneNames.length;
-    const subset = new FileMeshSubset();
-    subset.boneIndices = new Array(26).fill(65535);
-    subset.boneIndices[0] = boneNames.length - 1;
-    subset.vertsBegin = 0;
-    subset.vertsLength = this.coreMesh.numverts;
-    subset.facesBegin = 0;
-    subset.facesLength = this.coreMesh.numverts;
-    subset.numBoneIndices = 1;
-    this.skinning.subsets = [subset];
     for (let i = 0; i < this.coreMesh.numverts; i++) {
-      const skinning = new FileMeshSkinning();
-      skinning.boneWeights = [255, 0, 0, 0];
-      skinning.subsetIndices = [0, 0, 0, 0];
-      this.skinning.skinnings[i] = skinning;
+      this.skinning.setIndex(i, [boneNames.length - 1, 0, 0, 0]);
+      this.skinning.setWeight(i, [255, 0, 0, 0]);
     }
     for (let i = 0; i < boneNames.length; i++) {
       const bone = new FileMeshBone();
+      bone.name = boneNames[i];
       bone.parentIndex = i - 1;
       if (bone.parentIndex < 0) {
         bone.parentIndex = 65535;
@@ -35496,15 +35470,6 @@ class FileMesh {
     }
   }
   getValidationIssue() {
-    if (this.skinning.skinnings.length > 0) {
-      let totalSubsetVerts = 0;
-      for (const subset of this.skinning.subsets) {
-        totalSubsetVerts += subset.vertsLength;
-      }
-      if (totalSubsetVerts !== this.skinning.skinnings.length) {
-        return "subsetLengthMismatch";
-      }
-    }
     return void 0;
   }
 }
@@ -35657,7 +35622,7 @@ async function RBLXPost(url, auth, body, attempt = 0, method = "POST") {
       "X-CSRF-TOKEN": xCsrfToken
     });
     try {
-      fetch(FLAGS.API_REQUEST_PREFIX + url, {
+      (FLAGS.FETCH_FUNC || fetch)(FLAGS.API_REQUEST_PREFIX + url, {
         method,
         credentials: FLAGS.INCLUDE_REQUEST_CREDENTIALS_OVERRIDE,
         headers: fetchHeaders,
@@ -35707,7 +35672,7 @@ async function RBLXGet(url, headers, includeCredentials = true, attempt = 0) {
     }
     const fetchHeaders = new Headers(newHeaders);
     try {
-      fetch(FLAGS.API_REQUEST_PREFIX + url, {
+      (FLAGS.FETCH_FUNC || fetch)(FLAGS.API_REQUEST_PREFIX + url, {
         credentials: includeCredentials ? FLAGS.INCLUDE_REQUEST_CREDENTIALS_OVERRIDE : void 0,
         headers: fetchHeaders,
         priority: FLAGS.ASSET_REQUEST_PRIORITY
@@ -36282,6 +36247,13 @@ const API = {
         return promise;
       }
     },
+    /**
+     * Remember to call .Destroy() on the Instance returned by RBX.generateTree() to avoid memory leaks
+     * @param url 
+     * @param headers 
+     * @param contentRepresentationPriorityList 
+     * @returns 
+     */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     GetRBX: async function(url, headers, contentRepresentationPriorityList) {
       const fetchStr = url;
@@ -36359,6 +36331,7 @@ const API = {
           }
         }
         CACHE.IsLayered.set(id, hasWrapLayer);
+        dataModel.Destroy();
         return hasWrapLayer;
       } else {
         warn(true, "Failed to get accessory");
@@ -36463,6 +36436,18 @@ const API = {
     }
     //https://apis.roblox.com/marketplace-widgets/v1/pills
   },
+  "Develop": {
+    GetLatestVersions: async function(auth, assetIds) {
+      const response = await RBLXPost("https://develop.roblox.com/v1/assets/latest-versions", auth, {
+        assetIds,
+        versionStatus: "Any"
+      });
+      if (response.status !== 200) {
+        return response;
+      }
+      return await response.json();
+    }
+  },
   "Inventory": {
     GetInventory: async function(userId, assetType, cursor) {
       let requestUrl = `https://inventory.roblox.com/v2/users/${userId}/inventory/${assetType}?sortOrder=Desc&limit=100`;
@@ -41204,6 +41189,210 @@ class RenderDesc extends DisposableDesc {
     return this.constructor;
   }
 }
+function getPartAssemblyScore(part) {
+  let score = 0;
+  if (part.PropOrDefault("Name", "Part") === "HumanoidRootPart") {
+    score += 1e6;
+  }
+  if (part.PropOrDefault("Anchored", false)) {
+    score += 1e5;
+  }
+  if (part.PropOrDefault("Massless", false)) {
+    score += 1e4;
+  }
+  const size = part.PropOrDefault("size", new Vector32(0, 0, 0));
+  score += size.X * size.Y * size.Z;
+  return score;
+}
+function getPartsInAssembly_Generate(part) {
+  const inAssembly = [];
+  let toCheck = [part];
+  while (toCheck.length > 0) {
+    const newToCheck = [];
+    for (const part2 of toCheck) {
+      const connected = part2.w.GetConnectedParts();
+      for (const connect of connected) {
+        if (!inAssembly.includes(connect)) {
+          inAssembly.push(connect);
+          newToCheck.push(connect);
+        }
+      }
+    }
+    toCheck = newToCheck;
+  }
+  return inAssembly;
+}
+function getRootAssemblyPart_Generate(part) {
+  const parts = getPartsInAssembly_Generate(part);
+  let highestScore = -1;
+  let highestPart = part;
+  for (const part2 of parts) {
+    const score = getPartAssemblyScore(part2);
+    if (score > highestScore) {
+      highestScore = score;
+      highestPart = part2;
+    }
+  }
+  return highestPart;
+}
+class AssemblyNode {
+  depth;
+  nodes = [];
+  part;
+  children = [];
+  connectors = [];
+  parent;
+  assembly;
+  traversedRestCFrame = new CFrame();
+  traversedTransformCFrame = new CFrame();
+  constructor(assembly, parent, depth, part, already = []) {
+    this.assembly = assembly;
+    this.parent = parent;
+    this.depth = depth;
+    this.part = part;
+    if (part.IsA("BasePart")) {
+      const w = part.w;
+      w.data.assemblyNode = this;
+    }
+    const connected = part.w.GetConnectedParts();
+    for (const connect of connected) {
+      if (!already.includes(connect)) {
+        this.children.push(connect);
+      }
+    }
+    const jointConnectors = part.w.GetConnectors();
+    this.connectors = jointConnectors;
+  }
+  getNodeChildren() {
+    return this.nodes;
+  }
+  getNodeDescendants() {
+    let descendants = [...this.getNodeChildren()];
+    for (const child of this.getNodeChildren()) {
+      descendants = descendants.concat(child.getNodeDescendants());
+    }
+    return descendants;
+  }
+  getParentConnector() {
+    if (this.parent instanceof Assembly) return;
+    for (const connector of this.connectors) {
+      if (this.parent.connectors.includes(connector)) {
+        return connector;
+      }
+    }
+  }
+  getConnectorOffset(includeTransform) {
+    const parentConnector = this.getParentConnector();
+    if (!parentConnector) return new CFrame();
+    if (parentConnector.Prop("Part0") === this.part) {
+      return parentConnector.Prop("C0");
+    } else if (parentConnector.Prop("Part1") === this.part) {
+      const transform = includeTransform ? parentConnector.PropOrDefault("Transform", new CFrame()) : new CFrame();
+      return parentConnector.Prop("C1").multiply(transform).inverse();
+    }
+    return new CFrame();
+  }
+  _traverseTree(transform, rest) {
+    const parentConnector = this.getParentConnector();
+    if (parentConnector) {
+      const w = parentConnector.w;
+      transform = transform.multiply(w.getAssemblyOffset(true));
+      rest = rest.multiply(w.getAssemblyOffset(false));
+    }
+    this.traversedTransformCFrame = transform.clone();
+    this.traversedRestCFrame = rest.clone();
+    this.part.setProperty("CFrame", this.assembly.traverseCFrame(this, true, true));
+    for (const node of this.nodes) {
+      node._traverseTree(transform, rest);
+    }
+  }
+  /**
+   * Should only be called when destroying entire assembly by calling Assembly.destroy()
+   */
+  destroy() {
+    if (this.part.IsA("BasePart")) {
+      const w = this.part.w;
+      w.data.assemblyNode = void 0;
+    }
+  }
+}
+let lastAssemblyId = 0;
+class Assembly {
+  id = lastAssemblyId++;
+  rootNode;
+  allNodes;
+  allConnectors;
+  constructor(rootPart) {
+    const checked = [rootPart];
+    let depth = 0;
+    this.rootNode = new AssemblyNode(this, this, 0, rootPart, checked);
+    let toCheckNodes = [this.rootNode];
+    while (toCheckNodes.length > 0) {
+      depth += 1;
+      const newToCheckNodes = [];
+      for (const toCheck of toCheckNodes) {
+        for (const child of toCheck.children) {
+          const childNode = new AssemblyNode(this, toCheck, depth, child, checked);
+          checked.push(child);
+          newToCheckNodes.push(childNode);
+          toCheck.nodes.push(childNode);
+        }
+      }
+      toCheckNodes = newToCheckNodes;
+    }
+    this.traverseTree();
+  }
+  getNodeDescendants() {
+    if (!this.allNodes) {
+      this.allNodes = [this.rootNode, ...this.rootNode.getNodeDescendants()];
+    }
+    return this.allNodes;
+  }
+  getPartDescendants() {
+    return this.getNodeDescendants().map((v) => {
+      return v.part;
+    });
+  }
+  getAllConnectors() {
+    if (!this.allConnectors) {
+      this.allConnectors = [];
+      for (const node of this.getNodeDescendants()) {
+        this.allConnectors.push(...node.connectors);
+      }
+    }
+    return this.allConnectors;
+  }
+  getNode(name) {
+    for (const node of this.getNodeDescendants()) {
+      if (node.part.Prop("Name") === name) {
+        return node;
+      }
+    }
+  }
+  getPart(name) {
+    return this.getNode(name)?.part;
+  }
+  traverseTree() {
+    this.rootNode._traverseTree(new CFrame(), new CFrame());
+  }
+  traverseCFrame(node, includeTransform, applyRoot = false) {
+    const traversedCF = includeTransform ? node.traversedTransformCFrame : node.traversedRestCFrame;
+    let finalCF = traversedCF.clone();
+    if (applyRoot) {
+      finalCF = this.rootNode.part.Prop("CFrame").multiply(finalCF);
+    }
+    return finalCF;
+  }
+  traverseInstance(node) {
+    return traverseRigInstance(node.part);
+  }
+  destroy() {
+    const descendants = this.getNodeDescendants();
+    for (const descendant of descendants) {
+      descendant.destroy();
+    }
+  }
+}
 class AccessoryWrapper extends InstanceWrapper {
   static className = "Accessory";
   static requiredProperties = [
@@ -41267,18 +41456,31 @@ const __vite_glob_0_0$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.d
   __proto__: null,
   AccessoryWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-class AnimationConstraintWrapper extends InstanceWrapper {
-  static className = "AnimationConstraint";
+class ConstraintWrapper extends InstanceWrapper {
+  static className = "Constraint";
   static requiredProperties = [
     "Name",
     "Attachment0",
-    "Attachment1",
-    "Transform"
+    "Attachment1"
   ];
   setup() {
     if (!this.instance.HasProperty("Name")) this.instance.addProperty(new Property("Name", DataType.String), this.instance.className);
     if (!this.instance.HasProperty("Attachment0")) this.instance.addProperty(new Property("Attachment0", DataType.Referent), void 0);
     if (!this.instance.HasProperty("Attachment1")) this.instance.addProperty(new Property("Attachment1", DataType.Referent), void 0);
+  }
+}
+const __vite_glob_0_9 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  ConstraintWrapper
+}, Symbol.toStringTag, { value: "Module" }));
+class AnimationConstraintWrapper extends ConstraintWrapper {
+  static className = "AnimationConstraint";
+  static requiredProperties = [
+    ...super.requiredProperties,
+    "Transform"
+  ];
+  setup() {
+    super.setup();
     if (!this.instance.HasProperty("Transform")) this.instance.addProperty(new Property("Transform", DataType.CFrame), new CFrame());
   }
 }
@@ -42141,7 +42343,7 @@ function calculateMotor6Doffset(motor, includeTransform = false) {
   const finalCF = C0.multiply(offset1);
   return finalCF;
 }
-function traverseRigCFrame(instance, includeTransform = false, applyRoot = false) {
+function traverseRigCFrameNoAssembly(instance, includeTransform = false, applyRoot = false) {
   const motors = [];
   let lastInstance = instance;
   let lastMotor6D = void 0;
@@ -42221,6 +42423,35 @@ function traverseRigCFrame(instance, includeTransform = false, applyRoot = false
   }
   return finalCF;
 }
+function traverseRigCFrameAssembly(instance, includeTransform = false, applyRoot = false) {
+  const motors = [];
+  let assemblyNode = instance.w.GetAssemblyNode();
+  while (!(assemblyNode.parent instanceof Assembly)) {
+    for (const connector of assemblyNode.connectors) {
+      if (assemblyNode.parent.connectors.includes(connector)) {
+        motors.push(connector);
+        break;
+      }
+    }
+    assemblyNode = assemblyNode.parent;
+  }
+  motors.reverse();
+  let finalCF = new CFrame();
+  for (const motor of motors) {
+    finalCF = finalCF.multiply(calculateMotor6Doffset(motor, includeTransform));
+  }
+  if (applyRoot) {
+    finalCF = assemblyNode.assembly.rootNode.part.Prop("CFrame").multiply(finalCF);
+  }
+  return finalCF;
+}
+function traverseRigCFrame(instance, includeTransform = false, applyRoot = false) {
+  if (FLAGS.USE_ASSEMBLY) {
+    return traverseRigCFrameAssembly(instance, includeTransform, applyRoot);
+  } else {
+    return traverseRigCFrameNoAssembly(instance, includeTransform, applyRoot);
+  }
+}
 function traverseRigInstanceOld(instance) {
   const children = [];
   let lastMotor6D = instance.FindFirstChildOfClass("Motor6D");
@@ -42238,7 +42469,7 @@ function traverseRigInstanceOld(instance) {
   children.reverse();
   return children;
 }
-function traverseRigInstance(instance) {
+function traverseRigInstanceNoAssembly(instance) {
   const children = [];
   let lastMotor6D = void 0;
   if (instance.className === "Motor6D" || instance.className === "Weld") {
@@ -42304,6 +42535,23 @@ function traverseRigInstance(instance) {
   children.reverse();
   return children;
 }
+function traverseRigInstanceAssembly(instance) {
+  const children = [];
+  let assemblyNode = instance.w.GetAssemblyNode();
+  while (!(assemblyNode.parent instanceof Assembly)) {
+    children.push(assemblyNode.part);
+    assemblyNode = assemblyNode.parent;
+  }
+  children.reverse();
+  return children;
+}
+function traverseRigInstance(instance) {
+  if (FLAGS.USE_ASSEMBLY) {
+    return traverseRigInstanceAssembly(instance);
+  } else {
+    return traverseRigInstanceNoAssembly(instance);
+  }
+}
 const modelLayers = /* @__PURE__ */ new Map();
 function arrIsSameVector3(arr0, arr1) {
   if (arr0.length !== arr1.length) {
@@ -42506,6 +42754,12 @@ class ModelLayersDesc {
     }
     return true;
   }
+  getTargetName(i) {
+    if (!this.targetParents) throw new Error("this.targetParents is missing");
+    const targetParents = this.targetParents[i];
+    const targetName = targetParents[targetParents.length - 1];
+    return targetName;
+  }
   fromModel(model) {
     this.targetMeshes = [];
     this.targetCages = [];
@@ -42607,12 +42861,14 @@ class ModelLayersDesc {
     }
     for (let i = 0; i < this.targetMeshes.length; i++) {
       const targetMesh = meshMap.get(this.targetMeshes[i]);
-      if (targetMesh.skinning.skinnings.length < 1) {
+      if (targetMesh.skinning.numskinnings < 1) {
         targetMesh.basicSkin(this.targetParents[i]);
       }
       const targetCage = meshMap.get(this.targetCages[i]);
       targetCage.removeDuplicateVertices();
       inheritSkeleton(targetCage, targetMesh);
+      targetCage.setBoneSource(this.getTargetName(i));
+      targetCage.setBoneSourceSize();
     }
     const distDeformer = this.targetDeformers[0];
     const dist_mesh = distDeformer ? meshMap.get(distDeformer.targetCage).clone() : meshMap.get(this.targetCages[0]).clone();
@@ -43047,32 +43303,25 @@ function fileMeshToTHREEGeometry(mesh, canIncludeSkinning = true, forceVertexCol
   const toUseIndices = mesh.coreMesh.getIndices().subarray(facesStart * 3, facesEnd * 3);
   geometry.setIndex(new BufferAttribute(toUseIndices, 1));
   const meshSkinning = mesh.skinning;
-  if (meshSkinning && meshSkinning.subsets.length > 0 && canIncludeSkinning) {
-    const skinIndices = new Uint16Array(meshSkinning.skinnings.length * 4);
-    const skinWeights = new Float32Array(meshSkinning.skinnings.length * 4);
-    const hasRootBone = meshSkinning.nameTable.includes("Root") || meshSkinning.nameTable.includes("root");
-    for (const subset of meshSkinning.subsets) {
-      for (let i = subset.vertsBegin; i < subset.vertsBegin + subset.vertsLength; i++) {
-        const skinning = meshSkinning.skinnings[i];
-        skinWeights[i * 4 + 0] = skinning.boneWeights[0] / 255;
-        skinWeights[i * 4 + 1] = skinning.boneWeights[1] / 255;
-        skinWeights[i * 4 + 2] = skinning.boneWeights[2] / 255;
-        skinWeights[i * 4 + 3] = skinning.boneWeights[3] / 255;
-        if (subset.boneIndices[skinning.subsetIndices[0]] >= 65535 || subset.boneIndices[skinning.subsetIndices[1]] >= 65535 || subset.boneIndices[skinning.subsetIndices[2]] >= 65535 || subset.boneIndices[skinning.subsetIndices[3]] >= 65535) {
-          error(mesh);
-          error(subset);
-          error(skinning);
-          throw new Error("mesh is invalid");
-        }
-        const index0 = subset.boneIndices[skinning.subsetIndices[0]];
-        const index1 = subset.boneIndices[skinning.subsetIndices[1]];
-        const index2 = subset.boneIndices[skinning.subsetIndices[2]];
-        const index3 = subset.boneIndices[skinning.subsetIndices[3]];
-        skinIndices[i * 4 + 0] = !hasRootBone && index0 > 0 ? index0 + 1 : index0;
-        skinIndices[i * 4 + 1] = !hasRootBone && index1 > 0 ? index1 + 1 : index1;
-        skinIndices[i * 4 + 2] = !hasRootBone && index2 > 0 ? index2 + 1 : index2;
-        skinIndices[i * 4 + 3] = !hasRootBone && index3 > 0 ? index3 + 1 : index3;
-      }
+  if (meshSkinning && meshSkinning.numskinnings > 0 && canIncludeSkinning) {
+    const skinIndices = meshSkinning.indices.slice();
+    const skinWeights = meshSkinning.weights.slice();
+    const hasRootBone = meshSkinning.getBone("Root") !== void 0 || meshSkinning.getBone("root") !== void 0;
+    for (let i = 0; i < meshSkinning.numskinnings; i++) {
+      const boneWeights = meshSkinning.getWeight(i);
+      const boneIndices = meshSkinning.getIndex(i);
+      skinWeights[i * 4 + 0] = boneWeights[0] / 255;
+      skinWeights[i * 4 + 1] = boneWeights[1] / 255;
+      skinWeights[i * 4 + 2] = boneWeights[2] / 255;
+      skinWeights[i * 4 + 3] = boneWeights[3] / 255;
+      const index0 = boneIndices[0];
+      const index1 = boneIndices[1];
+      const index2 = boneIndices[2];
+      const index3 = boneIndices[3];
+      skinIndices[i * 4 + 0] = !hasRootBone && index0 > 0 ? index0 + 1 : index0;
+      skinIndices[i * 4 + 1] = !hasRootBone && index1 > 0 ? index1 + 1 : index1;
+      skinIndices[i * 4 + 2] = !hasRootBone && index2 > 0 ? index2 + 1 : index2;
+      skinIndices[i * 4 + 3] = !hasRootBone && index3 > 0 ? index3 + 1 : index3;
     }
     geometry.setAttribute("skinIndex", new Uint16BufferAttribute(skinIndices, 4));
     geometry.setAttribute("skinWeight", new Float32BufferAttribute(skinWeights, 4));
@@ -43113,6 +43362,7 @@ class MeshDesc {
   instance;
   fileMesh;
   wasAutoSkinned = false;
+  wasDeformed = false;
   dispose() {
     this.instance = void 0;
   }
@@ -43291,14 +43541,13 @@ class MeshDesc {
         }
         if (FLAGS.SHOW_CAGE) {
           the_ref_mesh = dist_mesh;
-          the_ref_mesh.skinning.skinnings = [];
+          the_ref_mesh.skinning.numskinnings = 0;
           the_ref_mesh.skinning.bones = [];
-          the_ref_mesh.skinning.subsets = [];
         }
         const layeredClothingCacheId = `${this.mesh}-${this.layerDesc.reference}`;
         switch (FLAGS.LAYERED_CLOTHING_ALGORITHM) {
           case "rbf": {
-            const shouldAutoSkin = this.layerDesc.autoSkin === WrapLayerAutoSkin.EnabledOverride || this.layerDesc.autoSkin === WrapLayerAutoSkin.EnabledPreserve && mesh.skinning.skinnings.length < 1 || mesh.skinning.skinnings.length <= 0;
+            const shouldAutoSkin = this.layerDesc.autoSkin === WrapLayerAutoSkin.EnabledOverride || this.layerDesc.autoSkin === WrapLayerAutoSkin.EnabledPreserve && mesh.skinning.numskinnings < 1 || mesh.skinning.numskinnings <= 0;
             if (FLAGS.AUTO_SKIN_EVERYTHING || shouldAutoSkin) {
               this.wasAutoSkinned = true;
               const transferTo = ref_mesh.clone();
@@ -43310,6 +43559,7 @@ class MeshDesc {
               noDeformation = true;
             }
             rbfDeformer.affectBones = FLAGS.USE_LOCAL_SKELETONDESC;
+            this.wasDeformed = true;
             await rbfDeformer.solveAsync();
             rbfDeformer.deformMesh();
             break;
@@ -43442,7 +43692,7 @@ class MeshDesc {
     let mesh = void 0;
     mesh = await this.getMesh();
     if (mesh instanceof Response) return mesh;
-    if (!mesh.facs && this.headMesh && mesh.skinning.skinnings.length > 0) {
+    if (!mesh.facs && this.headMesh && mesh.skinning.numskinnings > 0) {
       const headMesh = await API.Asset.GetMesh(this.headMesh, void 0, true);
       if (headMesh instanceof Response) {
         warn(true, "Failed to get headMesh for compileMesh", headMesh);
@@ -43554,26 +43804,6 @@ class MeshDesc {
     const meshIdStr = child.Property("MeshId");
     this.mesh = meshIdStr;
     this.scaleIsRelative = true;
-    if (!FLAGS.AVATAR_JOINT_UPGRADE) {
-      if (child.FindFirstChildOfClass("Bone")) {
-        this.canHaveSkinning = false;
-      } else {
-        if (child.Prop("Name").includes("Arm")) {
-          const rig = child.parent;
-          if (rig) {
-            const humanoid = rig.FindFirstChildOfClass("Humanoid");
-            if (humanoid) {
-              const side = child.Prop("Name").startsWith("Right") ? "Right" : "Left";
-              const handName = side + "Hand";
-              const hand = rig.FindFirstChild(handName);
-              if (hand && hand.FindFirstChildOfClass("Bone")) {
-                this.canHaveSkinning = false;
-              }
-            }
-          }
-        }
-      }
-    }
     const surfaceAppearance = child.FindLastChildOfClass("SurfaceAppearance");
     if (surfaceAppearance) {
       const color = surfaceAppearance.HasProperty("Color") ? surfaceAppearance.Prop("Color") : new Color3(1, 1, 1);
@@ -44933,6 +45163,84 @@ class MaterialDesc {
     }
   }
 }
+class BasePartWrapperData {
+  assemblyNode;
+}
+class BasePartWrapper extends InstanceWrapper {
+  static className = "BasePart";
+  static requiredProperties = [
+    "Name",
+    "CFrame",
+    "size",
+    "Transparency",
+    "_data"
+  ];
+  setup() {
+    if (!this.instance.HasProperty("Name")) this.instance.addProperty(new Property("Name", DataType.String), this.instance.className);
+    if (!this.instance.HasProperty("CFrame")) this.instance.addProperty(new Property("CFrame", DataType.CFrame), new CFrame());
+    if (!this.instance.HasProperty("size")) this.instance.addProperty(new Property("size", DataType.Vector3), new Vector32());
+    if (!this.instance.HasProperty("Transparency")) this.instance.addProperty(new Property("Transparency", DataType.Float32), 0);
+    if (!this.instance.HasProperty("_data")) this.instance.addProperty(new Property("_data", DataType.NonSerializable), new BasePartWrapperData());
+  }
+  get data() {
+    return this.instance.Prop("_data");
+  }
+  created() {
+    const destroyAssembly = () => {
+      if (this.data.assemblyNode) {
+        this.data.assemblyNode.assembly.destroy();
+      }
+    };
+    this.instance.referencedByChanged.Connect(destroyAssembly);
+    this.instance.AncestryChanged.Connect(destroyAssembly);
+    this.instance.ChildRemoved.Connect(destroyAssembly);
+    this.instance.Destroying.Connect(destroyAssembly);
+  }
+  preRender() {
+    if (FLAGS.USE_ASSEMBLY) {
+      const assemblyNode = this.GetAssemblyNode();
+      if (assemblyNode.depth === 0) {
+        assemblyNode.assembly.traverseTree();
+      }
+    }
+  }
+  GetAssemblyNode() {
+    if (this.data.assemblyNode) return this.data.assemblyNode;
+    const rootPart = getRootAssemblyPart_Generate(this.instance);
+    new Assembly(rootPart);
+    return this.data.assemblyNode;
+  }
+  GetAssembly() {
+    return this.GetAssemblyNode().assembly;
+  }
+  GetConnectors() {
+    const connectors = [];
+    const references = this.instance.getReferencedBy();
+    for (const reference of references) {
+      if (reference.IsA("JointInstance")) {
+        connectors.push(reference);
+      }
+    }
+    return connectors;
+  }
+  GetConnectedParts() {
+    const connected = [];
+    const references = this.instance.getReferencedBy();
+    for (const reference of references) {
+      if (reference.IsA("JointInstance")) {
+        const part0 = reference.Prop("Part0");
+        const part1 = reference.Prop("Part1");
+        if (part0 && part0 !== this.instance && part0.IsA("BasePart")) connected.push(part0);
+        if (part1 && part1 !== this.instance && part1.IsA("BasePart")) connected.push(part1);
+      }
+    }
+    return connected;
+  }
+}
+const __vite_glob_0_5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  BasePartWrapper
+}, Symbol.toStringTag, { value: "Module" }));
 class FaceControlsWrapper extends InstanceWrapper {
   static className = "FaceControls";
   static requiredProperties = ["Name", ...FaceControlNames];
@@ -44945,27 +45253,12 @@ class FaceControlsWrapper extends InstanceWrapper {
     }
   }
 }
-const __vite_glob_0_9 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_11 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   FaceControlsWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-const BaseR15Bones = ["Root", "HumanoidRootNode", "LowerTorso", "UpperTorso", "RightUpperArm", "RightLowerArm", "RightHand", "LeftUpperArm", "LeftLowerArm", "LeftHand", "Head", "DynamicHead"];
-function getJointForInstances$1(parent, child, includeTransform) {
-  const childMotor = child.FindFirstChildOfClass("Motor6D");
-  const parentMotor = parent.FindFirstChildOfClass("Motor6D");
-  let transform = new CFrame();
-  if (childMotor) {
-    if (includeTransform) {
-      transform = childMotor.Prop("Transform");
-    }
-    let initalCF = new CFrame();
-    if (parentMotor) {
-      initalCF = parentMotor.Prop("C1").inverse();
-    }
-    const jointCF = initalCF.multiply(childMotor.Prop("C0")).multiply(transform.inverse());
-    return jointCF;
-  }
-  return new CFrame();
+function diffCFrame(parent, child) {
+  return parent.inverse().multiply(child);
 }
 function boneIsChildOf(bone, parentName) {
   let nextParent = bone.parent;
@@ -44977,73 +45270,16 @@ function boneIsChildOf(bone, parentName) {
   }
   return false;
 }
-function getBoneBaseR15Parent(bone) {
-  let currentParent = bone.parent;
-  if (!currentParent) return;
-  while (currentParent && !BaseR15Bones.includes(currentParent.name)) {
-    currentParent = currentParent.parent;
-  }
-  if (!currentParent) {
-    return bone.parent;
-  } else {
-    return currentParent;
-  }
-}
-function boneIsBaseR15(bone) {
-  return BaseR15Bones.includes(bone.name);
-}
-function getMotorsInRig(rigChildren) {
-  const motors = [];
-  for (const child of rigChildren) {
-    for (const motor of child.GetChildren()) {
-      if (motor.className === "Motor6D") {
-        motors.push(motor);
-      }
-    }
-  }
-  return motors;
-}
-function getBoneDependencies(rig) {
-  const names = /* @__PURE__ */ new Map();
-  const hrp = rig.FindFirstChild("HumanoidRootPart");
-  let currentSearch = hrp ? [hrp] : [];
-  let currentSearchOrigin = hrp ? ["Root"] : [];
-  const children = rig.GetChildren();
-  const motors = getMotorsInRig(children);
-  const searchedParts = [];
-  while (currentSearch.length > 0 && currentSearch[0]) {
-    const newCurrentSearch = [];
-    const newCurrentSearchOrigin = [];
-    for (let i = 0; i < currentSearch.length; i++) {
-      const toSearch = currentSearch[i];
-      searchedParts.push(toSearch);
-      const selfName = toSearch === hrp ? "HumanoidRootNode" : toSearch.Prop("Name");
-      names.set(selfName, currentSearchOrigin[i]);
-      for (const motor of motors) {
-        if (motor.Prop("Part0") === toSearch && !searchedParts.includes(motor.parent)) {
-          newCurrentSearch.push(motor.parent);
-          newCurrentSearchOrigin.push(selfName);
-        }
-      }
-    }
-    currentSearch = newCurrentSearch;
-    currentSearchOrigin = newCurrentSearchOrigin;
-  }
-  if (names.get("Head")) {
-    names.set("DynamicHead", "Head");
-  }
-  return names;
-}
-let SkeletonDesc$1 = class SkeletonDesc {
+class SkeletonDesc {
   renderableDesc;
   meshDesc;
   skeleton;
   rootBone;
   bones;
   originalBoneCFrames = [];
-  originalHeadCFrame = new CFrame();
-  originalDynamicHeadCFrame = new CFrame();
+  boneSourceParts = [];
   skeletonHelper;
+  frameCount = 0;
   constructor(renderableDesc, meshDesc, scene) {
     this.renderableDesc = renderableDesc;
     this.meshDesc = meshDesc;
@@ -45055,9 +45291,9 @@ let SkeletonDesc$1 = class SkeletonDesc {
     const boneArr = [];
     for (let i = 0; i < skinning.bones.length; i++) {
       const threeBone = new Bone();
-      threeBone.name = skinning.nameTable[i];
-      if (threeBone.name === "HumanoidRootPart") {
-        threeBone.name = "HumanoidRootNode";
+      threeBone.name = skinning.bones[i].name || "";
+      if (threeBone.name === "HumanoidRootNode") {
+        threeBone.name = "HumanoidRootPart";
       }
       if (threeBone.name === "root") {
         threeBone.name = "Root";
@@ -45066,6 +45302,7 @@ let SkeletonDesc$1 = class SkeletonDesc {
     }
     this.bones = boneArr;
     log(false, skinning);
+    log(false, this);
     let rootBone = void 0;
     for (let i = 0; i < skinning.bones.length; i++) {
       const bone = skinning.bones[i];
@@ -45078,18 +45315,15 @@ let SkeletonDesc$1 = class SkeletonDesc {
         const worldBoneCF = new CFrame(...bone.position);
         worldBoneCF.fromRotationMatrix(...bone.rotationMatrix);
         const boneCF = worldParentBoneCF.inverse().multiply(worldBoneCF);
-        this.originalBoneCFrames.push(boneCF);
-        if (threeBone.name === "Head") {
-          this.originalHeadCFrame = boneCF;
-        } else if (threeBone.name === "DynamicHead") {
-          this.originalDynamicHeadCFrame = boneCF;
-        }
+        this.boneSourceParts.push(bone.sourcePart);
+        this.originalBoneCFrames.push(worldBoneCF);
         setTHREEObjectCF(threeBone, boneCF);
         parentThreeBone.add(threeBone);
       } else {
         rootBone = threeBone;
         const boneCF = new CFrame(...bone.position);
         boneCF.fromRotationMatrix(...bone.rotationMatrix);
+        this.boneSourceParts.push(bone.sourcePart);
         this.originalBoneCFrames.push(boneCF);
         setTHREEObjectCF(threeBone, boneCF);
       }
@@ -45103,6 +45337,7 @@ let SkeletonDesc$1 = class SkeletonDesc {
         trueRootBone.name = "Root";
         trueRootBone.position.set(0, 0, 0);
         trueRootBone.rotation.set(0, 0, 0, "YXZ");
+        this.boneSourceParts.unshift(void 0);
         this.originalBoneCFrames.unshift(new CFrame());
         this.bones.unshift(trueRootBone);
         trueRootBone.add(rootBone);
@@ -45110,23 +45345,9 @@ let SkeletonDesc$1 = class SkeletonDesc {
       }
       this.rootBone = rootBone;
     }
-    const rig = this.getRig();
-    if (rig) {
-      const boneDependencies = getBoneDependencies(rig);
-      for (const bone of [...this.bones]) {
-        let lastBone = bone.name;
-        while (lastBone) {
-          const newLastBone = boneDependencies.get(lastBone);
-          if (newLastBone && !this.getBoneWithName(newLastBone)) {
-            this.insertBefore(newLastBone, lastBone);
-          }
-          lastBone = newLastBone;
-        }
-      }
-    }
     this.skeleton = new Skeleton(boneArr);
     this.setAsRest();
-    if (FLAGS.SHOW_SKELETON_HELPER) {
+    if (FLAGS.SHOW_SKELETON_HELPER && (FLAGS.SKELETON_HELPER_INSTANCE_NAME === void 0 || FLAGS.SKELETON_HELPER_INSTANCE_NAME === meshDesc.instance?.name)) {
       const skeletonHelper = new SkeletonHelper(this.rootBone);
       scene.add(skeletonHelper);
       this.skeletonHelper = skeletonHelper;
@@ -45139,39 +45360,6 @@ let SkeletonDesc$1 = class SkeletonDesc {
       this.skeleton.boneInverses[boneIndex].copy(bone.matrixWorld).invert();
     }
   }
-  traverseOriginal(name) {
-    const cframes = [];
-    let lastBone = this.getBoneWithName(name);
-    while (lastBone) {
-      const index = this.bones.indexOf(lastBone);
-      const ogCFrame = this.originalBoneCFrames[index];
-      cframes.push(ogCFrame);
-      lastBone = lastBone.parent ? this.getBoneWithName(lastBone.parent.name) : void 0;
-    }
-    cframes.reverse();
-    let finalCF = new CFrame();
-    for (const cf of cframes) {
-      finalCF = finalCF.multiply(cf);
-    }
-    return finalCF;
-  }
-  insertBefore(toInsert, before) {
-    const bone = new Bone();
-    bone.name = toInsert;
-    bone.position.set(0, 0, 0);
-    bone.rotation.set(0, 0, 0, "YXZ");
-    for (let i = 0; i < this.bones.length; i++) {
-      if (this.bones[i].name === before) {
-        const beforeBone = this.bones[i];
-        const beforeParent = beforeBone.parent;
-        this.originalBoneCFrames.push(new CFrame());
-        this.bones.push(bone);
-        bone.add(beforeBone);
-        beforeParent?.add(bone);
-        break;
-      }
-    }
-  }
   getBoneWithName(name) {
     for (const bone of this.bones) {
       if (bone.name === name) {
@@ -45190,377 +45378,160 @@ let SkeletonDesc$1 = class SkeletonDesc {
       return rig;
     }
   }
-  getPartEquivalent(selfInstance, name) {
-    if (!selfInstance.parent) return;
-    let partEquivalent = selfInstance.parent.FindFirstChild(name);
-    if (partEquivalent === void 0 && selfInstance.parent.parent) {
-      partEquivalent = selfInstance.parent.parent.FindFirstChild(name);
-    }
-    return partEquivalent;
+  getScale(node) {
+    if (this.meshDesc.wasAutoSkinned) return new Vector32(1, 1, 1);
+    const partSize = node.part.Prop("Size");
+    const meshSize = node.part.PropOrDefault("InitialSize", new Vector32(...this.meshDesc.fileMesh.size));
+    const scale = partSize.divide(meshSize);
+    return scale;
   }
-  getRootCFrame(instance, includeTransform) {
-    if (includeTransform) {
-      return instance.Prop("CFrame");
-    } else {
-      let bodyPart = void 0;
-      if (instance.parent && instance.parent.FindFirstChildOfClass("Humanoid")) {
-        bodyPart = instance;
-      } else if (instance.parent && instance.parent.parent && instance.parent.className === "Accessory") {
-        bodyPart = GetAttachedPart(instance.parent, instance.parent.parent);
-      }
-      const hrp = this.getPartEquivalent(instance, "HumanoidRootPart");
-      if (hrp && bodyPart) {
-        return hrp.Prop("CFrame").multiply(traverseRigCFrame(bodyPart));
-      }
-    }
-    return new CFrame();
+  getOriginalWorldCFrameNoChange(bone) {
+    const ogCF = this.originalBoneCFrames[this.bones.indexOf(bone)].clone();
+    return ogCF;
   }
-  updateBoneMatrix(selfInstance, includeTransform = false) {
-    if (!selfInstance.parent) return;
-    if (!this.meshDesc.fileMesh) return;
-    const isHead = this.meshDesc.headMesh === this.meshDesc.mesh;
-    const rootBoneCFog = this.getRootCFrame(selfInstance, includeTransform);
-    const humanoidRootPartEquivalent = this.getPartEquivalent(selfInstance, "HumanoidRootPart");
-    for (let i = 0; i < this.bones.length; i++) {
-      const bone = this.bones[i];
-      const partEquivalent = this.getPartEquivalent(selfInstance, bone.name);
-      const boneParent = boneIsBaseR15(bone) ? getBoneBaseR15Parent(bone) : bone.parent;
-      const parentPartEquivalent = boneParent ? boneParent.name !== "HumanoidRootNode" ? this.getPartEquivalent(selfInstance, boneParent.name) : humanoidRootPartEquivalent : void 0;
-      let rootBoneCF = new CFrame();
-      if (bone.name === "Root") {
-        rootBoneCF = rootBoneCFog;
-      } else if (bone.parent?.name === "Root") {
-        rootBoneCF = rootBoneCFog.inverse();
-      }
-      if (partEquivalent && parentPartEquivalent) {
-        setTHREEObjectCF(bone, rootBoneCF.multiply(getJointForInstances$1(parentPartEquivalent, partEquivalent, includeTransform)));
-      } else if (partEquivalent) {
-        if (includeTransform) {
-          setTHREEObjectCF(bone, rootBoneCF.multiply(partEquivalent.Prop("CFrame")));
-        } else {
-          let hrpCF = new CFrame();
-          const hrp = humanoidRootPartEquivalent;
-          if (hrp) {
-            hrpCF = hrp.Prop("CFrame");
-          }
-          setTHREEObjectCF(bone, rootBoneCF.multiply(hrpCF.multiply(traverseRigCFrame(partEquivalent))));
-        }
-      } else if (bone.name === "Root") {
-        setTHREEObjectCF(bone, rootBoneCF.multiply(new CFrame()));
-      } else if (bone.name === "HumanoidRootNode") {
-        let rootCF = new CFrame();
-        const rootPart = humanoidRootPartEquivalent;
-        if (rootPart) {
-          rootCF = rootPart.Prop("CFrame");
-        }
-        setTHREEObjectCF(bone, rootBoneCF.multiply(rootCF));
-      } else if (bone.name === "DynamicHead" && isHead) {
-        const head = this.getPartEquivalent(selfInstance, "Head");
-        if (head) {
-          let targetCF = this.traverseOriginal("DynamicHead");
-          if (this.meshDesc.wasAutoSkinned) {
-            targetCF = this.originalBoneCFrames[i];
-          }
-          const headSize = head.Prop("Size");
-          const ogHeadSize = isHead ? new Vector32(...this.meshDesc.fileMesh.size) : getOriginalSize(head);
-          let scale = divide(headSize.toVec3(), ogHeadSize.toVec3());
-          if (this.meshDesc.wasAutoSkinned) {
-            scale = [1, 1, 1];
-          }
-          const scaledCF = targetCF.clone();
-          scaledCF.Position = multiply(scaledCF.Position, scale);
-          const neck = head.FindFirstChildOfClass("Motor6D");
-          let neckCF = new CFrame();
-          if (neck) {
-            neckCF = neck.PropOrDefault("C1", new CFrame());
-          }
-          if (this.meshDesc.wasAutoSkinned) {
-            neckCF = new CFrame();
-          }
-          const totalCF = neckCF.inverse().multiply(scaledCF);
-          setTHREEObjectCF(bone, totalCF);
-        }
-      } else if (!isHead || boneIsChildOf(bone, "DynamicHead")) {
-        const ogCF = this.originalBoneCFrames[i];
-        const head = this.getPartEquivalent(selfInstance, "Head");
-        if (head) {
-          const headSize = head.Prop("Size");
-          const ogHeadSize = isHead ? new Vector32(...this.meshDesc.fileMesh.size) : getOriginalSize(head);
-          let scale = divide(headSize.toVec3(), ogHeadSize.toVec3());
-          if (this.meshDesc.wasAutoSkinned) {
-            scale = [1, 1, 1];
-          }
-          const scaledCF = ogCF.clone();
-          scaledCF.Position = multiply(scaledCF.Position, scale);
-          const headOffset = this.originalHeadCFrame.clone();
-          headOffset.Position = [0, 0, 0];
-          if (bone.name !== "DynamicHead") {
-            headOffset.Orientation = [0, 0, 0];
-          }
-          const finalCF = headOffset.multiply(scaledCF);
-          setTHREEObjectCF(bone, finalCF);
-        }
+  getOriginalWorldCFrame(bone, node) {
+    if (this.meshDesc.wasAutoSkinned) {
+      const ogCF = this.originalBoneCFrames[this.bones.indexOf(bone)].clone();
+      const nodeWorldCF = node.assembly.traverseCFrame(node, false, false);
+      return nodeWorldCF.inverse().multiply(ogCF);
+    } else {
+      const scale = this.getScale(node);
+      const ogCF = this.originalBoneCFrames[this.bones.indexOf(bone)].clone();
+      ogCF.Position = multiply(ogCF.Position, scale.toVec3());
+      return ogCF;
+    }
+  }
+  getSourcePart(bone) {
+    return this.boneSourceParts[this.bones.indexOf(bone)];
+  }
+  getSourceNode(selfNode, bone, assembly) {
+    const sourceName = this.getSourcePart(bone);
+    const potentialSourceNode = sourceName ? assembly.getNode(sourceName) : selfNode;
+    const sourceNode = potentialSourceNode ? potentialSourceNode : selfNode;
+    return sourceNode;
+  }
+  getBoneWorldCFrame(bone, assembly, selfInstance, includeTransform) {
+    const node = assembly.getNode(bone.name);
+    const selfNode = selfInstance.w.GetAssemblyNode();
+    const sourceNode = this.getSourceNode(selfNode, bone, assembly);
+    if (bone.name === "Root") {
+      return assembly.traverseCFrame(selfNode, includeTransform, true);
+    } else if (node) {
+      if (this.meshDesc.wasDeformed && !this.meshDesc.wasAutoSkinned && bone.name === "Head") {
+        const ogCF = assembly.traverseCFrame(node, includeTransform, true);
+        const connectorOffset = node.getConnectorOffset(includeTransform).inverse();
+        connectorOffset.Orientation = [0, 0, 0];
+        return ogCF.multiply(connectorOffset);
+      } else {
+        return assembly.traverseCFrame(node, includeTransform, true);
       }
-    }
-    this.updateMatrixWorld();
-    if (!includeTransform) {
-      this.setAsRest();
-      this.updateMatrixWorld();
-    }
-  }
-  updateMatrixWorld() {
-    for (const bone of this.skeleton.bones) {
-      bone.updateMatrixWorld(true);
+    } else {
+      const result = assembly.traverseCFrame(sourceNode, includeTransform, true).multiply(this.getOriginalWorldCFrame(bone, sourceNode));
+      return result;
     }
   }
-  update(instance) {
-    if (!FLAGS.UPDATE_SKELETON || !instance.parent || !this.meshDesc.fileMesh) return;
-    const isHead = this.meshDesc.headMesh === this.meshDesc.mesh;
-    this.updateBoneMatrix(instance);
-    if (FLAGS.ANIMATE_SKELETON) {
-      this.updateBoneMatrix(instance, true);
-      for (const bone of this.skeleton.bones) {
-        const isFACS = this.meshDesc.fileMesh?.facs?.faceBoneNames.includes(bone.name);
-        if (isFACS) {
-          const facsMesh = this.meshDesc.fileMesh;
-          const facs = this.meshDesc.fileMesh?.facs;
-          const head = this.getPartEquivalent(instance, "Head");
-          if (head && facsMesh && facs && facs.quantizedTransforms) {
-            const headSize = head.Prop("Size");
-            const ogHeadSize = isHead ? new Vector32(...this.meshDesc.fileMesh.size) : getOriginalSize(head);
-            let headScale = divide(headSize.toVec3(), ogHeadSize.toVec3());
-            if (this.meshDesc.wasAutoSkinned) {
-              headScale = [1, 1, 1];
-            }
-            let faceControls = head.FindFirstChildOfClass("FaceControls");
-            if (!faceControls) {
-              faceControls = new Instance("FaceControls");
-              faceControls.setParent(head);
-            }
-            new FaceControlsWrapper(faceControls);
-            for (let j = 0; j < facs.faceBoneNames.length; j++) {
-              const boneName = facs.faceBoneNames[j];
-              if (boneName === bone.name) {
-                let jointCF = new CFrame();
-                const ogCF = this.originalBoneCFrames[this.bones.indexOf(bone)];
-                jointCF = ogCF.clone();
-                const head2 = this.getPartEquivalent(instance, "Head");
-                if (head2) {
-                  const headSize2 = head2.Prop("Size");
-                  const ogHeadSize2 = isHead ? new Vector32(...this.meshDesc.fileMesh.size) : getOriginalSize(head2);
-                  let scale = divide(headSize2.toVec3(), ogHeadSize2.toVec3());
-                  if (this.meshDesc.wasAutoSkinned) {
-                    scale = [1, 1, 1];
-                  }
-                  jointCF.Position = multiply(jointCF.Position, scale);
-                }
-                let totalPosition = new Vector32();
-                let totalRotation = new Vector32();
-                for (let i = 0; i < facs.faceControlNames.length; i++) {
-                  const faceControlName = facs.faceControlNames[i];
-                  const col = i;
-                  const row = j;
-                  const cols = facs.faceControlNames.length;
-                  const index = row * cols + col;
-                  const posX = facs.quantizedTransforms.px.matrix[index];
-                  const posY = facs.quantizedTransforms.py.matrix[index];
-                  const posZ = facs.quantizedTransforms.pz.matrix[index];
-                  const rotX = facs.quantizedTransforms.rx.matrix[index];
-                  const rotY = facs.quantizedTransforms.ry.matrix[index];
-                  const rotZ = facs.quantizedTransforms.rz.matrix[index];
-                  const pos = new Vector32(posX, posY, posZ);
-                  const rot = new Vector32(rotX, rotY, rotZ);
-                  let weight = 0;
-                  if (faceControlName.includes(" ")) {
-                    weight = 1;
-                    for (const faceControlSubname of faceControlName.split(" ")) {
-                      const propertyName = AbbreviationToFaceControlProperty[faceControlSubname];
-                      weight *= faceControls.Prop(propertyName);
-                    }
-                  } else {
-                    const propertyName = AbbreviationToFaceControlProperty[faceControlName];
-                    if (propertyName === void 0) {
-                      log(false, faceControlName);
-                    }
-                    weight = faceControls.Prop(propertyName);
-                  }
-                  totalPosition = totalPosition.add(pos.multiply(new Vector32(weight, weight, weight)));
-                  totalRotation = totalRotation.add(rot.multiply(new Vector32(weight, weight, weight)));
-                }
-                const resultCF = new CFrame();
-                const euler = new Euler(rad(totalRotation.X), rad(totalRotation.Y), rad(totalRotation.Z), "XYZ");
-                euler.reorder("YXZ");
-                resultCF.Orientation = [deg(euler.x), deg(euler.y), deg(euler.z)];
-                resultCF.Position = multiply(totalPosition.toVec3(), headScale);
-                setTHREEObjectCF(bone, jointCF.multiply(resultCF));
-                break;
+  isFACS(boneName) {
+    return this.meshDesc.fileMesh?.facs?.faceBoneNames.includes(boneName);
+  }
+  addFACS(restCF, bone, assembly) {
+    const isFACS = this.isFACS(bone.name);
+    if (!isFACS) return restCF;
+    const facsMesh = this.meshDesc.fileMesh;
+    const facs = this.meshDesc.fileMesh?.facs;
+    const headNode = assembly.getNode("Head");
+    if (headNode && facsMesh && facs && facs.quantizedTransforms) {
+      const head = headNode.part;
+      let faceControls = head.FindFirstChildOfClass("FaceControls");
+      if (!faceControls) {
+        faceControls = new Instance("FaceControls");
+        faceControls.setParent(head);
+      }
+      new FaceControlsWrapper(faceControls);
+      for (let j = 0; j < facs.faceBoneNames.length; j++) {
+        const boneName = facs.faceBoneNames[j];
+        if (boneName === bone.name) {
+          let totalPosition = new Vector32();
+          let totalRotation = new Vector32();
+          for (let i = 0; i < facs.faceControlNames.length; i++) {
+            const faceControlName = facs.faceControlNames[i];
+            const col = i;
+            const row = j;
+            const cols = facs.faceControlNames.length;
+            const index = row * cols + col;
+            const posX = facs.quantizedTransforms.px.matrix[index];
+            const posY = facs.quantizedTransforms.py.matrix[index];
+            const posZ = facs.quantizedTransforms.pz.matrix[index];
+            const rotX = facs.quantizedTransforms.rx.matrix[index];
+            const rotY = facs.quantizedTransforms.ry.matrix[index];
+            const rotZ = facs.quantizedTransforms.rz.matrix[index];
+            const pos = new Vector32(posX, posY, posZ);
+            const rot = new Vector32(rotX, rotY, rotZ);
+            let weight = 0;
+            if (faceControlName.includes(" ")) {
+              weight = 1;
+              for (const faceControlSubname of faceControlName.split(" ")) {
+                const propertyName = AbbreviationToFaceControlProperty[faceControlSubname];
+                weight *= faceControls.Prop(propertyName);
               }
+            } else {
+              const propertyName = AbbreviationToFaceControlProperty[faceControlName];
+              if (propertyName === void 0) {
+                log(false, faceControlName);
+              }
+              weight = faceControls.Prop(propertyName);
             }
+            totalPosition = totalPosition.add(pos.multiply(new Vector32(weight, weight, weight)));
+            totalRotation = totalRotation.add(rot.multiply(new Vector32(weight, weight, weight)));
           }
+          const resultCF = new CFrame();
+          const euler = new Euler(rad(totalRotation.X), rad(totalRotation.Y), rad(totalRotation.Z), "XYZ");
+          euler.reorder("YXZ");
+          resultCF.Orientation = [deg(euler.x), deg(euler.y), deg(euler.z)];
+          resultCF.Position = multiply(totalPosition.toVec3(), this.getScale(headNode).toVec3());
+          return restCF.multiply(resultCF);
         }
       }
     }
-    this.updateMatrixWorld();
-  }
-  dispose(scene) {
-    if (this.skeletonHelper) {
-      scene.remove(this.skeletonHelper);
-      this.skeletonHelper.dispose();
-      this.skeletonHelper = void 0;
-    }
-    if (this.rootBone.parent) {
-      this.rootBone.parent.remove(this.rootBone);
-    }
-    for (let i = 0; i < this.skeleton.bones.length; i++) {
-      const bone = this.skeleton.bones[i];
-      if (bone.parent) {
-        bone.removeFromParent();
-      }
-    }
-  }
-  static descNeedsSkeleton(meshDesc) {
-    return meshDesc.canHaveSkinning && meshDesc.fileMesh && meshDesc.fileMesh.skinning && meshDesc.fileMesh.skinning.subsets.length > 0 && meshDesc.fileMesh.skinning.skinnings.length > 0;
-  }
-};
-function setBoneToCFrame(bone, cf) {
-  bone.position.set(...cf.Position);
-  bone.rotation.order = "YXZ";
-  bone.rotation.x = rad(cf.Orientation[0]);
-  bone.rotation.y = rad(cf.Orientation[1]);
-  bone.rotation.z = rad(cf.Orientation[2]);
-}
-function getJointForInstances(child, includeTransform) {
-  const childMotor = child.FindFirstChildOfClass("Motor6D");
-  let transform = new CFrame();
-  if (childMotor) {
-    if (includeTransform) {
-      transform = childMotor.Prop("Transform");
-      return transform.inverse();
-    }
-  }
-  return new CFrame();
-}
-class SkeletonDesc2 {
-  renderableDesc;
-  meshDesc;
-  skeleton;
-  rootBone;
-  bones;
-  originalBoneCFrames = [];
-  originalHeadCFrame = new CFrame();
-  originalDynamicHeadCFrame = new CFrame();
-  skeletonHelper;
-  constructor(renderableDesc, meshDesc, scene) {
-    this.renderableDesc = renderableDesc;
-    this.meshDesc = meshDesc;
-    const mesh = this.meshDesc.fileMesh;
-    if (!mesh) {
-      throw new Error("MeshDesc is not compiled");
-    }
-    const skinning = mesh.skinning;
-    const boneArr = [];
-    for (let i = 0; i < skinning.bones.length; i++) {
-      const threeBone = new Bone();
-      threeBone.name = skinning.nameTable[i];
-      boneArr.push(threeBone);
-    }
-    this.bones = boneArr;
-    let rootBone = void 0;
-    for (let i = 0; i < skinning.bones.length; i++) {
-      const bone = skinning.bones[i];
-      const threeBone = boneArr[i];
-      if (bone.parentIndex < skinning.bones.length) {
-        const parentBone = skinning.bones[bone.parentIndex];
-        const parentThreeBone = boneArr[bone.parentIndex];
-        const worldParentBoneCF = new CFrame(...parentBone.position);
-        worldParentBoneCF.fromRotationMatrix(...parentBone.rotationMatrix);
-        const worldBoneCF = new CFrame(...bone.position);
-        worldBoneCF.fromRotationMatrix(...bone.rotationMatrix);
-        const boneCF = worldParentBoneCF.inverse().multiply(worldBoneCF);
-        this.originalBoneCFrames.push(boneCF);
-        if (threeBone.name === "Head") {
-          this.originalHeadCFrame = boneCF;
-        } else if (threeBone.name === "DynamicHead") {
-          this.originalDynamicHeadCFrame = boneCF;
-        }
-        setBoneToCFrame(threeBone, boneCF);
-        parentThreeBone.add(threeBone);
-      } else {
-        rootBone = threeBone;
-        const worldBoneCF = new CFrame(...bone.position);
-        worldBoneCF.fromRotationMatrix(...bone.rotationMatrix);
-        setBoneToCFrame(threeBone, worldBoneCF);
-        this.originalBoneCFrames.push(worldBoneCF);
-      }
-    }
-    if (!rootBone) {
-      throw new Error("FileMesh has no root bone");
-    } else {
-      if (rootBone && rootBone.name !== "Root") {
-        const trueRootBone = new Bone();
-        trueRootBone.name = "Root";
-        trueRootBone.position.set(0, 0, 0);
-        trueRootBone.rotation.set(0, 0, 0, "YXZ");
-        this.originalBoneCFrames.unshift(new CFrame());
-        this.bones.unshift(trueRootBone);
-        trueRootBone.add(rootBone);
-        rootBone = trueRootBone;
-      }
-      this.rootBone = rootBone;
-    }
-    this.skeleton = new Skeleton(boneArr);
-    this.setAsRest();
-    if (FLAGS.SHOW_SKELETON_HELPER) {
-      const skeletonHelper = new SkeletonHelper(this.rootBone);
-      scene.add(skeletonHelper);
-      this.skeletonHelper = skeletonHelper;
-    }
-  }
-  setAsRest() {
-    for (const bone of this.skeleton.bones) {
-      const boneIndex = this.skeleton.bones.indexOf(bone);
-      this.skeleton.boneInverses[boneIndex].copy(bone.matrixWorld).invert();
-    }
-  }
-  getPartEquivalent(selfInstance, name) {
-    if (!selfInstance.parent) return;
-    let partEquivalent = selfInstance.parent.FindFirstChild(name);
-    if (partEquivalent === void 0 && selfInstance.parent.parent) {
-      partEquivalent = selfInstance.parent.parent.FindFirstChild(name);
-    }
-    return partEquivalent;
-  }
-  getRootCFrame(instance, includeTransform) {
-    if (includeTransform) {
-      return instance.Prop("CFrame");
-    } else {
-      let bodyPart = void 0;
-      if (instance.parent && instance.parent.FindFirstChildOfClass("Humanoid")) {
-        bodyPart = instance;
-      } else if (instance.parent && instance.parent.parent && instance.parent.className === "Accessory") {
-        bodyPart = GetAttachedPart(instance.parent, instance.parent.parent);
-      }
-      const hrp = this.getPartEquivalent(instance, "HumanoidRootPart");
-      if (hrp && bodyPart) {
-        return hrp.Prop("CFrame").multiply(traverseRigCFrame(bodyPart));
-      }
-    }
-    return new CFrame();
+    return restCF;
   }
   updateBoneMatrix(selfInstance, includeTransform = false) {
     if (!selfInstance.parent) return;
     if (!this.meshDesc.fileMesh) return;
-    const ogMeshSize = new Vector32(...this.meshDesc.fileMesh.size);
-    const scale = divide((this.meshDesc.instance?.Prop("Size")).toVec3(), ogMeshSize.toVec3());
+    const w = selfInstance.w;
+    if (!(w instanceof BasePartWrapper)) return;
+    const assembly = w.GetAssembly();
+    const boneWorldCFrameArr = new Array(this.bones.length);
     for (let i = 0; i < this.bones.length; i++) {
       const bone = this.bones[i];
-      const partEquivalent = this.getPartEquivalent(selfInstance, bone.name);
-      const ogBoneCF = this.originalBoneCFrames[i].clone();
-      ogBoneCF.Position = multiply(ogBoneCF.Position, scale);
-      if (partEquivalent && includeTransform) {
-        setBoneToCFrame(bone, ogBoneCF.multiply(getJointForInstances(partEquivalent, includeTransform)));
+      const boneWorldCFrame = this.getBoneWorldCFrame(bone, assembly, selfInstance, includeTransform);
+      boneWorldCFrameArr[i] = boneWorldCFrame;
+    }
+    for (let i = 0; i < this.bones.length; i++) {
+      const bone = this.bones[i];
+      const boneWorldCFrame = boneWorldCFrameArr[i];
+      let parentBone = bone.parent;
+      if (!(parentBone instanceof Bone)) parentBone = null;
+      if (bone && parentBone) {
+        if ((boneIsChildOf(bone, "DynamicHead") || bone.name === "DynamicHead") && this.meshDesc.wasDeformed && !this.meshDesc.wasAutoSkinned) {
+          const parentBoneWorldCFrame = this.getOriginalWorldCFrameNoChange(parentBone);
+          const boneWorldCFrameNoChange = this.getOriginalWorldCFrameNoChange(bone);
+          let diffCF = diffCFrame(parentBoneWorldCFrame, boneWorldCFrameNoChange);
+          let scale = new Vector32(1, 1, 1);
+          const headNode = assembly.getNode("Head");
+          if (headNode) {
+            scale = this.getScale(headNode);
+          }
+          diffCF.Position = multiply(diffCF.Position, scale.toVec3());
+          if (includeTransform) diffCF = this.addFACS(diffCF, bone, assembly);
+          setTHREEObjectCF(bone, diffCF);
+        } else {
+          const parentBoneWorldCFrame = boneWorldCFrameArr[this.bones.indexOf(parentBone)];
+          let diffCF = diffCFrame(parentBoneWorldCFrame, boneWorldCFrame);
+          if (includeTransform) diffCF = this.addFACS(diffCF, bone, assembly);
+          setTHREEObjectCF(bone, diffCF);
+        }
       } else {
-        setBoneToCFrame(bone, ogBoneCF);
+        setTHREEObjectCF(bone, boneWorldCFrame);
       }
     }
     this.updateMatrixWorld();
@@ -45576,85 +45547,12 @@ class SkeletonDesc2 {
   }
   update(instance) {
     if (!FLAGS.UPDATE_SKELETON || !instance.parent || !this.meshDesc.fileMesh) return;
-    const isHead = this.meshDesc.headMesh === this.meshDesc.mesh;
     this.updateBoneMatrix(instance);
     if (FLAGS.ANIMATE_SKELETON) {
       this.updateBoneMatrix(instance, true);
-      for (const bone of this.skeleton.bones) {
-        const isFACS = this.meshDesc.fileMesh?.facs?.faceBoneNames.includes(bone.name);
-        if (isFACS) {
-          const facsMesh = this.meshDesc.fileMesh;
-          const facs = this.meshDesc.fileMesh?.facs;
-          const head = this.getPartEquivalent(instance, "Head");
-          if (head && facsMesh && facs && facs.quantizedTransforms) {
-            let faceControls = head.FindFirstChildOfClass("FaceControls");
-            if (!faceControls) {
-              faceControls = new Instance("FaceControls");
-              faceControls.setParent(head);
-            }
-            new FaceControlsWrapper(faceControls);
-            for (let j = 0; j < facs.faceBoneNames.length; j++) {
-              const boneName = facs.faceBoneNames[j];
-              if (boneName === bone.name) {
-                let jointCF = new CFrame();
-                const ogCF = this.originalBoneCFrames[this.bones.indexOf(bone)];
-                jointCF = ogCF.clone();
-                const head2 = this.getPartEquivalent(instance, "Head");
-                if (head2) {
-                  const headSize = head2.Prop("Size");
-                  const ogHeadSize = isHead ? new Vector32(...this.meshDesc.fileMesh.size) : getOriginalSize(head2);
-                  let scale = divide(headSize.toVec3(), ogHeadSize.toVec3());
-                  if (this.meshDesc.wasAutoSkinned) {
-                    scale = [1, 1, 1];
-                  }
-                  jointCF.Position = multiply(jointCF.Position, scale);
-                }
-                let totalPosition = new Vector32();
-                let totalRotation = new Vector32();
-                for (let i = 0; i < facs.faceControlNames.length; i++) {
-                  const faceControlName = facs.faceControlNames[i];
-                  const col = i;
-                  const row = j;
-                  const cols = facs.faceControlNames.length;
-                  const index = row * cols + col;
-                  const posX = facs.quantizedTransforms.px.matrix[index];
-                  const posY = facs.quantizedTransforms.py.matrix[index];
-                  const posZ = facs.quantizedTransforms.pz.matrix[index];
-                  const rotX = facs.quantizedTransforms.rx.matrix[index];
-                  const rotY = facs.quantizedTransforms.ry.matrix[index];
-                  const rotZ = facs.quantizedTransforms.rz.matrix[index];
-                  const pos = new Vector32(posX, posY, posZ);
-                  const rot = new Vector32(rotX, rotY, rotZ);
-                  let weight = 0;
-                  if (faceControlName.includes(" ")) {
-                    weight = 1;
-                    for (const faceControlSubname of faceControlName.split(" ")) {
-                      const propertyName = AbbreviationToFaceControlProperty[faceControlSubname];
-                      weight *= faceControls.Prop(propertyName);
-                    }
-                  } else {
-                    const propertyName = AbbreviationToFaceControlProperty[faceControlName];
-                    if (propertyName === void 0) {
-                      log(false, faceControlName);
-                    }
-                    weight = faceControls.Prop(propertyName);
-                  }
-                  totalPosition = totalPosition.add(pos.multiply(new Vector32(weight, weight, weight)));
-                  totalRotation = totalRotation.add(rot.multiply(new Vector32(weight, weight, weight)));
-                }
-                const resultCF = new CFrame();
-                const euler = new Euler(rad(totalRotation.X), rad(totalRotation.Y), rad(totalRotation.Z), "YXZ");
-                resultCF.Orientation = [deg(euler.x), deg(euler.y), deg(euler.z)];
-                resultCF.Position = totalPosition.toVec3();
-                setBoneToCFrame(bone, jointCF.multiply(resultCF));
-                break;
-              }
-            }
-          }
-        }
-      }
     }
     this.updateMatrixWorld();
+    this.frameCount += 1;
   }
   dispose(scene) {
     if (this.skeletonHelper) {
@@ -45673,7 +45571,7 @@ class SkeletonDesc2 {
     }
   }
   static descNeedsSkeleton(meshDesc) {
-    return meshDesc.canHaveSkinning && meshDesc.fileMesh && meshDesc.fileMesh.skinning && meshDesc.fileMesh.skinning.subsets.length > 0 && meshDesc.fileMesh.skinning.skinnings.length > 0;
+    return meshDesc.canHaveSkinning && meshDesc.fileMesh && meshDesc.fileMesh.skinning && meshDesc.fileMesh.skinning.numskinnings > 0;
   }
 }
 const PartTypes = ["Part", "WedgePart"];
@@ -45823,12 +45721,8 @@ class ObjectDesc extends RenderDesc {
       const oldSize = this.originalScale;
       threeMesh.scale.set(this.size.X / oldSize.x, this.size.Y / oldSize.y, this.size.Z / oldSize.z);
     }
-    if (SkeletonDesc$1.descNeedsSkeleton(this.meshDesc)) {
-      if (FLAGS.USE_LOCAL_SKELETONDESC) {
-        this.skeletonDesc = new SkeletonDesc2(this, this.meshDesc, scene);
-      } else {
-        this.skeletonDesc = new SkeletonDesc$1(this, this.meshDesc, scene);
-      }
+    if (SkeletonDesc.descNeedsSkeleton(this.meshDesc)) {
+      this.skeletonDesc = new SkeletonDesc(this, this.meshDesc, scene);
     } else {
       this.meshDesc.fileMesh = void 0;
     }
@@ -47136,7 +47030,8 @@ class AnimatorWrapper extends InstanceWrapper {
     const result = await API.Asset.GetRBX(`rbxassetid://${id}`, void 0);
     if (result instanceof RBX) {
       log(false, "loading anim", id);
-      const animTrackInstance = result.generateTree().GetChildren()[0];
+      const dataModel = result.generateTree();
+      const animTrackInstance = dataModel.GetChildren()[0];
       if (animTrackInstance && humanoid.parent) {
         const animTrack = new AnimationTrack().loadAnimation(humanoid.parent, animTrackInstance);
         if (forceLoop) {
@@ -47147,7 +47042,10 @@ class AnimatorWrapper extends InstanceWrapper {
         }
         this.data.animationTracks.set(id, animTrack);
         this.instance.setProperty("_HasLoadedAnimation", true);
+        dataModel.Destroy();
         return animTrack;
+      } else {
+        dataModel.Destroy();
       }
     } else {
       return result;
@@ -47170,7 +47068,8 @@ class AnimatorWrapper extends InstanceWrapper {
     if (!(animationInfo instanceof RBX)) {
       return animationInfo;
     }
-    const root = animationInfo.generateTree().GetChildren()[0];
+    const dataModel = animationInfo.generateTree();
+    const root = dataModel.GetChildren()[0];
     const promises = [];
     if (!isEmote) {
       for (const anim of root.GetChildren()) {
@@ -47240,6 +47139,7 @@ class AnimatorWrapper extends InstanceWrapper {
         }
       }
     }
+    dataModel.Destroy();
   }
   /**
    * Switches to new animation
@@ -47305,14 +47205,16 @@ class AttachmentWrapper extends InstanceWrapper {
     if (!this.instance.HasProperty("Name")) this.instance.addProperty(new Property("Name", DataType.String), this.instance.className);
     if (!this.instance.HasProperty("CFrame")) this.instance.addProperty(new Property("CFrame", DataType.CFrame), new CFrame());
   }
-  getWorldCFrame() {
+  getWorldCFrame(includeTransform = true) {
     if (this.instance.parent) {
       if (this.instance.parent.w?.IsA("BasePart")) {
         const parentCF = this.instance.parent.PropOrDefault("CFrame", new CFrame());
-        return parentCF.multiply(this.instance.Prop("CFrame"));
+        const transform = includeTransform ? this.instance.PropOrDefault("Transform", new CFrame()) : new CFrame();
+        return parentCF.multiply(this.instance.Prop("CFrame")).multiply(transform);
       } else if (this.instance.parent.w?.IsA("Attachment")) {
         const w = this.instance.parent.w;
-        return w.getWorldCFrame().multiply(this.instance.Prop("CFrame"));
+        const transform = includeTransform ? this.instance.PropOrDefault("Transform", new CFrame()) : new CFrame();
+        return w.getWorldCFrame().multiply(this.instance.Prop("CFrame")).multiply(transform);
       }
     }
     return this.instance.Prop("CFrame");
@@ -47322,25 +47224,6 @@ const __vite_glob_0_4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   __proto__: null,
   AttachmentWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-class BasePartWrapper extends InstanceWrapper {
-  static className = "BasePart";
-  static requiredProperties = [
-    "Name",
-    "CFrame",
-    "size",
-    "Transparency"
-  ];
-  setup() {
-    if (!this.instance.HasProperty("Name")) this.instance.addProperty(new Property("Name", DataType.String), this.instance.className);
-    if (!this.instance.HasProperty("CFrame")) this.instance.addProperty(new Property("CFrame", DataType.CFrame), new CFrame());
-    if (!this.instance.HasProperty("size")) this.instance.addProperty(new Property("size", DataType.Vector3), new Vector32());
-    if (!this.instance.HasProperty("Transparency")) this.instance.addProperty(new Property("Transparency", DataType.Float32), 0);
-  }
-}
-const __vite_glob_0_5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  BasePartWrapper
-}, Symbol.toStringTag, { value: "Module" }));
 class BodyColorsWrapper extends InstanceWrapper {
   static className = "BodyColors";
   static requiredProperties = [
@@ -47420,6 +47303,21 @@ const __vite_glob_0_7 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   __proto__: null,
   BodyPartDescriptionWrapper
 }, Symbol.toStringTag, { value: "Module" }));
+class BoneWrapper extends AttachmentWrapper {
+  static className = "Bone";
+  static requiredProperties = [
+    ...super.requiredProperties,
+    "Transform"
+  ];
+  setup() {
+    super.setup();
+    if (!this.instance.HasProperty("Transform")) this.instance.addProperty(new Property("Transform", DataType.CFrame), new CFrame());
+  }
+}
+const __vite_glob_0_8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  BoneWrapper
+}, Symbol.toStringTag, { value: "Module" }));
 class DecalWrapper extends InstanceWrapper {
   static className = "Decal";
   static requiredProperties = [
@@ -47441,7 +47339,7 @@ class DecalWrapper extends InstanceWrapper {
     if (!this.instance.HasProperty("UVScale")) this.instance.addProperty(new Property("UVScale", DataType.Vector2), new Vector22());
   }
 }
-const __vite_glob_0_8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_10 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   DecalWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -47585,7 +47483,7 @@ class MakeupDescriptionWrapper extends InstanceWrapper {
     if (!this.instance.HasProperty("Instance")) this.instance.addProperty(new Property("Instance", DataType.Referent), void 0);
   }
 }
-const __vite_glob_0_12 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_15 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   MakeupDescriptionWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -48285,7 +48183,7 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                         moveAttachmentsToBase(child);
                       }
                       for (const childChild of child.GetChildren()) {
-                        if (childChild.w?.IsA("Weld") || childChild.w?.IsA("AnimationConstraint")) {
+                        if (childChild.w?.IsA("JointInstance") || childChild.w?.IsA("AnimationConstraint")) {
                           childChild.Destroy();
                         }
                       }
@@ -48323,10 +48221,13 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                   const head2 = dataModel.FindFirstChildOfClass("MeshPart");
                   if (head2) {
                     for (const childChild of head2.GetChildren()) {
-                      if (childChild.w?.IsA("Weld") || childChild.w?.IsA("AnimationConstraint")) {
+                      if (childChild.w?.IsA("JointInstance") || childChild.w?.IsA("AnimationConstraint")) {
                         childChild.Destroy();
                       }
                     }
+                    if (!FLAGS.AVATAR_JOINT_UPGRADE) {
+                      moveAttachmentsToBase(head2);
+                    }
                     replaceBodyPart(rig, head2);
                   }
                 }
@@ -48340,6 +48241,7 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                 }
                 resolve(void 0);
               }
+              dataModel.Destroy();
             }
           });
         }));
@@ -48396,6 +48298,7 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                   }
                 }
               }
+              dataModel.Destroy();
               resolve(void 0);
             } else {
               resolve(result);
@@ -48439,9 +48342,9 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                 }
                 asset.setParent(rig);
               } else {
-                dataModel.Destroy();
                 warn(false, `Clothing asset does not exist or is invalid`);
               }
+              dataModel.Destroy();
               resolve(void 0);
             } else {
               resolve(rbx);
@@ -48497,9 +48400,9 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
             face.setParent(head);
           }
         } else {
-          dataModel.Destroy();
           warn(false, `Face asset does not exist or is invalid`);
         }
+        dataModel.Destroy();
       } else {
         return rbx;
       }
@@ -48545,32 +48448,34 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
           if (oldTool) {
             oldTool.Destroy();
           }
-          const handle = tool.FindFirstChild("Handle");
-          for (const child of tool.GetDescendants()) {
-            if (child.className === "Motor6D" || child.className === "Weld" || child.className === "ManualWeld") {
-              if (child.HasProperty("Part0") && child.HasProperty("Part1") && child.HasProperty("C0") && child.HasProperty("C1") && child.Prop("Part1") === handle) {
-                const part0 = child.Prop("Part0");
-                const part1 = child.Prop("Part1");
-                const c0 = child.Prop("C0");
-                const c1 = child.Prop("C1");
-                child.setProperty("Part0", part1, true);
-                child.setProperty("Part1", part0, true);
-                child.setProperty("C0", c1, true);
-                child.setProperty("C1", c0);
-              } else if (child.HasProperty("Part0") && child.Prop("Part0") === handle) ;
-              else {
-                child.Destroy();
-              }
-              if (!child.destroyed && child.PropOrDefault("Part0", void 0) == void 0 || child.PropOrDefault("Part1", void 0) === void 0) {
-                child.Destroy();
+          if (!FLAGS.USE_ASSEMBLY) {
+            const handle = tool.FindFirstChild("Handle");
+            for (const child of tool.GetDescendants()) {
+              if (child.className === "Motor6D" || child.className === "Weld" || child.className === "ManualWeld") {
+                if (child.HasProperty("Part0") && child.HasProperty("Part1") && child.HasProperty("C0") && child.HasProperty("C1") && child.Prop("Part1") === handle) {
+                  const part0 = child.Prop("Part0");
+                  const part1 = child.Prop("Part1");
+                  const c0 = child.Prop("C0");
+                  const c1 = child.Prop("C1");
+                  child.setProperty("Part0", part1, true);
+                  child.setProperty("Part1", part0, true);
+                  child.setProperty("C0", c1, true);
+                  child.setProperty("C1", c0);
+                } else if (child.HasProperty("Part0") && child.Prop("Part0") === handle) ;
+                else {
+                  child.Destroy();
+                }
+                if (!child.destroyed && child.PropOrDefault("Part0", void 0) == void 0 || child.PropOrDefault("Part1", void 0) === void 0) {
+                  child.Destroy();
+                }
               }
             }
           }
           tool.setParent(rig);
         } else {
-          dataModel.Destroy();
           warn(false, `Gear asset does not exist or is invalid`);
         }
+        dataModel.Destroy();
       } else {
         return rbx;
       }
@@ -48660,9 +48565,9 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                 accessoryDesc.setProperty("Instance", accessory);
               }
             } else {
-              dataModel.Destroy();
               warn(false, `Accessory asset does not exist or is invalid`);
             }
+            dataModel.Destroy();
             resolve(void 0);
           } else {
             resolve(rbx);
@@ -48746,9 +48651,9 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
                 makeupDesc.setProperty("Instance", makeup);
               }
             } else {
-              dataModel.Destroy();
               warn(false, `Makeup asset does not exist or is invalid`);
             }
+            dataModel.Destroy();
             resolve(void 0);
           } else {
             resolve(rbx);
@@ -48956,17 +48861,17 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
     return this.instance;
   }
 }
-const __vite_glob_0_10 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_12 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   HumanoidDescriptionWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-class WeldWrapperData {
+class JointInstanceWrapperData {
   part0ChangedConnection;
   lastUpdateTime = 0;
   timeUpdates = 0;
 }
-class WeldWrapper extends InstanceWrapper {
-  static className = "Weld";
+class JointInstanceWrapper extends InstanceWrapper {
+  static className = "JointInstance";
   static requiredProperties = [
     "Name",
     "Enabled",
@@ -48983,7 +48888,7 @@ class WeldWrapper extends InstanceWrapper {
     if (!this.instance.HasProperty("Part1")) this.instance.addProperty(new Property("Part1", DataType.Referent), void 0);
     if (!this.instance.HasProperty("C0")) this.instance.addProperty(new Property("C0", DataType.CFrame), new CFrame());
     if (!this.instance.HasProperty("C1")) this.instance.addProperty(new Property("C1", DataType.CFrame), new CFrame());
-    if (!this.instance.HasProperty("_data")) this.instance.addProperty(new Property("_data", DataType.NonSerializable), new WeldWrapperData());
+    if (!this.instance.HasProperty("_data")) this.instance.addProperty(new Property("_data", DataType.NonSerializable), new JointInstanceWrapperData());
   }
   get data() {
     return this.instance.Prop("_data");
@@ -49004,10 +48909,42 @@ class WeldWrapper extends InstanceWrapper {
     if (FLAGS.LEGACY_WELD_BEHAVIOR) return;
     const part0 = this.instance.Prop("Part0");
     const part1 = this.instance.Prop("Part1");
-    if (part0 && part1 && part1.HasProperty("CFrame") && part0 !== part1) {
-      part1.setProperty("CFrame", traverseRigCFrame(this.instance, true, true));
+    if (!FLAGS.USE_ASSEMBLY) {
+      if (part0 && part1 && part1.HasProperty("CFrame") && part0 !== part1) {
+        part1.setProperty("CFrame", traverseRigCFrame(this.instance, true, true));
+      }
     }
   }
+  getAssemblyOffset(includeTransform) {
+    const part0 = this.instance.Prop("Part0");
+    const part1 = this.instance.Prop("Part1");
+    if (part0 && part1 && part0 !== part1) {
+      const part0W = part0.w;
+      const part1W = part1.w;
+      if (part0W && part1W && part0W.IsA("BasePart") && part1W.IsA("BasePart")) {
+        const c0 = this.instance.Prop("C0");
+        const c1 = this.instance.Prop("C1");
+        const transform = this.instance.PropOrDefault("Transform", new CFrame());
+        const an0 = part0W.GetAssemblyNode();
+        const an1 = part1W.GetAssemblyNode();
+        const affectedPart = an0.depth <= an1.depth ? 1 : 0;
+        if (affectedPart === 1) {
+          if (includeTransform) {
+            return c0.multiply(c1.multiply(transform).inverse());
+          } else {
+            return c0.multiply(c1.inverse());
+          }
+        } else if (affectedPart === 0) {
+          if (includeTransform) {
+            return c1.multiply(transform).multiply(c0.inverse());
+          } else {
+            return c1.multiply(c0.inverse());
+          }
+        }
+      }
+    }
+    return new CFrame();
+  }
   update(affectedPart = 1) {
     if (!this.instance.parent) return;
     if (this.data.lastUpdateTime === Date.now()) {
@@ -49059,14 +48996,14 @@ class WeldWrapper extends InstanceWrapper {
     }
   }
 }
-const __vite_glob_0_22 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_14 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  WeldWrapper
+  JointInstanceWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-class ManualWeldWrapper extends WeldWrapper {
+class ManualWeldWrapper extends JointInstanceWrapper {
   static className = "ManualWeld";
 }
-const __vite_glob_0_13 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_16 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   ManualWeldWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -49081,7 +49018,7 @@ class MeshPartWrapper extends BasePartWrapper {
     if (!this.instance.HasProperty("DoubleSided")) this.instance.addProperty(new Property("DoubleSided", DataType.Bool), false);
   }
 }
-const __vite_glob_0_14 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_17 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   MeshPartWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -49100,11 +49037,11 @@ class ModelWrapper extends InstanceWrapper {
     throw new Error("Model has no PrimaryPart");
   }
 }
-const __vite_glob_0_15 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_18 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   ModelWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-class Motor6DWrapper extends WeldWrapper {
+class Motor6DWrapper extends JointInstanceWrapper {
   static className = "Motor6D";
   static requiredProperties = [
     ...super.requiredProperties,
@@ -49115,7 +49052,7 @@ class Motor6DWrapper extends WeldWrapper {
     if (!this.instance.HasProperty("Transform")) this.instance.addProperty(new Property("Transform", DataType.CFrame), new CFrame());
   }
 }
-const __vite_glob_0_16 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_19 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   Motor6DWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -49130,7 +49067,7 @@ class PartWrapper extends BasePartWrapper {
     if (!this.instance.HasProperty("shape")) this.instance.addProperty(new Property("shape", DataType.Enum), PartType.Block);
   }
 }
-const __vite_glob_0_17 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_20 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   PartWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -49233,7 +49170,7 @@ class SoundWrapper extends InstanceWrapper {
     }
   }
 }
-const __vite_glob_0_19 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_22 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   SoundWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -49298,7 +49235,7 @@ class ScriptWrapper extends InstanceWrapper {
     }
   }
 }
-const __vite_glob_0_18 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_21 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   ScriptWrapper
 }, Symbol.toStringTag, { value: "Module" }));
@@ -49355,18 +49292,25 @@ class ToolWrapper extends InstanceWrapper {
     }
   }
 }
-const __vite_glob_0_20 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_23 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   ToolWrapper
 }, Symbol.toStringTag, { value: "Module" }));
 class WedgePartWrapper extends BasePartWrapper {
   static className = "WedgePart";
 }
-const __vite_glob_0_21 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const __vite_glob_0_24 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   WedgePartWrapper
 }, Symbol.toStringTag, { value: "Module" }));
-const modules$1 = /* @__PURE__ */ Object.assign({ "./instance/Accessory.ts": __vite_glob_0_0$1, "./instance/AccessoryDescription.ts": __vite_glob_0_1$1, "./instance/AnimationConstraint.ts": __vite_glob_0_2$1, "./instance/Animator.ts": __vite_glob_0_3, "./instance/Attachment.ts": __vite_glob_0_4, "./instance/BasePart.ts": __vite_glob_0_5, "./instance/BodyColors.ts": __vite_glob_0_6, "./instance/BodyPartDescription.ts": __vite_glob_0_7, "./instance/Decal.ts": __vite_glob_0_8, "./instance/FaceControls.ts": __vite_glob_0_9, "./instance/HumanoidDescription.ts": __vite_glob_0_10, "./instance/InstanceWrapper.ts": __vite_glob_0_11, "./instance/MakeupDescription.ts": __vite_glob_0_12, "./instance/ManualWeld.ts": __vite_glob_0_13, "./instance/MeshPart.ts": __vite_glob_0_14, "./instance/Model.ts": __vite_glob_0_15, "./instance/Motor6D.ts": __vite_glob_0_16, "./instance/Part.ts": __vite_glob_0_17, "./instance/Script.ts": __vite_glob_0_18, "./instance/Sound.ts": __vite_glob_0_19, "./instance/Tool.ts": __vite_glob_0_20, "./instance/WedgePart.ts": __vite_glob_0_21, "./instance/Weld.ts": __vite_glob_0_22 });
+class WeldWrapper extends JointInstanceWrapper {
+  static className = "Weld";
+}
+const __vite_glob_0_25 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  WeldWrapper
+}, Symbol.toStringTag, { value: "Module" }));
+const modules$1 = /* @__PURE__ */ Object.assign({ "./instance/Accessory.ts": __vite_glob_0_0$1, "./instance/AccessoryDescription.ts": __vite_glob_0_1$1, "./instance/AnimationConstraint.ts": __vite_glob_0_2$1, "./instance/Animator.ts": __vite_glob_0_3, "./instance/Attachment.ts": __vite_glob_0_4, "./instance/BasePart.ts": __vite_glob_0_5, "./instance/BodyColors.ts": __vite_glob_0_6, "./instance/BodyPartDescription.ts": __vite_glob_0_7, "./instance/Bone.ts": __vite_glob_0_8, "./instance/Constraint.ts": __vite_glob_0_9, "./instance/Decal.ts": __vite_glob_0_10, "./instance/FaceControls.ts": __vite_glob_0_11, "./instance/HumanoidDescription.ts": __vite_glob_0_12, "./instance/InstanceWrapper.ts": __vite_glob_0_13, "./instance/JointInstance.ts": __vite_glob_0_14, "./instance/MakeupDescription.ts": __vite_glob_0_15, "./instance/ManualWeld.ts": __vite_glob_0_16, "./instance/MeshPart.ts": __vite_glob_0_17, "./instance/Model.ts": __vite_glob_0_18, "./instance/Motor6D.ts": __vite_glob_0_19, "./instance/Part.ts": __vite_glob_0_20, "./instance/Script.ts": __vite_glob_0_21, "./instance/Sound.ts": __vite_glob_0_22, "./instance/Tool.ts": __vite_glob_0_23, "./instance/WedgePart.ts": __vite_glob_0_24, "./instance/Weld.ts": __vite_glob_0_25 });
 function RegisterWrappers() {
   for (const module of Object.values(modules$1)) {
     for (const exprt of Object.values(module)) {
@@ -51551,7 +51495,10 @@ class OutfitRenderer {
         this.currentRigType = newRigType;
         API.Asset.GetRBX(`roavatar://Rig${this.currentRigType}.rbxm`, void 0).then((result) => {
           if (result instanceof RBX) {
-            const newRig = result.generateTree().GetChildren()[0];
+            const dataModel = result.generateTree();
+            const newRig = dataModel.GetChildren()[0];
+            newRig.setParent(void 0);
+            dataModel.Destroy();
             this.currentRig = newRig;
             this.currentlyChangingRig = false;
             RBXRenderer.addInstance(this.currentRig, this.auth, this.renderScene);
@@ -51856,6 +51803,8 @@ export {
   AnimationPropToName,
   AnimationTrack,
   AnimatorWrapper,
+  Assembly,
+  AssemblyNode,
   Asset,
   AssetMeta,
   AssetType,
@@ -51866,6 +51815,7 @@ export {
   AttachmentWrapper,
   Authentication,
   AvatarType,
+  BasePartWrapper,
   BodyColor3s,
   BodyColors,
   BodyColorsWrapper,
@@ -51873,6 +51823,7 @@ export {
   BodyPartDescriptionWrapper,
   BodyPartEnumToNames,
   BodyPartNameToEnum,
+  BoneWrapper,
   BrickColors,
   BuildJoints,
   BundleTypes,
@@ -51886,6 +51837,7 @@ export {
   ColorSequence,
   ColorSequenceKeypoint,
   Connection,
+  ConstraintWrapper,
   Content,
   ContentMap,
   DataType,
@@ -51901,7 +51853,6 @@ export {
   FaceControlsWrapper,
   FileMesh,
   FileMeshBone,
-  FileMeshSkinning,
   FileMeshSubset,
   FindFirstMatchingAttachment,
   FullBodyColors,
@@ -51915,6 +51866,7 @@ export {
   InstanceWrapper,
   ItemInfo,
   ItemSort,
+  JointInstanceWrapper,
   LODS,
   LayeredAssetTypes,
   LayeredClothingAssetOrder,
@@ -51925,6 +51877,7 @@ export {
   ManualWeldWrapper,
   MaxOneOfAssetTypes,
   MaxPerAsset,
+  MeshPartWrapper,
   MeshType,
   ModelWrapper,
   Motor6DWrapper,
@@ -51937,6 +51890,7 @@ export {
   OutfitOrigin,
   OutfitRenderer,
   PartType,
+  PartWrapper,
   ParticleEmitterShapeInOut,
   ParticleFlipbookLayout,
   ParticleFlipbookMode,
@@ -51975,6 +51929,7 @@ export {
   Vector32 as Vector3,
   Wait,
   WearableAssetTypes,
+  WedgePartWrapper,
   WeldWrapper,
   WorkerTypeToFunction,
   WrapLayerAutoSkin,
@@ -52036,8 +51991,11 @@ export {
   getOriginalAttachmentOrientation,
   getOriginalAttachmentPosition,
   getOriginalSize,
+  getPartAssemblyScore,
+  getPartsInAssembly_Generate,
   getRandomBetweenInclusive,
   getRigExtentsWorld,
+  getRootAssemblyPart_Generate,
   getThumbnailCameraCFrame,
   getUVtoIndexMap,
   getUVtoIndicesMap,