roavatar-renderer 1.9.2 → 1.9.4

package/dist/index.d.ts

@@ -1436,6 +1436,11 @@ export declare function exposeFLAGS(): void;
  */
 export declare function exposeMesh(): void;
 
+/**
+ * @category Exposer
+ */
+export declare function exposeTests(): void;
+
 /**
  * @category Exposer
  */
@@ -1515,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;
@@ -1695,6 +1706,8 @@ export declare const FLAGS: {
     SEARCH_FOR_STRING: string | undefined;
     /**only used by RoAvatar, set this to a string to load a place file, for example "../assets/UniversalApp.rbxm" */
     LOAD_TEST_PLACE: string | undefined;
+    /**Used for autotests */
+    AUTOTEST_MODEL: string;
 };
 
 declare class FloatCurve {
@@ -2233,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

@@ -32648,8 +32648,9 @@ const FLAGS = {
   VERBOSE_LOGGING: false,
   SEARCH_FOR_STRING: void 0,
   //"requestparams" //"looks/" //this is useful if you want to find api endpoints
-  LOAD_TEST_PLACE: void 0
+  LOAD_TEST_PLACE: void 0,
   //"../assets/UniversalApp.rbxm" //"../assets/WrapDeformerTest.rbxm" //"../assets/DecalTest2.rbxm" //"../assets/TransparentDominus.rbxm" //"../assets/EmissiveTest.rbxm" //"../assets/Mesh Deformation Test.rbxl" //set this to a string to load a place file
+  AUTOTEST_MODEL: "rbxassetid://138879899842500"
 };
 function log(critical, ...args) {
   if (critical || FLAGS.VERBOSE_LOGGING) {
@@ -33113,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([
@@ -33196,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;
@@ -33229,7 +33229,13 @@ class CFrame {
     return newCF;
   }
   isSame(other) {
-    return isSameFloat(this.Position[0], other.Position[0]) && isSameFloat(this.Position[1], other.Position[1]) && isSameFloat(this.Position[2], other.Position[2]) && isSameFloat(this.Orientation[0], other.Orientation[0]) && isSameFloat(this.Orientation[1], other.Orientation[1]) && isSameFloat(this.Orientation[2], other.Orientation[2]);
+    const so0 = Math.abs(this.Orientation[0]) > 179 ? Math.abs(this.Orientation[0]) : this.Orientation[0];
+    const so1 = Math.abs(this.Orientation[1]) > 179 ? Math.abs(this.Orientation[1]) : this.Orientation[1];
+    const so2 = Math.abs(this.Orientation[2]) > 179 ? Math.abs(this.Orientation[2]) : this.Orientation[2];
+    const oo0 = Math.abs(other.Orientation[0]) > 179 ? Math.abs(other.Orientation[0]) : other.Orientation[0];
+    const oo1 = Math.abs(other.Orientation[1]) > 179 ? Math.abs(other.Orientation[1]) : other.Orientation[1];
+    const oo2 = Math.abs(other.Orientation[2]) > 179 ? Math.abs(other.Orientation[2]) : other.Orientation[2];
+    return isSameFloat(this.Position[0], other.Position[0]) && isSameFloat(this.Position[1], other.Position[1]) && isSameFloat(this.Position[2], other.Position[2]) && isSameFloat(so0, oo0) && isSameFloat(so1, oo1) && isSameFloat(so2, oo2);
   }
 }
 class Connection {
@@ -33628,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;
   }
@@ -39034,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);
@@ -39054,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);
@@ -44174,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];
         }
       }
     }
@@ -44201,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());
@@ -44221,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());
@@ -44492,7 +44504,7 @@ function getOriginalSize(part) {
   }
   return originalSize;
 }
