@babylonjs/core 6.11.0 → 6.11.2

package/Materials/standardMaterial.d.ts

@@ -169,6 +169,7 @@ export declare class StandardMaterialDefines extends MaterialDefines implements
      */
     IS_REFRACTION_LINEAR: boolean;
     EXPOSURE: boolean;
+    DECAL_AFTER_DETAIL: boolean;
     /**
      * Initializes the Standard Material defines.
      * @param externalProperties The external properties
@@ -407,6 +408,11 @@ export declare class StandardMaterial extends PushMaterial {
      * If sets to true and backfaceCulling is false, normals will be flipped on the backside.
      */
     twoSidedLighting: boolean;
+    private _applyDecalMapAfterDetailMap;
+    /**
+     * If sets to true, the decal map will be applied after the detail map. Else, it is applied before (default: false)
+     */
+    applyDecalMapAfterDetailMap: boolean;
     /**
      * Default configuration related to image processing available in the standard Material.
      */

package/Materials/standardMaterial.js

@@ -179,6 +179,7 @@ export class StandardMaterialDefines extends MaterialDefines {
          */
         this.IS_REFRACTION_LINEAR = false;
         this.EXPOSURE = false;
+        this.DECAL_AFTER_DETAIL = false;
         this.rebuild();
     }
     setReflectionMode(modeToEnable) {
@@ -432,6 +433,7 @@ export class StandardMaterial extends PushMaterial {
         this._invertNormalMapX = false;
         this._invertNormalMapY = false;
         this._twoSidedLighting = false;
+        this._applyDecalMapAfterDetailMap = false;
         this._renderTargets = new SmartArray(16);
         this._worldViewProjectionMatrix = Matrix.Zero();
         this._globalAmbientColor = new Color3(0, 0, 0);
@@ -792,7 +794,7 @@ export class StandardMaterial extends PushMaterial {
             }
         }
         // Misc.
-        MaterialHelper.PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh) || this._forceAlphaTest, defines);
+        MaterialHelper.PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh) || this._forceAlphaTest, defines, this._applyDecalMapAfterDetailMap);
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, this, defines, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
         // External config
@@ -1784,6 +1786,12 @@ __decorate([
 __decorate([
     expandToProperty("_markAllSubMeshesAsTexturesDirty")
 ], StandardMaterial.prototype, "twoSidedLighting", void 0);
+__decorate([
+    serialize("applyDecalMapAfterDetailMap")
+], StandardMaterial.prototype, "_applyDecalMapAfterDetailMap", void 0);
+__decorate([
+    expandToProperty("_markAllSubMeshesAsMiscDirty")
+], StandardMaterial.prototype, "applyDecalMapAfterDetailMap", void 0);
 __decorate([
     serialize()
 ], StandardMaterial.prototype, "useLogarithmicDepth", null);