roavatar-renderer 1.2.4 → 1.2.5

package/dist/index.d.ts

@@ -942,6 +942,7 @@ export declare const FLAGS: {
     ENABLE_LC_WEIGHT_CACHE: boolean;
     INFLATE_LAYERED_CLOTHING: number;
     LAYERED_CLOTHING_ALGORITHM: "linear" | "linearnormal" | "linearnormal2" | "rbf";
+    SHOW_CAGE: boolean;
     RBF_PATCH_COUNT: number;
     RBF_PATCH_DETAIL_SAMPLES: number;
     RBF_PATCH_SHAPE_SAMPLES: number;
@@ -951,6 +952,7 @@ export declare const FLAGS: {
     GEAR_ENABLED: boolean;
     AUDIO_ENABLED: boolean;
     LEGACY_WELD_BEHAVIOR: boolean;
+    USE_RENDERTARGET: boolean;
     SHOW_SKELETON_HELPER: boolean;
     UPDATE_SKELETON: boolean;
     ANIMATE_SKELETON: boolean;

package/dist/index.js

@@ -28256,6 +28256,7 @@ const FLAGS = {
   INFLATE_LAYERED_CLOTHING: 0.05,
   //only used by linear algorithms
   LAYERED_CLOTHING_ALGORITHM: "rbf",
+  SHOW_CAGE: false,
   RBF_PATCH_COUNT: 300,
   //amount of "patches" that are used for layered clothing, multiple verts share the same patch
   RBF_PATCH_DETAIL_SAMPLES: 32,
@@ -28271,6 +28272,7 @@ const FLAGS = {
   GEAR_ENABLED: true,
   AUDIO_ENABLED: true,
   LEGACY_WELD_BEHAVIOR: false,
+  USE_RENDERTARGET: true,
   //skeleton
   SHOW_SKELETON_HELPER: false,
   UPDATE_SKELETON: true,
@@ -34490,6 +34492,22 @@ async function RBLXDelete(url, auth, body, attempt = 0) {
 async function RBLXPatch(url, auth, body, attempt = 0) {
   return RBLXPost(url, auth, body, attempt, "PATCH");
 }
+async function getAssetBufferInternal(url, headers) {
+  API.Misc.startCurrentlyLoadingAssets();
+  const fetchStr = await API.Misc.assetURLToCDNURL(url, headers);
+  if (fetchStr instanceof Response) {
+    API.Misc.stopCurrentlyLoadingAssets();
+    return fetchStr;
+  }
+  const response = await RBLXGet(fetchStr, void 0, false);
+  API.Misc.stopCurrentlyLoadingAssets();
+  if (response.status === 200) {
+    const data = await response.arrayBuffer();
+    return data;
+  } else {
+    return response;
+  }
+}
 let isCurrentlyLoading = false;
 let currentlyLoadingAssets = 0;
 function _updateCurrentlyLoadingAssets() {
@@ -34889,23 +34907,15 @@ const API = {
       if (cachedBuffer) {
         return cachedBuffer;
       } else {
-        API.Misc.startCurrentlyLoadingAssets();
-        const fetchStr = await API.Misc.assetURLToCDNURL(url, headers);
-        if (fetchStr instanceof Response) {
-          API.Misc.stopCurrentlyLoadingAssets();
-          return fetchStr;
-        }
-        const response = await RBLXGet(fetchStr, void 0, false);
-        API.Misc.stopCurrentlyLoadingAssets();
-        if (response.status === 200) {
-          const data = await response.arrayBuffer();
-          if (FLAGS.ENABLE_API_CACHE) {
-            CACHE.AssetBuffer.set(cacheStr, data);
-          }
-          return data;
-        } else {
-          return response;
+        const promise = new Promise((resolve) => {
+          getAssetBufferInternal(url, headers).then((result) => {
+            resolve(result);
+          });
+        });
+        if (FLAGS.ENABLE_API_CACHE) {
+          CACHE.AssetBuffer.set(cacheStr, promise);
         }
+        return promise;
       }
     },
     GetRBX: async function(url, headers) {
@@ -54225,6 +54235,9 @@ function traverseRigCFrame(instance, includeTransform = false, applyRoot = false
     lastMotor6D = instance.FindFirstChildOfClass("Motor6D");
     if (!lastMotor6D) {
       lastMotor6D = instance.FindFirstChildOfClass("Weld");
+      if (!lastMotor6D) {
+        lastMotor6D = instance.FindFirstChildOfClass("ManualWeld");
+      }
     }
   }
   while (lastMotor6D) {
@@ -54241,12 +54254,15 @@ function traverseRigCFrame(instance, includeTransform = false, applyRoot = false
       lastMotor6D = ogPart0?.FindFirstChildOfClass("Motor6D");
       if (!lastMotor6D) {
         lastMotor6D = ogPart0?.FindFirstChildOfClass("Weld");
+        if (!lastMotor6D) {
+          lastMotor6D = ogPart0?.FindFirstChildOfClass("ManualWeld");
+        }
       }
       if (lastMotor6D && lastMotor6D.PropOrDefault("Part1", void 0) !== ogPart0) {
         const descendants = ogLastMotor6D.parent?.parent?.GetDescendants() || [];
         let foundMotor = false;
         for (const child of descendants) {
-          if ((child.className === "Motor6D" || child.className === "Weld") && child.PropOrDefault("Part1", void 0) === ogPart0) {
+          if ((child.className === "Motor6D" || child.className === "Weld" || child.className === "ManualWeld") && child.PropOrDefault("Part1", void 0) === ogPart0) {
             lastMotor6D = child;
             foundMotor = true;
             break;
@@ -54260,7 +54276,7 @@ function traverseRigCFrame(instance, includeTransform = false, applyRoot = false
       const descendants = ogLastMotor6D.parent?.parent?.GetDescendants() || [];
       let foundMotor = false;
       for (const child of descendants) {
-        if ((child.className === "Motor6D" || child.className === "Weld") && child.PropOrDefault("Part1", void 0) === ogPart0) {
+        if ((child.className === "Motor6D" || child.className === "Weld" || child.className === "ManualWeld") && child.PropOrDefault("Part1", void 0) === ogPart0) {
           lastMotor6D = child;
           foundMotor = true;
           break;
@@ -55204,6 +55220,12 @@ class MeshDesc {
             break;
           }
         }
+        if (FLAGS.SHOW_CAGE) {
+          the_ref_mesh = dist_mesh;
+          the_ref_mesh.skinning.skinnings = [];
+          the_ref_mesh.skinning.bones = [];
+          the_ref_mesh.skinning.subsets = [];
+        }
         const layeredClothingCacheId = `${this.mesh}-${this.layerDesc.reference}`;
         switch (FLAGS.LAYERED_CLOTHING_ALGORITHM) {
           case "rbf": {
@@ -55246,7 +55268,7 @@ class MeshDesc {
         }
         offsetMesh(mesh, totalOffset);
       }
-      the_ref_mesh = void 0;
+      if (!FLAGS.SHOW_CAGE) the_ref_mesh = void 0;
       if (FLAGS.HIDE_LAYERED_CLOTHING) return;
     }
     if (this.target && this.targetOrigin && this.hsrDesc) {
@@ -55323,6 +55345,7 @@ class MeshDesc {
     }
     threeMesh.castShadow = true;
     threeMesh.geometry = geometry;
+    threeMesh.name = this.instance?.PropOrDefault("Name", "Mesh");
     threeMesh.scale.set(mesh.size[0], mesh.size[1], mesh.size[2]);
     this.compilationTimestamp = Date.now() / 1e3;
     return threeMesh;
@@ -56277,9 +56300,9 @@ class MaterialDesc {
       }
     }
     if (!hasLayerOfType) return;
-    if (hasSpecialUVType || this.bodyPart !== void 0) {
+    if ((hasSpecialUVType || this.bodyPart !== void 0) && FLAGS.USE_RENDERTARGET) {
       return this.compileTexture_FullCompose(textureType, meshDesc);
-    } else if (this.layers.length > 1 || hasColorLayer) {
+    } else if (this.layers.length > 1 || hasColorLayer && FLAGS.USE_RENDERTARGET) {
       return this.compileTexture_SimpleCompose(textureType);
     } else {
       let textureUrl = void 0;
@@ -60700,7 +60723,7 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
           }
           const handle = tool.FindFirstChild("Handle");
           for (const child of tool.GetDescendants()) {
-            if (child.className === "Motor6D" || child.className === "Weld") {
+            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");
@@ -61109,66 +61132,6 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
     return this.instance;
   }
 }
-function getCorners(cframe, size2) {
-  const halfX = size2.X / 2;
-  const halfY = size2.Y / 2;
-  const halfZ = size2.Z / 2;
-  return [
-    cframe.multiply(new CFrame(halfX, halfY, halfZ)),
-    cframe.multiply(new CFrame(halfX, halfY, -halfZ)),
-    cframe.multiply(new CFrame(-halfX, halfY, halfZ)),
-    cframe.multiply(new CFrame(-halfX, halfY, -halfZ)),
-    cframe.multiply(new CFrame(halfX, -halfY, halfZ)),
-    cframe.multiply(new CFrame(halfX, -halfY, -halfZ)),
-    cframe.multiply(new CFrame(-halfX, -halfY, halfZ)),
-    cframe.multiply(new CFrame(-halfX, -halfY, -halfZ))
-  ];
-}
-function getLower(a, b) {
-  return new Vector32(
-    a.X < b.X ? a.X : b.X,
-    a.Y < b.Y ? a.Y : b.Y,
-    a.Z < b.Z ? a.Z : b.Z
-  );
-}
-function getHigher(a, b) {
-  return new Vector32(
-    a.X > b.X ? a.X : b.X,
-    a.Y > b.Y ? a.Y : b.Y,
-    a.Z > b.Z ? a.Z : b.Z
-  );
-}
-class ModelWrapper extends InstanceWrapper {
-  static className = "Model";
-  static requiredProperties = ["Name", "PrimaryPart"];
-  setup() {
-    if (!this.instance.HasProperty("Name")) this.instance.addProperty(new Property("Name", DataType.String), "Model");
-    if (!this.instance.HasProperty("PrimaryPart")) this.instance.addProperty(new Property("PrimaryPart", DataType.Referent), void 0);
-  }
-  GetModelCFrame() {
-    const primaryPart = this.instance.Prop("PrimaryPart");
-    if (primaryPart) {
-      return primaryPart.Prop("CFrame");
-    }
-    throw new Error("Model has no PrimaryPart");
-  }
-  GetExtentsSize() {
-    let lowerExtents = new Vector32(0, 0, 0);
-    let higherExtents = new Vector32(0, 0, 0);
-    for (const child of this.instance.GetDescendants()) {
-      if (child.className === "Part" || child.className === "MeshPart") {
-        const cframe = traverseRigCFrame(child);
-        const size2 = child.Prop("Size");
-        const corners = getCorners(cframe, size2);
-        for (const corner of corners) {
-          lowerExtents = getLower(lowerExtents, new Vector32().fromVec3(corner.Position));
-          higherExtents = getHigher(higherExtents, new Vector32().fromVec3(corner.Position));
-        }
-      }
-    }
-    return higherExtents.minus(lowerExtents);
-  }
-}
 class WeldWrapperData {
   part0ChangedConnection;
   lastUpdateTime = 0;
@@ -61268,6 +61231,69 @@ class WeldWrapper extends InstanceWrapper {
     }
   }
 }
+class ManualWeldWrapper extends WeldWrapper {
+  static className = "ManualWeld";
+}
+function getCorners(cframe, size2) {
+  const halfX = size2.X / 2;
+  const halfY = size2.Y / 2;
+  const halfZ = size2.Z / 2;
+  return [
+    cframe.multiply(new CFrame(halfX, halfY, halfZ)),
+    cframe.multiply(new CFrame(halfX, halfY, -halfZ)),
+    cframe.multiply(new CFrame(-halfX, halfY, halfZ)),
+    cframe.multiply(new CFrame(-halfX, halfY, -halfZ)),
+    cframe.multiply(new CFrame(halfX, -halfY, halfZ)),
+    cframe.multiply(new CFrame(halfX, -halfY, -halfZ)),
+    cframe.multiply(new CFrame(-halfX, -halfY, halfZ)),
+    cframe.multiply(new CFrame(-halfX, -halfY, -halfZ))
+  ];
+}
+function getLower(a, b) {
+  return new Vector32(
+    a.X < b.X ? a.X : b.X,
+    a.Y < b.Y ? a.Y : b.Y,
+    a.Z < b.Z ? a.Z : b.Z
+  );
+}
+function getHigher(a, b) {
+  return new Vector32(
+    a.X > b.X ? a.X : b.X,
+    a.Y > b.Y ? a.Y : b.Y,
+    a.Z > b.Z ? a.Z : b.Z
+  );
+}
+class ModelWrapper extends InstanceWrapper {
+  static className = "Model";
+  static requiredProperties = ["Name", "PrimaryPart"];
+  setup() {
+    if (!this.instance.HasProperty("Name")) this.instance.addProperty(new Property("Name", DataType.String), "Model");
+    if (!this.instance.HasProperty("PrimaryPart")) this.instance.addProperty(new Property("PrimaryPart", DataType.Referent), void 0);
+  }
+  GetModelCFrame() {
+    const primaryPart = this.instance.Prop("PrimaryPart");
+    if (primaryPart) {
+      return primaryPart.Prop("CFrame");
+    }
+    throw new Error("Model has no PrimaryPart");
+  }
+  GetExtentsSize() {
+    let lowerExtents = new Vector32(0, 0, 0);
+    let higherExtents = new Vector32(0, 0, 0);
+    for (const child of this.instance.GetDescendants()) {
+      if (child.className === "Part" || child.className === "MeshPart") {
+        const cframe = traverseRigCFrame(child);
+        const size2 = child.Prop("Size");
+        const corners = getCorners(cframe, size2);
+        for (const corner of corners) {
+          lowerExtents = getLower(lowerExtents, new Vector32().fromVec3(corner.Position));
+          higherExtents = getHigher(higherExtents, new Vector32().fromVec3(corner.Position));
+        }
+      }
+    }
+    return higherExtents.minus(lowerExtents);
+  }
+}
 class Motor6DWrapper extends WeldWrapper {
   static className = "Motor6D";
   static requiredProperties = [
@@ -61481,6 +61507,7 @@ function RegisterWrappers() {
   ToolWrapper.register();
   WeldWrapper.register();
   Motor6DWrapper.register();
+  ManualWeldWrapper.register();
   AnimatorWrapper.register();
   FaceControlsWrapper.register();
   HumanoidDescriptionWrapper.register();

package/package.json

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