roavatar-renderer 1.9.3 → 1.9.5

package/dist/index.d.ts

@@ -1520,7 +1520,13 @@ export declare class FileMesh {
     setBoneSource(name: string): void;
     setBoneSourceSize(): void;
     combine(other: FileMesh): void;
-    removeDuplicateVertices(distance?: number): number;
+    /**
+     *
+     * @param distance
+     * @param updateFaces This also fixes the faces (but it doesnt actually since its broken)
+     * @returns
+     */
+    removeDuplicateVertices(distance?: number, updateFaces?: boolean): number;
     removeFaces(indices: number[]): void;
     basicSkin(boneNames: string[]): void;
     getValidationIssue(): "subsetLengthMismatch" | undefined;
@@ -2240,6 +2246,10 @@ export declare class Instance {
     setParent(instance: Instance | undefined | null, fireEvents?: boolean): void;
     Destroy(): void;
     GetFullName(): string;
+    /**
+     * @returns A reference to Instance._children, dangerous since the array can be modified by the Instance due to setParent and similar
+     */
+    GetChildrenDangerous(): Instance[];
     GetChildren(): Instance[];
     GetDescendants(): Instance[];
     FindFirstChild(name: string): Instance | undefined;

package/dist/index.js

@@ -33114,7 +33114,7 @@ class CFrame {
     return new Matrix4().compose(new Vector3$1(...this.Position), new Quaternion().setFromEuler(new Euler(rad(this.Orientation[0]), rad(this.Orientation[1]), rad(this.Orientation[2]), "YXZ")), new Vector3$1(1, 1, 1));
   }
   getMatrix() {
-    return this.getTHREEMatrix().toArray();
+    return this.getTHREEMatrix().elements;
   }
   fromMatrix(m) {
     this.Orientation = rotationMatrixToEulerAngles([
@@ -33197,14 +33197,13 @@ class CFrame {
     return euler.toArray();
   }
   inverse() {
-    const thisM = new Matrix4().fromArray(this.getMatrix());
-    const inverse = thisM.clone();
+    const inverse = this.getTHREEMatrix();
     inverse.invert();
     return new CFrame().fromMatrix(inverse.elements);
   }
   multiply(cf) {
-    const thisM = new Matrix4().fromArray(this.getMatrix());
-    const cfM = new Matrix4().fromArray(cf.getMatrix());
+    const thisM = this.getTHREEMatrix();
+    const cfM = cf.getTHREEMatrix();
     const newM = thisM.multiply(cfM);
     const newCf = new CFrame().fromMatrix(newM.elements);
     return newCf;
@@ -33635,17 +33634,23 @@ class Instance {
       return this.name || "null";
     }
   }
+  /**
+   * @returns A reference to Instance._children, dangerous since the array can be modified by the Instance due to setParent and similar
+   */
+  GetChildrenDangerous() {
+    return this._children;
+  }
   GetChildren() {
-    const childrenList = [];
-    for (const child of this._children) {
-      childrenList.push(child);
-    }
-    return childrenList;
+    return [...this._children];
   }
   GetDescendants() {
-    let descendants = this.GetChildren();
-    for (const child of this.GetChildren()) {
-      descendants = descendants.concat(child.GetDescendants());
+    const toCheck = this.GetChildren();
+    const descendants = [...toCheck];
+    while (toCheck.length > 0) {
+      const child = toCheck.pop();
+      const children = child.GetChildrenDangerous();
+      toCheck.push(...children);
+      descendants.push(...children);
     }
     return descendants;
   }
@@ -39041,10 +39046,15 @@ class FileMesh {
       this.skinning.setWeight(ogSkinningsSize + i, other.skinning.getWeight(i));
     }
   }
-  removeDuplicateVertices(distance2 = 1e-4) {
+  /**
+   * 
+   * @param distance
+   * @param updateFaces This also fixes the faces (but it doesnt actually since its broken)
+   * @returns 
+   */
+  removeDuplicateVertices(distance2 = 1e-4, updateFaces = false) {
     const posToIndex = /* @__PURE__ */ new Map();
     const remap = new Array(this.coreMesh.numverts).fill(-1);
-    const vertToSubset = new Array(this.coreMesh.numverts).fill(-1);
     for (let i = 0; i < this.coreMesh.numverts; i++) {
       const pos = this.coreMesh.getPos(i);
       const uv = this.coreMesh.getUV(i);
@@ -39061,27 +39071,26 @@ class FileMesh {
         remap[i] = i;
       }
     }
-    for (let i = 0; i < this.coreMesh.numfaces; i++) {
-      const remapFace = this.coreMesh.getFace(remap[i]);
-      this.coreMesh.setFace(i, clonePrimitiveArray(remapFace));
-    }
     const newVerts = [];
     const newSkinnings = [];
-    const newSubsetIndices = [];
     const newIndex = /* @__PURE__ */ new Map();
     for (let i = 0; i < this.coreMesh.numverts; i++) {
       const canonical = remap[i];
       if (!newIndex.has(canonical)) {
         newIndex.set(canonical, newVerts.length);
         newVerts.push(canonical);
-        newSubsetIndices.push(vertToSubset[i]);
         newSkinnings.push(canonical);
       }
       remap[i] = newIndex.get(canonical);
     }
-    for (let i = 0; i < this.coreMesh.numfaces; i++) {
-      const remapFace = this.coreMesh.getFace(remap[i]);
-      this.coreMesh.setFace(i, clonePrimitiveArray(remapFace));
+    if (updateFaces) {
+      for (let i = 0; i < this.coreMesh.numfaces; i++) {
+        const face = this.coreMesh.getFace(i);
+        face[0] = remap[face[0]];
+        face[1] = remap[face[1]];
+        face[2] = remap[face[2]];
+        this.coreMesh.setFace(i, face);
+      }
     }
     this.coreMesh.onlyVerts(newVerts);
     this.skinning.onlySkinnings(newSkinnings);
@@ -44181,21 +44190,20 @@ class AccessoryWrapper extends InstanceWrapper {
       if (humanoid) {
         const handle = this.instance.FindFirstChild("Handle");
         if (handle) {
-          let accessoryAttachment = null;
-          let bodyAttachment = null;
-          for (const child of handle.GetChildren()) {
+          for (const child of handle.GetChildrenDangerous()) {
             if (child.className === "Attachment") {
-              const bodyDescendants = this.instance.parent.GetDescendants();
-              for (const bodyChild of bodyDescendants) {
-                if (bodyChild.className === "Attachment" && child && bodyChild.Property("Name") === child.Property("Name") && bodyChild.parent && bodyChild.parent.parent === this.instance.parent) {
-                  bodyAttachment = bodyChild;
-                  accessoryAttachment = child;
-                  break;
+              const bodyParts = this.instance.parent.GetChildrenDangerous();
+              for (const bodyPart of bodyParts) {
+                if (bodyPart.className !== "Part" && bodyPart.className !== "MeshPart") continue;
+                const bodyPartChildren = bodyPart.GetChildrenDangerous();
+                for (const bodyChild of bodyPartChildren) {
+                  if (bodyChild.className === "Attachment" && child && bodyChild.Property("Name") === child.Property("Name") && bodyChild.parent && bodyChild.parent.parent === this.instance.parent) {
+                    return [bodyChild, child];
+                  }
                 }
               }
             }
           }
-          if (bodyAttachment && accessoryAttachment) return [bodyAttachment, accessoryAttachment];
         }
       }
     }
@@ -44208,12 +44216,9 @@ class AccessoryWrapper extends InstanceWrapper {
         if (handle) {
           const attachmentPair = this.getBodyAccessoryAttachmentPair();
           const oldAccessoryWeld = handle.FindFirstChild("AccessoryWeld");
-          if (oldAccessoryWeld) {
-            oldAccessoryWeld.Destroy();
-          }
           if (attachmentPair) {
             const [bodyAttachment, accessoryAttachment] = attachmentPair;
-            const weld = new Instance("Weld");
+            const weld = oldAccessoryWeld || new Instance("Weld");
             weld.addProperty(new Property("Name", DataType.String), "AccessoryWeld");
             weld.addProperty(new Property("Archivable", DataType.Bool), true);
             weld.addProperty(new Property("C1", DataType.CFrame), accessoryAttachment.Property("CFrame").clone());
@@ -44228,7 +44233,7 @@ class AccessoryWrapper extends InstanceWrapper {
             const head = this.instance.parent.FindFirstChild("Head");
             if (!head) return;
             const attachmentPoint = this.instance.PropOrDefault("AttachmentPoint", new CFrame());
-            const weld = new Instance("Weld");
+            const weld = oldAccessoryWeld || new Instance("Weld");
             weld.addProperty(new Property("Name", DataType.String), "AccessoryWeld");
             weld.addProperty(new Property("Archivable", DataType.Bool), true);
             weld.addProperty(new Property("C1", DataType.CFrame), attachmentPoint.clone());
@@ -48634,7 +48639,12 @@ class ObjectDesc extends RenderDesc {
         threeMesh.scale.set(this.size.X, this.size.Y, this.size.Z);
       } else {
         const oldSize = this.originalScale;
-        threeMesh.scale.set(this.size.X / oldSize.x, this.size.Y / oldSize.y, this.size.Z / oldSize.z);
+        const [sX, sY, sZ] = [
+          specialClamp(this.size.X / oldSize.x, 1e-5, 1e6),
+          specialClamp(this.size.Y / oldSize.y, 1e-5, 1e6),
+          specialClamp(this.size.Z / oldSize.z, 1e-5, 1e6)
+        ];
+        threeMesh.scale.set(sX, sY, sZ);
       }
       if (SkeletonDesc.descNeedsSkeleton(this.meshDesc)) {
         this.skeletonDesc = new SkeletonDesc(this, this.meshDesc, scene);
@@ -48663,7 +48673,12 @@ class ObjectDesc extends RenderDesc {
       return new Vector3(this.size.X, this.size.Y, this.size.Z);
     } else {
       const oldSize = this.originalScale;
-      return new Vector3(this.size.X / oldSize.x, this.size.Y / oldSize.y, this.size.Z / oldSize.z);
+      const [sX, sY, sZ] = [
+        specialClamp(this.size.X / oldSize.x, 1e-5, 1e6),
+        specialClamp(this.size.Y / oldSize.y, 1e-5, 1e6),
+        specialClamp(this.size.Z / oldSize.z, 1e-5, 1e6)
+      ];
+      return new Vector3(sX, sY, sZ);
     }
   }
   updateResults() {
@@ -52553,7 +52568,7 @@ class EmitterDesc extends DisposableDesc {
       const size = this.size.getValue(this.normalizeSizeKeypointTime ? normalizedTime : time2, particle.seed + 0);
       const squash = this.squash.getValue(this.normalizeSizeKeypointTime ? normalizedTime : time2, particle.seed + 2);
       const opacity = 1 - this.transparency.getValue(normalizedTime, particle.seed + 1);
-      const flipbookFramerate = mathRandom(this.flipbookFramerate.Min, this.flipbookFramerate.Max, new RNG(particle.seed + 67).nextFloat());
+      const flipbookFramerate = mathRandom(this.flipbookFramerate.Min, this.flipbookFramerate.Max, new RNG(particle.seed + 67).nextFloat()) || 1;
       let flipbookFrameTime = this.flipbookMode === ParticleFlipbookMode.OneShot ? particle.lifetime / flipbookTotal : 1 / flipbookFramerate;
       if (!this.flipbookBlendFrames) flipbookFrameTime = 1e6;
       this.result.setMatrixAt(i, particle.getMatrix(renderScene, size, this.orientation, squash));
@@ -62315,6 +62330,10 @@ class RBXRenderer {
             controls.domElement = newCanvas;
             controls.connect(newCanvas);
           }
+          const effectComposer = renderScene.effectComposer;
+          if (effectComposer) {
+            RBXRenderer.createEffectComposer(renderScene);
+          }
           for (const renderDesc of renderScene.renderDescs.values()) {
             if (renderDesc instanceof ObjectDesc) {
               const materialDesc = renderDesc.materialDesc;

package/package.json

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