@babylonjs/core 5.0.0-alpha.59 → 5.0.0-alpha.62

package/Materials/shaderMaterial.js

@@ -4,12 +4,12 @@ import { Matrix, Vector3, Vector2, Vector4 } from "../Maths/math.vector.js";
 import { VertexBuffer } from "../Buffers/buffer.js";
 import { Texture } from "../Materials/Textures/texture.js";
 import { MaterialHelper } from "./materialHelper.js";
-import { Material } from "./material.js";
 import { RegisterClass } from '../Misc/typeStore.js';
 import { Color3, Color4 } from '../Maths/math.color.js';
 import { EffectFallbacks } from './effectFallbacks.js';
 import { WebRequest } from '../Misc/webRequest.js';
 import { Engine } from '../Engines/engine.js';
+import { PushMaterial } from "./pushMaterial.js";
 var onCreatedEffectParameters = { effect: null, subMesh: null };
 /**
  * The ShaderMaterial object has the necessary methods to pass data from your scene to the Vertex and Fragment Shaders and returns a material that can be applied to any mesh.
@@ -33,10 +33,12 @@ var ShaderMaterial = /** @class */ (function (_super) {
      *  * object: { vertexSource: "vertex shader code string", fragmentSource: "fragment shader code string" } using with strings containing the shaders code
      *  * string: "./COMMON_NAME", used with external files COMMON_NAME.vertex.fx and COMMON_NAME.fragment.fx in index.html folder.
      * @param options Define the options used to create the shader
+     * @param storeEffectOnSubMeshes true to store effect on submeshes, false to store the effect directly in the material class.
      */
-    function ShaderMaterial(name, scene, shaderPath, options) {
+    function ShaderMaterial(name, scene, shaderPath, options, storeEffectOnSubMeshes) {
         if (options === void 0) { options = {}; }
-        var _this = _super.call(this, name, scene) || this;
+        if (storeEffectOnSubMeshes === void 0) { storeEffectOnSubMeshes = true; }
+        var _this = _super.call(this, name, scene, storeEffectOnSubMeshes) || this;
         _this._textures = {};
         _this._textureArrays = {};
         _this._externalTextures = {};
@@ -418,11 +420,19 @@ var ShaderMaterial = /** @class */ (function (_super) {
      * @returns true if ready, otherwise false
      */
     ShaderMaterial.prototype.isReady = function (mesh, useInstances, subMesh) {
-        var _a, _b;
-        var effect = this.getEffect();
-        if (effect && this.isFrozen) {
-            if (effect._wasPreviouslyReady && this._effectUsesInstances === useInstances) {
-                return true;
+        var _a, _b, _c, _d;
+        var storeEffectOnSubMeshes = subMesh && this._storeEffectOnSubMeshes;
+        if (this.isFrozen) {
+            if (storeEffectOnSubMeshes) {
+                if (subMesh.effect && subMesh.effect._wasPreviouslyReady) {
+                    return true;
+                }
+            }
+            else {
+                var effect_1 = this._drawWrapper.effect;
+                if (effect_1 && effect_1._wasPreviouslyReady && this._effectUsesInstances === useInstances) {
+                    return true;
+                }
             }
         }
         var scene = this.getScene();
@@ -546,6 +556,26 @@ var ShaderMaterial = /** @class */ (function (_super) {
         else {
             defines.push("#define NUM_MORPH_INFLUENCERS 0");
         }
+        // Baked Vertex Animation
+        if (mesh) {
+            var bvaManager = mesh.bakedVertexAnimationManager;
+            if (bvaManager && bvaManager.isEnabled) {
+                defines.push("#define BAKED_VERTEX_ANIMATION_TEXTURE");
+                if (this._options.uniforms.indexOf("bakedVertexAnimationSettings") === -1) {
+                    this._options.uniforms.push("bakedVertexAnimationSettings");
+                }
+                if (this._options.uniforms.indexOf("bakedVertexAnimationTextureSizeInverted") === -1) {
+                    this._options.uniforms.push("bakedVertexAnimationTextureSizeInverted");
+                }
+                if (this._options.uniforms.indexOf("bakedVertexAnimationTime") === -1) {
+                    this._options.uniforms.push("bakedVertexAnimationTime");
+                }
+                if (this._options.samplers.indexOf("bakedVertexAnimationTexture") === -1) {
+                    this._options.samplers.push("bakedVertexAnimationTexture");
+                }
+            }
+            MaterialHelper.PrepareAttributesForBakedVertexAnimation(attribs, mesh, defines);
+        }
         // Textures
         for (var name in this._textures) {
             if (!this._textures[name].isReady()) {
@@ -599,9 +629,12 @@ var ShaderMaterial = /** @class */ (function (_super) {
             samplers = samplers.slice();
             shaderName = this.customShaderNameResolve(shaderName, uniforms, uniformBuffers, samplers, defines, attribs);
         }
-        var previousEffect = effect;
+        var drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper() : this._drawWrapper;
+        var previousEffect = (_a = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.effect) !== null && _a !== void 0 ? _a : null;
+        var previousDefines = (_b = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.defines) !== null && _b !== void 0 ? _b : null;
         var join = defines.join("\n");
-        if (this._drawWrapper.defines !== join) {
+        var effect = previousEffect;
+        if (previousDefines !== join) {
             effect = engine.createEffect(shaderName, {
                 attributes: attribs,
                 uniformsNames: uniforms,
@@ -614,15 +647,20 @@ var ShaderMaterial = /** @class */ (function (_super) {
                 indexParameters: { maxSimultaneousMorphTargets: numInfluencers },
                 shaderLanguage: this._options.shaderLanguage
             }, engine);
-            this._drawWrapper.setEffect(effect, join);
+            if (storeEffectOnSubMeshes) {
+                subMesh.setEffect(effect, join, this._materialContext);
+            }
+            else if (drawWrapper) {
+                drawWrapper.setEffect(effect, join);
+            }
             if (this._onEffectCreatedObservable) {
                 onCreatedEffectParameters.effect = effect;
-                onCreatedEffectParameters.subMesh = (_a = subMesh !== null && subMesh !== void 0 ? subMesh : mesh === null || mesh === void 0 ? void 0 : mesh.subMeshes[0]) !== null && _a !== void 0 ? _a : null;
+                onCreatedEffectParameters.subMesh = (_c = subMesh !== null && subMesh !== void 0 ? subMesh : mesh === null || mesh === void 0 ? void 0 : mesh.subMeshes[0]) !== null && _c !== void 0 ? _c : null;
                 this._onEffectCreatedObservable.notifyObservers(onCreatedEffectParameters);
             }
         }
         this._effectUsesInstances = !!useInstances;
-        if ((_b = !(effect === null || effect === void 0 ? void 0 : effect.isReady())) !== null && _b !== void 0 ? _b : true) {
+        if ((_d = !(effect === null || effect === void 0 ? void 0 : effect.isReady())) !== null && _d !== void 0 ? _d : true) {
             return false;
         }
         if (previousEffect !== effect) {
@@ -662,18 +700,25 @@ var ShaderMaterial = /** @class */ (function (_super) {
      */
     ShaderMaterial.prototype.bindForSubMesh = function (world, mesh, subMesh) {
         var _a;
-        this.bind(world, mesh, (_a = subMesh._drawWrapperOverride) === null || _a === void 0 ? void 0 : _a.effect);
+        this.bind(world, mesh, (_a = subMesh._drawWrapperOverride) === null || _a === void 0 ? void 0 : _a.effect, subMesh);
     };
     /**
      * Binds the material to the mesh
      * @param world defines the world transformation matrix
      * @param mesh defines the mesh to bind the material to
      * @param effectOverride - If provided, use this effect instead of internal effect
+     * @param subMesh defines the submesh to bind the material to
      */
-    ShaderMaterial.prototype.bind = function (world, mesh, effectOverride) {
+    ShaderMaterial.prototype.bind = function (world, mesh, effectOverride, subMesh) {
+        var _a;
         // Std values
+        var storeEffectOnSubMeshes = subMesh && this._storeEffectOnSubMeshes;
+        var effect = effectOverride !== null && effectOverride !== void 0 ? effectOverride : (storeEffectOnSubMeshes ? subMesh.effect : this.getEffect());
+        if (!effect) {
+            return;
+        }
+        this._activeEffect = effect;
         this.bindOnlyWorldMatrix(world, effectOverride);
-        var effect = effectOverride !== null && effectOverride !== void 0 ? effectOverride : this.getEffect();
         var uniformBuffers = this._options.uniformBuffers;
         var useSceneUBO = false;
         if (effect && uniformBuffers && uniformBuffers.length > 0 && this.getScene().getEngine().supportsUniformBuffers) {
@@ -694,7 +739,7 @@ var ShaderMaterial = /** @class */ (function (_super) {
                 }
             }
         }
-        var mustRebind = this.getScene().getCachedMaterial() !== this;
+        var mustRebind = mesh && storeEffectOnSubMeshes ? this._mustRebind(this.getScene(), effect, mesh.visibility) : this.getScene().getCachedMaterial() !== this;
         if (effect && mustRebind) {
             if (!useSceneUBO && this._options.uniforms.indexOf("view") !== -1) {
                 effect.setMatrix("view", this.getScene().getViewMatrix());
@@ -819,16 +864,12 @@ var ShaderMaterial = /** @class */ (function (_super) {
             if (manager && manager.numInfluencers > 0) {
                 MaterialHelper.BindMorphTargetParameters(mesh, effect);
             }
+            var bvaManager = mesh.bakedVertexAnimationManager;
+            if (bvaManager && bvaManager.isEnabled) {
+                (_a = mesh.bakedVertexAnimationManager) === null || _a === void 0 ? void 0 : _a.bind(effect, this._effectUsesInstances);
+            }
         }
-        var seffect = this.getEffect();
-        this._drawWrapper.effect = effect; // make sure the active effect is the right one if there are some observers for onBind that would need to get the current effect
         this._afterBind(mesh, effect);
-        this._drawWrapper.effect = seffect;
-    };
-    ShaderMaterial.prototype._afterBind = function (mesh, effect) {
-        if (effect === void 0) { effect = null; }
-        _super.prototype._afterBind.call(this, mesh, effect);
-        this.getScene()._cachedEffect = effect;
     };
     /**
      * Gets the active textures from the material
@@ -878,7 +919,7 @@ var ShaderMaterial = /** @class */ (function (_super) {
      */
     ShaderMaterial.prototype.clone = function (name) {
         var _this = this;
-        var result = SerializationHelper.Clone(function () { return new ShaderMaterial(name, _this.getScene(), _this._shaderPath, _this._options); }, this);
+        var result = SerializationHelper.Clone(function () { return new ShaderMaterial(name, _this.getScene(), _this._shaderPath, _this._options, _this._storeEffectOnSubMeshes); }, this);
         result.name = name;
         result.id = name;
         // Shader code path
@@ -1020,6 +1061,7 @@ var ShaderMaterial = /** @class */ (function (_super) {
         serializationObject.customType = "BABYLON.ShaderMaterial";
         serializationObject.options = this._options;
         serializationObject.shaderPath = this._shaderPath;
+        serializationObject.storeEffectOnSubMeshes = this._storeEffectOnSubMeshes;
         var name;
         // Stencil
         serializationObject.stencil = this.stencil.serialize();
@@ -1132,7 +1174,7 @@ var ShaderMaterial = /** @class */ (function (_super) {
      * @returns a new material
      */
     ShaderMaterial.Parse = function (source, scene, rootUrl) {
-        var material = SerializationHelper.Parse(function () { return new ShaderMaterial(source.name, scene, source.shaderPath, source.options); }, source, scene, rootUrl);
+        var material = SerializationHelper.Parse(function () { return new ShaderMaterial(source.name, scene, source.shaderPath, source.options, source.storeEffectOnSubMeshes); }, source, scene, rootUrl);
         var name;
         // Stencil
         if (source.stencil) {
@@ -1304,7 +1346,7 @@ var ShaderMaterial = /** @class */ (function (_super) {
     /** Define the Url to load snippets */
     ShaderMaterial.SnippetUrl = "https://snippet.babylonjs.com";
     return ShaderMaterial;
-}(Material));
+}(PushMaterial));
 export { ShaderMaterial };
 RegisterClass("BABYLON.ShaderMaterial", ShaderMaterial);
 //# sourceMappingURL=shaderMaterial.js.map