roavatar-renderer 1.1.3 → 1.2.1

package/dist/index.d.ts

@@ -151,12 +151,17 @@ export declare class AnimatorWrapper extends InstanceWrapper {
     static className: string;
     static requiredProperties: string[];
     setup(): void;
+    created(): void;
     get data(): AnimatorWrapperData;
+    updateToolAnimation(rig: Instance): void;
+    updateToolConnections(): void;
     _pickRandom(entries: AnimationSetEntry[]): AnimationSetEntry;
     _getTrack(id: string): AnimationTrack | undefined;
     _switchAnimation(name: string): boolean;
     stopMoodAnimation(): void;
     _switchMoodAnimation(name: string): boolean;
+    stopToolAnimation(): void;
+    _switchToolAnimation(name: string): boolean;
     isValidTrackForSet(track: AnimationTrack, name: string): boolean;
     _fixUnloaded(): void;
     restPose(includeMotors?: boolean, includeFACS?: boolean): void;
@@ -176,6 +181,9 @@ declare class AnimatorWrapperData {
     currentMoodAnimation?: string;
     currentMoodAnimationTrack?: AnimationTrack;
     moodTracks: AnimationTrack[];
+    toolTracks: AnimationTrack[];
+    toolAddedConnection?: Connection;
+    toolRemovedConnection?: Connection;
 }
 
 export declare const animNamesR15: AnimationSet;
@@ -1120,6 +1128,7 @@ export declare class Instance {
     classID?: number;
     objectFormat?: number;
     ChildAdded: Event_2;
+    ChildRemoved: Event_2;
     Destroying: Event_2;
     Changed: Event_2;
     AncestryChanged: Event_2;
@@ -1395,10 +1404,6 @@ export declare const magic = "<roblox!";
 
 export declare function magnitude(v: Vec3): number;
 
-export declare const MainToSubNames: {
-    [K in string]: string[];
-};
-
 export declare class MakeupDescriptionWrapper extends InstanceWrapper {
     static className: string;
     static requiredProperties: string[];
@@ -1915,7 +1920,7 @@ export declare class RBX {
     readPROP(chunkView: RBXSimpleView): void;
     readPRNT(chunkView: RBXSimpleView): void;
     getChunkBuffer(view: RBXSimpleView, compressedLength: number, uncompressedLength: number): ArrayBuffer | SharedArrayBuffer;
-    addItem(item: Element, itemParent?: Instance): Instance;
+    addItem(propertyToReferent: Map<Property, string>, item: Element, itemParent?: Instance): Instance;
     fromXML(xml: Document): void;
     fromBuffer(buffer: ArrayBuffer): void;
     fromInstance(root: Instance): ArrayBuffer;

package/dist/index.js

@@ -27204,16 +27204,6 @@ const AllAnimations = [
   "SwimAnimation",
   "WalkAnimation"
 ];
-const MainToSubNames = {
-  "climb": ["ClimbAnim"],
-  "fall": ["FallAnim"],
-  "idle": ["Animation1", "Animation2"],
-  "jump": ["JumpAnim"],
-  "mood": ["Animation1"],
-  "run": ["RunAnim"],
-  "swim": ["Swim"],
-  "walk": ["WalkAnim"]
-};
 const AnimationPropToName = {
   "ClimbAnimation": "climb",
   "FallAnimation": "fall",
@@ -28272,7 +28262,7 @@ const FLAGS = {
   //this is needed to enable bloom, but ugly since it disables anti aliasing...
   POST_PROCESSING_IS_DOUBLE_SIZE: true,
   //does this count as anti aliasing?
-  GEAR_ENABLED: false,
+  GEAR_ENABLED: true,
   //skeleton
   SHOW_SKELETON_HELPER: false,
   UPDATE_SKELETON: true,
@@ -28720,6 +28710,7 @@ class Instance {
   objectFormat;
   //same as above
   ChildAdded = new Event();
+  ChildRemoved = new Event();
   Destroying = new Event();
   Changed = new Event();
   AncestryChanged = new Event();
@@ -29058,10 +29049,14 @@ class Instance {
         this.parent.children.splice(index, 1);
       }
     }
+    const originalParent = this.parent;
     this.parent = instance;
     if (this.parent) {
       this.AccessoryBuildWeld();
     }
+    if (originalParent && originalParent !== instance) {
+      originalParent.ChildRemoved.Fire(this);
+    }
     if (instance) {
       instance.children.push(this);
       instance.ChildAdded.Fire(this);
@@ -29074,15 +29069,16 @@ class Instance {
       connection.Disconnect();
     }
     this._connectionReferences = [];
-    for (const child of this.GetChildren()) {
-      child.Destroy();
-    }
     this.Destroying.Fire(this);
     this.ChildAdded.Clear();
+    this.ChildRemoved.Clear();
     this.Destroying.Clear();
     this.Changed.Clear();
     this.AncestryChanged.Clear();
     this.setParent(null);
+    for (const child of this.GetChildren()) {
+      child.Destroy();
+    }
     for (const property of this.getPropertyNames()) {
       this.setProperty(property, null);
     }
@@ -29687,7 +29683,7 @@ class RBX {
     }
     return view.buffer.slice(view.viewOffset, view.viewOffset + uncompressedLength);
   }
-  addItem(item, itemParent) {
+  addItem(propertyToReferent, item, itemParent) {
     const instance = new Instance(item.getAttribute("class") || "null", true);
     const properties = item.querySelectorAll(":scope > Properties > *");
     for (const propertyNode of properties) {
@@ -29836,6 +29832,14 @@ class RBX {
           instance.setProperty(property.name, Number(propertyNode.textContent));
           break;
         }
+        case "Ref": {
+          const property = new Property();
+          property.name = propertyNode.getAttribute("name") || "null";
+          property.typeID = DataType.Referent;
+          instance.addProperty(property);
+          instance.setProperty(property.name, void 0);
+          propertyToReferent.set(property, propertyNode.textContent);
+        }
       }
     }
     if (itemParent) {
@@ -29849,11 +29853,15 @@ class RBX {
     console.warn("Parsing RBX xml file, the result may not be accurate");
     console.log(xml);
     const itemParentMap = /* @__PURE__ */ new Map();
+    const propertyToReferent = /* @__PURE__ */ new Map();
+    const referentMap = /* @__PURE__ */ new Map();
     let currentItems = xml.querySelectorAll(":scope > Item");
     while (currentItems.length > 0) {
       const newCurrentItems = [];
       for (const item of currentItems) {
-        const instance = this.addItem(item, itemParentMap.get(item));
+        const instance = this.addItem(propertyToReferent, item, itemParentMap.get(item));
+        const referent = item.getAttribute("referent") || "null";
+        referentMap.set(referent, instance);
         const itemChildren = item.querySelectorAll(":scope > Item");
         for (const itemChild of itemChildren) {
           itemParentMap.set(itemChild, instance);
@@ -29863,6 +29871,16 @@ class RBX {
       currentItems = newCurrentItems;
     }
     for (const child of this.dataModel.GetDescendants()) {
+      for (const propertyName of child.getPropertyNames()) {
+        const property = child._properties.get(propertyName);
+        if (property && property.typeID === DataType.Referent) {
+          const referent = propertyToReferent.get(property);
+          if (referent) {
+            const instance = referentMap.get(referent);
+            child.setProperty(propertyName, instance);
+          }
+        }
+      }
       child.createWrapper();
     }
     this.treeGenerated = true;
@@ -31655,6 +31673,13 @@ class Outfit {
   }
   fixOrders() {
     for (const asset of this.assets.slice().reverse()) {
+      if (!AccessoryAssetTypes.includes(asset.assetType.name) && LayeredAssetTypes.includes(asset.assetType.name)) {
+        if (asset.meta) {
+          if (typeof asset.meta.order !== "number") {
+            asset.meta.order = this.getNextOrder(LayeredClothingAssetOrder[asset.assetType.id]);
+          }
+        }
+      }
       if (asset.meta && asset.meta.order && this.isOrderUsed(asset.meta.order, asset)) {
         asset.setOrder(this.getNextOrder(asset.meta.order));
       }
@@ -34675,7 +34700,10 @@ const API = {
       } else {
         API.Misc.startCurrentlyLoadingAssets();
         const fetchStr = await API.Misc.assetURLToCDNURL(url, headers);
-        if (fetchStr instanceof Response) return fetchStr;
+        if (fetchStr instanceof Response) {
+          API.Misc.stopCurrentlyLoadingAssets();
+          return fetchStr;
+        }
         const response = await RBLXGet(fetchStr, void 0, false);
         API.Misc.stopCurrentlyLoadingAssets();
         if (response.status === 200) {
@@ -49885,8 +49913,8 @@ function replaceBodyPart(rig, child) {
     const motor6ds = rig.GetDescendants();
     for (const motor of motor6ds) {
       if (motor.className === "Motor6D" || motor.className === "Weld") {
-        const part0 = motor.Prop("Part0");
-        const part1 = motor.Prop("Part1");
+        const part0 = motor.PropOrDefault("Part0", void 0);
+        const part1 = motor.PropOrDefault("Part1", void 0);
         if (part0 && oldBodyPart === part0) {
           motor.setProperty("Part0", child);
         }
@@ -50830,6 +50858,9 @@ class AnimatorWrapperData {
   currentMoodAnimation = "mood";
   currentMoodAnimationTrack;
   moodTracks = [];
+  toolTracks = [];
+  toolAddedConnection;
+  toolRemovedConnection;
 }
 class AnimatorWrapper extends InstanceWrapper {
   static className = "Animator";
@@ -50839,9 +50870,45 @@ class AnimatorWrapper extends InstanceWrapper {
     if (!this.instance.HasProperty("_data")) this.instance.addProperty(new Property("_data", DataType.NonSerializable), new AnimatorWrapperData());
     if (!this.instance.HasProperty("_HasLoadedAnimation")) this.instance.addProperty(new Property("_HasLoadedAnimation", DataType.NonSerializable), false);
   }
+  created() {
+    if (this.instance.parent) {
+      this.updateToolConnections();
+    }
+    const ancestryChangedConnection = this.instance.AncestryChanged.Connect(() => {
+      this.updateToolConnections();
+    });
+    const destroyingConection = this.instance.Destroying.Connect(() => {
+      ancestryChangedConnection.Disconnect();
+      destroyingConection.Disconnect();
+    });
+  }
   get data() {
     return this.instance.Prop("_data");
   }
+  updateToolAnimation(rig) {
+    if (rig.FindFirstChildOfClass("Tool")) {
+      this._switchToolAnimation("toolnone");
+    } else {
+      this.stopToolAnimation();
+    }
+  }
+  updateToolConnections() {
+    this.data.toolAddedConnection?.Disconnect();
+    this.data.toolRemovedConnection?.Disconnect();
+    this.data.toolAddedConnection = void 0;
+    this.data.toolRemovedConnection = void 0;
+    const humanoid = this.instance.parent;
+    const rig = humanoid?.parent;
+    console.log(humanoid, rig);
+    if (humanoid && rig) {
+      this.data.toolAddedConnection = rig.ChildAdded.Connect(() => {
+        this.updateToolAnimation(rig);
+      });
+      this.data.toolRemovedConnection = rig.ChildRemoved.Connect(() => {
+        this.updateToolAnimation(rig);
+      });
+    }
+  }
   _pickRandom(entries) {
     let totalWeight = 0;
     for (const entry of entries) {
@@ -50933,6 +51000,42 @@ class AnimatorWrapper extends InstanceWrapper {
     }
     return !!toPlayTrack;
   }
+  stopToolAnimation() {
+    if (this.data.currentToolAnimationTrack) {
+      this.data.currentToolAnimationTrack.Stop();
+    }
+    this.data.currentToolAnimationTrack = void 0;
+    this.data.currentToolAnimation = void 0;
+  }
+  _switchToolAnimation(name2) {
+    let transitionTime = 0.2;
+    if (name2 === this.data.currentToolAnimation) {
+      transitionTime = 0.15;
+    }
+    this.data.currentToolAnimation = name2;
+    let toPlayTrack = void 0;
+    const entries = this.data.animationSet[name2];
+    if (entries && entries.length > 0) {
+      const entry = this._pickRandom(entries);
+      if (entry) {
+        toPlayTrack = this._getTrack(entry.id);
+      }
+    }
+    if (toPlayTrack !== this.data.currentToolAnimationTrack) {
+      if (toPlayTrack) {
+        if (this.data.currentToolAnimationTrack) {
+          this.data.currentToolAnimationTrack.Stop(transitionTime);
+        }
+        this.data.currentToolAnimationTrack = void 0;
+        if (!this.data.toolTracks.includes(toPlayTrack)) {
+          this.data.toolTracks.push(toPlayTrack);
+        }
+        this.data.currentToolAnimationTrack = toPlayTrack;
+        toPlayTrack.Play(transitionTime);
+      }
+    }
+    return !!toPlayTrack;
+  }
   isValidTrackForSet(track, name2) {
     if (this.data.animationSet[name2]) {
       for (const entry of this.data.animationSet[name2]) {
@@ -50950,6 +51053,9 @@ class AnimatorWrapper extends InstanceWrapper {
     if (this.data.currentMoodAnimation && !this.data.currentMoodAnimationTrack || this.data.currentMoodAnimation && this.data.currentMoodAnimationTrack && !this.isValidTrackForSet(this.data.currentMoodAnimationTrack, this.data.currentMoodAnimation)) {
       this._switchMoodAnimation(this.data.currentMoodAnimation);
     }
+    if (this.data.currentToolAnimation && !this.data.currentToolAnimationTrack || this.data.currentToolAnimation && this.data.currentToolAnimationTrack && !this.isValidTrackForSet(this.data.currentToolAnimationTrack, this.data.currentToolAnimation)) {
+      this._switchToolAnimation(this.data.currentToolAnimation);
+    }
   }
   restPose(includeMotors = true, includeFACS = true) {
     const rig = this.instance.parent?.parent;
@@ -50975,6 +51081,7 @@ class AnimatorWrapper extends InstanceWrapper {
     this._fixUnloaded();
     for (const track of this.data.animationTracks.values()) {
       if (this.data.moodTracks.includes(track)) continue;
+      if (this.data.toolTracks.includes(track)) continue;
       const looped = track.tick(addTime);
       if (this.data.currentAnimationTrack === track && looped && this.data.currentAnimation) {
         this._switchAnimation(this.data.currentAnimation);
@@ -50987,6 +51094,13 @@ class AnimatorWrapper extends InstanceWrapper {
         this._switchAnimation(this.data.currentAnimation);
       }
     }
+    for (const track of this.data.animationTracks.values()) {
+      if (!this.data.toolTracks.includes(track)) continue;
+      const looped = track.tick(addTime);
+      if (this.data.currentAnimationTrack === track && looped && this.data.currentAnimation) {
+        this._switchAnimation(this.data.currentAnimation);
+      }
+    }
     const hasMood = this.data.currentMoodAnimation && this.data.currentMoodAnimation.length > 0;
     const isEmote = this.data.currentAnimation?.startsWith("emote.");
     if (!hasMood && !isEmote) {
@@ -51134,6 +51248,13 @@ class AnimatorWrapper extends InstanceWrapper {
         } else {
           return true;
         }
+      case "tool":
+        if (this.data.currentToolAnimation !== name2) {
+          console.log("playing", name2);
+          return this._switchToolAnimation(name2);
+        } else {
+          return true;
+        }
     }
     return false;
   }
@@ -52120,6 +52241,11 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
           if (oldTool) {
             oldTool.Destroy();
           }
+          for (const child of tool.GetDescendants()) {
+            if (child.className === "Motor6D" || child.className === "Weld") {
+              child.Destroy();
+            }
+          }
           tool.setParent(rig);
         }
       } else {
@@ -52466,6 +52592,7 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
           toChange.push("dance1");
           toChange.push("dance2");
           toChange.push("dance3");
+          toChange.push("toolnone");
         }
         miniPromises.push(this._applyAnimations(humanoid, toChange));
       }
@@ -52709,23 +52836,26 @@ class ToolWrapper extends InstanceWrapper {
     }
     const humanoid = rig?.FindFirstChildOfClass("Humanoid");
     if (handle && rig && rig.className === "Model" && humanoid) {
-      for (const child of rig.GetDescendants()) {
-        if (child.Prop("Name") === "RightGripAttachment") {
-          const rightGripAttCF = child.PropOrDefault("CFrame", new CFrame()).clone();
-          if (humanoid.Prop("RigType") === HumanoidRigType.R6) {
-            rightGripAttCF.Orientation[0] -= 90;
+      const rightHand = rig.FindFirstChild("RightHand") || rig.FindFirstChild("Right Arm");
+      if (rightHand) {
+        for (const child of rightHand.GetChildren()) {
+          if (child.Prop("Name") === "RightGripAttachment") {
+            const rightGripAttCF = child.PropOrDefault("CFrame", new CFrame()).clone();
+            if (humanoid.Prop("RigType") === HumanoidRigType.R6) {
+              rightGripAttCF.Orientation[0] -= 90;
+            }
+            const weld = new Instance("Weld");
+            weld.addProperty(new Property("Name", DataType.String), "ToolWeld_GripRoAvatar");
+            weld.addProperty(new Property("Archivable", DataType.Bool), true);
+            weld.addProperty(new Property("C0", DataType.CFrame), rightGripAttCF);
+            weld.addProperty(new Property("C1", DataType.CFrame), grip);
+            weld.addProperty(new Property("Part0", DataType.Referent), child.parent);
+            weld.addProperty(new Property("Part1", DataType.Referent), handle);
+            weld.addProperty(new Property("Active", DataType.Bool), true);
+            weld.addProperty(new Property("Enabled", DataType.Bool), false);
+            weld.setParent(handle);
+            weld.setProperty("Enabled", true);
           }
-          const weld = new Instance("Weld");
-          weld.addProperty(new Property("Name", DataType.String), "ToolWeld_GripRoAvatar");
-          weld.addProperty(new Property("Archivable", DataType.Bool), true);
-          weld.addProperty(new Property("C1", DataType.CFrame), grip);
-          weld.addProperty(new Property("C0", DataType.CFrame), rightGripAttCF);
-          weld.addProperty(new Property("Part1", DataType.Referent), handle);
-          weld.addProperty(new Property("Part0", DataType.Referent), child.parent);
-          weld.addProperty(new Property("Active", DataType.Bool), true);
-          weld.addProperty(new Property("Enabled", DataType.Bool), false);
-          weld.setParent(handle);
-          weld.setProperty("Enabled", true);
         }
       }
     }
@@ -56898,10 +57028,12 @@ class WrapLayerDesc {
   cage;
   cageOrigin;
   autoSkin;
+  importOrigin;
   //temporary, order of array is used instead
   order;
   isSame(other) {
-    return this.reference === other.reference && this.referenceOrigin.isSame(other.referenceOrigin) && this.cage === other.cage && this.cageOrigin.isSame(other.cageOrigin) && this.autoSkin === other.autoSkin;
+    const importOriginSame = this.importOrigin && other.importOrigin && this.importOrigin.isSame(other.importOrigin) || !this.importOrigin && !other.importOrigin;
+    return this.reference === other.reference && this.referenceOrigin.isSame(other.referenceOrigin) && this.cage === other.cage && this.cageOrigin.isSame(other.cageOrigin) && this.autoSkin === other.autoSkin && importOriginSame;
   }
   constructor(reference, referenceOrigin, cage, cageOrigin) {
     this.reference = reference;
@@ -57462,6 +57594,20 @@ class MeshDesc {
             layerClothingChunked(mesh, ref_mesh, dist_mesh, layeredClothingCacheId);
             break;
         }
+      } else {
+        let totalOffset = this.layerDesc.cageOrigin.inverse();
+        if (this.layerDesc.importOrigin) {
+          totalOffset = totalOffset.multiply(this.layerDesc.importOrigin.inverse());
+        }
+        const rig = this.instance?.parent?.parent;
+        if (rig) {
+          const lowerTorso = rig.FindFirstChild("LowerTorso");
+          if (lowerTorso) {
+            const lowerTorsoSize = lowerTorso.PropOrDefault("Size", new Vector32());
+            totalOffset = totalOffset.multiply(new CFrame(0, -lowerTorsoSize.Y, 0));
+          }
+        }
+        offsetMesh(mesh, totalOffset);
       }
       the_ref_mesh = void 0;
     }
@@ -57622,6 +57768,9 @@ class MeshDesc {
       if (wrapLayer.HasProperty("AutoSkin")) {
         this.layerDesc.autoSkin = wrapLayer.Prop("AutoSkin");
       }
+      if (wrapLayer.HasProperty("ImportOrigin")) {
+        this.layerDesc.importOrigin = wrapLayer.Prop("ImportOrigin");
+      }
       this.layerDesc.order = layerOrder;
       this.modelLayersDesc = getModelLayersDesc(model);
     } else if (wrapDeformer && wrapTarget) {
@@ -60793,7 +60942,6 @@ export {
   LayeredAssetTypes,
   LayeredClothingAssetOrder,
   LocalOutfit,
-  MainToSubNames,
   MakeupDescriptionWrapper,
   MakeupType,
   MaxOneOfAssetTypes,

package/package.json

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