roavatar-renderer 1.4.4 → 1.4.5

package/README.md

@@ -1,9 +1,7 @@
 # Renderer for RoAvatar
 The Roblox Avatar renderer used by https://github.com/steinann/RoAvatar
 
-Links: [npm](https://www.npmjs.com/package/roavatar-renderer) | [GitHub](https://github.com/steinann/RoAvatar-Renderer)
-
-Docs: [Documentation](https://steinann.github.io/RoAvatar-Renderer/)
+Links: [npm](https://www.npmjs.com/package/roavatar-renderer) | [GitHub](https://github.com/steinann/RoAvatar-Renderer) | [docs](https://steinann.github.io/RoAvatar-Renderer/)
 
 > **IMPORTANT** <br>
 > Assets are *NOT* included in the npm module or this repository, you have to get them from the main RoAvatar repository OR set

package/dist/index.d.ts

@@ -39,6 +39,7 @@ export declare const accessoryRefinementTypes: number[];
 /** @category Outfit */
 export declare const accessoryRefinementUpperBounds: typeof accessoryRefinementLowerBounds;
 
+/**@category DataModelEnum */
 export declare const AccessoryType: {
     Unknown: number;
     Hat: number;
@@ -103,6 +104,7 @@ export declare const AllHeadShapes: string[];
  */
 export declare const AllInstances: Instance[];
 
+/**@category DataModelEnum */
 export declare const AlphaMode: {
     Overlay: number;
     Transparency: number;
@@ -280,6 +282,7 @@ export declare const API: {
         parseAssetString: (str: string) => string;
         getCDNURLFromAssetDelivery: (url: string, headers?: any) => Promise<string | Response>;
         assetURLToCDNURL: (url: string | number | bigint, headers?: any, extraStr?: string) => Promise<string | Response>;
+        getCurrentlyLoading: () => boolean;
     };
     Events: {
         OnLoadingAssets: Event_2;
@@ -515,6 +518,7 @@ export declare class Authentication {
     getSessionUUID(): string;
 }
 
+/**@category API */
 export declare interface AvatarInventory_Result {
     avatarInventoryItems: {
         itemId: number;
@@ -587,14 +591,10 @@ declare class BaseKeyframeGroup {
     getHigherKeyframe(time: number): BaseKeyframe | null;
 }
 
-/**
- * @category Outfit
- */
+/**@category Outfit */
 export declare type BodyColor3Name = "headColor3" | "torsoColor3" | "rightArmColor3" | "leftArmColor3" | "rightLegColor3" | "leftLegColor3";
 
-/**
- * @category Outfit
- */
+/**@category Outfit */
 export declare class BodyColor3s {
     colorType: ColorType;
     headColor3: string;
@@ -618,6 +618,7 @@ export declare class BodyColor3s {
     fromJson(bodyColorsJson: BodyColor3sJson): void;
 }
 
+/**@category Outfit */
 export declare type BodyColor3sJson = {
     headColor3?: string;
     torsoColor3?: string;
@@ -627,9 +628,7 @@ export declare type BodyColor3sJson = {
     leftLegColor3?: string;
 };
 
-/**
- * @category Outfit
- */
+/**@category Outfit */
 export declare class BodyColors {
     colorType: ColorType;
     headColorId: number;
@@ -654,6 +653,7 @@ export declare class BodyColors {
     toColor3(): BodyColor3s;
 }
 
+/**@category Outfit */
 export declare type BodyColorsJson = {
     headColorId?: number;
     torsoColorId?: number;
@@ -674,6 +674,7 @@ export declare class BodyColorsWrapper extends InstanceWrapper {
     update(): void;
 }
 
+/**@category DataModelEnum */
 export declare const BodyPart: {
     Head: number;
     Torso: number;
@@ -728,6 +729,7 @@ export declare function BuildJoints(self: RigData): void;
  */
 export declare function buildVertKD(mesh: FileMesh): KDNode | null;
 
+/**@category API */
 export declare interface BundleDetails_Result {
     bundleType: number;
     bundledItems: {
@@ -829,6 +831,7 @@ export declare function cleanString(inputString: string): string;
 
 export declare function clonePrimitiveArray<T>(arr: T[]): any[];
 
+/**@category API */
 export declare function cloneSearch_Payload(data: Search_Payload): Search_Payload;
 
 /**
@@ -889,9 +892,7 @@ export declare class ColorSequenceKeypoint {
     isSame(other: ColorSequenceKeypoint): boolean;
 }
 
-/**
- * @category Outfit
- */
+/**@category Outfit */
 export declare type ColorType = "BrickColor" | "Color3";
 
 /**
@@ -917,7 +918,10 @@ export declare class Content {
 
 export declare const ContentMap: Map<string, string>;
 
-declare class COREMESH {
+/**
+ * Class inside FileMesh that contains core data
+ * @category Mesh */
+export declare class COREMESH {
     private _numverts;
     private _positions;
     private _normals;
@@ -1144,7 +1148,10 @@ declare class FaceKeyframeGroup extends BaseKeyframeGroup {
     getLowerKeyframe(time: number): FaceKeyframe | null;
 }
 
-declare class FACS {
+/**
+ * Class inside FileMesh that contains facial animation data
+ * @category Mesh */
+export declare class FACS {
     faceBoneNames: string[];
     faceControlNames: string[];
     quantizedTransforms?: QuantizedTransform;
@@ -1189,7 +1196,10 @@ export declare class FileMesh {
     getValidationIssue(): "subsetLengthMismatch" | undefined;
 }
 
-declare class FileMeshBone {
+/**
+ * Bone inside SKINNING in FileMesh
+ * @category Mesh */
+export declare class FileMeshBone {
     boneNameIndex: number;
     parentIndex: number;
     lodParentIndex: number;
@@ -1199,12 +1209,18 @@ declare class FileMeshBone {
     clone(): FileMeshBone;
 }
 
+/**
+ * Contains bone weights for a single vert
+ * @category Mesh */
 export declare class FileMeshSkinning {
     subsetIndices: Vec4;
     boneWeights: Vec4;
     clone(): FileMeshSkinning;
 }
 
+/**
+ * Section of mesh inside SKINNING in FileMesh
+ * @category Mesh */
 export declare class FileMeshSubset {
     facesBegin: number;
     facesLength: number;
@@ -1298,7 +1314,7 @@ export declare const FLAGS: {
     AUTO_RESTORE_CONTEXT: boolean;
     /**RenderTarget textures are converted to CanvasTextures which can be exported */
     RENDERTARGET_TO_CANVASTEXTURE: boolean;
-    /**Amount of time thumbnail generator will wait after no assets are being loaded to resolve */
+    /**Amount of time thumbnail generator will wait after no assets are being loaded to resolve, should be a little time at least so particles can render */
     THUMBNAIL_TIMEOUT: number;
     /**shows ThreeJS SkeletonHelper */
     SHOW_SKELETON_HELPER: boolean;
@@ -1364,7 +1380,7 @@ export declare function gaussian_rbf(v0: Vec3, v1: Vec3, sigma?: number): number
 /**
  * Generates a 2d or 3d thumbnail of a model/similar instance
  * @param auth Authentication
- * @param renderScene Scene to render inside, do note the scene appearance is not populated automaticall, use setupThumbnailScene()
+ * @param renderScene Scene to render inside, do note the scene appearance is not populated automatically, use setupThumbnailScene()
  * @param model Model to render
  * @param size Size of the resulting image, ignored for 3d thumbnails
  * @param type Type of thumbnail, "png" | "webp" | "gltf"
@@ -1428,26 +1444,44 @@ export declare function generateUUIDv4(): string;
 
 export declare function GetAttachedPart(accessory: Instance, rig: Instance): Instance | undefined;
 
+/**
+ * @deprecated Use getThumbnailCameraCFrame instead
+ * @param rig
+ * @returns
+ */
 export declare function getCameraCFrameForAvatarNonCustomized(rig: Instance): CFrame | undefined;
 
+/**
+ * Calculates the CFrame the camera should be at when generating a customized headshot thumbnail
+ * @param rig Character
+ * @param fov Customized fov
+ * @param yRot Customized yRot
+ * @param distance Customized distanceScale
+ * @returns Thumbnail camera cframe
+ * @category ThumbnailGenerator
+ */
 export declare function getCameraCFrameForHeadshotCustomized(rig: Instance, fov: number, yRot: number, distance: number): CFrame | undefined;
 
-export declare function getCameraOffset(fov: number, extentsSize: Vector3): number;
-
 /**
  * @category Mesh
  */
 export declare function getDistIndexArray(ref: FileMesh, dist: FileMesh): (number | undefined)[];
 
+/**@category ThumbnailGenerator */
 export declare function getExtents(cframe: CFrame, parts: Instance[]): [Vector3, Vector3];
 
+/**@category ThumbnailGenerator */
 export declare function getExtentsCenter(extents: [Vector3, Vector3]): Vector3;
 
-/**@deprecated this is SO broken */
+/**
+ * @deprecated this is SO broken
+ * @category ThumbnailGenerator
+ * */
 export declare function getExtentsForParts(parts: Instance[], includeTransform?: boolean): [Vector3, Vector3];
 
 export declare function getHeadExtents(rig: Instance): [Vector3, Vector3] | undefined;
 
+/**@category API */
 export declare interface GetInfoForId_Result {
     "description": string;
     "created": string;
@@ -1474,6 +1508,7 @@ export declare function getRandomBetweenInclusive(min: number, max: number): num
 
 export declare function getRigExtentsWorld(rig: Instance): [Vector3, Vector3];
 
+/**@category API */
 export declare interface GetSubscription_Result {
     "subscriptionProductModel": {
         "premiumFeatureId": number;
@@ -1489,12 +1524,22 @@ export declare interface GetSubscription_Result {
     };
 }
 
+/**
+ * Calculates the CFrame the camera should be at when generating a thumbnail
+ * @param model The model-like instance to get thumbnail camera for
+ * @returns Thumbnail camera cframe
+ * @category ThumbnailGenerator
+ */
+export declare function getThumbnailCameraCFrame(model: Instance): CFrame | undefined;
+
+/**@category API */
 export declare interface GetTopics_Payload {
     items: unknown[];
     maxResult: 40;
     selectTopics: string[];
 }
 
+/**@category API */
 export declare interface GetTopics_Result {
     error: null | unknown;
     topics: {
@@ -1503,6 +1548,7 @@ export declare interface GetTopics_Result {
     }[];
 }
 
+/**@category API */
 export declare interface GetUserOutfits_Result {
     data: {
         id: number;
@@ -1557,6 +1603,7 @@ export declare function hexToRgb(hex: string): {
 } | null;
 
 /**
+ * The main class for the process of HSR (Hidden Surface Removal)
  * @category Mesh
  */
 export declare class HSR {
@@ -1577,7 +1624,10 @@ export declare class HSR {
     calculateCloseToCageThreshold(): void;
 }
 
-declare class HSRAVIS {
+/**
+ * Class inside FileMesh that contains HSR Always Visible data (unused?)
+ * @category Mesh */
+export declare class HSRAVIS {
     bitFlags: boolean[];
     clone(): HSRAVIS;
 }
@@ -1655,6 +1705,7 @@ export declare class HumanoidDescriptionWrapper extends InstanceWrapper {
     applyDescription(humanoid: Instance): Promise<Instance | Response | undefined>;
 }
 
+/**@category DataModelEnum */
 export declare const HumanoidRigType: {
     R6: number;
     R15: number;
@@ -1712,7 +1763,7 @@ export declare class Instance {
     get id(): string;
     set name(value: string);
     get name(): string;
-    createWrapper(): void;
+    createWrapper(): InstanceWrapper | undefined;
     addConnectionReference(connection: Connection): void;
     removeConnectionReference(connection: Connection): void;
     addReferencedBy(instance: Instance): void;
@@ -1781,6 +1832,7 @@ export declare class InstanceWrapper {
     preRender(): void;
 }
 
+/**@category API */
 export declare interface Inventory_Result {
     data: {
         assetId: number;
@@ -1809,6 +1861,7 @@ export declare function isSameFloat(num0: number, num1: number): boolean;
 
 export declare function isSameVector3(vec0: Vector3, vec1: Vector3): boolean;
 
+/**@category API */
 export declare interface ItemDetail_Result {
     assetType: number;
     bundledItems: [];
@@ -1835,6 +1888,7 @@ export declare interface ItemDetail_Result {
     };
 }
 
+/**@category API */
 export declare interface ItemDetails_Result {
     data: ItemDetail_Result[];
 }
@@ -1929,7 +1983,10 @@ export declare interface LocalOutfitJson {
     buffer: string;
 }
 
-declare class LODS {
+/**
+ * Class inside FileMesh that contains LOD metadata
+ * @category Mesh */
+export declare class LODS {
     lodType: number;
     numHighQualityLODs: number;
     numLodOffsets: number;
@@ -1937,6 +1994,7 @@ declare class LODS {
     clone(): LODS;
 }
 
+/**@category API */
 export declare interface Look_Result {
     look: {
         avatarProperties: {
@@ -2047,6 +2105,7 @@ export declare class MakeupDescriptionWrapper extends InstanceWrapper {
     setup(): void;
 }
 
+/**@category DataModelEnum */
 export declare const MakeupType: {
     Face: number;
     Lip: number;
@@ -2062,6 +2121,7 @@ export declare class ManualWeldWrapper extends WeldWrapper {
 
 export declare function mapNum(x: number, in_min: number, in_max: number, out_min: number, out_max: number): number;
 
+/**@category API */
 export declare interface MarketplaceWidget {
     id: string;
     type: string;
@@ -2083,6 +2143,7 @@ export declare interface MarketplaceWidget {
     };
 }
 
+/**@category API */
 export declare interface MarketplaceWidgets_Result {
     widgets: {
         [K in number]: MarketplaceWidget;
@@ -2134,6 +2195,7 @@ declare class MeshCollider {
     raycast(ray: Ray_2): boolean;
 }
 
+/**@category DataModelEnum */
 export declare const MeshType: {
     Brick: number;
     Cylinder: number;
@@ -2203,6 +2265,7 @@ export declare function multiply(v0: Vec3, v1: Vec3): Vec3;
  */
 export declare function multiplyMatrixVector(m: Mat3x3, v: Vec3): Vec3;
 
+/**@category API */
 export declare interface NavigationMenuItems {
     categories: {
         category: string;
@@ -2279,6 +2342,7 @@ export declare interface NavigationMenuItems {
 
 export declare const NeverLayeredAccessoryTypes: number[];
 
+/**@category DataModelEnum */
 export declare const NormalId: {
     Right: number;
     Top: number;
@@ -2436,6 +2500,7 @@ export declare class Outfit {
     toBuffer(): ArrayBuffer;
 }
 
+/**@category Outfit */
 export declare type OutfitJson = {
     scale?: ScaleJson;
     playerAvatarType?: AvatarType;
@@ -2525,12 +2590,14 @@ declare class PartCurve {
     rotation?: FloatCurve3;
 }
 
+/**@category DataModelEnum */
 export declare const ParticleEmitterShapeInOut: {
     Outward: number;
     Inward: number;
     InAndOut: number;
 };
 
+/**@category DataModelEnum */
 export declare const ParticleOrientation: {
     FacingCamera: number;
     FacingCameraWorldUp: number;
@@ -3007,13 +3074,12 @@ export declare class RoAvatarVersions {
 
 export declare function rotationMatrixToEulerAngles(te: number[], order?: string): Vec3;
 
+/**@category API */
 export declare type SaleLocationType = "ShopOnly" | "ShopAndAllExperiences" | "ExperiencesDevApiOnly" | string;
 
 export declare function saveByteArray(data: BlobPart[] | undefined, name: string): void;
 
-/**
- * @category Outfit
- */
+/**@category Outfit */
 export declare class Scale {
     height: number;
     width: number;
@@ -3041,6 +3107,7 @@ export declare function ScaleAccessoryForRig(accessory: Instance, rig: Instance,
 
 export declare function ScaleCharacter(rig: Instance, outfit: Outfit, humanoidDescription: Instance): RigData | undefined;
 
+/**@category Outfit */
 export declare type ScaleJson = {
     height?: number;
     width?: number;
@@ -3055,9 +3122,7 @@ export declare type ScaleJson = {
  */
 export declare function scaleMesh(mesh: FileMesh, scale: Vector3): void;
 
-/**
- * @category Outfit
- */
+/**@category Outfit */
 export declare type ScaleName = "height" | "width" | "head" | "depth" | "proportion" | "bodyType";
 
 /**
@@ -3077,6 +3142,7 @@ declare class ScriptWrapperData {
     shouldStop: boolean;
 }
 
+/**@category API */
 export declare interface Search_Payload {
     taxonomy: string;
     salesTypeFilter: number;
@@ -3091,6 +3157,7 @@ export declare interface Search_Payload {
     limit?: number;
 }
 
+/**@category API */
 export declare interface Search_Result {
     keyword: string | null;
     previousPageCursor: string | null;
@@ -3167,7 +3234,10 @@ declare class SimpleView {
     readUint8(): number;
 }
 
-declare class SKINNING {
+/**
+ * Class inside FileMesh that contains skinning data
+ * @category Mesh */
+export declare class SKINNING {
     numSkinnings: number;
     skinnings: FileMeshSkinning[];
     numBones: number;
@@ -3232,6 +3302,7 @@ export declare const StringBufferProperties: string[];
 
 declare type ThreePoseCorrective = Vec3;
 
+/**@category API */
 export declare interface ThumbnailCustomizations_Result {
     "avatarThumbnailCustomizations": {
         "thumbnailType": number;
@@ -3244,10 +3315,12 @@ export declare interface ThumbnailCustomizations_Result {
     }[];
 }
 
+/**@category ThumbnailGenerator */
 export declare type ThumbnailResult = ArrayBuffer | {
     [key: string]: unknown;
 } | string | undefined;
 
+/**@category API */
 export declare interface ThumbnailsCustomization_Payload {
     thumbnailType: number;
     emoteAssetId: number;
@@ -3258,6 +3331,7 @@ export declare interface ThumbnailsCustomization_Payload {
     };
 }
 
+/**@category ThumbnailGenerator */
 export declare type ThumbnailType = "png" | "webp" | "gltf";
 
 /**
@@ -3324,6 +3398,7 @@ declare type UserInfo = {
     displayName: string;
 };
 
+/**@category API */
 export declare interface UserLooks_Result {
     data: {
         assets: {
@@ -3349,6 +3424,7 @@ export declare interface UserLooks_Result {
     previousCursor: string | null;
 }
 
+/**@category API */
 export declare interface UserOmniSearch_Result {
     "searchResults": {
         "contentGroupType": "User";
@@ -3365,12 +3441,14 @@ export declare interface UserOmniSearch_Result {
     "nextPageToken": string;
 }
 
+/**@category Outfit */
 export declare type ValidationIssue = {
     type: ValidationIssueType;
     text: string;
     assetIndex?: number;
 };
 
+/**@category Outfit */
 export declare type ValidationIssueType = "AccessoryLimit" | "LayeredLimit" | "OneOfTypeLimit" | "DuplicateId" | "NotWearable" | "MissingLayeredMeta" | "InvalidAsset" | "MakeupLimit";
 
 /** @category Mesh */
@@ -3476,6 +3554,7 @@ export declare const WorkerTypeToFunction: {
     [K in string]: Function;
 };
 
+/**@category DataModelEnum */
 export declare const WrapLayerAutoSkin: {
     Disabled: number;
     EnabledPreserve: number;
@@ -3484,8 +3563,27 @@ export declare const WrapLayerAutoSkin: {
 
 export declare const xmlMagic = "<roblox ";
 
-export declare function zoomExtents(cameraCFrame: CFrame, modelCFrame: CFrame, modelSize: Vector3, targetFOV: number, distanceScale: number): void;
+export declare function zoomExtents(cameraCFrame: CFrame, modelCFrame: CFrame, modelSize: Vector3, targetFOV: number, distanceScale: number, sizeType?: ZoomExtentsSizeType): void;
 
+/**
+ * Makes model fit inside camera
+ * @param cameraCFrame Original camera cframe
+ * @param modelCFrame Model cframe
+ * @param modelSize Model extents size
+ * @param targetFOV Camera fov
+ * @param distanceScale Distance is multiplied by this
+ * @category ThumbnailGenerator
+ */
+export declare type ZoomExtentsSizeType = "largestAxis" | "calculate";
+
+/**
+ * @deprecated Use zoomExtents instead
+ * @param cameraCFrame
+ * @param modelCFrame
+ * @param modelSize
+ * @param fov
+ * @category ThumbnailGenerator
+ */
 export declare function zoomToExtents(cameraCFrame: CFrame, modelCFrame: CFrame, modelSize: Vector3, fov?: number): void;
 
 export { }

package/dist/index.js

@@ -29548,7 +29548,7 @@ const FLAGS = {
   USE_RENDERTARGET: true,
   AUTO_RESTORE_CONTEXT: true,
   RENDERTARGET_TO_CANVASTEXTURE: false,
-  THUMBNAIL_TIMEOUT: 750,
+  THUMBNAIL_TIMEOUT: 500,
   //skeleton
   SHOW_SKELETON_HELPER: false,
   UPDATE_SKELETON: true,
@@ -30168,6 +30168,7 @@ class Instance {
       this._hasWrappered = true;
       wrapper.created();
     }
+    return wrapper;
   }
   addConnectionReference(connection) {
     if (!this._connectionReferences.includes(connection)) {
@@ -35497,6 +35498,9 @@ const API = {
       }
       const cdnURL = await API.Misc.getCDNURLFromAssetDelivery(fetchStr, headers);
       return cdnURL;
+    },
+    "getCurrentlyLoading": function() {
+      return currentlyLoadingAssets > 0;
     }
   },
   "Events": {
@@ -36515,6 +36519,7 @@ class RBFDeformerPatch {
     if (this.refVerts.length === 0) {
       return;
     }
+    API.Misc.startCurrentlyLoadingAssets();
     const [neighborIndicesBuf, weightsBuf, nearestPatchBuf] = await WorkerPool.instance.work(
       "RBFDeformerSolveAsync",
       [this.patchCount, this.K, this.epsilon, this.importantIndices.buffer, this.refVerts.buffer, this.distVerts.buffer, this.meshVerts.buffer, this.meshBones.buffer],
@@ -36535,6 +36540,7 @@ class RBFDeformerPatch {
     });
     this.nearestPatch = new Uint16Array(nearestPatchBuf);
     timeEnd(`RBFDeformerPatch.solveAsync.unpack.${this.id}`);
+    API.Misc.stopCurrentlyLoadingAssets();
   }
   /**
    * solveAsync() needs to be called before this
@@ -49635,8 +49641,7 @@ class RBXRenderer {
     RBXRenderer.backgroundColorHex = backgroundColorHex;
     const backgroundColor = new Color(backgroundColorHex);
     renderScene.scene.background = backgroundColor;
-    let thumbnailAmbientVal = 138;
-    thumbnailAmbientVal = 128;
+    const thumbnailAmbientVal = 128;
     let ambientLightColor = void 0;
     if (lightingType === "Thumbnail") {
       ambientLightColor = new Color(thumbnailAmbientVal / 255, thumbnailAmbientVal / 255, thumbnailAmbientVal / 255);
@@ -49647,7 +49652,7 @@ class RBXRenderer {
     renderScene.scene.add(ambientLight);
     renderScene.ambientLight = ambientLight;
     let directionalLightColor = void 0;
-    const directionalLightVal = 0.7 * 0.9 * 2 * 0.4;
+    const directionalLightVal = Math.PI;
     if (lightingType === "Thumbnail") {
       directionalLightColor = new Color(directionalLightVal, directionalLightVal, directionalLightVal);
     } else if (lightingType === "WellLit") {
@@ -49687,7 +49692,7 @@ class RBXRenderer {
       renderScene.scene.add(directionalLight2);
       renderScene.directionalLight2 = directionalLight2;
     } else if (lightingType === "Thumbnail") {
-      const directionalLight2 = new DirectionalLight(directionalLightColor, directionalLightIntensity * 0.5);
+      const directionalLight2 = new DirectionalLight(directionalLightColor, directionalLightVal * 0.1);
       directionalLight2.position.set(-0.47489210963249207 * -10, 0.8225368857383728 * -10, 0.3129066228866577 * -10);
       directionalLight2.target.position.set(0, 0, 0);
       renderScene.scene.add(directionalLight2);
@@ -50173,8 +50178,11 @@ function getExtents(cframe, parts) {
 function getExtentsCenter(extents) {
   return extents[1].minus(extents[0]).divide(new Vector32(2, 2, 2)).add(extents[0]);
 }
-function zoomExtents(cameraCFrame, modelCFrame, modelSize, targetFOV, distanceScale) {
-  const largestSize = Math.max(modelSize.X, modelSize.Y, modelSize.Z);
+function zoomExtents(cameraCFrame, modelCFrame, modelSize, targetFOV, distanceScale, sizeType = "calculate") {
+  let largestSize = Math.max(modelSize.X, modelSize.Y, modelSize.Z);
+  if (sizeType === "calculate") {
+    largestSize = modelSize.magnitude() / 2 / Math.sin(rad(targetFOV / 2));
+  }
   const fovMultiplier = 70 / targetFOV;
   const lookDir = multiply(normalize(minus(cameraCFrame.Position, modelCFrame.Position)), [distanceScale, distanceScale, distanceScale]);
   cameraCFrame.Position = add(modelCFrame.Position, multiply(multiply(lookDir, [largestSize, largestSize, largestSize]), [fovMultiplier, fovMultiplier, fovMultiplier]));
@@ -50243,7 +50251,7 @@ function getCameraCFrameForHeadshotCustomized(rig, fov2, yRot, distance2) {
   lookCF.Position = add(headCenterCF.Position, multiply(multiply([10, 10, 10], lookVector), [fovMultiplier, fovMultiplier, fovMultiplier]));
   lookCF = CFrame.lookAt(lookCF.Position, headCenterCF.Position);
   const cameraCF = lookCF.clone();
-  zoomExtents(cameraCF, headCenterCF, headLocalExtents[1].minus(headLocalExtents[0]), fov2, distance2);
+  zoomExtents(cameraCF, headCenterCF, headLocalExtents[1].minus(headLocalExtents[0]), fov2, distance2, "largestAxis");
   return cameraCF;
 }
 function getCameraCFrameForAvatarNonCustomized(rig) {
@@ -50274,6 +50282,36 @@ function getCameraCFrameForAvatarNonCustomized(rig) {
   zoomExtents(cameraCF, rootPartCF, extentsSize, 70, 1);
   return cameraCF;
 }
+function getThumbnailCameraCFrame(model) {
+  const thumbnailCamera = model.FindFirstChildOfClass("Camera");
+  if (thumbnailCamera) return thumbnailCamera.PropOrDefault("CFrame", new CFrame());
+  let rootPart = model.PropOrDefault("PrimaryPart", void 0);
+  if (!rootPart) rootPart = model.FindFirstChildOfClass("Part");
+  if (!rootPart) rootPart = model.FindFirstChildOfClass("MeshPart");
+  if (!rootPart) return;
+  const rootPartCF = rootPart.PropOrDefault("CFrame", new CFrame()).clone();
+  const worldExtents = getRigExtentsWorld(model);
+  if (!worldExtents) return;
+  const extentsSize = worldExtents[1].minus(worldExtents[0]);
+  rootPartCF.Position = getExtentsCenter(worldExtents).toVec3();
+  let lookVector = rootPartCF.lookVector();
+  if (Math.abs(lookVector[1]) > 0.95) {
+    lookVector = [0, 0, -1];
+  } else {
+    lookVector[1] = 0;
+    lookVector = normalize(lookVector);
+  }
+  let lookCF = CFrame.lookAt([0, 0, 0], lookVector);
+  lookCF = lookCF.multiply(CFrame.fromEulerAngles(0, 0, rad(45)));
+  lookCF = lookCF.multiply(CFrame.fromEulerAngles(rad(35), 0, 0));
+  lookCF = lookCF.multiply(CFrame.fromEulerAngles(0, 0, 0));
+  lookVector = lookCF.lookVector();
+  lookCF.Position = add(rootPartCF.Position, multiply([10, 10, 10], lookVector));
+  lookCF = CFrame.lookAt(lookCF.Position, rootPartCF.Position);
+  const cameraCF = lookCF.clone();
+  zoomExtents(cameraCF, rootPartCF, extentsSize, 70, 1);
+  return cameraCF;
+}
 class OutfitRenderer {
   auth;
   outfit;
@@ -50475,7 +50513,8 @@ function renderToRenderTarget(width, height, renderScene) {
     generateMipmaps: false,
     minFilter: LinearFilter,
     magFilter: LinearFilter,
-    type: UnsignedByteType
+    type: UnsignedByteType,
+    samples: 4
   });
   const rbxRenderer = RBXRenderer.getRenderer();
   if (!rbxRenderer) return renderTarget;
@@ -50494,12 +50533,12 @@ async function renderTargetToCanvas(renderTarget) {
 }
 async function generateModelThumbnail(auth, renderScene, model, size = [150, 150], type = "png", quality = 1, gltfAutoDownload = false) {
   return new Promise((resolve) => {
-    const cameraCFrame = getCameraCFrameForAvatarNonCustomized(model);
+    const cameraCFrame = getThumbnailCameraCFrame(model);
     if (cameraCFrame) {
       RBXRenderer.setCameraCFrame(cameraCFrame, renderScene);
     }
     RBXRenderer.addInstance(model, auth, renderScene);
-    let exportTimeout = setTimeout(doExport, FLAGS.THUMBNAIL_TIMEOUT);
+    let exportTimeout = !API.Misc.getCurrentlyLoading() ? setTimeout(doExport, FLAGS.THUMBNAIL_TIMEOUT) : void 0;
     const onLoadingConnection = API.Events.OnLoadingAssets.Connect((currentlyLoading) => {
       if (exportTimeout) {
         clearTimeout(exportTimeout);
@@ -50531,12 +50570,20 @@ async function generateModelThumbnail(auth, renderScene, model, size = [150, 150
 }
 async function generateOutfitThumbnail(auth, outfit, size = [150, 150], type = "png", quality = 1, gltfAutoDownload = false) {
   return new Promise((resolve) => {
+    const startTime = performance.now();
     const renderScene = RBXRenderer.addScene();
     setupThumbnailScene(renderScene);
     const outfitRenderer = new OutfitRenderer(auth, outfit, renderScene);
     if (outfit.playerAvatarType === AvatarType.R6) outfitRenderer.deltaTimeMultiplier = 0;
     outfitRenderer.startAnimating();
-    let exportTimeout = setTimeout(doExport, FLAGS.THUMBNAIL_TIMEOUT);
+    if (!outfit.containsAssetType("Gear")) {
+      if (outfit.playerAvatarType === AvatarType.R15) {
+        outfitRenderer.setMainAnimation("pose");
+      }
+    } else {
+      outfitRenderer.setMainAnimation("toolnone");
+    }
+    let exportTimeout = !API.Misc.getCurrentlyLoading() ? setTimeout(doExport, FLAGS.THUMBNAIL_TIMEOUT) : void 0;
     const onLoadingConnection = API.Events.OnLoadingAssets.Connect((currentlyLoading) => {
       if (exportTimeout) {
         clearTimeout(exportTimeout);
@@ -50548,15 +50595,9 @@ async function generateOutfitThumbnail(auth, outfit, size = [150, 150], type = "
     });
     async function doExport() {
       onLoadingConnection.Disconnect();
-      if (!outfit.containsAssetType("Gear")) {
-        if (outfit.playerAvatarType === AvatarType.R15) {
-          outfitRenderer.setMainAnimation("pose");
-        }
-      } else {
-        outfitRenderer.setMainAnimation("toolnone");
-      }
       if (outfitRenderer.currentRig) {
         const thumbnailResult = await generateModelThumbnail(auth, renderScene, outfitRenderer.currentRig, size, type, quality, gltfAutoDownload);
+        console.log("Generated outfit thumbnail after seconds:", (performance.now() - startTime) / 1e3);
         resolve(thumbnailResult);
         outfitRenderer.stopAnimating();
         if (outfitRenderer.currentRig) outfitRenderer.currentRig.Destroy();
@@ -50570,7 +50611,7 @@ function setupThumbnailScene(renderScene) {
   renderScene.shouldAnimate = false;
   renderScene.wellLitDirectionalLightIntensity *= 2;
   renderScene.shadowEnabled = false;
-  RBXRenderer.setupScene("WellLit", 16777215, renderScene);
+  RBXRenderer.setupScene("Thumbnail", 16777215, renderScene);
   if (renderScene.plane) renderScene.scene.remove(renderScene.plane);
   if (renderScene.shadowPlane) renderScene.scene.remove(renderScene.shadowPlane);
   renderScene.scene.background = null;
@@ -50590,6 +50631,7 @@ function exposeThumbnailGenerator() {
   globalThis.generateOutfitThumbnail = generateOutfitThumbnail;
   globalThis.generateModelThumbnail = generateModelThumbnail;
   globalThis.setupThumbnailScene = setupThumbnailScene;
+  globalThis.getThumbnailCameraCFrame = getThumbnailCameraCFrame;
 }
 export {
   API,
@@ -50635,6 +50677,7 @@ export {
   BundleTypes,
   CACHE,
   CFrame,
+  COREMESH,
   CatalogBundleTypes,
   CategoryDictionary,
   Color3,
@@ -50652,10 +50695,12 @@ export {
   DefaultSearchData,
   EmitterGroupDescClassTypes,
   Event,
+  FACS,
   FLAGS,
   FaceControlNames,
   FaceControlsWrapper,
   FileMesh,
+  FileMeshBone,
   FileMeshSkinning,
   FileMeshSubset,
   FindFirstMatchingAttachment,
@@ -50663,12 +50708,14 @@ export {
   GetAttachedPart,
   GetWrapperForInstance,
   HSR,
+  HSRAVIS,
   HumanoidDescriptionWrapper,
   HumanoidRigType,
   Instance,
   InstanceWrapper,
   ItemInfo,
   ItemSort,
+  LODS,
   LayeredAssetTypes,
   LayeredClothingAssetOrder,
   LocalOutfit,
@@ -50705,6 +50752,7 @@ export {
   RoAvatarData,
   RoAvatarDataError,
   RoAvatarVersions,
+  SKINNING,
   Scale,
   ScaleAccessory,
   ScaleAccessoryForRig,
@@ -50775,7 +50823,6 @@ export {
   generateUUIDv4,
   getCameraCFrameForAvatarNonCustomized,
   getCameraCFrameForHeadshotCustomized,
-  getCameraOffset,
   getDistIndexArray,
   getExtents,
   getExtentsCenter,
@@ -50787,6 +50834,7 @@ export {
   getOriginalSize,
   getRandomBetweenInclusive,
   getRigExtentsWorld,
+  getThumbnailCameraCFrame,
   getUVtoIndexMap,
   getUVtoIndicesMap,
   getWorkerOnMessage,

package/package.json

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