roavatar-renderer 1.8.0 → 1.8.1

package/dist/index.d.ts

@@ -1837,8 +1837,15 @@ export declare function getCameraCFrameForAvatarNonCustomized(rig: Instance): CF
  */
 export declare function getCameraCFrameForHeadshotCustomized(rig: Instance, fov: number, yRot: number, distance: number): CFrame | undefined;
 
+export declare function getCameraCFrameForHeadshotNonCustomized(rig: Instance, newLighting?: boolean): {
+    cframe: CFrame;
+    fov: number;
+};
+
 export declare function getCharacterTorsoCFrame(character: Instance): CFrame;
 
+export declare function getCloseupCameraCFrame(character: Instance, newLighting?: boolean): Instance;
+
 /**
  * @category Mesh
  */

package/dist/index.js

@@ -48650,6 +48650,11 @@ class ObjectDesc extends RenderDesc {
     }
     if (this.materialDesc.result) {
       this.materialDesc.updateResult();
+      if (this.results) {
+        for (const result of this.results) {
+          result.visible = this.materialDesc.visible;
+        }
+      }
     }
   }
   static shouldRenderInstance(instance) {
@@ -62894,6 +62899,63 @@ function getAvatarCameraCFrame(character, applyEmote, isFallbackEmoteApplied, fi
   setupCamera(camera, cameraOptions);
   return camera;
 }
+function getCloseupCameraCFrame(character, newLighting = true) {
+  const cameraOffsetX = 0;
+  const cameraOffsetY = 0;
+  const baseHatZoom = 30;
+  const maxHatZoom = 100;
+  const headAttachments = [];
+  const head = character.FindFirstChild("Head");
+  let headPos = new Vector3();
+  let headCF = new CFrame();
+  if (head) {
+    headPos = head.Prop("Position");
+    headCF = head.Prop("CFrame");
+    for (const child of head.GetChildren()) {
+      if (child.IsA("Attachment")) {
+        headAttachments.push(child.Prop("Name"));
+      }
+    }
+  }
+  let maxDimension = 0;
+  for (const child of character.GetChildren()) {
+    if (child.IsA("Accessory")) {
+      const handle = child.FindFirstChild("Handle");
+      if (handle) {
+        const handlePos = handle.Prop("Position");
+        let hasHeadAttachment = false;
+        for (const att of handle.GetChildren()) {
+          if (att.IsA("Attachment") && headAttachments.includes(att.Prop("Name"))) {
+            hasHeadAttachment = true;
+            break;
+          }
+        }
+        if (hasHeadAttachment) {
+          const size = handle.Prop("Size").divide(new Vector3(2, 2, 2)).add(handlePos).minus(headPos);
+          size.Z = 0;
+          if (size.magnitude() > maxDimension) {
+            maxDimension = size.magnitude();
+          }
+        }
+      }
+    }
+  }
+  const maxHatOffset = 0.5;
+  maxDimension = Math.min(1, maxDimension / 3);
+  maxDimension *= maxDimension;
+  const viewOffset = headCF.multiply(new CFrame(cameraOffsetX, cameraOffsetY + maxHatOffset * maxDimension, 0.1));
+  let yAngle = -Math.PI / 16;
+  if (newLighting) {
+    yAngle = 0;
+  }
+  const positionOffset = headCF.clone();
+  const toAdd = multiply(normalize(CFrame.Angles(0, yAngle, 0).lookVector()), [3, 3, 3]);
+  positionOffset.Position = add(positionOffset.Position, toAdd);
+  const camera = createThumbnailCamera();
+  camera.setProperty("CFrame", CFrame.lookAt(positionOffset.Position, viewOffset.Position));
+  camera.setProperty("FieldOfView", baseHatZoom + (maxHatZoom - baseHatZoom) * maxDimension);
+  return camera;
+}
 function getCorners(cframe, size) {
   const halfX = size.X / 2;
   const halfY = size.Y / 2;
@@ -62959,7 +63021,7 @@ function getExtents(cframe, parts) {
 function getExtentsWorld(rig) {
   const rigParts = [];
   for (const child of rig.GetDescendants()) {
-    if (child.createWrapper()?.IsA("BasePart")) {
+    if (child.createWrapper()?.IsA("BasePart") && !(child.Prop("Name") === "HumanoidRootPart")) {
       rigParts.push(child);
     }
   }
@@ -63021,6 +63083,13 @@ function getCameraCFrameForHeadshotCustomized(rig, fov2, yRot, distance2) {
     return cameraCF;
   }
 }
+function getCameraCFrameForHeadshotNonCustomized(rig, newLighting = true) {
+  const camera = getCloseupCameraCFrame(rig, newLighting);
+  const cameraCF = camera.Prop("CFrame");
+  const cameraFOV = camera.Prop("FieldOfView");
+  camera.Destroy();
+  return { cframe: cameraCF, fov: cameraFOV };
+}
 function getCameraCFrameForAvatarCustomized(rig, fov2, yRot) {
   const camera = getAvatarCameraCFrame(rig, void 0, void 0, fov2, {
     optCameraYRot: yRot,
@@ -64211,7 +64280,9 @@ export {
   getCameraCFrameForAvatarCustomized,
   getCameraCFrameForAvatarNonCustomized,
   getCameraCFrameForHeadshotCustomized,
+  getCameraCFrameForHeadshotNonCustomized,
   getCharacterTorsoCFrame,
+  getCloseupCameraCFrame,
   getDistIndexArray,
   getExtents,
   getExtentsCenter,

package/package.json

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