@babylonjs/core 8.37.0 → 8.37.1

package/Materials/shaderMaterial.d.ts

@@ -13,6 +13,7 @@ import type { StorageBuffer } from "../Buffers/storageBuffer.js";
 import { PushMaterial } from "./pushMaterial.js";
 import type { ExternalTexture } from "./Textures/externalTexture.js";
 import type { IColor3Like, IColor4Like, IVector2Like, IVector3Like, IVector4Like } from "../Maths/math.like.js";
+import type { InternalTexture } from "./Textures/internalTexture.js";
 /**
  * Defines the options associated with the creation of a shader material.
  */
@@ -81,6 +82,7 @@ export declare class ShaderMaterial extends PushMaterial {
     private _shaderPath;
     private _options;
     private _textures;
+    private _internalTextures;
     private _textureArrays;
     private _externalTextures;
     private _floats;
@@ -172,6 +174,13 @@ export declare class ShaderMaterial extends PushMaterial {
      * @returns the material itself allowing "fluent" like uniform updates
      */
     setTexture(name: string, texture: BaseTexture): ShaderMaterial;
+    /**
+     * Set an internal texture in the shader.
+     * @param name Define the name of the uniform samplers as defined in the shader
+     * @param texture Define the texture to bind to this sampler
+     * @returns the material itself allowing "fluent" like uniform updates
+     */
+    setInternalTexture(name: string, texture: InternalTexture): ShaderMaterial;
     /**
      * Remove a texture from the material.
      * @param name Define the name of the texture to remove

package/Materials/shaderMaterial.js

@@ -10,7 +10,7 @@ import { PushMaterial } from "./pushMaterial.js";
 import { EngineStore } from "../Engines/engineStore.js";
 
 import { AddClipPlaneUniforms, BindClipPlane, PrepareStringDefinesForClipPlanes } from "./clipPlaneMaterialHelper.js";
-import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetParameters, BindSceneUniformBuffer, PrepareAttributesForBakedVertexAnimation, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances, } from "./materialHelper.functions.js";
+import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetParameters, BindSceneUniformBuffer, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances, } from "./materialHelper.functions.js";
 const 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.
@@ -34,6 +34,7 @@ export class ShaderMaterial extends PushMaterial {
     constructor(name, scene, shaderPath, options = {}, storeEffectOnSubMeshes = true) {
         super(name, scene, storeEffectOnSubMeshes);
         this._textures = {};
+        this._internalTextures = {};
         this._textureArrays = {};
         this._externalTextures = {};
         this._floats = {};
@@ -149,6 +150,19 @@ export class ShaderMaterial extends PushMaterial {
         this._textures[name] = texture;
         return this;
     }
+    /**
+     * Set an internal texture in the shader.
+     * @param name Define the name of the uniform samplers as defined in the shader
+     * @param texture Define the texture to bind to this sampler
+     * @returns the material itself allowing "fluent" like uniform updates
+     */
+    setInternalTexture(name, texture) {
+        if (this._options.samplers.indexOf(name) === -1) {
+            this._options.samplers.push(name);
+        }
+        this._internalTextures[name] = texture;
+        return this;
+    }
     /**
      * Remove a texture from the material.
      * @param name Define the name of the texture to remove
@@ -626,8 +640,10 @@ export class ShaderMaterial extends PushMaterial {
                 if (this._options.samplers.indexOf("bakedVertexAnimationTexture") === -1) {
                     this._options.samplers.push("bakedVertexAnimationTexture");
                 }
+                if (useInstances) {
+                    attribs.push("bakedVertexAnimationSettingsInstanced");
+                }
             }
-            PrepareAttributesForBakedVertexAnimation(attribs, mesh, defines);
         }
         // Textures
         for (const name in this._textures) {
@@ -635,6 +651,11 @@ export class ShaderMaterial extends PushMaterial {
                 return false;
             }
         }
+        for (const name in this._internalTextures) {
+            if (!this._internalTextures[name].isReady) {
+                return false;
+            }
+        }
         // Alpha test
         if (mesh && this.needAlphaTestingForMesh(mesh)) {
             defines.push("#define ALPHATEST");
@@ -829,6 +850,9 @@ export class ShaderMaterial extends PushMaterial {
             for (name in this._textures) {
                 effect.setTexture(name, this._textures[name]);
             }
+            for (name in this._internalTextures) {
+                effect._bindTexture(name, this._internalTextures[name]);
+            }
             // Texture arrays
             for (name in this._textureArrays) {
                 effect.setTextureArray(name, this._textureArrays[name]);
@@ -989,6 +1013,12 @@ export class ShaderMaterial extends PushMaterial {
                 return true;
             }
         }
+        const internalTexture = texture.getInternalTexture();
+        for (const name in this._internalTextures) {
+            if (this._internalTextures[name] === internalTexture) {
+                return true;
+            }
+        }
         for (const name in this._textureArrays) {
             const array = this._textureArrays[name];
             for (let index = 0; index < array.length; index++) {
@@ -1027,6 +1057,9 @@ export class ShaderMaterial extends PushMaterial {
         for (const key in this._textures) {
             result.setTexture(key, this._textures[key]);
         }
+        for (const key in this._internalTextures) {
+            result.setInternalTexture(key, this._internalTextures[key]);
+        }
         // TextureArray
         for (const key in this._textureArrays) {
             result.setTextureArray(key, this._textureArrays[key]);
@@ -1141,6 +1174,9 @@ export class ShaderMaterial extends PushMaterial {
             for (name in this._textures) {
                 this._textures[name].dispose();
             }
+            for (name in this._internalTextures) {
+                this._internalTextures[name].dispose();
+            }
             for (name in this._textureArrays) {
                 const array = this._textureArrays[name];
                 for (let index = 0; index < array.length; index++) {
@@ -1149,6 +1185,7 @@ export class ShaderMaterial extends PushMaterial {
             }
         }
         this._textures = {};
+        this._internalTextures = {};
         super.dispose(forceDisposeEffect, forceDisposeTextures, notBoundToMesh);
     }
     /**