roavatar-renderer 1.6.6 → 1.6.7

package/dist/index.js

@@ -47113,7 +47113,8 @@ class MaterialDesc {
     if (normalTexture || roughnessTexture || metalnessTexture || emissiveTexture) {
       material = new MeshStandardMaterial({
         ...textureTemplate,
-        emissiveIntensity: hasEmissive ? 1 / Math.sqrt(40) * Math.sqrt(this.emissiveStrength) : 0,
+        emissiveIntensity: hasEmissive ? this.emissiveStrength : 0,
+        //1/Math.sqrt(40) * Math.sqrt(this.emissiveStrength) : 0,
         emissive: hasEmissive ? new Color(this.emissiveTint.R, this.emissiveTint.G, this.emissiveTint.B) : new Color(0, 0, 0),
         transparent: hasTransparency,
         opacity: 1 - this.transparency,
@@ -47126,6 +47127,26 @@ class MaterialDesc {
         polygonOffsetUnits: this.isDecal ? 0.05 : 0,
         depthWrite: this.transparency > 0 ? false : true
       });
+      material.onBeforeCompile = ((shader) => {
+        shader.fragmentShader = shader.fragmentShader.replace(
+          `#include <emissivemap_fragment>`,
+          `#ifdef USE_EMISSIVEMAP
+
+	vec4 emissiveColor = texture2D( emissiveMap, vEmissiveMapUv );
+
+	#ifdef DECODE_VIDEO_TEXTURE_EMISSIVE
+
+		// use inline sRGB decode until browsers properly support SRGB8_ALPHA8 with video textures (#26516)
+
+		emissiveColor = sRGBTransferEOTF( emissiveColor );
+
+	#endif
+
+	totalEmissiveRadiance *= emissiveColor.rgb * diffuseColor.rgb;
+
+#endif`
+        );
+      });
     } else {
       material = new MeshPhongMaterial({
         ...textureTemplate,
@@ -47376,11 +47397,11 @@ class MaterialDesc {
     if (surfaceAppearance) {
       surfaceAppearanceAlphaMode = surfaceAppearance.Prop("AlphaMode");
     }
+    const partColor = child.Prop("Color").toColor3();
     if (surfaceAppearance && surfaceAppearanceAlphaMode === AlphaMode.Transparency) {
       this.transparent = true;
     } else {
       if (affectedByHumanoid || surfaceAppearance && surfaceAppearanceAlphaMode === AlphaMode.Overlay || meshPartTexture.length < 1 && !surfaceAppearance) {
-        const partColor = child.Prop("Color").toColor3();
         const colorLayer = new ColorLayer(partColor);
         this.layers.push(colorLayer);
       } else if (this.transparency === 0) {
@@ -47399,6 +47420,10 @@ class MaterialDesc {
         if (surfaceAppearanceLayer.emissive && surfaceAppearanceLayer.emissive.length > 0) {
           if (surfaceAppearance.HasProperty("EmissiveStrength")) {
             this.emissiveStrength = surfaceAppearance.Prop("EmissiveStrength");
+            if (this.emissiveStrength > 0) {
+              const colorLayer = new ColorLayer(partColor, void 0, "emissive");
+              this.layers.push(colorLayer);
+            }
           }
           if (surfaceAppearance.HasProperty("EmissiveTint")) {
             this.emissiveTint = surfaceAppearance.Prop("EmissiveTint");

package/package.json

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