@babylonjs/core 5.0.0-alpha.63 → 5.0.0-alpha.64

package/Materials/standardMaterial.js

@@ -8,6 +8,7 @@ import { VertexBuffer } from "../Buffers/buffer.js";
 import { PrePassConfiguration } from "./prePassConfiguration.js";
 import { ImageProcessingConfiguration } from "./imageProcessingConfiguration.js";
 import { Material } from "../Materials/material.js";
+import { MaterialPluginEvent } from "./materialPluginEvent.js";
 import { MaterialDefines } from "../Materials/materialDefines.js";
 import { PushMaterial } from "./pushMaterial.js";
 import { MaterialHelper } from "./materialHelper.js";
@@ -17,13 +18,17 @@ import { MaterialFlags } from "./materialFlags.js";
 import "../Shaders/default.fragment.js";
 import "../Shaders/default.vertex.js";
 import { EffectFallbacks } from './effectFallbacks.js';
-import { DetailMapConfiguration } from './material.detailMapConfiguration.js';
+import { DetailMapConfiguration } from "./material.detailMapConfiguration.js";
 var onCreatedEffectParameters = { effect: null, subMesh: null };
 /** @hidden */
 var StandardMaterialDefines = /** @class */ (function (_super) {
     __extends(StandardMaterialDefines, _super);
-    function StandardMaterialDefines() {
-        var _this = _super.call(this) || this;
+    /**
+     * Initializes the Standard Material defines.
+     * @param externalProperties The external properties
+     */
+    function StandardMaterialDefines(externalProperties) {
+        var _this = _super.call(this, externalProperties) || this;
         _this.MAINUV1 = false;
         _this.MAINUV2 = false;
         _this.MAINUV3 = false;
@@ -32,9 +37,6 @@ var StandardMaterialDefines = /** @class */ (function (_super) {
         _this.MAINUV6 = false;
         _this.DIFFUSE = false;
         _this.DIFFUSEDIRECTUV = 0;
-        _this.DETAIL = false;
-        _this.DETAILDIRECTUV = 0;
-        _this.DETAIL_NORMALBLENDMETHOD = 0;
         _this.BAKED_VERTEX_ANIMATION_TEXTURE = false;
         _this.AMBIENT = false;
         _this.AMBIENTDIRECTUV = 0;
@@ -275,14 +277,11 @@ var StandardMaterial = /** @class */ (function (_super) {
         _this._invertNormalMapX = false;
         _this._invertNormalMapY = false;
         _this._twoSidedLighting = false;
-        /**
-         * Defines the detail map parameters for the material.
-         */
-        _this.detailMap = new DetailMapConfiguration(_this._markAllSubMeshesAsTexturesDirty.bind(_this));
         _this._renderTargets = new SmartArray(16);
         _this._worldViewProjectionMatrix = Matrix.Zero();
         _this._globalAmbientColor = new Color3(0, 0, 0);
-        _this.buildUniformLayout();
+        _this._cacheHasRenderTargetTextures = false;
+        _this.detailMap = new DetailMapConfiguration(_this);
         // Setup the default processing configuration to the scene.
         _this._attachImageProcessingConfiguration(null);
         _this.prePassConfiguration = new PrePassConfiguration();
@@ -294,6 +293,8 @@ var StandardMaterial = /** @class */ (function (_super) {
             if (StandardMaterial.RefractionTextureEnabled && _this._refractionTexture && _this._refractionTexture.isRenderTarget) {
                 _this._renderTargets.push(_this._refractionTexture);
             }
+            _this._eventInfo.renderTargets = _this._renderTargets;
+            _this._callbackPluginEventFillRenderTargetTextures(_this._eventInfo);
             return _this._renderTargets;
         };
         return _this;
@@ -498,7 +499,7 @@ var StandardMaterial = /** @class */ (function (_super) {
             if (StandardMaterial.RefractionTextureEnabled && this._refractionTexture && this._refractionTexture.isRenderTarget) {
                 return true;
             }
-            return false;
+            return this._cacheHasRenderTargetTextures;
         },
         enumerable: false,
         configurable: true
@@ -576,13 +577,17 @@ var StandardMaterial = /** @class */ (function (_super) {
      */
     StandardMaterial.prototype.isReadyForSubMesh = function (mesh, subMesh, useInstances) {
         if (useInstances === void 0) { useInstances = false; }
+        if (!this._uniformBufferLayoutBuilt) {
+            this.buildUniformLayout();
+        }
         if (subMesh.effect && this.isFrozen) {
             if (subMesh.effect._wasPreviouslyReady) {
                 return true;
             }
         }
         if (!subMesh.materialDefines) {
-            subMesh.materialDefines = new StandardMaterialDefines();
+            this._callbackPluginEventGeneric(MaterialPluginEvent.GetDefineNames, this._eventInfo);
+            subMesh.materialDefines = new StandardMaterialDefines(this._eventInfo.defineNames);
         }
         var scene = this.getScene();
         var defines = subMesh.materialDefines;
@@ -601,6 +606,9 @@ var StandardMaterial = /** @class */ (function (_super) {
         MaterialHelper.PrepareDefinesForOIT(scene, defines, oit);
         // Textures
         if (defines._areTexturesDirty) {
+            this._eventInfo.hasRenderTargetTextures = false;
+            this._callbackPluginEventHasRenderTargetTextures(this._eventInfo);
+            this._cacheHasRenderTargetTextures = this._eventInfo.hasRenderTargetTextures;
             defines._needUVs = false;
             for (var i = 1; i <= 6; ++i) {
                 defines["MAINUV" + i] = false;
@@ -777,7 +785,10 @@ var StandardMaterial = /** @class */ (function (_super) {
             defines.ALPHATEST_AFTERALLALPHACOMPUTATIONS = this.transparencyMode !== null;
             defines.ALPHABLEND = this.transparencyMode === null || this.needAlphaBlendingForMesh(mesh); // check on null for backward compatibility
         }
-        if (!this.detailMap.isReadyForSubMesh(defines, scene)) {
+        this._eventInfo.isReadyForSubMesh = true;
+        this._eventInfo.defines = defines;
+        this._callbackPluginEventIsReadyForSubMesh(this._eventInfo);
+        if (!this._eventInfo.isReadyForSubMesh) {
             return false;
         }
         if (defines._areImageProcessingDirty && this._imageProcessingConfiguration) {
@@ -815,7 +826,9 @@ var StandardMaterial = /** @class */ (function (_super) {
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
         // External config
-        this.detailMap.prepareDefines(defines, scene);
+        this._eventInfo.defines = defines;
+        this._eventInfo.mesh = mesh;
+        this._callbackPluginEventPrepareDefines(this._eventInfo);
         // Get correct effect
         if (defines.isDirty) {
             var lightDisposed = defines._areLightsDisposed;
@@ -907,8 +920,13 @@ var StandardMaterial = /** @class */ (function (_super) {
                 "refractionCubeSampler", "refraction2DSampler", "boneSampler", "morphTargets", "oitDepthSampler",
                 "oitFrontColorSampler"];
             var uniformBuffers = ["Material", "Scene", "Mesh"];
-            DetailMapConfiguration.AddUniforms(uniforms);
-            DetailMapConfiguration.AddSamplers(samplers);
+            this._eventInfo.fallbacks = fallbacks;
+            this._eventInfo.fallbackRank = 0;
+            this._eventInfo.defines = defines;
+            this._eventInfo.uniforms = uniforms;
+            this._eventInfo.samplers = samplers;
+            this._eventInfo.customCode = undefined;
+            this._callbackPluginEventGeneric(MaterialPluginEvent.PrepareEffect, this._eventInfo);
             PrePassConfiguration.AddUniforms(uniforms);
             PrePassConfiguration.AddSamplers(samplers);
             if (ImageProcessingConfiguration) {
@@ -939,6 +957,7 @@ var StandardMaterial = /** @class */ (function (_super) {
                 onError: this.onError,
                 indexParameters: { maxSimultaneousLights: this._maxSimultaneousLights, maxSimultaneousMorphTargets: defines.NUM_MORPH_INFLUENCERS },
                 processFinalCode: csnrOptions.processFinalCode,
+                processCodeAfterIncludes: this._eventInfo.customCode,
                 multiTarget: defines.PREPASS
             }, engine);
             if (effect) {
@@ -1015,28 +1034,7 @@ var StandardMaterial = /** @class */ (function (_super) {
         ubo.addUniform("vEmissiveColor", 3);
         ubo.addUniform("vDiffuseColor", 4);
         ubo.addUniform("vAmbientColor", 3);
-        DetailMapConfiguration.PrepareUniformBuffer(ubo);
-        ubo.create();
-    };
-    /**
-     * Unbinds the material from the mesh
-     */
-    StandardMaterial.prototype.unbind = function () {
-        if (this._activeEffect && !this.getScene().getEngine()._features.needToAlwaysBindUniformBuffers) {
-            var needFlag = false;
-            if (this._reflectionTexture && this._reflectionTexture.isRenderTarget) {
-                this._activeEffect.setTexture("reflection2DSampler", null);
-                needFlag = true;
-            }
-            if (this._refractionTexture && this._refractionTexture.isRenderTarget) {
-                this._activeEffect.setTexture("refraction2DSampler", null);
-                needFlag = true;
-            }
-            if (needFlag) {
-                this._markAllSubMeshesAsTexturesDirty();
-            }
-        }
-        _super.prototype.unbind.call(this);
+        _super.prototype.buildUniformLayout.call(this);
     };
     /**
      * Binds the submesh to this material by preparing the effect and shader to draw
@@ -1059,8 +1057,11 @@ var StandardMaterial = /** @class */ (function (_super) {
         // Matrices Mesh.
         mesh.getMeshUniformBuffer().bindToEffect(effect, "Mesh");
         mesh.transferToEffect(world);
-        // PrePass
+        // Binding unconditionally
+        this._uniformBuffer.bindToEffect(effect, "Material");
         this.prePassConfiguration.bindForSubMesh(this._activeEffect, scene, mesh, world, this.isFrozen);
+        this._eventInfo.subMesh = subMesh;
+        this._callbackPluginEventHardBindForSubMesh(this._eventInfo);
         // Normal Matrix
         if (defines.OBJECTSPACE_NORMALMAP) {
             world.toNormalMatrix(this._normalMatrix);
@@ -1071,7 +1072,6 @@ var StandardMaterial = /** @class */ (function (_super) {
         MaterialHelper.BindBonesParameters(mesh, effect);
         var ubo = this._uniformBuffer;
         if (mustRebind) {
-            ubo.bindToEffect(effect, "Material");
             this.bindViewProjection(effect);
             if (!ubo.useUbo || !this.isFrozen || !ubo.isSync) {
                 if (StandardMaterial.FresnelEnabled && defines.FRESNEL) {
@@ -1217,14 +1217,14 @@ var StandardMaterial = /** @class */ (function (_super) {
             if (this.getScene().useOrderIndependentTransparency && this.needAlphaBlendingForMesh(mesh)) {
                 this.getScene().depthPeelingRenderer.bind(effect);
             }
-            this.detailMap.bindForSubMesh(ubo, scene, this.isFrozen);
+            this._eventInfo.subMesh = subMesh;
+            this._callbackPluginEventBindForSubMesh(this._eventInfo);
             // Clip plane
             MaterialHelper.BindClipPlane(effect, scene);
             // Colors
             this.bindEyePosition(effect);
         }
         else if (scene.getEngine()._features.needToAlwaysBindUniformBuffers) {
-            ubo.bindToEffect(effect, "Material");
             this._needToBindSceneUbo = true;
         }
         if (mustRebind || !this.isFrozen) {
@@ -1262,7 +1262,7 @@ var StandardMaterial = /** @class */ (function (_super) {
      * @returns the list of animatables object used in the material
      */
     StandardMaterial.prototype.getAnimatables = function () {
-        var results = [];
+        var results = _super.prototype.getAnimatables.call(this);
         if (this._diffuseTexture && this._diffuseTexture.animations && this._diffuseTexture.animations.length > 0) {
             results.push(this._diffuseTexture);
         }
@@ -1290,7 +1290,6 @@ var StandardMaterial = /** @class */ (function (_super) {
         if (this._refractionTexture && this._refractionTexture.animations && this._refractionTexture.animations.length > 0) {
             results.push(this._refractionTexture);
         }
-        this.detailMap.getAnimatables(results);
         return results;
     };
     /**
@@ -1326,7 +1325,6 @@ var StandardMaterial = /** @class */ (function (_super) {
         if (this._refractionTexture) {
             activeTextures.push(this._refractionTexture);
         }
-        this.detailMap.getActiveTextures(activeTextures);
         return activeTextures;
     };
     /**
@@ -1365,9 +1363,6 @@ var StandardMaterial = /** @class */ (function (_super) {
         if (this._refractionTexture === texture) {
             return true;
         }
-        if (this.detailMap.hasTexture(texture)) {
-            return true;
-        }
         return false;
     };
     /**
@@ -1388,7 +1383,6 @@ var StandardMaterial = /** @class */ (function (_super) {
             (_h = this._lightmapTexture) === null || _h === void 0 ? void 0 : _h.dispose();
             (_j = this._refractionTexture) === null || _j === void 0 ? void 0 : _j.dispose();
         }
-        this.detailMap.dispose(forceDisposeTextures);
         if (this._imageProcessingConfiguration && this._imageProcessingObserver) {
             this._imageProcessingConfiguration.onUpdateParameters.remove(this._imageProcessingObserver);
         }