repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 82ca44bad80d2f71d9ddb01553aeb7b736c9c575:
path_to: 
revision_to: 

commit 82ca44bad80d2f71d9ddb01553aeb7b736c9c575
Author: James Baicoianu 
Date:   Fri Apr 26 00:48:19 2024 -0700

    Fix for emissive textures when lighting is disabled

diff --git a/scripts/object.js b/scripts/object.js

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -867,6 +867,12 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
                 m.emissive.copy(this.emissive)
               }
               m.emissiveIntensity = this.emissive_intensity;
+            } else {
+              if (textureEmissive) {
+                m.map = textureEmissive;
+                textureEmissive.encoding = THREE.sRGBEncoding;
+                m.color = new THREE.Color(0xffffff);
+              }
             }
             if (textureAlpha) {
               m.alphaMap = textureAlpha;
@@ -1028,6 +1034,11 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
             }
           }
           if (oldmat.emissiveIntensity !== undefined) m.emissiveIntensity = oldmat.emissiveIntensity;
+        } else {
+          if (oldmat.emissiveMap && !oldmat.map) {
+            m.map = oldmat.emissiveMap;
+            oldmat.color.setRGB(1,1,1);
+          }
         }

         m.lightMap = oldmat.lightMap;

-----END OF PAGE-----