@babylonjs/core 5.55.0 → 5.56.0

package/Materials/effect.js

@@ -231,7 +231,7 @@ export class Effect {
                         migratedFragmentCode = processFinalCode("fragment", migratedFragmentCode);
                     }
                     const finalShaders = ShaderProcessor.Finalize(migratedVertexCode, migratedFragmentCode, processorOptions);
-                    processorOptions = null; // avoid some GC leaks because of code below (related to proxyFunction(name).bind(this))
+                    processorOptions = null;
                     this._useFinalCode(finalShaders.vertexCode, finalShaders.fragmentCode, baseName);
                 }, this._engine);
             }
@@ -253,27 +253,6 @@ export class Effect {
             shaderCodes[1] = fragmentCode;
             shadersLoaded();
         });
-        const proxyFunction = function (functionName) {
-            // check if the function exists in the pipelineContext
-            return function () {
-                if (this._pipelineContext) {
-                    const func = this._pipelineContext[functionName];
-                    func.apply(this._pipelineContext, arguments);
-                }
-                return this;
-            };
-        };
-        ["Int?", "UInt?", "IntArray?", "UIntArray?", "Array?", "Color?", "Vector?", "Float?", "Matrices", "Matrix", "Matrix3x3", "Matrix2x2", "Quaternion", "DirectColor4"].forEach((functionName) => {
-            const name = `set${functionName}`;
-            if (name.endsWith("?")) {
-                ["", 2, 3, 4].forEach((n) => {
-                    this[(name.slice(0, -1) + n)] = this[(name.slice(0, -1) + n)] || proxyFunction(name.slice(0, -1) + n).bind(this);
-                });
-            }
-            else {
-                this[name] = this[name] || proxyFunction(name).bind(this);
-            }
-        });
     }
     _useFinalCode(migratedVertexCode, migratedFragmentCode, baseName) {
         if (baseName) {
@@ -809,6 +788,178 @@ export class Effect {
     bindUniformBlock(blockName, index) {
         this._engine.bindUniformBlock(this._pipelineContext, blockName, index);
     }
+    /**
+     * Sets an integer value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param value Value to be set.
+     * @returns this effect.
+     */
+    setInt(uniformName, value) {
+        this._pipelineContext.setInt(uniformName, value);
+        return this;
+    }
+    /**
+     * Sets an int2 value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First int in int2.
+     * @param y Second int in int2.
+     * @returns this effect.
+     */
+    setInt2(uniformName, x, y) {
+        this._pipelineContext.setInt2(uniformName, x, y);
+        return this;
+    }
+    /**
+     * Sets an int3 value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First int in int3.
+     * @param y Second int in int3.
+     * @param z Third int in int3.
+     * @returns this effect.
+     */
+    setInt3(uniformName, x, y, z) {
+        this._pipelineContext.setInt3(uniformName, x, y, z);
+        return this;
+    }
+    /**
+     * Sets an int4 value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First int in int4.
+     * @param y Second int in int4.
+     * @param z Third int in int4.
+     * @param w Fourth int in int4.
+     * @returns this effect.
+     */
+    setInt4(uniformName, x, y, z, w) {
+        this._pipelineContext.setInt4(uniformName, x, y, z, w);
+        return this;
+    }
+    /**
+     * Sets an int array on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setIntArray(uniformName, array) {
+        this._pipelineContext.setIntArray(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an int array 2 on a uniform variable. (Array is specified as single array eg. [1,2,3,4] will result in [[1,2],[3,4]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setIntArray2(uniformName, array) {
+        this._pipelineContext.setIntArray2(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an int array 3 on a uniform variable. (Array is specified as single array eg. [1,2,3,4,5,6] will result in [[1,2,3],[4,5,6]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setIntArray3(uniformName, array) {
+        this._pipelineContext.setIntArray3(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an int array 4 on a uniform variable. (Array is specified as single array eg. [1,2,3,4,5,6,7,8] will result in [[1,2,3,4],[5,6,7,8]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setIntArray4(uniformName, array) {
+        this._pipelineContext.setIntArray4(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an unsigned integer value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param value Value to be set.
+     * @returns this effect.
+     */
+    setUInt(uniformName, value) {
+        this._pipelineContext.setInt(uniformName, value);
+        return this;
+    }
+    /**
+     * Sets an unsigned int2 value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First unsigned int in uint2.
+     * @param y Second unsigned int in uint2.
+     * @returns this effect.
+     */
+    setUInt2(uniformName, x, y) {
+        this._pipelineContext.setInt2(uniformName, x, y);
+        return this;
+    }
+    /**
+     * Sets an unsigned int3 value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First unsigned int in uint3.
+     * @param y Second unsigned int in uint3.
+     * @param z Third unsigned int in uint3.
+     * @returns this effect.
+     */
+    setUInt3(uniformName, x, y, z) {
+        this._pipelineContext.setInt3(uniformName, x, y, z);
+        return this;
+    }
+    /**
+     * Sets an unsigned int4 value on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First unsigned int in uint4.
+     * @param y Second unsigned int in uint4.
+     * @param z Third unsigned int in uint4.
+     * @param w Fourth unsigned int in uint4.
+     * @returns this effect.
+     */
+    setUInt4(uniformName, x, y, z, w) {
+        this._pipelineContext.setInt4(uniformName, x, y, z, w);
+        return this;
+    }
+    /**
+     * Sets an unsigned int array on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setUIntArray(uniformName, array) {
+        this._pipelineContext.setUIntArray(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an unsigned int array 2 on a uniform variable. (Array is specified as single array eg. [1,2,3,4] will result in [[1,2],[3,4]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setUIntArray2(uniformName, array) {
+        this._pipelineContext.setUIntArray2(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an unsigned int array 3 on a uniform variable. (Array is specified as single array eg. [1,2,3,4,5,6] will result in [[1,2,3],[4,5,6]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setUIntArray3(uniformName, array) {
+        this._pipelineContext.setUIntArray3(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an unsigned int array 4 on a uniform variable. (Array is specified as single array eg. [1,2,3,4,5,6,7,8] will result in [[1,2,3,4],[5,6,7,8]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setUIntArray4(uniformName, array) {
+        this._pipelineContext.setUIntArray4(uniformName, array);
+        return this;
+    }
     /**
      * Sets an float array on a uniform variable.
      * @param uniformName Name of the variable.
@@ -849,6 +1000,98 @@ export class Effect {
         this._pipelineContext.setArray4(uniformName, array);
         return this;
     }
+    /**
+     * Sets an array on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setArray(uniformName, array) {
+        this._pipelineContext.setArray(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an array 2 on a uniform variable. (Array is specified as single array eg. [1,2,3,4] will result in [[1,2],[3,4]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setArray2(uniformName, array) {
+        this._pipelineContext.setArray2(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an array 3 on a uniform variable. (Array is specified as single array eg. [1,2,3,4,5,6] will result in [[1,2,3],[4,5,6]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setArray3(uniformName, array) {
+        this._pipelineContext.setArray3(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets an array 4 on a uniform variable. (Array is specified as single array eg. [1,2,3,4,5,6,7,8] will result in [[1,2,3,4],[5,6,7,8]] in the shader)
+     * @param uniformName Name of the variable.
+     * @param array array to be set.
+     * @returns this effect.
+     */
+    setArray4(uniformName, array) {
+        this._pipelineContext.setArray4(uniformName, array);
+        return this;
+    }
+    /**
+     * Sets matrices on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param matrices matrices to be set.
+     * @returns this effect.
+     */
+    setMatrices(uniformName, matrices) {
+        this._pipelineContext.setMatrices(uniformName, matrices);
+        return this;
+    }
+    /**
+     * Sets matrix on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param matrix matrix to be set.
+     * @returns this effect.
+     */
+    setMatrix(uniformName, matrix) {
+        this._pipelineContext.setMatrix(uniformName, matrix);
+        return this;
+    }
+    /**
+     * Sets a 3x3 matrix on a uniform variable. (Specified as [1,2,3,4,5,6,7,8,9] will result in [1,2,3][4,5,6][7,8,9] matrix)
+     * @param uniformName Name of the variable.
+     * @param matrix matrix to be set.
+     * @returns this effect.
+     */
+    setMatrix3x3(uniformName, matrix) {
+        // the cast is ok because it is gl.uniformMatrix3fv() which is called at the end, and this function accepts Float32Array and Array<number>
+        this._pipelineContext.setMatrix3x3(uniformName, matrix);
+        return this;
+    }
+    /**
+     * Sets a 2x2 matrix on a uniform variable. (Specified as [1,2,3,4] will result in [1,2][3,4] matrix)
+     * @param uniformName Name of the variable.
+     * @param matrix matrix to be set.
+     * @returns this effect.
+     */
+    setMatrix2x2(uniformName, matrix) {
+        // the cast is ok because it is gl.uniformMatrix3fv() which is called at the end, and this function accepts Float32Array and Array<number>
+        this._pipelineContext.setMatrix2x2(uniformName, matrix);
+        return this;
+    }
+    /**
+     * Sets a float on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param value value to be set.
+     * @returns this effect.
+     */
+    setFloat(uniformName, value) {
+        this._pipelineContext.setFloat(uniformName, value);
+        return this;
+    }
     /**
      * Sets a boolean on a uniform variable.
      * @param uniformName Name of the variable.
@@ -859,12 +1102,120 @@ export class Effect {
         this._pipelineContext.setInt(uniformName, bool ? 1 : 0);
         return this;
     }
+    /**
+     * Sets a Vector2 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param vector2 vector2 to be set.
+     * @returns this effect.
+     */
+    setVector2(uniformName, vector2) {
+        this._pipelineContext.setVector2(uniformName, vector2);
+        return this;
+    }
+    /**
+     * Sets a float2 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First float in float2.
+     * @param y Second float in float2.
+     * @returns this effect.
+     */
+    setFloat2(uniformName, x, y) {
+        this._pipelineContext.setFloat2(uniformName, x, y);
+        return this;
+    }
+    /**
+     * Sets a Vector3 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param vector3 Value to be set.
+     * @returns this effect.
+     */
+    setVector3(uniformName, vector3) {
+        this._pipelineContext.setVector3(uniformName, vector3);
+        return this;
+    }
+    /**
+     * Sets a float3 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First float in float3.
+     * @param y Second float in float3.
+     * @param z Third float in float3.
+     * @returns this effect.
+     */
+    setFloat3(uniformName, x, y, z) {
+        this._pipelineContext.setFloat3(uniformName, x, y, z);
+        return this;
+    }
+    /**
+     * Sets a Vector4 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param vector4 Value to be set.
+     * @returns this effect.
+     */
+    setVector4(uniformName, vector4) {
+        this._pipelineContext.setVector4(uniformName, vector4);
+        return this;
+    }
+    /**
+     * Sets a Quaternion on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param quaternion Value to be set.
+     * @returns this effect.
+     */
+    setQuaternion(uniformName, quaternion) {
+        this._pipelineContext.setQuaternion(uniformName, quaternion);
+        return this;
+    }
+    /**
+     * Sets a float4 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param x First float in float4.
+     * @param y Second float in float4.
+     * @param z Third float in float4.
+     * @param w Fourth float in float4.
+     * @returns this effect.
+     */
+    setFloat4(uniformName, x, y, z, w) {
+        this._pipelineContext.setFloat4(uniformName, x, y, z, w);
+        return this;
+    }
+    /**
+     * Sets a Color3 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param color3 Value to be set.
+     * @returns this effect.
+     */
+    setColor3(uniformName, color3) {
+        this._pipelineContext.setColor3(uniformName, color3);
+        return this;
+    }
+    /**
+     * Sets a Color4 on a uniform variable.
+     * @param uniformName Name of the variable.
+     * @param color3 Value to be set.
+     * @param alpha Alpha value to be set.
+     * @returns this effect.
+     */
+    setColor4(uniformName, color3, alpha) {
+        this._pipelineContext.setColor4(uniformName, color3, alpha);
+        return this;
+    }
+    /**
+     * Sets a Color4 on a uniform variable
+     * @param uniformName defines the name of the variable
+     * @param color4 defines the value to be set
+     * @returns this effect.
+     */
+    setDirectColor4(uniformName, color4) {
+        this._pipelineContext.setDirectColor4(uniformName, color4);
+        return this;
+    }
     /**
      * Release all associated resources.
      **/
     dispose() {
-        var _a;
-        (_a = this._pipelineContext) === null || _a === void 0 ? void 0 : _a.dispose();
+        if (this._pipelineContext) {
+            this._pipelineContext.dispose();
+        }
         this._engine._releaseEffect(this);
         this._isDisposed = true;
     }