playcanvas 2.24.0-beta.35 → 2.24.0-beta.36

package/build/playcanvas/src/core/core.js

@@ -1,5 +1,5 @@
-const version = "2.24.0-beta.35";
-const revision = "597f7e9";
+const version = "2.24.0-beta.36";
+const revision = "934e4e7";
 function extend(target, ex) {
 	for (const prop in ex) {
 		const copy = ex[prop];

package/build/playcanvas/src/scene/materials/lit-material-options-builder.js

@@ -67,7 +67,7 @@ class LitMaterialOptionsBuilder {
 		litOptions.pixelSnap = material.pixelSnap;
 		litOptions.ambientSH = material.ambientSH;
 		litOptions.occludeSpecular = material.occludeSpecular;
-		litOptions.occludeSpecularFloat = material.occludeSpecularIntensity !== 1;
+		litOptions.occludeSpecularFloat = true;
 		litOptions.useMsdf = false;
 		litOptions.msdfTextAttribute = false;
 		litOptions.alphaToCoverage = material.alphaToCoverage;

package/build/playcanvas/src/scene/materials/lit-material.js

@@ -51,6 +51,7 @@ class LitMaterial extends Material {
 		super.updateUniforms(device, scene);
 		this.setParameter("material_occludeDirect", this.occludeDirect ? 1 : 0);
 		this.setParameter("material_twoSidedLighting", this.twoSidedLighting ? 1 : 0);
+		this.setParameter("material_occludeSpecularIntensity", this.occludeSpecularIntensity);
 	}
 	getShaderVariant(params) {
 		options.usedUvs = this.usedUvs.slice();

package/build/playcanvas/src/scene/materials/standard-material-options-builder.d.ts

@@ -1,23 +1,4 @@
 export class StandardMaterialOptionsBuilder {
-    /**
-     * The refraction index for which the shader uses a built-in constant instead of the
-     * material_refractionIndex uniform. Shared with StandardMaterial, which needs to invalidate its
-     * shaders when refractionIndex moves across this value.
-     *
-     * @type {number}
-     * @ignore
-     */
-    static DEFAULT_REFRACTION_INDEX: number;
-    /**
-     * Compares two material numbers with the tolerance used to decide whether a shader constant can
-     * replace a uniform.
-     *
-     * @param {number} a - The first value.
-     * @param {number} b - The second value.
-     * @returns {boolean} True when the values are equal within tolerance.
-     * @ignore
-     */
-    static equalish(a: number, b: number): boolean;
     updateMinRef(options: any, scene: any, stdMat: any, objDefs: any, pass: any, lightList: any, vertexFormat: any, outlinePass?: boolean): void;
     updateRef(options: any, scene: any, cameraShaderParams: any, stdMat: any, objDefs: any, pass: any, lightList: any, vertexFormat: any): void;
     _updateSharedOptions(options: any, scene: any, stdMat: any, objDefs: any, pass: any, cameraShaderParams: any): void;

package/build/playcanvas/src/scene/materials/standard-material-options-builder.js

@@ -44,10 +44,6 @@ const notBlack = (color) => {
 	return color.r !== 0 || color.g !== 0 || color.b !== 0;
 };
 class StandardMaterialOptionsBuilder {
-	static DEFAULT_REFRACTION_INDEX = 1 / 1.5;
-	static equalish(a, b) {
-		return Math.abs(a - b) < 1e-4;
-	}
 	// Minimal options for Depth and Shadow passes, and the outline pass
 	updateMinRef(options, scene, stdMat, objDefs, pass, lightList, vertexFormat, outlinePass = false) {
 		this._updateSharedOptions(options, scene, stdMat, objDefs, pass);
@@ -169,20 +165,20 @@ class StandardMaterialOptionsBuilder {
 	_updateMaterialOptions(options, stdMat, scene) {
 		const useSpecular = !!(stdMat.useMetalness || stdMat.specularMap || stdMat.sphereMap || stdMat.cubeMap || stdMat.planarReflectionMap || notBlack(stdMat.specular) || stdMat.specularityFactor > 0 && stdMat.useMetalness || stdMat.enableGGXSpecular || stdMat.clearCoat > 0);
 		const useSpecularColor = !stdMat.useMetalness || stdMat.useMetalnessSpecularColor;
-		const specularityFactorTint = useSpecular && stdMat.useMetalnessSpecularColor && (stdMat.specularityFactorTint || stdMat.specularityFactor !== 1);
+		const specularityFactorTint = useSpecular && stdMat.useMetalnessSpecularColor;
 		const isPackedNormalMap = (texture) => texture ? texture.format === PIXELFORMAT_DXT5 || texture.type === TEXTURETYPE_SWIZZLEGGGR : false;
-		const { equalish, DEFAULT_REFRACTION_INDEX } = StandardMaterialOptionsBuilder;
-		options.specularityFactorTint = specularityFactorTint;
 		options.metalnessTint = stdMat.useMetalness;
 		options.glossTint = true;
+		options.iorTint = true;
+		options.refractionTint = true;
+		options.thicknessTint = true;
+		options.iridescenceTint = true;
+		options.specularityFactorTint = specularityFactorTint;
 		options.diffuseEncoding = stdMat.diffuseMap?.encoding;
 		options.diffuseDetailEncoding = stdMat.diffuseDetailMap?.encoding;
 		options.emissiveEncoding = stdMat.emissiveMap?.encoding;
 		options.lightMapEncoding = stdMat.lightMap?.encoding;
 		options.packedNormal = isPackedNormalMap(stdMat.normalMap);
-		options.refractionTint = !equalish(stdMat.refraction, 1);
-		options.refractionIndexTint = !equalish(stdMat.refractionIndex, DEFAULT_REFRACTION_INDEX);
-		options.thicknessTint = stdMat.useDynamicRefraction && stdMat.thickness !== 1;
 		options.specularEncoding = stdMat.specularMap?.encoding;
 		options.sheenEncoding = stdMat.sheenMap?.encoding;
 		options.diffuseTransmissionColorEncoding = stdMat.diffuseTransmissionColorMap?.encoding;
@@ -192,10 +188,7 @@ class StandardMaterialOptionsBuilder {
 		options.normalDetailPackedNormal = isPackedNormalMap(stdMat.normalDetailMap);
 		options.diffuseDetailMode = stdMat.diffuseDetailMode;
 		options.aoDetailMode = stdMat.aoDetailMode;
-		options.clearCoatGloss = !!stdMat.clearCoatGloss;
 		options.clearCoatPackedNormal = isPackedNormalMap(stdMat.clearCoatNormalMap);
-		options.iorTint = !equalish(stdMat.refractionIndex, DEFAULT_REFRACTION_INDEX);
-		options.iridescenceTint = true;
 		options.glossInvert = stdMat.glossInvert;
 		options.sheenGlossInvert = stdMat.sheenGlossInvert;
 		options.clearCoatGlossInvert = stdMat.clearCoatGlossInvert;
@@ -204,7 +197,7 @@ class StandardMaterialOptionsBuilder {
 		options.litOptions.pixelSnap = stdMat.pixelSnap;
 		options.litOptions.ambientSH = !!stdMat.ambientSH;
 		options.litOptions.occludeSpecular = stdMat.occludeSpecular;
-		options.litOptions.occludeSpecularFloat = stdMat.occludeSpecularIntensity !== 1;
+		options.litOptions.occludeSpecularFloat = true;
 		options.litOptions.useMsdf = !!stdMat.msdfMap;
 		options.litOptions.msdfTextAttribute = !!stdMat.msdfTextAttribute;
 		options.litOptions.alphaToCoverage = stdMat.alphaToCoverage;

package/build/playcanvas/src/scene/materials/standard-material-parameters.d.ts

@@ -75,7 +75,6 @@ export namespace standardMaterialParameterTypes {
     let metalnessTint: string;
     let occludeSpecular: string;
     let specularityFactor: string;
-    let specularityFactorTint: string;
     let diffuseDetailMode: string;
     let vertexColorGamma: string;
     let specular: string;
@@ -111,5 +110,6 @@ export namespace standardMaterialRemovedParameters {
     let useGamma: string;
     let useGammaTonemap: string;
     let sheenGlossTint: string;
+    let specularityFactorTint: string;
     let anisotropy: string;
 }

package/build/playcanvas/src/scene/materials/standard-material-parameters.js

@@ -34,7 +34,6 @@ const standardMaterialParameterTypes = {
 	..._textureParameter("specular"),
 	occludeSpecular: "enum:occludeSpecular",
 	specularityFactor: "number",
-	specularityFactorTint: "boolean",
 	..._textureParameter("specularityFactor"),
 	useMetalness: "boolean",
 	metalness: "number",
@@ -180,6 +179,7 @@ const standardMaterialRemovedParameters = {
 	useGamma: "boolean",
 	useGammaTonemap: "boolean",
 	sheenGlossTint: "boolean",
+	specularityFactorTint: "boolean",
 	anisotropy: "boolean"
 };
 export {

package/build/playcanvas/src/scene/materials/standard-material.d.ts

@@ -96,10 +96,6 @@ export type UpdateShaderCallback = (options: StandardMaterialOptions) => Standar
  * @property {boolean} specularVertexColor Multiply specular by the mesh vertex colors.
  * @property {string} specularVertexColorChannel Vertex color channels to use for specular. Can be
  * "r", "g", "b", "a", "rgb" or any swizzled combination.
- * @property {boolean} specularityFactorTint Force inclusion of the constant `specularityFactor`
- * when compositing with `specularityFactorMap` and/or specularity factor vertex colors. Defaults
- * to `false`. Setting this to `true` is rarely needed - the constant is automatically applied
- * whenever `specularityFactor` differs from 1. Provided as an explicit override.
  * @property {Texture|null} specularityFactorMap The factor of specularity as a texture (default is
  * null).
  * @property {number} specularityFactorMapUv Specularity factor map UV channel. Valid values are 0 to 7.
@@ -108,8 +104,8 @@ export type UpdateShaderCallback = (options: StandardMaterialOptions) => Standar
  * between 0 and 1.
  * @property {number} specularityFactorMapRotation Controls the 2D rotation (in degrees) of the specularity factor map.
  * @property {string} specularityFactorMapChannel The channel used by the specularity factor texture to sample from (default is 'a').
- * @property {boolean} specularityFactorVertexColor Use mesh vertex colors for specularity factor. If specularityFactorMap or
- * are specularityFactorTint are set, they'll be multiplied by vertex colors.
+ * @property {boolean} specularityFactorVertexColor Use mesh vertex colors for specularity factor.
+ * They are multiplied by `specularityFactor`, and by `specularityFactorMap` if set.
  * @property {string} specularityFactorVertexColorChannel Vertex color channels to use for specularity factor. Can be
  * "r", "g", "b", "a", "rgb" or any swizzled combination.
  * @property {boolean} enableGGXSpecular Enables GGX specular. Also enables
@@ -1302,11 +1298,7 @@ export class StandardMaterial extends Material {
 	set specularityFactorMapUv(arg: number);
 	get specularityFactorMapUv(): number;
 
-	/** Force inclusion of the constant `specularityFactor` when compositing with `specularityFactorMap` and/or specularity factor vertex colors. Defaults to `false`. Setting this to `true` is rarely needed - the constant is automatically applied whenever `specularityFactor` differs from 1. Provided as an explicit override. */
-	set specularityFactorTint(arg: boolean);
-	get specularityFactorTint(): boolean;
-
-	/** Use mesh vertex colors for specularity factor. If specularityFactorMap or are specularityFactorTint are set, they'll be multiplied by vertex colors. */
+	/** Use mesh vertex colors for specularity factor. They are multiplied by `specularityFactor`, and by `specularityFactorMap` if set. */
 	set specularityFactorVertexColor(arg: boolean);
 	get specularityFactorVertexColor(): boolean;
 

package/build/playcanvas/src/scene/materials/standard-material.js

@@ -115,10 +115,6 @@ const _propertiesByUniform = new Map(_propertyList.map((property) => [property.u
 const isBlack = (color) => {
 	return color.r === 0 && color.g === 0 && color.b === 0;
 };
-const dirtyShaderOnZeroOrOne = (oldValue, newValue) => {
-	return oldValue === 0 || oldValue === 1 || newValue === 0 || newValue === 1;
-};
-const { equalish, DEFAULT_REFRACTION_INDEX } = StandardMaterialOptionsBuilder;
 class StandardMaterial extends Material {
 	_usesViewTextures = true;
 	static TEXTURE_PARAMETERS = standardMaterialTextureParameters;
@@ -237,7 +233,7 @@ class StandardMaterial extends Material {
 	}
 	set specularityFactor(value) {
 		if (this._specularityFactor !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._specularityFactor, value);
+			this._dirtyShader = this._dirtyShader || this._specularityFactor > 0 !== value > 0;
 			this._specularityFactor = value;
 			this._markPropertyModified(_properties.specularityFactor);
 		}
@@ -247,7 +243,6 @@ class StandardMaterial extends Material {
 	}
 	set sheenGloss(value) {
 		if (this._sheenGloss !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._sheenGloss, value);
 			this._sheenGloss = value;
 			this._markPropertyModified(_properties.sheenGloss);
 		}
@@ -257,7 +252,6 @@ class StandardMaterial extends Material {
 	}
 	set gloss(value) {
 		if (this._gloss !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._gloss, value);
 			this._gloss = value;
 			this._markPropertyModified(_properties.gloss);
 		}
@@ -267,7 +261,6 @@ class StandardMaterial extends Material {
 	}
 	set aoIntensity(value) {
 		if (this._aoIntensity !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._aoIntensity, value);
 			this._aoIntensity = value;
 			this._markPropertyModified(_properties.aoIntensity);
 		}
@@ -286,7 +279,6 @@ class StandardMaterial extends Material {
 	}
 	set parallaxSamples(value) {
 		if (this._parallaxSamples !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._parallaxSamples, value);
 			this._parallaxSamples = value;
 			this._markPropertyModified(_properties.parallaxSamples);
 		}
@@ -306,7 +298,6 @@ class StandardMaterial extends Material {
 	}
 	set opacity(value) {
 		if (this._opacity !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._opacity, value);
 			this._opacity = value;
 			this._markPropertyModified(_properties.opacity);
 			this._markPropertyModified(_properties.alphaDither);
@@ -317,7 +308,6 @@ class StandardMaterial extends Material {
 	}
 	set alphaFade(value) {
 		if (this._alphaFade !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._alphaFade, value);
 			this._alphaFade = value;
 			this._markPropertyModified(_properties.alphaFade);
 		}
@@ -327,7 +317,6 @@ class StandardMaterial extends Material {
 	}
 	set bumpiness(value) {
 		if (this._bumpiness !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._bumpiness, value);
 			this._bumpiness = value;
 			this._markPropertyModified(_properties.bumpiness);
 		}
@@ -337,7 +326,6 @@ class StandardMaterial extends Material {
 	}
 	set normalDetailMapBumpiness(value) {
 		if (this._normalDetailMapBumpiness !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._normalDetailMapBumpiness, value);
 			this._normalDetailMapBumpiness = value;
 			this._markPropertyModified(_properties.normalDetailMapBumpiness);
 		}
@@ -347,7 +335,6 @@ class StandardMaterial extends Material {
 	}
 	set reflectivity(value) {
 		if (this._reflectivity !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._reflectivity, value);
 			this._reflectivity = value;
 			this._markPropertyModified(_properties.reflectivity);
 		}
@@ -357,7 +344,6 @@ class StandardMaterial extends Material {
 	}
 	set occludeSpecularIntensity(value) {
 		if (this._occludeSpecularIntensity !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._occludeSpecularIntensity, value);
 			this._occludeSpecularIntensity = value;
 			this._markPropertyModified(_properties.occludeSpecularIntensity);
 		}
@@ -367,7 +353,7 @@ class StandardMaterial extends Material {
 	}
 	set refraction(value) {
 		if (this._refraction !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._refraction, value) || equalish(this._refraction, 1) !== equalish(value, 1);
+			this._dirtyShader = this._dirtyShader || this._refraction !== 0 !== (value !== 0);
 			this._refraction = value;
 			this._markPropertyModified(_properties.refraction);
 		}
@@ -377,7 +363,6 @@ class StandardMaterial extends Material {
 	}
 	set refractionIndex(value) {
 		if (this._refractionIndex !== value) {
-			this._dirtyShader = this._dirtyShader || equalish(this._refractionIndex, DEFAULT_REFRACTION_INDEX) !== equalish(value, DEFAULT_REFRACTION_INDEX);
 			this._refractionIndex = value;
 			this._markPropertyModified(_properties.refractionIndex);
 		}
@@ -387,7 +372,7 @@ class StandardMaterial extends Material {
 	}
 	set dispersion(value) {
 		if (this._dispersion !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._dispersion, value);
+			this._dirtyShader = this._dirtyShader || this._dispersion > 0 !== value > 0;
 			this._dispersion = value;
 			this._markPropertyModified(_properties.dispersion);
 		}
@@ -397,7 +382,6 @@ class StandardMaterial extends Material {
 	}
 	set thickness(value) {
 		if (this._thickness !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._thickness, value);
 			this._thickness = value;
 			this._markPropertyModified(_properties.thickness);
 		}
@@ -416,7 +400,7 @@ class StandardMaterial extends Material {
 	}
 	set anisotropyIntensity(value) {
 		if (this._anisotropyIntensity !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._anisotropyIntensity, value);
+			this._dirtyShader = this._dirtyShader || this.enableGGXSpecular && !this.anisotropyMap && this._anisotropyIntensity > 0 !== value > 0;
 			this._anisotropyIntensity = value;
 			this._markPropertyModified(_properties.anisotropyIntensity);
 		}
@@ -426,7 +410,7 @@ class StandardMaterial extends Material {
 	}
 	set clearCoat(value) {
 		if (this._clearCoat !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._clearCoat, value);
+			this._dirtyShader = this._dirtyShader || this._clearCoat !== 0 !== (value !== 0) || this._clearCoat > 0 !== value > 0;
 			this._clearCoat = value;
 			this._markPropertyModified(_properties.clearCoat);
 		}
@@ -436,7 +420,6 @@ class StandardMaterial extends Material {
 	}
 	set clearCoatGloss(value) {
 		if (this._clearCoatGloss !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._clearCoatGloss, value);
 			this._clearCoatGloss = value;
 			this._markPropertyModified(_properties.clearCoatGloss);
 		}
@@ -446,7 +429,6 @@ class StandardMaterial extends Material {
 	}
 	set clearCoatBumpiness(value) {
 		if (this._clearCoatBumpiness !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._clearCoatBumpiness, value);
 			this._clearCoatBumpiness = value;
 			this._markPropertyModified(_properties.clearCoatBumpiness);
 		}
@@ -456,7 +438,7 @@ class StandardMaterial extends Material {
 	}
 	set iridescence(value) {
 		if (this._iridescence !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._iridescence, value);
+			this._dirtyShader = this._dirtyShader || this.useIridescence && this._iridescence !== 0 !== (value !== 0);
 			this._iridescence = value;
 			this._markPropertyModified(_properties.iridescence);
 		}
@@ -466,7 +448,6 @@ class StandardMaterial extends Material {
 	}
 	set iridescenceRefractionIndex(value) {
 		if (this._iridescenceRefractionIndex !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._iridescenceRefractionIndex, value);
 			this._iridescenceRefractionIndex = value;
 			this._markPropertyModified(_properties.iridescenceRefractionIndex);
 		}
@@ -476,7 +457,6 @@ class StandardMaterial extends Material {
 	}
 	set iridescenceThicknessMin(value) {
 		if (this._iridescenceThicknessMin !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._iridescenceThicknessMin, value);
 			this._iridescenceThicknessMin = value;
 			this._markPropertyModified(_properties.iridescenceThicknessMin);
 		}
@@ -486,7 +466,6 @@ class StandardMaterial extends Material {
 	}
 	set iridescenceThicknessMax(value) {
 		if (this._iridescenceThicknessMax !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._iridescenceThicknessMax, value);
 			this._iridescenceThicknessMax = value;
 			this._markPropertyModified(_properties.iridescenceThicknessMax);
 		}
@@ -516,7 +495,6 @@ class StandardMaterial extends Material {
 	}
 	set anisotropyRotation(value) {
 		if (this._anisotropyRotation !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._anisotropyRotation, value);
 			this._anisotropyRotation = value;
 			this._markPropertyModified(_properties.anisotropyRotation);
 		}
@@ -526,7 +504,6 @@ class StandardMaterial extends Material {
 	}
 	set attenuationDistance(value) {
 		if (this._attenuationDistance !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._attenuationDistance, value);
 			this._attenuationDistance = value;
 			this._markPropertyModified(_properties.attenuationDistance);
 		}
@@ -536,7 +513,6 @@ class StandardMaterial extends Material {
 	}
 	set heightMapFactor(value) {
 		if (this._heightMapFactor !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._heightMapFactor, value);
 			this._heightMapFactor = value;
 			this._markPropertyModified(_properties.heightMapFactor);
 		}
@@ -912,7 +888,7 @@ function _defineMaterialProps() {
 	registerProp("reflectivity", () => 1);
 	registerProp("occludeSpecularIntensity", () => 1);
 	registerProp("refraction", () => 0);
-	registerProp("refractionIndex", () => DEFAULT_REFRACTION_INDEX);
+	registerProp("refractionIndex", () => 1 / 1.5);
 	registerProp("dispersion", () => 0);
 	registerProp("thickness", () => 0);
 	registerProp("metalness", () => 1);
@@ -933,7 +909,6 @@ function _defineMaterialProps() {
 	registerProp("planarReflectionMatrix", () => new Mat4(), true);
 	registerProp("alphaTest", () => 0);
 	_defineObject("ambientSH");
-	_defineFlag("specularityFactorTint", false);
 	_defineFlag("useMetalness", false);
 	_defineFlag("useMetalnessSpecularColor", false);
 	_defineFlag("useSheen", false);
@@ -1067,6 +1042,7 @@ _defineRemovedTint("diffuseTint");
 _defineRemovedTint("emissiveTint");
 _defineRemovedTint("ambientTint");
 _defineRemovedTint("specularTint");
+_defineRemovedTint("specularityFactorTint");
 _defineDeprecatedAlias("aoVertexColor", "aoMapVertexColor");
 _defineDeprecatedAlias("diffuseVertexColor", "diffuseMapVertexColor");
 _defineDeprecatedAlias("specularVertexColor", "specularMapVertexColor");

package/build/playcanvas.d.ts

@@ -35616,25 +35616,6 @@ declare class Material {
 }
 
 declare class StandardMaterialOptionsBuilder {
-    /**
-     * The refraction index for which the shader uses a built-in constant instead of the
-     * material_refractionIndex uniform. Shared with StandardMaterial, which needs to invalidate its
-     * shaders when refractionIndex moves across this value.
-     *
-     * @type {number}
-     * @ignore
-     */
-    static DEFAULT_REFRACTION_INDEX: number;
-    /**
-     * Compares two material numbers with the tolerance used to decide whether a shader constant can
-     * replace a uniform.
-     *
-     * @param {number} a - The first value.
-     * @param {number} b - The second value.
-     * @returns {boolean} True when the values are equal within tolerance.
-     * @ignore
-     */
-    static equalish(a: number, b: number): boolean;
     updateMinRef(options: any, scene: any, stdMat: any, objDefs: any, pass: any, lightList: any, vertexFormat: any, outlinePass?: boolean): void;
     updateRef(options: any, scene: any, cameraShaderParams: any, stdMat: any, objDefs: any, pass: any, lightList: any, vertexFormat: any): void;
     _updateSharedOptions(options: any, scene: any, stdMat: any, objDefs: any, pass: any, cameraShaderParams: any): void;
@@ -35744,10 +35725,6 @@ type UpdateShaderCallback = (options: StandardMaterialOptions) => StandardMateri
  * @property {boolean} specularVertexColor Multiply specular by the mesh vertex colors.
  * @property {string} specularVertexColorChannel Vertex color channels to use for specular. Can be
  * "r", "g", "b", "a", "rgb" or any swizzled combination.
- * @property {boolean} specularityFactorTint Force inclusion of the constant `specularityFactor`
- * when compositing with `specularityFactorMap` and/or specularity factor vertex colors. Defaults
- * to `false`. Setting this to `true` is rarely needed - the constant is automatically applied
- * whenever `specularityFactor` differs from 1. Provided as an explicit override.
  * @property {Texture|null} specularityFactorMap The factor of specularity as a texture (default is
  * null).
  * @property {number} specularityFactorMapUv Specularity factor map UV channel. Valid values are 0 to 7.
@@ -35756,8 +35733,8 @@ type UpdateShaderCallback = (options: StandardMaterialOptions) => StandardMateri
  * between 0 and 1.
  * @property {number} specularityFactorMapRotation Controls the 2D rotation (in degrees) of the specularity factor map.
  * @property {string} specularityFactorMapChannel The channel used by the specularity factor texture to sample from (default is 'a').
- * @property {boolean} specularityFactorVertexColor Use mesh vertex colors for specularity factor. If specularityFactorMap or
- * are specularityFactorTint are set, they'll be multiplied by vertex colors.
+ * @property {boolean} specularityFactorVertexColor Use mesh vertex colors for specularity factor.
+ * They are multiplied by `specularityFactor`, and by `specularityFactorMap` if set.
  * @property {string} specularityFactorVertexColorChannel Vertex color channels to use for specularity factor. Can be
  * "r", "g", "b", "a", "rgb" or any swizzled combination.
  * @property {boolean} enableGGXSpecular Enables GGX specular. Also enables
@@ -36950,11 +36927,7 @@ declare class StandardMaterial extends Material {
 	set specularityFactorMapUv(arg: number);
 	get specularityFactorMapUv(): number;
 
-	/** Force inclusion of the constant `specularityFactor` when compositing with `specularityFactorMap` and/or specularity factor vertex colors. Defaults to `false`. Setting this to `true` is rarely needed - the constant is automatically applied whenever `specularityFactor` differs from 1. Provided as an explicit override. */
-	set specularityFactorTint(arg: boolean);
-	get specularityFactorTint(): boolean;
-
-	/** Use mesh vertex colors for specularity factor. If specularityFactorMap or are specularityFactorTint are set, they'll be multiplied by vertex colors. */
+	/** Use mesh vertex colors for specularity factor. They are multiplied by `specularityFactor`, and by `specularityFactorMap` if set. */
 	set specularityFactorVertexColor(arg: boolean);
 	get specularityFactorVertexColor(): boolean;
 

package/build/playcanvas.dbg/src/core/core.js

@@ -1,5 +1,5 @@
-const version = "2.24.0-beta.35";
-const revision = "597f7e9";
+const version = "2.24.0-beta.36";
+const revision = "934e4e7";
 function extend(target, ex) {
   for (const prop in ex) {
     const copy = ex[prop];

package/build/playcanvas.dbg/src/scene/materials/lit-material-options-builder.js

@@ -67,7 +67,7 @@ class LitMaterialOptionsBuilder {
     litOptions.pixelSnap = material.pixelSnap;
     litOptions.ambientSH = material.ambientSH;
     litOptions.occludeSpecular = material.occludeSpecular;
-    litOptions.occludeSpecularFloat = material.occludeSpecularIntensity !== 1;
+    litOptions.occludeSpecularFloat = true;
     litOptions.useMsdf = false;
     litOptions.msdfTextAttribute = false;
     litOptions.alphaToCoverage = material.alphaToCoverage;

package/build/playcanvas.dbg/src/scene/materials/lit-material.js

@@ -59,6 +59,7 @@ class LitMaterial extends Material {
     super.updateUniforms(device, scene);
     this.setParameter("material_occludeDirect", this.occludeDirect ? 1 : 0);
     this.setParameter("material_twoSidedLighting", this.twoSidedLighting ? 1 : 0);
+    this.setParameter("material_occludeSpecularIntensity", this.occludeSpecularIntensity);
   }
   /** @ignore */
   getShaderVariant(params) {

package/build/playcanvas.dbg/src/scene/materials/standard-material-options-builder.js

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import {
   PIXELFORMAT_DXT5,
   PIXELFORMAT_RGBA8,
@@ -46,19 +43,7 @@ import { shaderDefsToLightMask } from "../light-mask.js";
 const notBlack = (color) => {
   return color.r !== 0 || color.g !== 0 || color.b !== 0;
 };
-const _StandardMaterialOptionsBuilder = class _StandardMaterialOptionsBuilder {
-  /**
-   * Compares two material numbers with the tolerance used to decide whether a shader constant can
-   * replace a uniform.
-   *
-   * @param {number} a - The first value.
-   * @param {number} b - The second value.
-   * @returns {boolean} True when the values are equal within tolerance.
-   * @ignore
-   */
-  static equalish(a, b) {
-    return Math.abs(a - b) < 1e-4;
-  }
+class StandardMaterialOptionsBuilder {
   // Minimal options for Depth and Shadow passes, and the outline pass
   updateMinRef(options, scene, stdMat, objDefs, pass, lightList, vertexFormat, outlinePass = false) {
     this._updateSharedOptions(options, scene, stdMat, objDefs, pass);
@@ -180,20 +165,20 @@ const _StandardMaterialOptionsBuilder = class _StandardMaterialOptionsBuilder {
   _updateMaterialOptions(options, stdMat, scene) {
     const useSpecular = !!(stdMat.useMetalness || stdMat.specularMap || stdMat.sphereMap || stdMat.cubeMap || stdMat.planarReflectionMap || notBlack(stdMat.specular) || stdMat.specularityFactor > 0 && stdMat.useMetalness || stdMat.enableGGXSpecular || stdMat.clearCoat > 0);
     const useSpecularColor = !stdMat.useMetalness || stdMat.useMetalnessSpecularColor;
-    const specularityFactorTint = useSpecular && stdMat.useMetalnessSpecularColor && (stdMat.specularityFactorTint || stdMat.specularityFactor !== 1);
+    const specularityFactorTint = useSpecular && stdMat.useMetalnessSpecularColor;
     const isPackedNormalMap = (texture) => texture ? texture.format === PIXELFORMAT_DXT5 || texture.type === TEXTURETYPE_SWIZZLEGGGR : false;
-    const { equalish, DEFAULT_REFRACTION_INDEX } = _StandardMaterialOptionsBuilder;
-    options.specularityFactorTint = specularityFactorTint;
     options.metalnessTint = stdMat.useMetalness;
     options.glossTint = true;
+    options.iorTint = true;
+    options.refractionTint = true;
+    options.thicknessTint = true;
+    options.iridescenceTint = true;
+    options.specularityFactorTint = specularityFactorTint;
     options.diffuseEncoding = stdMat.diffuseMap?.encoding;
     options.diffuseDetailEncoding = stdMat.diffuseDetailMap?.encoding;
     options.emissiveEncoding = stdMat.emissiveMap?.encoding;
     options.lightMapEncoding = stdMat.lightMap?.encoding;
     options.packedNormal = isPackedNormalMap(stdMat.normalMap);
-    options.refractionTint = !equalish(stdMat.refraction, 1);
-    options.refractionIndexTint = !equalish(stdMat.refractionIndex, DEFAULT_REFRACTION_INDEX);
-    options.thicknessTint = stdMat.useDynamicRefraction && stdMat.thickness !== 1;
     options.specularEncoding = stdMat.specularMap?.encoding;
     options.sheenEncoding = stdMat.sheenMap?.encoding;
     options.diffuseTransmissionColorEncoding = stdMat.diffuseTransmissionColorMap?.encoding;
@@ -203,10 +188,7 @@ const _StandardMaterialOptionsBuilder = class _StandardMaterialOptionsBuilder {
     options.normalDetailPackedNormal = isPackedNormalMap(stdMat.normalDetailMap);
     options.diffuseDetailMode = stdMat.diffuseDetailMode;
     options.aoDetailMode = stdMat.aoDetailMode;
-    options.clearCoatGloss = !!stdMat.clearCoatGloss;
     options.clearCoatPackedNormal = isPackedNormalMap(stdMat.clearCoatNormalMap);
-    options.iorTint = !equalish(stdMat.refractionIndex, DEFAULT_REFRACTION_INDEX);
-    options.iridescenceTint = true;
     options.glossInvert = stdMat.glossInvert;
     options.sheenGlossInvert = stdMat.sheenGlossInvert;
     options.clearCoatGlossInvert = stdMat.clearCoatGlossInvert;
@@ -215,7 +197,7 @@ const _StandardMaterialOptionsBuilder = class _StandardMaterialOptionsBuilder {
     options.litOptions.pixelSnap = stdMat.pixelSnap;
     options.litOptions.ambientSH = !!stdMat.ambientSH;
     options.litOptions.occludeSpecular = stdMat.occludeSpecular;
-    options.litOptions.occludeSpecularFloat = stdMat.occludeSpecularIntensity !== 1;
+    options.litOptions.occludeSpecularFloat = true;
     options.litOptions.useMsdf = !!stdMat.msdfMap;
     options.litOptions.msdfTextAttribute = !!stdMat.msdfTextAttribute;
     options.litOptions.alphaToCoverage = stdMat.alphaToCoverage;
@@ -332,17 +314,7 @@ const _StandardMaterialOptionsBuilder = class _StandardMaterialOptionsBuilder {
       options.litOptions.noShadow = true;
     }
   }
-};
-/**
- * The refraction index for which the shader uses a built-in constant instead of the
- * material_refractionIndex uniform. Shared with StandardMaterial, which needs to invalidate its
- * shaders when refractionIndex moves across this value.
- *
- * @type {number}
- * @ignore
- */
-__publicField(_StandardMaterialOptionsBuilder, "DEFAULT_REFRACTION_INDEX", 1 / 1.5);
-let StandardMaterialOptionsBuilder = _StandardMaterialOptionsBuilder;
+}
 export {
   StandardMaterialOptionsBuilder
 };

package/build/playcanvas.dbg/src/scene/materials/standard-material-parameters.js

@@ -34,7 +34,6 @@ const standardMaterialParameterTypes = {
   ..._textureParameter("specular"),
   occludeSpecular: "enum:occludeSpecular",
   specularityFactor: "number",
-  specularityFactorTint: "boolean",
   ..._textureParameter("specularityFactor"),
   useMetalness: "boolean",
   metalness: "number",
@@ -180,6 +179,7 @@ const standardMaterialRemovedParameters = {
   useGamma: "boolean",
   useGammaTonemap: "boolean",
   sheenGlossTint: "boolean",
+  specularityFactorTint: "boolean",
   anisotropy: "boolean"
 };
 export {