roavatar-renderer 1.6.1 → 1.6.3

package/dist/index.d.ts

@@ -695,9 +695,11 @@ export declare class BackgroundRenderer {
     hasNewUpdate: boolean;
     affectSceneAppearance: boolean;
     cameraAffectsTransparency: boolean;
+    cameraAffectsRotation: boolean;
     lastFrameTime: number;
     animationInterval?: NodeJS.Timeout;
     animationFPS: number;
+    originalPartCFrames: Map<Instance, CFrame>;
     renderScene: RBXRendererScene;
     private _renderSceneCompiledConnection?;
     private _renderSceneFailedConnection?;
@@ -733,6 +735,7 @@ export declare class BackgroundRenderer {
     _loadBackgroundData(): Promise<void>;
     _loadAvatarCyclorama(): Promise<void>;
     _applyBackgroundData(): void;
+    _applyBackgroundRotation(): void;
     /**
      * Starts updating the animation of the background per frame
      */
@@ -3671,6 +3674,12 @@ declare class RenderDesc extends DisposableDesc {
 
 export declare function replaceBodyPart(rig: Instance, child: Instance): void;
 
+/**@category DataModelEnum */
+export declare const ResamplerMode: {
+    Default: number;
+    Pixelated: number;
+};
+
 export declare function rgbToHex(r: number, g: number, b: number): string;
 
 export declare type RigData = {

package/dist/index.js

@@ -30279,6 +30279,10 @@ class RBXSimpleView {
 }
 const magic = "<roblox!";
 const xmlMagic = "<roblox ";
+const ResamplerMode = {
+  "Default": 0,
+  "Pixelated": 1
+};
 const CameraType = {
   "Fixed": 0,
   "Attach": 1,
@@ -33167,9 +33171,7 @@ class CFrame {
     this.Position = [x, y, z];
   }
   static Angles(x, y, z) {
-    const cf = new CFrame();
-    cf.Orientation = [x, y, z];
-    return cf;
+    return CFrame.fromEulerAngles(x, y, z, "XYZ");
   }
   clone() {
     const cloneCF = new CFrame(this.Position[0], this.Position[1], this.Position[2]);
@@ -38944,6 +38946,7 @@ function createContentMap() {
   ContentMap.set("roavatar://AvatarCyclorama.rbxm", "79116945688799");
 }
 let CachedRoAvatarData = void 0;
+const thumbnailTypesWithBackground = ["Outfit", "Avatar", "AvatarHeadshot"];
 let ThumbnailsToBatch = [];
 const API = {
   "Misc": {
@@ -39492,7 +39495,7 @@ const API = {
           try {
             await mesh.fromBuffer(buffer2);
             if (FLAGS.ENABLE_API_CACHE && FLAGS.ENABLE_API_MESH_CACHE) {
-              CACHE.Mesh.set(cacheStr, mesh.clone());
+              CACHE.Mesh.set(cacheStr, readOnly ? mesh : mesh.clone());
             }
             return mesh;
           } catch {
@@ -39717,7 +39720,7 @@ const API = {
         id,
         size,
         headShape,
-        includeBackground: type === "Outfit"
+        includeBackground: thumbnailTypesWithBackground.includes(type)
       };
       const cachedThumbnail = CACHE.Thumbnails.get(requestIdFromThumbnailInfo(thisThumbnailInfo));
       if (CACHE.Thumbnails.has(requestIdFromThumbnailInfo(thisThumbnailInfo))) {
@@ -39742,7 +39745,7 @@ const API = {
           attempt: 0,
           lastTryTimestamp: 0,
           headShape,
-          includeBackground: type === "Outfit"
+          includeBackground: thumbnailTypesWithBackground.includes(type)
         });
       });
     },
@@ -39752,7 +39755,7 @@ const API = {
         id,
         size,
         headShape,
-        includeBackground: type === "Outfit"
+        includeBackground: thumbnailTypesWithBackground.includes(type)
       };
       CACHE.Thumbnails.delete(requestIdFromThumbnailInfo(thisThumbnailInfo));
     },
@@ -46469,6 +46472,7 @@ class MaterialDesc {
   transparency = 0;
   doubleSided = false;
   visible = true;
+  resampleMode = ResamplerMode.Default;
   emissiveStrength = 1;
   emissiveTint = new Color3(1, 1, 1);
   bodyPart;
@@ -46481,7 +46485,7 @@ class MaterialDesc {
   result;
   isSame(other) {
     if (this.dirty || other.dirty) return false;
-    const propertiesSame = this.isDecal === other.isDecal && this.transparent === other.transparent && Math.round(this.transparency * 100) === Math.round(other.transparency * 100) && this.doubleSided === other.doubleSided && this.visible === other.visible && this.canHaveMipmaps === other.canHaveMipmaps;
+    const propertiesSame = this.isDecal === other.isDecal && this.transparent === other.transparent && Math.round(this.transparency * 100) === Math.round(other.transparency * 100) && this.doubleSided === other.doubleSided && this.visible === other.visible && this.canHaveMipmaps === other.canHaveMipmaps && this.resampleMode === other.resampleMode;
     let layersSame = true;
     if (this.layers.length !== other.layers.length) {
       layersSame = false;
@@ -46496,7 +46500,7 @@ class MaterialDesc {
   }
   needsRegeneration(other) {
     if (this.dirty || other.dirty) return true;
-    const propertiesSame = this.isDecal === other.isDecal && this.doubleSided === other.doubleSided && this.visible === other.visible && this.canHaveMipmaps === other.canHaveMipmaps;
+    const propertiesSame = this.isDecal === other.isDecal && this.doubleSided === other.doubleSided && this.visible === other.visible && this.canHaveMipmaps === other.canHaveMipmaps && this.resampleMode === other.resampleMode;
     let layersSame = true;
     if (this.layers.length !== other.layers.length) {
       layersSame = false;
@@ -46795,6 +46799,7 @@ class MaterialDesc {
     if (texture !== lineartexture) {
       lineartexture.dispose();
     }
+    texture.magFilter = this.resampleMode === ResamplerMode.Default ? LinearFilter : NearestFilter;
     let hasTransparency = false;
     const rbxRenderer = RBXRenderer.getRenderer();
     if (!hasColorLayer && rbxRenderer || FLAGS.RENDERTARGET_TO_CANVASTEXTURE && rbxRenderer) {
@@ -46815,6 +46820,7 @@ class MaterialDesc {
         texture.minFilter = ogTexture.minFilter;
         texture.magFilter = ogTexture.magFilter;
         texture.generateMipmaps = ogTexture.generateMipmaps;
+        ogTexture.dispose();
       }
     }
     if (!this.transparent) {
@@ -46880,6 +46886,7 @@ class MaterialDesc {
     } else {
       hasTransparency = false;
     }
+    texture.magFilter = this.resampleMode === ResamplerMode.Default ? LinearFilter : NearestFilter;
     texture.needsUpdate = true;
     return [texture, hasTransparency];
   }
@@ -46904,6 +46911,7 @@ class MaterialDesc {
         texture.wrapT = RepeatWrapping;
         texture.colorSpace = textureType === "color" ? SRGBColorSpace : NoColorSpace;
         texture.generateMipmaps = this.canHaveMipmaps;
+        texture.magFilter = this.resampleMode === ResamplerMode.Default ? LinearFilter : NearestFilter;
         texture.needsUpdate = true;
         return [texture, hasTransparency];
       }
@@ -47294,6 +47302,7 @@ class MaterialDesc {
       if (surfaceAppearance.Prop("AlphaMode") === AlphaMode.Transparency) {
         this.transparent = true;
       }
+      this.resampleMode = surfaceAppearance.PropOrDefault("ResampleMode", this.resampleMode);
       affectedByHumanoid = false;
     }
     if (affectedByHumanoid && child.parent && !surfaceAppearance) {
@@ -48939,7 +48948,7 @@ class AnimatorWrapper extends InstanceWrapper {
       const entries = this.data.animationSet[name];
       if (entries && entries.length > 0) {
         const isSpecificSub = subAnimSpecifier !== void 0 && subAnimSpecifier >= 0;
-        const entry = isSpecificSub ? entries[subAnimSpecifier] : this._pickRandom(entries);
+        const entry = (isSpecificSub ? entries[subAnimSpecifier] : this._pickRandom(entries)) || entries[0];
         if (entry) {
           toPlayTrack = this._getTrack(entry.id);
         }
@@ -49246,27 +49255,20 @@ class AnimatorWrapper extends InstanceWrapper {
           if (subAnimIdStr.length > 0) {
             const subAnimId = BigInt(API.Misc.idFromStr(subAnimIdStr));
             const foundAnimTrack = this.data.animationTracks.get(subAnimId);
+            if (!this.data.animationSet[animName]) {
+              this.data.animationSet[animName] = [];
+            }
+            this.data.animationSet[animName].push({
+              id: `rbxassetid://${subAnimId}`,
+              weight: subWeight
+            });
             if (foundAnimTrack) {
               if (forceLoop) {
                 foundAnimTrack.looped = true;
               }
-              if (!this.data.animationSet[animName]) {
-                this.data.animationSet[animName] = [];
-              }
-              this.data.animationSet[animName].push({
-                id: `rbxassetid://${subAnimId}`,
-                weight: subWeight
-              });
             } else {
               promises.push(new Promise((resolve) => {
                 this.loadAnimation(subAnimId, forceLoop).then((result) => {
-                  if (!this.data.animationSet[animName]) {
-                    this.data.animationSet[animName] = [];
-                  }
-                  this.data.animationSet[animName].push({
-                    id: `rbxassetid://${subAnimId}`,
-                    weight: subWeight
-                  });
                   resolve(result instanceof Response ? result : void 0);
                 });
               }));
@@ -49330,7 +49332,7 @@ class AnimatorWrapper extends InstanceWrapper {
     }
     switch (type) {
       case "main":
-        if (this.data.currentAnimation !== name) {
+        if (this.data.currentAnimation !== name || subAnimSpecifier !== -1) {
           if (!name.startsWith("emote.") || staticFacialAnimation) {
             this.playAnimation("mood", "mood");
           } else {
@@ -50876,18 +50878,13 @@ class HumanoidDescriptionWrapper extends InstanceWrapper {
     if (animationSetEntries) {
       for (const subAnim of animationSetEntries) {
         const subAnimId = BigInt(API.Misc.idFromStr(subAnim.id));
+        animatorW.data.animationSet[animName].push(subAnim);
         if (!animatorW.data.animationTracks.has(subAnimId)) {
           promises.push(new Promise((resolve) => {
             animatorW.loadAnimation(subAnimId, true).then((result) => {
-              if (!animatorW.data.animationSet[animName]) {
-                animatorW.data.animationSet[animName] = [];
-              }
-              animatorW.data.animationSet[animName].push(subAnim);
               resolve(result instanceof Response ? result : void 0);
             });
           }));
-        } else {
-          animatorW.data.animationSet[animName].push(subAnim);
         }
       }
     } else {
@@ -57702,7 +57699,7 @@ class RBXRenderer {
     if (RBXRenderer.renderer) RBXRenderer.renderer.setClearColor(new Color(0, 0, 0), 0);
     RBXRenderer.renderer.outputColorSpace = SRGBColorSpace;
     RBXRenderer.renderer.shadowMap.enabled = true;
-    RBXRenderer.renderer.shadowMap.type = PCFSoftShadowMap;
+    RBXRenderer.renderer.shadowMap.type = PCFShadowMap;
     RBXRenderer.renderer.setPixelRatio(globalThis.devicePixelRatio * 1 || 1);
     RBXRenderer.renderer.setSize(...RBXRenderer.resolution);
     if (FLAGS.USE_POST_PROCESSING && FLAGS.POST_PROCESSING_IS_DOUBLE_SIZE) {
@@ -57798,7 +57795,11 @@ class RBXRenderer {
     directionalLight.shadow.camera.bottom = -shadowPhysicalSize + bottomOffset;
     directionalLight.shadow.camera.near = 0.5;
     directionalLight.shadow.camera.far = 25;
-    directionalLight.shadow.intensity = 0.5;
+    if (lightingType === "WellLit") directionalLight.shadow.intensity = 0.5;
+    if (lightingType === "Thumbnail") {
+      directionalLight.shadow.radius = 4;
+      directionalLight.shadow.bias = 5e-4;
+    }
     directionalLight.target.position.set(0, 0, 0);
     renderScene.scene.add(directionalLight);
     renderScene.directionalLight = directionalLight;
@@ -58815,9 +58816,11 @@ class BackgroundRenderer {
   hasNewUpdate = false;
   affectSceneAppearance = true;
   cameraAffectsTransparency = true;
+  cameraAffectsRotation = false;
   lastFrameTime = Date.now() / 1e3;
   animationInterval;
   animationFPS = 60;
+  originalPartCFrames = /* @__PURE__ */ new Map();
   renderScene = RBXRenderer.firstScene;
   _renderSceneCompiledConnection;
   _renderSceneFailedConnection;
@@ -58906,6 +58909,12 @@ class BackgroundRenderer {
       const root = rbx.generateTree();
       this.avatarCyclorama = root.GetChildren()[0];
       this.avatarCyclorama.setParent(null);
+      for (const child of this.avatarCyclorama.GetChildren()) {
+        if (child.IsA("BasePart")) {
+          const childCF = child.Prop("CFrame");
+          this.originalPartCFrames.set(child, childCF);
+        }
+      }
       root.Destroy();
     } else {
       this.onError.Fire("avatarCyclorama");
@@ -58947,6 +58956,25 @@ class BackgroundRenderer {
     }
     this.fireFullyRenderedIfNeeded();
   }
+  _applyBackgroundRotation() {
+    if (this.avatarCyclorama && this.cameraAffectsRotation) {
+      const cameraCF = RBXRenderer.getCameraCFrame(this.renderScene);
+      const cameraLook = cameraCF.lookVector();
+      cameraLook[0] = -cameraLook[0];
+      cameraLook[1] = 0;
+      cameraLook[2] = -cameraLook[2];
+      const cameraAngle = CFrame.lookAt([0, 0, 0], cameraLook);
+      for (const child of this.avatarCyclorama.GetChildren()) {
+        if (child.IsA("BasePart")) {
+          const ogChildCF = this.originalPartCFrames.get(child);
+          if (ogChildCF) {
+            const newChildCF = cameraAngle.multiply(ogChildCF);
+            child.setProperty("CFrame", newChildCF);
+          }
+        }
+      }
+    }
+  }
   /**
    * Starts updating the animation of the background per frame
    */
@@ -58961,6 +58989,7 @@ class BackgroundRenderer {
    * Updates the animation once
    */
   animateOnce() {
+    this._applyBackgroundRotation();
     this._applyBackgroundData();
   }
   /**
@@ -59346,6 +59375,7 @@ class OutfitRenderer {
     this.doAddInstance = false;
     this.backgroundRenderer.affectSceneAppearance = false;
     this.backgroundRenderer.cameraAffectsTransparency = false;
+    this.backgroundRenderer.cameraAffectsRotation = true;
     if (this.outfit.playerAvatarType === AvatarType.R6) this.deltaTimeMultiplier = 0;
     await new Promise((resolve) => {
       this.onSuccess.Connect(() => {
@@ -59521,6 +59551,18 @@ async function generateOutfitThumbnail(auth, outfit, size = [150, 150], type = "
     renderScene.destroy();
     return void 0;
   }
+  if (thumbnailCameraType === "default" && outfitRenderer.backgroundRenderer.backgroundId) {
+    thumbnailCameraType = "avatarFullbody";
+  }
+  if (outfitRenderer.backgroundRenderer.backgroundId) {
+    renderScene.directionalLight.castShadow = true;
+    renderScene.directionalLight.position.set(...renderScene.directionalLight.position.toArray().map((v, i) => {
+      return i === 2 ? -v : v;
+    }));
+    renderScene.directionalLight2.position.set(...renderScene.directionalLight2.position.toArray().map((v, i) => {
+      return i === 2 ? -v : v;
+    }));
+  }
   if (outfitRenderer.currentRig) {
     let cameraCFrame = new CFrame();
     switch (thumbnailCameraType) {
@@ -59528,10 +59570,10 @@ async function generateOutfitThumbnail(auth, outfit, size = [150, 150], type = "
         cameraCFrame = getThumbnailCameraCFrame(outfitRenderer.currentRig, renderScene.camera.fov) || cameraCFrame;
         break;
       case "avatarHeadshot":
-        cameraCFrame = getCameraCFrameForHeadshotCustomized(outfitRenderer.currentRig, 28, 0, 1) || cameraCFrame;
+        cameraCFrame = getCameraCFrameForHeadshotCustomized(outfitRenderer.currentRig, 30, 0, 1) || cameraCFrame;
         break;
       case "avatarFullbody":
-        cameraCFrame = getCameraCFrameForAvatarCustomized(outfitRenderer.currentRig, 28, 0) || cameraCFrame;
+        cameraCFrame = getCameraCFrameForAvatarCustomized(outfitRenderer.currentRig, 30, 0) || cameraCFrame;
         break;
       case "fullbody":
         cameraCFrame = getFullBodyCameraCFrame(outfitRenderer.currentRig) || cameraCFrame;
@@ -59539,10 +59581,11 @@ async function generateOutfitThumbnail(auth, outfit, size = [150, 150], type = "
     }
     if (cameraCFrame) {
       RBXRenderer.setCameraCFrame(cameraCFrame, renderScene);
-      RBXRenderer.setCameraFov(thumbnailCameraType === "default" ? 70 : thumbnailCameraType === "fullbody" ? 56 : 28, renderScene);
+      RBXRenderer.setCameraFov(thumbnailCameraType === "default" ? 70 : thumbnailCameraType === "fullbody" ? 56 : 30, renderScene);
       renderScene.camera.updateProjectionMatrix();
     }
     outfitRenderer.updateParticleMatrix();
+    outfitRenderer.backgroundRenderer.animateOnce();
     const result = type === "gltf" || type === "glb" ? await modelThumbnailClick(renderScene, type, {
       includeAnimations
     }) : await imageThumbnailClick(renderScene, size[0], size[1], type, {
@@ -59791,6 +59834,7 @@ export {
   Ray3 as Ray,
   RegisterWrappers,
   RegularBodyColors,
+  ResamplerMode,
   RoAvatarData,
   RoAvatarDataError,
   RoAvatarVersions,

package/package.json

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