Glb unlit material fix (playcanvas#1998)

slimbuck · Donovan Hutchence · willeastcott · web-flow · commit 7a72c0b2f8e9 · 2020-04-15T12:32:47.000+01:00
* handle unlit materials

* fix comments

Co-authored-by: Donovan Hutchence &lt;dhutchence@snapchat.com&gt;
Co-authored-by: Will Eastcott &lt;will@playcanvas.com&gt;
diff --git a/src/resources/parser/glb-parser.js b/src/resources/parser/glb-parser.js
@@ -451,11 +451,6 @@ Object.assign(pc, function () {
             material.name = materialData.name;
         }
 
-        if (materialData.hasOwnProperty('extensions') &&
-            materialData.extensions.hasOwnProperty('KHR_materials_unlit')) {
-            material.useLighting = false;
-        }
-
         var color, texture;
         if (materialData.hasOwnProperty('extensions') &&
             materialData.extensions.hasOwnProperty('KHR_materials_pbrSpecularGlossiness')) {
@@ -703,6 +698,30 @@ Object.assign(pc, function () {
             material.cull = pc.CULLFACE_BACK;
         }
 
+        // handle unlit material by disabling lighting and copying diffuse colours
+        // into emissive.
+        if (materialData.hasOwnProperty('extensions') &&
+            materialData.extensions.hasOwnProperty('KHR_materials_unlit')) {
+            material.useLighting = false;
+
+            // copy diffuse into emissive
+            material.emissive.copy(material.diffuse);
+            material.emissiveTint = material.diffuseTint;
+            material.emissiveMap = material.diffuseMap;
+            material.emissiveMapUv = material.diffuseMapUv;
+            material.emissiveMapTiling.copy(material.diffuseMapTiling);
+            material.emissiveMapOffset.copy(material.diffuseMapOffset);
+            material.emissiveMapChannel = material.diffuseMapChannel;
+            material.emissiveVertexColor = material.diffuseVertexColor;
+            material.emissiveVertexColorChannel = material.diffuseVertexColorChannel;
+
+            // blank diffuse
+            material.diffuse.set(0, 0, 0);
+            material.diffuseTint = false;
+            material.diffuseMap = null;
+            material.diffuseVertexColor = false;
+        }
+
         material.update();
 
         return material;