-function scaleChildrenOfPart(part, scaleVector, alreadyScaledAttachment) {
+function scaleChildrenOfPart(part, scaleVector, adjustedScaleVector, alreadyScaledAttachment) {
   for (const child of part.GetDescendants()) {
     if (child.className === "Attachment" && child !== alreadyScaledAttachment) {
       let originalPosition = child.Prop("Position");
@@ -44503,7 +44515,7 @@ function scaleChildrenOfPart(part, scaleVector, alreadyScaledAttachment) {
     } else if (child.className === "SpecialMesh") {
       if (child.Prop("MeshType") !== MeshType.Head) {
         const orignalScale = child.Prop("Scale");
-        child.setProperty("Scale", orignalScale.multiply(scaleVector));
+        child.setProperty("Scale", orignalScale.multiply(adjustedScaleVector));
       }
     }
   }
@@ -44632,7 +44644,7 @@ function ScaleAccessory(accessory, bodyScaleVector, headScaleVector, bodyTypeSca
       }
     }
   }
-  scaleChildrenOfPart(handle, beforeAdjustmentResultScale, hasAdjusted);
+  scaleChildrenOfPart(handle, beforeAdjustmentResultScale, resultScale, hasAdjusted);
   handle.setProperty("Size", originalSize.multiply(resultScale));
   if (accessory.className === "Accessory") {
     const accessoryWrapper = new AccessoryWrapper(accessory);
@@ -48627,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);
@@ -48656,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() {
@@ -62308,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;
@@ -64395,6 +64421,106 @@ async function generateOutfitModelThumbnail(auth, outfitModel, options) {
   Object.assign(defaultOptions, options);
   return generateOutfitThumbnail(auth, outfitModel, defaultOptions.size, defaultOptions.type, defaultOptions.quality, defaultOptions.gltfAutoDownload, defaultOptions.includeAnimations);
 }
+async function runTests() {
+  const auth = new Authentication();
+  const testModel = await API.Asset.GetRBX(FLAGS.AUTOTEST_MODEL);
+  if (testModel instanceof Response) throw "FLAGS.AUTOTEST_MODEL request failed";
+  const root = testModel.generateTree();
+  const folder = root.Child("Tests");
+  if (!folder) throw "FLAGS.AUTOTEST_MODEL is missing Tests folder";
+  for (const test of folder.GetChildren()) {
+    console.log(test);
+    const outfitDataValue = test.Child("OutfitData");
+    const typesValue = test.Child("Types");
+    const avatar = test.Child("Player");
+    if (!outfitDataValue || !typesValue || !avatar) throw "A test is missing OutfitData";
+    const outfitData = outfitDataValue.Prop("Value");
+    const types = typesValue.Prop("Value").split(",");
+    const outfit = new Outfit();
+    await outfit.fromBuffer(base64ToArrayBuffer(outfitData), auth);
+    const outfitRenderer = new OutfitRenderer(auth, outfit);
+    await new Promise((resolve) => {
+      outfitRenderer.onSuccess.Connect(() => {
+        for (const type of types) {
+          switch (type) {
+            case "scale":
+              testScale(outfitRenderer, avatar);
+              break;
+            default:
+              throw `Invalid test type found: ${type}`;
+          }
+        }
+        resolve(null);
+      });
+    });
+    outfitRenderer.onError.Connect(() => {
+      throw "OutfitRenderer failed to load";
+    });
+    outfitRenderer.destroy();
+  }
+  console.log("TESTS COMPLETE!");
+}
+function getEquivalent(self2, otherParent) {
+  const equivalent = otherParent.GetChildren().filter((v) => {
+    return v.Prop("Name") === self2.Prop("Name") && v.className === self2.className;
+  })[0];
+  return equivalent;
+}
+function testScaleInstance(child, otherParent) {
+  if (child.IsA("BasePart")) {
+    const equivalent = getEquivalent(child, otherParent);
+    if (!equivalent) throw `BasePart: No equivalent for ${child.GetFullName()}`;
+    const equivalentSize = equivalent.Prop("size");
+    const selfSize = child.Prop("size");
+    if (!equivalentSize.isSame(selfSize)) throw `TEST FAIL: Part size for ${child.GetFullName()} is not the same`;
+    const specialMesh = child.FindFirstChildOfClass("SpecialMesh");
+    if (specialMesh) {
+      testScaleInstance(specialMesh, equivalent);
+    }
+    const foundNames = [];
+    for (const att of child.GetChildren()) {
+      if (att.IsA("Attachment")) {
+        foundNames.push(att.Prop("Name"));
+      }
+    }
+    const newNames = foundNames.filter((v) => {
+      return foundNames.filter((g) => {
+        return g === v;
+      }).length === 1;
+    });
+    for (const newName of newNames) {
+      const att = child.Child(newName);
+      if (!att) throw `Attachment somehow doesnt exist???`;
+      testScaleInstance(att, equivalent);
+    }
+  } else if (child.IsA("Accessory")) {
+    const equivalent = getEquivalent(child, otherParent);
+    if (!equivalent) throw `Accessory: No equivalent for ${child.GetFullName()}`;
+    const handle = child.Child("Handle");
+    if (handle) {
+      testScaleInstance(handle, equivalent);
+    }
+  } else if (child.className === "SpecialMesh") {
+    const equivalent = getEquivalent(child, otherParent);
+    if (!equivalent) throw `SpecialMesh: No equivalent for ${child.GetFullName()}`;
+    const selfScale = child.Prop("Scale");
+    const equivalentScale = equivalent.Prop("Scale");
+    if (!selfScale.isSame(equivalentScale)) throw `TEST FAIL: SpecialMesh Scale for ${child.GetFullName()} is not the same`;
+  } else if (child.IsA("Attachment")) {
+    if (child.Prop("Name") === "RootRigAttachment") return;
+    const equivalent = getEquivalent(child, otherParent);
+    if (!equivalent) throw `Attachment: No equivalent for ${child.GetFullName()}`;
+    const selfCF = child.Prop("CFrame");
+    const equivalentCF = equivalent.Prop("CFrame");
+    if (!selfCF.isSame(equivalentCF)) throw `TEST FAIL: Attachment CFrame for ${child.GetFullName()} is not the same`;
+  }
+}
+function testScale(outfitRenderer, avatar) {
+  const currentRig = outfitRenderer.currentRig;
+  for (const child of currentRig.GetChildren()) {
+    testScaleInstance(child, avatar);
+  }
+}
 function renderToRenderTarget(width, height, renderScene) {
   const renderTarget = new WebGLRenderTarget(width, height, {
     colorSpace: SRGBColorSpace,
@@ -64476,6 +64602,9 @@ function exposeThumbnailGenerator() {
   globalThis.setupThumbnailScene = setupThumbnailScene;
   globalThis.getThumbnailCameraCFrame = getThumbnailCameraCFrame;
 }
+function exposeTests() {
+  globalThis.runTests = runTests;
+}
 export {
   API,
   AbbreviationToFaceControlProperty,
@@ -64684,6 +64813,7 @@ export {
   exposeAPI,
   exposeFLAGS,
   exposeMesh,
+  exposeTests,
   exposeThumbnailGenerator,
   fileMeshToTHREEGeometry,
   floor,

package/package.json

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