Fix BasicMaterial for skinned and morphed meshes (playcanvas#3299)

mvaligursky · Martin Valigursky · web-flow · commit fbbff92b54a3 · 2021-07-06T04:42:13.000-07:00
* Fix BasicMaterial for skinned and morphed meshes

* lint space

Co-authored-by: Martin Valigursky &lt;mvaligursky@snapchat.com&gt;
diff --git a/src/graphics/program-lib/programs/basic.js b/src/graphics/program-lib/programs/basic.js
@@ -12,10 +12,18 @@ import { begin, end, fogCode, precisionCode, skinCode } from './common.js';
 const basic = {
     generateKey: function (options) {
         let key = 'basic';
-        if (options.fog)          key += '_fog';
-        if (options.alphaTest)    key += '_atst';
-        if (options.vertexColors) key += '_vcol';
-        if (options.diffuseMap)   key += '_diff';
+        if (options.fog)                    key += '_fog';
+        if (options.alphaTest)              key += '_atst';
+        if (options.vertexColors)           key += '_vcol';
+        if (options.diffuseMap)             key += '_diff';
+        if (options.skin)                   key += '_skin';
+
+        if (options.screenSpace)            key += '_ss';
+        if (options.useInstancing)          key += '_inst';
+        if (options.useMorphPosition)       key += '_morphp';
+        if (options.useMorphNormal)         key += '_morphn';
+        if (options.useMorphTextureBased)   key += '_morpht';
+
         key += '_' + options.pass;
         return key;
     },
diff --git a/src/scene/materials/basic-material.js b/src/scene/materials/basic-material.js
@@ -1,4 +1,8 @@
 import { Color } from '../../math/color.js';
+import {
+    SHADERDEF_INSTANCING, SHADERDEF_MORPH_NORMAL, SHADERDEF_MORPH_POSITION, SHADERDEF_MORPH_TEXTURE_BASED,
+    SHADERDEF_SCREENSPACE, SHADERDEF_SKIN
+} from '../constants.js';
 
 import { Material } from './material.js';
 
@@ -67,7 +71,13 @@ class BasicMaterial extends Material {
 
     updateShader(device, scene, objDefs, staticLightList, pass, sortedLights) {
         var options = {
-            skin: !!this.meshInstances[0].skinInstance,
+            skin: objDefs && (objDefs & SHADERDEF_SKIN) !== 0,
+            screenSpace: objDefs && (objDefs & SHADERDEF_SCREENSPACE) !== 0,
+            useInstancing: objDefs && (objDefs & SHADERDEF_INSTANCING) !== 0,
+            useMorphPosition: objDefs && (objDefs & SHADERDEF_MORPH_POSITION) !== 0,
+            useMorphNormal: objDefs && (objDefs & SHADERDEF_MORPH_NORMAL) !== 0,
+            useMorphTextureBased: objDefs && (objDefs & SHADERDEF_MORPH_TEXTURE_BASED) !== 0,
+
             vertexColors: this.vertexColors,
             diffuseMap: !!this.colorMap,
             pass: pass
