npm - playcanvas - Versions diffs - 2.24.0-beta.32 → 2.24.0-beta.33 - Mend

playcanvas 2.24.0-beta.32 → 2.24.0-beta.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (79) hide show

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

@@ -1,5 +1,5 @@
-const version = "2.24.0-beta.32";
-const revision = "3f0066f";
+const version = "2.24.0-beta.33";
+const revision = "217cc5b";
 function extend(target, ex) {
 	for (const prop in ex) {
 		const copy = ex[prop];

package/build/playcanvas/src/extras/input/controllers/orbit-controller.d.ts CHANGED Viewed

@@ -3,6 +3,8 @@
  * view around the focus within {@link yawRange} and {@link pitchRange}, the first two `move`
  * components pan the focus point, and the third scales the distance within {@link zoomRange}.
  * Motion is smoothed with {@link rotateDamping}, {@link moveDamping} and {@link zoomDamping}.
+ * With {@link horizontalPan}, the pan moves the focus point across the ground instead of the
+ * plane of the view.
  *
  * @category Input
  * @alpha
@@ -42,6 +44,13 @@ export class OrbitController extends InputController {
      * The zoom damping. A higher value means more damping. A value of 0 means no damping.
      */
     zoomDamping: number;
+    /**
+     * Whether the pan moves the focus point across the horizontal plane, as when dragging a map,
+     * instead of across the plane of the view. The first two `move` components are then the
+     * distances to move the focus point to the right and forward, level with the ground, so the
+     * height of the focus point does not change. Default is false.
+     */
+    horizontalPan: boolean;
     set pitchRange(range: import("../../../index.js").Vec2);
     get pitchRange(): import("../../../index.js").Vec2;
     set yawRange(range: import("../../../index.js").Vec2);

package/build/playcanvas/src/extras/input/controllers/orbit-controller.js CHANGED Viewed

@@ -15,6 +15,7 @@ class OrbitController extends InputController {
 	rotateDamping = 0.98;
 	moveDamping = 0.98;
 	zoomDamping = 0.98;
+	horizontalPan = false;
 	set pitchRange(range) {
 		this._targetRootPose.pitchRange.copy(range);
 		this._rootPose.copy(this._targetRootPose.rotate(Vec3.ZERO));
@@ -50,8 +51,13 @@ class OrbitController extends InputController {
 	}
 	update(frame, dt) {
 		const { move, rotate } = frame.read();
-		offset.set(move[0], move[1], 0);
-		rotation.setFromEulerAngles(this._rootPose.angles).transformVector(offset, offset);
+		if (this.horizontalPan) {
+			offset.set(move[0], 0, -move[1]);
+			rotation.setFromEulerAngles(0, this._rootPose.angles.y, 0).transformVector(offset, offset);
+		} else {
+			offset.set(move[0], move[1], 0);
+			rotation.setFromEulerAngles(this._rootPose.angles).transformVector(offset, offset);
+		}
 		this._targetRootPose.move(offset);
 		const { z: dist } = this._targetChildPose.position;
 		this._targetChildPose.move(offset.set(0, 0, dist * (1 + move[2]) - dist));

package/build/playcanvas/src/framework/components/particle-system/component.d.ts CHANGED Viewed

@@ -39,11 +39,11 @@ export const _properties: string[];
  *
  * Relevant Engine API examples:
  *
- * - [Particle Animated Index](https://playcanvas.github.io/#/graphics/particles-anim-index)
- * - [Particle Mesh](https://playcanvas.github.io/#/graphics/particles-mesh)
- * - [Particle Random Sprites](https://playcanvas.github.io/#/graphics/particles-random-sprites)
- * - [Particle Snow](https://playcanvas.github.io/#/graphics/particles-snow)
- * - [Particle Spark](https://playcanvas.github.io/#/graphics/particles-spark)
+ * - [Particle Animated Index](https://playcanvas.github.io/#/particles/anim-index)
+ * - [Particle Mesh](https://playcanvas.github.io/#/particles/mesh)
+ * - [Particle Random Sprites](https://playcanvas.github.io/#/particles/random-sprites)
+ * - [Particle Snow](https://playcanvas.github.io/#/particles/snow)
+ * - [Particle Spark](https://playcanvas.github.io/#/particles/spark)
  * - [Particles in a user interface](https://playcanvas.github.io/#/user-interface/particle-system)
  *
  * @hideconstructor

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

@@ -63,8 +63,6 @@ class LitMaterialOptionsBuilder {
 		litOptions.separateAmbient = false;
 		litOptions.pixelSnap = material.pixelSnap;
 		litOptions.ambientSH = material.ambientSH;
-		litOptions.twoSidedLighting = material.twoSidedLighting;
-		litOptions.occludeDirect = material.occludeDirect;
 		litOptions.occludeSpecular = material.occludeSpecular;
 		litOptions.occludeSpecularFloat = material.occludeSpecularIntensity !== 1;
 		litOptions.useMsdf = false;

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

@@ -47,6 +47,11 @@ class LitMaterial extends Material {
 	hasMetalness = false;
 	hasClearCoat = false;
 	hasClearCoatNormals = false;
+	updateUniforms(device, scene) {
+		super.updateUniforms(device, scene);
+		this.setParameter("material_occludeDirect", this.occludeDirect ? 1 : 0);
+		this.setParameter("material_twoSidedLighting", this.twoSidedLighting ? 1 : 0);
+	}
 	getShaderVariant(params) {
 		options.usedUvs = this.usedUvs.slice();
 		options.shaderChunkGLSL = this.shaderChunkGLSL;

package/build/playcanvas/src/scene/materials/material-property.d.ts CHANGED Viewed

@@ -62,6 +62,15 @@ export class MaterialProperty {
      */
     key: string;
 }
+/**
+ * Writes a boolean to a float uniform value, as 1 or 0.
+ *
+ * @param {boolean} value - The boolean.
+ * @param {Float32Array} storage - The uniform buffer storage.
+ * @param {number} offset - The element offset of the uniform in the storage.
+ * @ignore
+ */
+export function convertBoolean(value: boolean, storage: Float32Array, offset: number): void;
 /**
  * Converts an sRGB color to a linear RGB uniform value.
  *

package/build/playcanvas/src/scene/materials/material-property.js CHANGED Viewed

@@ -27,8 +27,12 @@ const convertColorToLinear = (color, storage, offset) => {
 const convertFloat = (value, storage, offset) => {
 	storage[offset] = value;
 };
+const convertBoolean = (value, storage, offset) => {
+	storage[offset] = value ? 1 : 0;
+};
 export {
 	MaterialProperty,
+	convertBoolean,
 	convertColorToLinear,
 	convertFloat
 };

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

@@ -170,7 +170,7 @@ class StandardMaterialOptionsBuilder {
 		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 && stdMat.metalness < 1;
+		options.metalnessTint = stdMat.useMetalness;
 		options.glossTint = true;
 		options.diffuseEncoding = stdMat.diffuseMap?.encoding;
 		options.diffuseDetailEncoding = stdMat.diffuseDetailMap?.encoding;
@@ -200,7 +200,6 @@ class StandardMaterialOptionsBuilder {
 		options.litOptions.separateAmbient = false;
 		options.litOptions.pixelSnap = stdMat.pixelSnap;
 		options.litOptions.ambientSH = !!stdMat.ambientSH;
-		options.litOptions.twoSidedLighting = stdMat.twoSidedLighting;
 		options.litOptions.occludeSpecular = stdMat.occludeSpecular;
 		options.litOptions.occludeSpecularFloat = stdMat.occludeSpecularIntensity !== 1;
 		options.litOptions.useMsdf = !!stdMat.msdfMap;
@@ -209,7 +208,6 @@ class StandardMaterialOptionsBuilder {
 		options.litOptions.opacityFadesSpecular = stdMat.opacityFadesSpecular;
 		options.litOptions.opacityDither = stdMat.opacityDither;
 		options.litOptions.cubeMapProjection = stdMat.cubeMapProjection;
-		options.litOptions.occludeDirect = stdMat.occludeDirect;
 		options.litOptions.useSpecular = useSpecular;
 		options.litOptions.useSpecularityFactor = (specularityFactorTint || !!stdMat.specularityFactorMap) && stdMat.useMetalnessSpecularColor;
 		options.litOptions.enableGGXSpecular = stdMat.enableGGXSpecular;

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

@@ -23,7 +23,7 @@ import { EnvLighting } from "../graphics/env-lighting.js";
 import { getProgramLibrary } from "../shader-lib/get-program-library.js";
 import { _matTex2D, standard } from "../shader-lib/programs/standard.js";
 import { Material } from "./material.js";
-import { MaterialProperty, convertColorToLinear, convertFloat } from "./material-property.js";
+import { MaterialProperty, convertBoolean, convertColorToLinear, convertFloat } from "./material-property.js";
 import { getMaterialLayout } from "./material-uniform-buffer-layout.js";
 import { getTextureDescriptors, getTextureIdentifiers, getTextureSharing } from "./standard-material-textures.js";
 import { StandardMaterialMapTransforms } from "./standard-material-map-transforms.js";
@@ -82,6 +82,8 @@ const _properties = {
 	normalDetailMapBumpiness: new MaterialProperty("normalDetailMapBumpiness", "material_normalDetailMapBumpiness", UNIFORMTYPE_FLOAT, convertFloat),
 	reflectivity: new MaterialProperty("reflectivity", "material_reflectivity", UNIFORMTYPE_FLOAT, convertFloat),
 	occludeSpecularIntensity: new MaterialProperty("occludeSpecularIntensity", "material_occludeSpecularIntensity", UNIFORMTYPE_FLOAT, convertFloat),
+	occludeDirect: new MaterialProperty("occludeDirect", "material_occludeDirect", UNIFORMTYPE_FLOAT, convertBoolean),
+	twoSidedLighting: new MaterialProperty("twoSidedLighting", "material_twoSidedLighting", UNIFORMTYPE_FLOAT, convertBoolean),
 	refraction: new MaterialProperty("refraction", "material_refraction", UNIFORMTYPE_FLOAT, convertFloat),
 	refractionIndex: new MaterialProperty("refractionIndex", "material_refractionIndex", UNIFORMTYPE_FLOAT, convertFloat),
 	dispersion: new MaterialProperty("dispersion", "material_dispersion", UNIFORMTYPE_FLOAT, convertFloat),
@@ -405,7 +407,6 @@ class StandardMaterial extends Material {
 	}
 	set metalness(value) {
 		if (this._metalness !== value) {
-			this._dirtyShader = this._dirtyShader || dirtyShaderOnZeroOrOne(this._metalness, value);
 			this._metalness = value;
 			this._markPropertyModified(_properties.metalness);
 		}
@@ -937,7 +938,14 @@ function _defineMaterialProps() {
 	_defineFlag("useMetalnessSpecularColor", false);
 	_defineFlag("useSheen", false);
 	_defineFlag("enableGGXSpecular", false);
-	_defineFlag("occludeDirect", false);
+	defineProp({
+		name: "occludeDirect",
+		defaultValue: false,
+		dirtyShaderFunc: () => false,
+		onSet: function() {
+			this._markPropertyModified(_properties.occludeDirect);
+		}
+	});
 	_defineFlag("opacityFadesSpecular", true);
 	_defineFlag("occludeSpecular", SPECOCC_AO);
 	_defineFlag("fresnelModel", FRESNEL_SCHLICK);
@@ -949,7 +957,14 @@ function _defineMaterialProps() {
 	_defineFlag("useSkybox", true);
 	_defineFlag("forceUv1", false);
 	_defineFlag("pixelSnap", false);
-	_defineFlag("twoSidedLighting", false);
+	defineProp({
+		name: "twoSidedLighting",
+		defaultValue: false,
+		dirtyShaderFunc: () => false,
+		onSet: function() {
+			this._markPropertyModified(_properties.twoSidedLighting);
+		}
+	});
 	_defineFlag("nineSlicedMode", void 0);
 	_defineFlag("msdfTextAttribute", false);
 	_defineFlag("useIridescence", false);

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardBackend.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\nvoid evaluateBackend() {\n\n    // apply SSAO during lighting\n    #ifdef LIT_SSAO\n        litArgs_ao *= texture2DLod(ssaoTexture, gl_FragCoord.xy * ssaoTextureSizeInv, 0.0).r;\n    #endif\n\n    // transform tangent space normals to world space\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef LIT_SPECULAR\n            getReflDir(litArgs_worldNormal, dViewDirW, litArgs_gloss, dTBN);\n        #endif\n\n        #ifdef LIT_CLEARCOAT\n            ccReflDirW = normalize(-reflect(dViewDirW, litArgs_clearcoat_worldNormal));\n        #endif\n    #endif\n\n    #if defined(LIT_SPECULAR_OR_REFLECTION) || defined(LIT_REFRACTION)\n        #ifdef LIT_METALNESS\n            float f0 = 1.0 / litArgs_ior;\n            f0 = (f0 - 1.0) / (f0 + 1.0);\n            f0 *= f0;\n            #ifdef LIT_SPECULARITY_FACTOR\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, litArgs_specularityFactor);\n            #else\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, 1.0);\n            #endif\n            litArgs_albedo = getAlbedoModulate(litArgs_albedo, litArgs_metalness);\n\n            // the diffuse transmission is a dielectric lobe, like the diffuse reflection\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                litArgs_diffuseTransmission_color = getAlbedoModulate(litArgs_diffuseTransmission_color, litArgs_metalness);\n            #endif\n        #endif\n\n        #ifdef LIT_IRIDESCENCE\n            vec3 iridescenceFresnel = getIridescence(saturate(dot(dViewDirW, litArgs_worldNormal)), litArgs_specularity, litArgs_iridescence_thickness);\n        #endif\n    #endif\n\n    // ambient\n    #ifdef LIT_ADD_AMBIENT\n\n        // the ambient light arriving at the back of the surface, which the diffuse transmission\n        // lets through, is added to the diffuse light first and moved out of it\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            addAmbient(-litArgs_worldNormal);\n            dDiffuseTransmissionLight = dDiffuseLight;\n            dDiffuseLight = vec3(0);\n        #endif\n\n        addAmbient(litArgs_worldNormal);\n\n        #ifdef LIT_SPECULAR\n            dDiffuseLight = dDiffuseLight * (1.0 - litArgs_specularity);\n\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                dDiffuseTransmissionLight *= 1.0 - litArgs_specularity;\n            #endif\n        #endif\n\n        // move ambient color out of diffuse (used by Lightmapper, to multiply ambient color by accumulated AO)\n        #ifdef LIT_SEPARATE_AMBIENT\n            vec3 dAmbientLight = dDiffuseLight;\n            dDiffuseLight = vec3(0);\n        #endif\n    #endif\n\n    dDiffuseLight *= litArgs_ambient;\n\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseTransmissionLight *= litArgs_ambient;\n    #endif\n\n    #ifdef LIT_AO\n        #ifndef LIT_OCCLUDE_DIRECT\n            occludeDiffuse(litArgs_ao);\n        #endif\n    #endif\n\n    #ifdef LIT_LIGHTMAP\n        addLightMap(\n            litArgs_lightmap, \n            litArgs_lightmapDir, \n            litArgs_worldNormal, \n            dViewDirW, \n            dReflDirW, \n            litArgs_gloss, \n            litArgs_specularity, \n            dVertexNormalW,\n            dTBN\n        #if defined(LIT_IRIDESCENCE)\n            , iridescenceFresnel,\n            litArgs_iridescence_intensity\n        #endif\n        );\n    #endif\n\n    #ifdef LIT_LIGHTING || LIT_REFLECTIONS\n\n        #ifdef LIT_REFLECTIONS\n\n            #ifdef LIT_CLEARCOAT\n                addReflectionCC(ccReflDirW, litArgs_clearcoat_gloss);\n            \n                #ifdef LIT_SPECULAR_FRESNEL\n                    ccFresnel = getFresnelCC(dot(dViewDirW, litArgs_clearcoat_worldNormal));\n                    ccReflection *= ccFresnel;\n                #else\n                    ccFresnel = 0.0;\n                #endif\n            #endif\n\n            #ifdef LIT_SPECULARITY_FACTOR\n                ccReflection *= litArgs_specularityFactor;\n            #endif\n\n            #ifdef LIT_SHEEN\n                addReflectionSheen(litArgs_worldNormal, dViewDirW, litArgs_sheen_gloss);\n            #endif\n\n            // Fresnel has to be applied to reflections\n            addReflection(dReflDirW, litArgs_gloss);\n\n            #ifdef LIT_FRESNEL_MODEL\n\n                dReflection.rgb *= getFresnel(\n                    dot(dViewDirW, litArgs_worldNormal), \n                    litArgs_gloss, \n                    litArgs_specularity\n                #if defined(LIT_IRIDESCENCE)\n                    , iridescenceFresnel,\n                    litArgs_iridescence_intensity\n                #endif\n                    );\n\n            #else\n\n                dReflection.rgb *= litArgs_specularity;\n\n            #endif\n\n        #endif\n\n        #ifdef AREA_LIGHTS\n            // specular has to be accumulated differently if we want area lights to look correct\n            dSpecularLight *= litArgs_specularity;\n\n            #ifdef LIT_SPECULAR\n                // evaluate material based area lights data, shared by all area lights\n                calcLTCLightValues(litArgs_gloss, litArgs_worldNormal, dViewDirW, litArgs_specularity, litArgs_clearcoat_gloss, litArgs_clearcoat_worldNormal, litArgs_clearcoat_specularity);\n            #endif\n        #endif\n        \n        // LOOP - evaluate all non-clustered lights\n        #ifdef LIGHT_COUNT > 0\n            #include \"lightEvaluationPS, LIGHT_COUNT\"\n        #endif\n\n        // clustered lighting\n        #ifdef LIT_CLUSTERED_LIGHTS\n            addClusteredLights(litArgs_worldNormal, dViewDirW, dReflDirW,\n                #if defined(LIT_CLEARCOAT)\n                        ccReflDirW,\n                #endif\n                        litArgs_gloss, litArgs_specularity, dVertexNormalW, dTBN, \n                #if defined(LIT_IRIDESCENCE)\n                        iridescenceFresnel,\n                #endif\n                        litArgs_clearcoat_worldNormal, litArgs_clearcoat_gloss, litArgs_sheen_gloss, litArgs_iridescence_intensity\n            );\n        #endif\n\n        #ifdef AREA_LIGHTS\n\n            #ifdef LIT_CLEARCOAT\n                // specular has to be accumulated differently if we want area lights to look correct\n                litArgs_clearcoat_specularity = 1.0;\n            #endif\n\n            #ifdef LIT_SPECULAR\n                litArgs_specularity = vec3(1);\n            #endif\n\n        #endif\n\n    #endif\n\n    // the diffuse transmission takes its share of the light entering the surface, and the diffuse\n    // reflection the rest\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseLight *= 1.0 - litArgs_diffuseTransmission_intensity;\n        dDiffuseTransmissionLight *= litArgs_diffuseTransmission_intensity;\n    #endif\n\n    // refraction is not gated on lighting / reflections, so that it also works without them\n    #ifdef LIT_REFRACTION\n        addRefraction(\n            litArgs_worldNormal,\n            dViewDirW,\n            litArgs_thickness,\n            litArgs_gloss,\n            litArgs_specularity,\n            litArgs_albedo,\n            litArgs_transmission,\n            litArgs_ior,\n            litArgs_dispersion\n            #if defined(LIT_IRIDESCENCE)\n                , iridescenceFresnel,\n                litArgs_iridescence_intensity\n            #endif\n        );\n\n        // refraction replaces the diffuse transmission as it replaces the diffuse reflection\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            dDiffuseTransmissionLight *= 1.0 - litArgs_transmission;\n        #endif\n    #endif\n\n    // apply ambient occlusion\n    #ifdef LIT_AO\n        #ifdef LIT_OCCLUDE_DIRECT\n            occludeDiffuse(litArgs_ao);\n        #endif\n\n        #if LIT_OCCLUDE_SPECULAR != NONE\n            occludeSpecular(litArgs_gloss, litArgs_ao, litArgs_worldNormal, dViewDirW);\n        #endif\n    #endif\n\n    #if !defined(LIT_OPACITY_FADES_SPECULAR)\n\n        #if LIT_BLEND_TYPE == NORMAL || LIT_BLEND_TYPE == PREMULTIPLIED\n\n            float specLum = dot((dSpecularLight + dReflection.rgb * dReflection.a), vec3( 0.2126, 0.7152, 0.0722 ));\n            #ifdef LIT_CLEARCOAT\n                specLum += dot(ccSpecularLight * litArgs_clearcoat_specularity + ccReflection * litArgs_clearcoat_specularity, vec3( 0.2126, 0.7152, 0.0722 ));\n            #endif\n            litArgs_opacity = clamp(litArgs_opacity + gammaCorrectInput(specLum), 0.0, 1.0);\n\n        #endif\n\n        litArgs_opacity *= material_alphaFade;\n\n    #endif\n\n    // end chunks - when baking lightmap\n    #ifdef LIT_LIGHTMAP_BAKING\n        #ifdef LIT_LIGHTMAP_BAKING_COLOR\n            #include \"bakeLmEndPS\"\n        #endif\n        #ifdef LIT_LIGHTMAP_BAKING_DIR\n            #include \"bakeDirLmEndPS\"\n        #endif\n    #else\n        // end chunks - in all other cases\n        #include \"endPS\"\n        #include \"outputAlphaPS\"\n    #endif\n\n    #ifdef LIT_MSDF\n        gl_FragColor = applyMsdf(gl_FragColor);\n    #endif\n\n    #include \"outputPS\"\n    #include \"debugOutputPS\"\n\n    #ifdef LIT_SHADOW_CATCHER\n        // output when the shadow catcher is enabled - accumulated shadows\n        gl_FragColor.rgb = vec3(dShadowCatcher);\n    #endif\n\n    #include \"outlineOutputPS\"\n}\n";
+declare const _default: "\nvoid evaluateBackend() {\n\n    // apply SSAO during lighting\n    #ifdef LIT_SSAO\n        litArgs_ao *= texture2DLod(ssaoTexture, gl_FragCoord.xy * ssaoTextureSizeInv, 0.0).r;\n    #endif\n\n    // transform tangent space normals to world space\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef LIT_SPECULAR\n            getReflDir(litArgs_worldNormal, dViewDirW, litArgs_gloss, dTBN);\n        #endif\n\n        #ifdef LIT_CLEARCOAT\n            ccReflDirW = normalize(-reflect(dViewDirW, litArgs_clearcoat_worldNormal));\n        #endif\n    #endif\n\n    #if defined(LIT_SPECULAR_OR_REFLECTION) || defined(LIT_REFRACTION)\n        #ifdef LIT_METALNESS\n            float f0 = 1.0 / litArgs_ior;\n            f0 = (f0 - 1.0) / (f0 + 1.0);\n            f0 *= f0;\n            #ifdef LIT_SPECULARITY_FACTOR\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, litArgs_specularityFactor);\n            #else\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, 1.0);\n            #endif\n            litArgs_albedo = getAlbedoModulate(litArgs_albedo, litArgs_metalness);\n\n            // the diffuse transmission is a dielectric lobe, like the diffuse reflection\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                litArgs_diffuseTransmission_color = getAlbedoModulate(litArgs_diffuseTransmission_color, litArgs_metalness);\n            #endif\n        #endif\n\n        #ifdef LIT_IRIDESCENCE\n            vec3 iridescenceFresnel = getIridescence(saturate(dot(dViewDirW, litArgs_worldNormal)), litArgs_specularity, litArgs_iridescence_thickness);\n        #endif\n    #endif\n\n    // ambient\n    #ifdef LIT_ADD_AMBIENT\n\n        // the ambient light arriving at the back of the surface, which the diffuse transmission\n        // lets through, is added to the diffuse light first and moved out of it\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            addAmbient(-litArgs_worldNormal);\n            dDiffuseTransmissionLight = dDiffuseLight;\n            dDiffuseLight = vec3(0);\n        #endif\n\n        addAmbient(litArgs_worldNormal);\n\n        #ifdef LIT_SPECULAR\n            dDiffuseLight = dDiffuseLight * (1.0 - litArgs_specularity);\n\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                dDiffuseTransmissionLight *= 1.0 - litArgs_specularity;\n            #endif\n        #endif\n\n        // move ambient color out of diffuse (used by Lightmapper, to multiply ambient color by accumulated AO)\n        #ifdef LIT_SEPARATE_AMBIENT\n            vec3 dAmbientLight = dDiffuseLight;\n            dDiffuseLight = vec3(0);\n        #endif\n    #endif\n\n    dDiffuseLight *= litArgs_ambient;\n\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseTransmissionLight *= litArgs_ambient;\n    #endif\n\n    // the ambient occlusion darkens the ambient light here, and with occludeDirect, which is 0 or 1,\n    // the direct light as well, once that is added below\n    #ifdef LIT_AO\n        occludeDiffuse(mix(litArgs_ao, 1.0, material_occludeDirect));\n    #endif\n\n    #ifdef LIT_LIGHTMAP\n        addLightMap(\n            litArgs_lightmap, \n            litArgs_lightmapDir, \n            litArgs_worldNormal, \n            dViewDirW, \n            dReflDirW, \n            litArgs_gloss, \n            litArgs_specularity, \n            dVertexNormalW,\n            dTBN\n        #if defined(LIT_IRIDESCENCE)\n            , iridescenceFresnel,\n            litArgs_iridescence_intensity\n        #endif\n        );\n    #endif\n\n    #ifdef LIT_LIGHTING || LIT_REFLECTIONS\n\n        #ifdef LIT_REFLECTIONS\n\n            #ifdef LIT_CLEARCOAT\n                addReflectionCC(ccReflDirW, litArgs_clearcoat_gloss);\n            \n                #ifdef LIT_SPECULAR_FRESNEL\n                    ccFresnel = getFresnelCC(dot(dViewDirW, litArgs_clearcoat_worldNormal));\n                    ccReflection *= ccFresnel;\n                #else\n                    ccFresnel = 0.0;\n                #endif\n            #endif\n\n            #ifdef LIT_SPECULARITY_FACTOR\n                ccReflection *= litArgs_specularityFactor;\n            #endif\n\n            #ifdef LIT_SHEEN\n                addReflectionSheen(litArgs_worldNormal, dViewDirW, litArgs_sheen_gloss);\n            #endif\n\n            // Fresnel has to be applied to reflections\n            addReflection(dReflDirW, litArgs_gloss);\n\n            #ifdef LIT_FRESNEL_MODEL\n\n                dReflection.rgb *= getFresnel(\n                    dot(dViewDirW, litArgs_worldNormal), \n                    litArgs_gloss, \n                    litArgs_specularity\n                #if defined(LIT_IRIDESCENCE)\n                    , iridescenceFresnel,\n                    litArgs_iridescence_intensity\n                #endif\n                    );\n\n            #else\n\n                dReflection.rgb *= litArgs_specularity;\n\n            #endif\n\n        #endif\n\n        #ifdef AREA_LIGHTS\n            // specular has to be accumulated differently if we want area lights to look correct\n            dSpecularLight *= litArgs_specularity;\n\n            #ifdef LIT_SPECULAR\n                // evaluate material based area lights data, shared by all area lights\n                calcLTCLightValues(litArgs_gloss, litArgs_worldNormal, dViewDirW, litArgs_specularity, litArgs_clearcoat_gloss, litArgs_clearcoat_worldNormal, litArgs_clearcoat_specularity);\n            #endif\n        #endif\n        \n        // LOOP - evaluate all non-clustered lights\n        #ifdef LIGHT_COUNT > 0\n            #include \"lightEvaluationPS, LIGHT_COUNT\"\n        #endif\n\n        // clustered lighting\n        #ifdef LIT_CLUSTERED_LIGHTS\n            addClusteredLights(litArgs_worldNormal, dViewDirW, dReflDirW,\n                #if defined(LIT_CLEARCOAT)\n                        ccReflDirW,\n                #endif\n                        litArgs_gloss, litArgs_specularity, dVertexNormalW, dTBN, \n                #if defined(LIT_IRIDESCENCE)\n                        iridescenceFresnel,\n                #endif\n                        litArgs_clearcoat_worldNormal, litArgs_clearcoat_gloss, litArgs_sheen_gloss, litArgs_iridescence_intensity\n            );\n        #endif\n\n        #ifdef AREA_LIGHTS\n\n            #ifdef LIT_CLEARCOAT\n                // specular has to be accumulated differently if we want area lights to look correct\n                litArgs_clearcoat_specularity = 1.0;\n            #endif\n\n            #ifdef LIT_SPECULAR\n                litArgs_specularity = vec3(1);\n            #endif\n\n        #endif\n\n    #endif\n\n    // the diffuse transmission takes its share of the light entering the surface, and the diffuse\n    // reflection the rest\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseLight *= 1.0 - litArgs_diffuseTransmission_intensity;\n        dDiffuseTransmissionLight *= litArgs_diffuseTransmission_intensity;\n    #endif\n\n    // refraction is not gated on lighting / reflections, so that it also works without them\n    #ifdef LIT_REFRACTION\n        addRefraction(\n            litArgs_worldNormal,\n            dViewDirW,\n            litArgs_thickness,\n            litArgs_gloss,\n            litArgs_specularity,\n            litArgs_albedo,\n            litArgs_transmission,\n            litArgs_ior,\n            litArgs_dispersion\n            #if defined(LIT_IRIDESCENCE)\n                , iridescenceFresnel,\n                litArgs_iridescence_intensity\n            #endif\n        );\n\n        // refraction replaces the diffuse transmission as it replaces the diffuse reflection\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            dDiffuseTransmissionLight *= 1.0 - litArgs_transmission;\n        #endif\n    #endif\n\n    // apply ambient occlusion\n    #ifdef LIT_AO\n        occludeDiffuse(mix(1.0, litArgs_ao, material_occludeDirect));\n\n        #if LIT_OCCLUDE_SPECULAR != NONE\n            occludeSpecular(litArgs_gloss, litArgs_ao, litArgs_worldNormal, dViewDirW);\n        #endif\n    #endif\n\n    #if !defined(LIT_OPACITY_FADES_SPECULAR)\n\n        #if LIT_BLEND_TYPE == NORMAL || LIT_BLEND_TYPE == PREMULTIPLIED\n\n            float specLum = dot((dSpecularLight + dReflection.rgb * dReflection.a), vec3( 0.2126, 0.7152, 0.0722 ));\n            #ifdef LIT_CLEARCOAT\n                specLum += dot(ccSpecularLight * litArgs_clearcoat_specularity + ccReflection * litArgs_clearcoat_specularity, vec3( 0.2126, 0.7152, 0.0722 ));\n            #endif\n            litArgs_opacity = clamp(litArgs_opacity + gammaCorrectInput(specLum), 0.0, 1.0);\n\n        #endif\n\n        litArgs_opacity *= material_alphaFade;\n\n    #endif\n\n    // end chunks - when baking lightmap\n    #ifdef LIT_LIGHTMAP_BAKING\n        #ifdef LIT_LIGHTMAP_BAKING_COLOR\n            #include \"bakeLmEndPS\"\n        #endif\n        #ifdef LIT_LIGHTMAP_BAKING_DIR\n            #include \"bakeDirLmEndPS\"\n        #endif\n    #else\n        // end chunks - in all other cases\n        #include \"endPS\"\n        #include \"outputAlphaPS\"\n    #endif\n\n    #ifdef LIT_MSDF\n        gl_FragColor = applyMsdf(gl_FragColor);\n    #endif\n\n    #include \"outputPS\"\n    #include \"debugOutputPS\"\n\n    #ifdef LIT_SHADOW_CATCHER\n        // output when the shadow catcher is enabled - accumulated shadows\n        gl_FragColor.rgb = vec3(dShadowCatcher);\n    #endif\n\n    #include \"outlineOutputPS\"\n}\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardBackend.js CHANGED Viewed

@@ -53,9 +53,7 @@ void evaluateBackend() {
 		dDiffuseTransmissionLight *= litArgs_ambient;
 	#endif
 	#ifdef LIT_AO
-		#ifndef LIT_OCCLUDE_DIRECT
-			occludeDiffuse(litArgs_ao);
-		#endif
+		occludeDiffuse(mix(litArgs_ao, 1.0, material_occludeDirect));
 	#endif
 	#ifdef LIT_LIGHTMAP
 		addLightMap(
@@ -163,9 +161,7 @@ void evaluateBackend() {
 		#endif
 	#endif
 	#ifdef LIT_AO
-		#ifdef LIT_OCCLUDE_DIRECT
-			occludeDiffuse(litArgs_ao);
-		#endif
+		occludeDiffuse(mix(1.0, litArgs_ao, material_occludeDirect));
 		#if LIT_OCCLUDE_SPECULAR != NONE
 			occludeSpecular(litArgs_gloss, litArgs_ao, litArgs_worldNormal, dViewDirW);
 		#endif

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardDeclaration.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n\n// globals\nvec3 sReflection;\nvec3 dVertexNormalW;\nvec3 dTangentW;\nvec3 dBinormalW;\nvec3 dViewDirW;\nvec3 dReflDirW;\nvec3 ccReflDirW;\n\n// Per-light temporaries\nvec3 dLightDirNormW;\nfloat dAtten;\n\n// Outputs\nmat3 dTBN;\nvec4 dReflection;\nvec3 dDiffuseLight;\nvec3 dSpecularLight;\nfloat ccFresnel;\nvec3 ccReflection;\nvec3 ccSpecularLight;\nfloat ccSpecularityNoFres;\nvec3 sSpecularLight;\n\n#ifdef LIT_DIFFUSE_TRANSMISSION\n    // the light arriving at the back of the surface, which the diffuse transmission lets through\n    vec3 dDiffuseTransmissionLight = vec3(0.0);\n#endif\n\n// FRAGMENT SHADER INPUTS: UNIFORMS\n\n#ifndef LIT_OPACITY_FADES_SPECULAR\n    uniform float material_alphaFade;\n#endif\n\n#ifdef LIT_SSAO\n    uniform sampler2D ssaoTexture;\n    uniform vec2 ssaoTextureSizeInv;\n#endif\n\n// dynamic refraction\n#ifdef LIT_SCENE_COLOR\n    uniform sampler2D uSceneColorMap;\n#endif\n\n#ifdef LIT_SCREEN_SIZE\n    uniform vec4 screen_size;\n#endif\n\n#ifdef LIT_TRANSFORMS\n    uniform mat4 matrix_viewProjection;\n#endif\n\n// lighting and shadowing declarations\n\n#ifdef LIT_SHADOW_CATCHER\n    // a variable to accumulate shadows for shadow catcher materials\n    float dShadowCatcher = 1.0;\n#endif\n\n// LOOP - uniform declarations for all non-clustered lights\n#if LIGHT_COUNT > 0\n    #include \"lightDeclarationPS, LIGHT_COUNT\"\n#endif\n\n// lightmap baking\n#ifdef STD_LIGHTMAP_DIR\n    uniform float bakeDir;\n#endif\n#ifdef LIT_LIGHTMAP_BAKING_ADD_AMBIENT\n    uniform float ambientBakeOcclusionContrast;\n    uniform float ambientBakeOcclusionBrightness;\n#endif\n";
+declare const _default: "\n\n// globals\nvec3 sReflection;\nvec3 dVertexNormalW;\nvec3 dTangentW;\nvec3 dBinormalW;\nvec3 dViewDirW;\nvec3 dReflDirW;\nvec3 ccReflDirW;\n\n// Per-light temporaries\nvec3 dLightDirNormW;\nfloat dAtten;\n\n// Outputs\nmat3 dTBN;\nvec4 dReflection;\nvec3 dDiffuseLight;\nvec3 dSpecularLight;\nfloat ccFresnel;\nvec3 ccReflection;\nvec3 ccSpecularLight;\nfloat ccSpecularityNoFres;\nvec3 sSpecularLight;\n\n#ifdef LIT_DIFFUSE_TRANSMISSION\n    // the light arriving at the back of the surface, which the diffuse transmission lets through\n    vec3 dDiffuseTransmissionLight = vec3(0.0);\n#endif\n\n// FRAGMENT SHADER INPUTS: UNIFORMS\n\n#ifndef LIT_OPACITY_FADES_SPECULAR\n    uniform float material_alphaFade;\n#endif\n\n#ifdef LIT_AO\n    uniform float material_occludeDirect;\n#endif\n\n#ifdef LIT_NEEDS_NORMAL\n    uniform float material_twoSidedLighting;\n#endif\n\n#ifdef LIT_SSAO\n    uniform sampler2D ssaoTexture;\n    uniform vec2 ssaoTextureSizeInv;\n#endif\n\n// dynamic refraction\n#ifdef LIT_SCENE_COLOR\n    uniform sampler2D uSceneColorMap;\n#endif\n\n#ifdef LIT_SCREEN_SIZE\n    uniform vec4 screen_size;\n#endif\n\n#ifdef LIT_TRANSFORMS\n    uniform mat4 matrix_viewProjection;\n#endif\n\n// lighting and shadowing declarations\n\n#ifdef LIT_SHADOW_CATCHER\n    // a variable to accumulate shadows for shadow catcher materials\n    float dShadowCatcher = 1.0;\n#endif\n\n// LOOP - uniform declarations for all non-clustered lights\n#if LIGHT_COUNT > 0\n    #include \"lightDeclarationPS, LIGHT_COUNT\"\n#endif\n\n// lightmap baking\n#ifdef STD_LIGHTMAP_DIR\n    uniform float bakeDir;\n#endif\n#ifdef LIT_LIGHTMAP_BAKING_ADD_AMBIENT\n    uniform float ambientBakeOcclusionContrast;\n    uniform float ambientBakeOcclusionBrightness;\n#endif\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardDeclaration.js CHANGED Viewed

@@ -23,6 +23,12 @@ vec3 sSpecularLight;
 #ifndef LIT_OPACITY_FADES_SPECULAR
 	uniform float material_alphaFade;
 #endif
+#ifdef LIT_AO
+	uniform float material_occludeDirect;
+#endif
+#ifdef LIT_NEEDS_NORMAL
+	uniform float material_twoSidedLighting;
+#endif
 #ifdef LIT_SSAO
 	uniform sampler2D ssaoTexture;
 	uniform vec2 ssaoTextureSizeInv;

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardMain.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n\n#include \"sceneTexturesPS\"\n\nvoid main(void) {\n\n    #ifdef CLIP_PLANES\n        applyClipPlanes(vPositionW);\n    #endif\n\n    #include \"litUserMainStartPS\"\n\n    dReflection = vec4(0);\n\n    #ifdef LIT_CLEARCOAT\n        ccSpecularLight = vec3(0);\n        ccReflection = vec3(0);\n    #endif\n\n    #if LIT_NONE_SLICE_MODE == SLICED\n        #include \"startNineSlicedPS\"\n    #elif LIT_NONE_SLICE_MODE == TILED\n        #include \"startNineSlicedTiledPS\"\n    #endif\n\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef FLAT_SHADING\n            dVertexNormalW = getFlatNormal(vPositionW);\n        #else\n            dVertexNormalW = normalize(vNormalW);\n        #endif\n\n        #ifdef LIT_TANGENTS\n            #if defined(LIT_HEIGHTS) || defined(LIT_USE_NORMALS) || defined(LIT_USE_CLEARCOAT_NORMALS) || defined(LIT_GGX_SPECULAR)\n                dTangentW = vTangentW;\n                dBinormalW = vBinormalW;\n            #endif\n        #endif\n\n        getViewDir();\n\n        #ifdef LIT_TBN\n            getTBN(dTangentW, dBinormalW, dVertexNormalW);\n        #endif\n\n        // after the TBN matrix, which is built from the unflipped normal\n        #ifdef LIT_TWO_SIDED_LIGHTING\n            handleTwoSidedLighting();\n        #endif\n    #endif\n\n    // invoke frontend functions\n    evaluateFrontend();\n\n    #include \"debugProcessFrontendPS\"\n\n    evaluateBackend();\n\n    // guarded by the same define the write function tests internally, as vLinearDepth is only\n    // generated when the depth is written\n    #ifdef SCENE_TEXTURE_DEPTH\n        writeSceneTextureDepth(vLinearDepth, 1.0);\n    #endif\n\n    #include \"litUserMainEndPS\"\n}\n";
+declare const _default: "\n\n#include \"sceneTexturesPS\"\n\nvoid main(void) {\n\n    #ifdef CLIP_PLANES\n        applyClipPlanes(vPositionW);\n    #endif\n\n    #include \"litUserMainStartPS\"\n\n    dReflection = vec4(0);\n\n    #ifdef LIT_CLEARCOAT\n        ccSpecularLight = vec3(0);\n        ccReflection = vec3(0);\n    #endif\n\n    #if LIT_NONE_SLICE_MODE == SLICED\n        #include \"startNineSlicedPS\"\n    #elif LIT_NONE_SLICE_MODE == TILED\n        #include \"startNineSlicedTiledPS\"\n    #endif\n\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef FLAT_SHADING\n            dVertexNormalW = getFlatNormal(vPositionW);\n        #else\n            dVertexNormalW = normalize(vNormalW);\n        #endif\n\n        #ifdef LIT_TANGENTS\n            #if defined(LIT_HEIGHTS) || defined(LIT_USE_NORMALS) || defined(LIT_USE_CLEARCOAT_NORMALS) || defined(LIT_GGX_SPECULAR)\n                dTangentW = vTangentW;\n                dBinormalW = vBinormalW;\n            #endif\n        #endif\n\n        getViewDir();\n\n        #ifdef LIT_TBN\n            getTBN(dTangentW, dBinormalW, dVertexNormalW);\n        #endif\n\n        // after the TBN matrix, which is built from the unflipped normal. twoSidedLighting is 0 or 1,\n        // the same for every pixel the material renders.\n        if (material_twoSidedLighting != 0.0) {\n            handleTwoSidedLighting();\n        }\n    #endif\n\n    // invoke frontend functions\n    evaluateFrontend();\n\n    #include \"debugProcessFrontendPS\"\n\n    evaluateBackend();\n\n    // guarded by the same define the write function tests internally, as vLinearDepth is only\n    // generated when the depth is written\n    #ifdef SCENE_TEXTURE_DEPTH\n        writeSceneTextureDepth(vLinearDepth, 1.0);\n    #endif\n\n    #include \"litUserMainEndPS\"\n}\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardMain.js CHANGED Viewed

@@ -31,9 +31,9 @@ void main(void) {
 		#ifdef LIT_TBN
 			getTBN(dTangentW, dBinormalW, dVertexNormalW);
 		#endif
-		#ifdef LIT_TWO_SIDED_LIGHTING
+		if (material_twoSidedLighting != 0.0) {
 			handleTwoSidedLighting();
-		#endif
+		}
 	#endif
 	evaluateFrontend();
 	#include "debugProcessFrontendPS"

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardPreCode.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n\n#include \"basePS\"\n#include \"sphericalPS\"\n#include \"decodePS\"\n#include \"gammaPS\"\n#include \"tonemappingPS\"\n#include \"fogPS\"\n\n// 9-slice support code\n#if LIT_NONE_SLICE_MODE == SLICED\n    #include \"baseNineSlicedPS\"\n#elif LIT_NONE_SLICE_MODE == TILED\n    #include \"baseNineSlicedTiledPS\"\n#endif\n\n// flat shading\n#ifdef FLAT_SHADING\n    #include \"flatNormalPS\"\n#endif\n\n// TBN\n#ifdef LIT_TBN\n    #include \"TBNPS\"\n#endif\n\n// two sided lighting\n#if defined(LIT_NEEDS_NORMAL) && defined(LIT_TWO_SIDED_LIGHTING)\n    #include \"twoSidedLightingPS\"\n#endif\n\n";
+declare const _default: "\n\n#include \"basePS\"\n#include \"sphericalPS\"\n#include \"decodePS\"\n#include \"gammaPS\"\n#include \"tonemappingPS\"\n#include \"fogPS\"\n\n// 9-slice support code\n#if LIT_NONE_SLICE_MODE == SLICED\n    #include \"baseNineSlicedPS\"\n#elif LIT_NONE_SLICE_MODE == TILED\n    #include \"baseNineSlicedTiledPS\"\n#endif\n\n// flat shading\n#ifdef FLAT_SHADING\n    #include \"flatNormalPS\"\n#endif\n\n// TBN\n#ifdef LIT_TBN\n    #include \"TBNPS\"\n#endif\n\n// two sided lighting\n#ifdef LIT_NEEDS_NORMAL\n    #include \"twoSidedLightingPS\"\n#endif\n\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/glsl/chunks/lit/frag/pass-forward/litForwardPreCode.js CHANGED Viewed

@@ -16,7 +16,7 @@ var litForwardPreCode_default = `
 #ifdef LIT_TBN
 	#include "TBNPS"
 #endif
-#if defined(LIT_NEEDS_NORMAL) && defined(LIT_TWO_SIDED_LIGHTING)
+#ifdef LIT_NEEDS_NORMAL
 	#include "twoSidedLightingPS"
 #endif
 `;

package/build/playcanvas/src/scene/shader-lib/programs/lit-shader-options.d.ts CHANGED Viewed

@@ -75,14 +75,6 @@ export class LitShaderOptions {
      * Apply SSAO during the lighting.
      */
     ssao: boolean;
-    /**
-     * The value of {@link StandardMaterial#twoSidedLighting}.
-     */
-    twoSidedLighting: boolean;
-    /**
-     * The value of {@link StandardMaterial#occludeDirect}.
-     */
-    occludeDirect: boolean;
     /**
      * The value of {@link StandardMaterial#occludeSpecular}.
      */

package/build/playcanvas/src/scene/shader-lib/programs/lit-shader-options.js CHANGED Viewed

@@ -31,8 +31,6 @@ class LitShaderOptions {
 	pixelSnap = false;
 	ambientSH = false;
 	ssao = false;
-	twoSidedLighting = false;
-	occludeDirect = false;
 	occludeSpecular = 0;
 	occludeSpecularFloat = false;
 	useMsdf = false;

package/build/playcanvas/src/scene/shader-lib/programs/lit-shader.js CHANGED Viewed

@@ -337,7 +337,6 @@ class LitShader {
 		this.fDefineSet(options.useCubeMapRotation, "CUBEMAP_ROTATION");
 		this.fDefineSet(options.occludeSpecularFloat, "LIT_OCCLUDE_SPECULAR_FLOAT");
 		this.fDefineSet(options.separateAmbient, "LIT_SEPARATE_AMBIENT");
-		this.fDefineSet(options.twoSidedLighting, "LIT_TWO_SIDED_LIGHTING");
 		this.fDefineSet(options.lightMapEnabled, "LIT_LIGHTMAP");
 		this.fDefineSet(options.dirLightMapEnabled, "LIT_DIR_LIGHTMAP");
 		this.fDefineSet(options.skyboxIntensity > 0, "LIT_SKYBOX_INTENSITY");
@@ -359,7 +358,6 @@ class LitShader {
 		this.fDefineSet(options.useMsdf, "LIT_MSDF");
 		this.fDefineSet(options.ssao, "LIT_SSAO");
 		this.fDefineSet(options.useAo, "LIT_AO");
-		this.fDefineSet(options.occludeDirect, "LIT_OCCLUDE_DIRECT");
 		this.fDefineSet(options.msdfTextAttribute, "LIT_MSDF_TEXT_ATTRIBUTE");
 		this.fDefineSet(options.shadowCatcher, "LIT_SHADOW_CATCHER");
 		this.fDefineSet(true, "LIT_FRESNEL_MODEL", fresnelNames[options.fresnelModel]);

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardBackend.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\nfn evaluateBackend() -> FragmentOutput {\n\n    var output: FragmentOutput;\n\n    // apply SSAO during lighting\n    #ifdef LIT_SSAO\n        litArgs_ao = litArgs_ao * textureSampleLevel(ssaoTexture, ssaoTextureSampler, pcPosition.xy * uniform.ssaoTextureSizeInv, 0.0).r;\n    #endif\n\n    // transform tangent space normals to world space\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef LIT_SPECULAR\n            getReflDir(litArgs_worldNormal, dViewDirW, litArgs_gloss, dTBN);\n        #endif\n\n        #ifdef LIT_CLEARCOAT\n            ccReflDirW = normalize(-reflect(dViewDirW, litArgs_clearcoat_worldNormal));\n        #endif\n    #endif\n\n    #if defined(LIT_SPECULAR_OR_REFLECTION) || defined(LIT_REFRACTION)\n        #ifdef LIT_METALNESS\n            var f0: f32 = 1.0 / litArgs_ior;\n            f0 = (f0 - 1.0) / (f0 + 1.0);\n            f0 = f0 * f0;\n            #ifdef LIT_SPECULARITY_FACTOR\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, litArgs_specularityFactor);\n            #else\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, 1.0);\n            #endif\n            litArgs_albedo = getAlbedoModulate(litArgs_albedo, litArgs_metalness);\n\n            // the diffuse transmission is a dielectric lobe, like the diffuse reflection\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                litArgs_diffuseTransmission_color = getAlbedoModulate(litArgs_diffuseTransmission_color, litArgs_metalness);\n            #endif\n        #endif\n\n        #ifdef LIT_IRIDESCENCE\n            var iridescenceFresnel: vec3f = getIridescenceDiffraction(saturate(dot(dViewDirW, litArgs_worldNormal)), litArgs_specularity, litArgs_iridescence_thickness);\n        #endif\n    #endif\n\n    // ambient\n    #ifdef LIT_ADD_AMBIENT\n\n        // the ambient light arriving at the back of the surface, which the diffuse transmission\n        // lets through, is added to the diffuse light first and moved out of it\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            addAmbient(-litArgs_worldNormal);\n            dDiffuseTransmissionLight = dDiffuseLight;\n            dDiffuseLight = vec3f(0.0);\n        #endif\n\n        addAmbient(litArgs_worldNormal);\n\n        #ifdef LIT_SPECULAR\n            dDiffuseLight = dDiffuseLight * (1.0 - litArgs_specularity);\n\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                dDiffuseTransmissionLight = dDiffuseTransmissionLight * (1.0 - litArgs_specularity);\n            #endif\n        #endif\n\n        // move ambient color out of diffuse (used by Lightmapper, to multiply ambient color by accumulated AO)\n        #ifdef LIT_SEPARATE_AMBIENT\n            var dAmbientLight: vec3f = dDiffuseLight;\n            dDiffuseLight = vec3(0.0);\n        #endif\n    #endif\n\n    dDiffuseLight = dDiffuseLight * litArgs_ambient;\n\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseTransmissionLight = dDiffuseTransmissionLight * litArgs_ambient;\n    #endif\n\n    #ifdef LIT_AO\n        #ifndef LIT_OCCLUDE_DIRECT\n            occludeDiffuse(litArgs_ao);\n        #endif\n    #endif\n\n    #ifdef LIT_LIGHTMAP\n        addLightMap(\n            litArgs_lightmap, \n            litArgs_lightmapDir, \n            litArgs_worldNormal, \n            dViewDirW, \n            dReflDirW, \n            litArgs_gloss, \n            litArgs_specularity, \n            dVertexNormalW,\n            dTBN\n        #if defined(LIT_IRIDESCENCE)\n            , iridescenceFresnel,\n            litArgs_iridescence_intensity\n        #endif\n        );\n    #endif\n\n    #ifdef LIT_LIGHTING || LIT_REFLECTIONS\n\n        #ifdef LIT_REFLECTIONS\n\n            #ifdef LIT_CLEARCOAT\n                addReflectionCC(ccReflDirW, litArgs_clearcoat_gloss);\n            \n                #ifdef LIT_SPECULAR_FRESNEL\n                    ccFresnel = getFresnelCC(dot(dViewDirW, litArgs_clearcoat_worldNormal));\n                    ccReflection = ccReflection * ccFresnel;\n                #else\n                    ccFresnel = 0.0;\n                #endif\n            #endif\n\n            #ifdef LIT_SPECULARITY_FACTOR\n                ccReflection = ccReflection * litArgs_specularityFactor;\n            #endif\n\n            #ifdef LIT_SHEEN\n                addReflectionSheen(litArgs_worldNormal, dViewDirW, litArgs_sheen_gloss);\n            #endif\n\n            // Fresnel has to be applied to reflections\n            addReflection(dReflDirW, litArgs_gloss);\n\n            #ifdef LIT_FRESNEL_MODEL\n\n                dReflection = vec4f(\n                    dReflection.rgb * getFresnel(\n                        dot(dViewDirW, litArgs_worldNormal),\n                        litArgs_gloss,\n                        litArgs_specularity\n                    #if defined(LIT_IRIDESCENCE)\n                        , iridescenceFresnel,\n                        litArgs_iridescence_intensity\n                    #endif\n                        ),\n                    dReflection.a\n                );\n\n            #else\n\n                dReflection = vec4f(dReflection.rgb * litArgs_specularity, dReflection.a);\n\n            #endif\n\n        #endif\n\n        #ifdef AREA_LIGHTS\n            // specular has to be accumulated differently if we want area lights to look correct\n            dSpecularLight = dSpecularLight * litArgs_specularity;\n\n            #ifdef LIT_SPECULAR\n                // evaluate material based area lights data, shared by all area lights\n                calcLTCLightValues(litArgs_gloss, litArgs_worldNormal, dViewDirW, litArgs_specularity, litArgs_clearcoat_gloss, litArgs_clearcoat_worldNormal, litArgs_clearcoat_specularity);\n            #endif\n        #endif\n        \n        // LOOP - evaluate all non-clustered lights\n        #ifdef LIGHT_COUNT > 0\n            #include \"lightEvaluationPS, LIGHT_COUNT\"\n        #endif\n\n        // clustered lighting\n        #ifdef LIT_CLUSTERED_LIGHTS\n            addClusteredLights(litArgs_worldNormal, dViewDirW, dReflDirW,\n                #if defined(LIT_CLEARCOAT)\n                        ccReflDirW,\n                #endif\n                        litArgs_gloss, litArgs_specularity, dVertexNormalW, dTBN, \n                #if defined(LIT_IRIDESCENCE)\n                        iridescenceFresnel,\n                #endif\n                        litArgs_clearcoat_worldNormal, litArgs_clearcoat_gloss, litArgs_sheen_gloss, litArgs_iridescence_intensity\n            );\n        #endif\n\n        #ifdef AREA_LIGHTS\n\n            #ifdef LIT_CLEARCOAT\n                // specular has to be accumulated differently if we want area lights to look correct\n                litArgs_clearcoat_specularity = 1.0;\n            #endif\n\n            #ifdef LIT_SPECULAR\n                litArgs_specularity = vec3(1.0);\n            #endif\n\n        #endif\n\n    #endif\n\n    // the diffuse transmission takes its share of the light entering the surface, and the diffuse\n    // reflection the rest\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseLight = dDiffuseLight * (1.0 - litArgs_diffuseTransmission_intensity);\n        dDiffuseTransmissionLight = dDiffuseTransmissionLight * litArgs_diffuseTransmission_intensity;\n    #endif\n\n    // refraction is not gated on lighting / reflections, so that it also works without them\n    #ifdef LIT_REFRACTION\n        addRefraction(\n            litArgs_worldNormal,\n            dViewDirW,\n            litArgs_thickness,\n            litArgs_gloss,\n            litArgs_specularity,\n            litArgs_albedo,\n            litArgs_transmission,\n            litArgs_ior,\n            litArgs_dispersion\n            #if defined(LIT_IRIDESCENCE)\n                , iridescenceFresnel,\n                litArgs_iridescence_intensity\n            #endif\n        );\n\n        // refraction replaces the diffuse transmission as it replaces the diffuse reflection\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            dDiffuseTransmissionLight = dDiffuseTransmissionLight * (1.0 - litArgs_transmission);\n        #endif\n    #endif\n\n    // apply ambient occlusion\n    #ifdef LIT_AO\n        #ifdef LIT_OCCLUDE_DIRECT\n            occludeDiffuse(litArgs_ao);\n        #endif\n\n        #if LIT_OCCLUDE_SPECULAR != NONE\n            occludeSpecular(litArgs_gloss, litArgs_ao, litArgs_worldNormal, dViewDirW);\n        #endif\n    #endif\n\n    #if !defined(LIT_OPACITY_FADES_SPECULAR)\n\n        #if LIT_BLEND_TYPE == NORMAL || LIT_BLEND_TYPE == PREMULTIPLIED\n\n            var specLum: f32 = dot((dSpecularLight + dReflection.rgb * dReflection.a), vec3f( 0.2126, 0.7152, 0.0722 ));\n            #ifdef LIT_CLEARCOAT\n                specLum = specLum + dot(ccSpecularLight * litArgs_clearcoat_specularity + ccReflection * litArgs_clearcoat_specularity, vec3f( 0.2126, 0.7152, 0.0722 ));\n            #endif\n            litArgs_opacity = clamp(litArgs_opacity + gammaCorrectInput(specLum), 0.0, 1.0);\n\n        #endif\n\n        litArgs_opacity = litArgs_opacity * uniform.material_alphaFade;\n\n    #endif\n\n    // end chunks - when baking lightmap\n    #ifdef LIT_LIGHTMAP_BAKING\n        #ifdef LIT_LIGHTMAP_BAKING_COLOR\n            #include \"bakeLmEndPS\"\n        #endif\n        #ifdef LIT_LIGHTMAP_BAKING_DIR\n            #include \"bakeDirLmEndPS\"\n        #endif\n    #else\n        // end chunks - in all other cases\n        #include \"endPS\"\n        #include \"outputAlphaPS\"\n    #endif\n\n    #ifdef LIT_MSDF\n        output.color = applyMsdf(output.color);\n    #endif\n\n    #include \"outputPS\"\n    #include \"debugOutputPS\"\n\n    #ifdef LIT_SHADOW_CATCHER\n        // output when the shadow catcher is enabled - accumulated shadows\n        output.color = vec4f(vec3f(dShadowCatcher), output.color.a);\n    #endif\n\n    #include \"outlineOutputPS\"\n\n    return output;\n}\n";
+declare const _default: "\nfn evaluateBackend() -> FragmentOutput {\n\n    var output: FragmentOutput;\n\n    // apply SSAO during lighting\n    #ifdef LIT_SSAO\n        litArgs_ao = litArgs_ao * textureSampleLevel(ssaoTexture, ssaoTextureSampler, pcPosition.xy * uniform.ssaoTextureSizeInv, 0.0).r;\n    #endif\n\n    // transform tangent space normals to world space\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef LIT_SPECULAR\n            getReflDir(litArgs_worldNormal, dViewDirW, litArgs_gloss, dTBN);\n        #endif\n\n        #ifdef LIT_CLEARCOAT\n            ccReflDirW = normalize(-reflect(dViewDirW, litArgs_clearcoat_worldNormal));\n        #endif\n    #endif\n\n    #if defined(LIT_SPECULAR_OR_REFLECTION) || defined(LIT_REFRACTION)\n        #ifdef LIT_METALNESS\n            var f0: f32 = 1.0 / litArgs_ior;\n            f0 = (f0 - 1.0) / (f0 + 1.0);\n            f0 = f0 * f0;\n            #ifdef LIT_SPECULARITY_FACTOR\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, litArgs_specularityFactor);\n            #else\n                litArgs_specularity = getSpecularModulate(litArgs_specularity, litArgs_albedo, litArgs_metalness, f0, 1.0);\n            #endif\n            litArgs_albedo = getAlbedoModulate(litArgs_albedo, litArgs_metalness);\n\n            // the diffuse transmission is a dielectric lobe, like the diffuse reflection\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                litArgs_diffuseTransmission_color = getAlbedoModulate(litArgs_diffuseTransmission_color, litArgs_metalness);\n            #endif\n        #endif\n\n        #ifdef LIT_IRIDESCENCE\n            var iridescenceFresnel: vec3f = getIridescenceDiffraction(saturate(dot(dViewDirW, litArgs_worldNormal)), litArgs_specularity, litArgs_iridescence_thickness);\n        #endif\n    #endif\n\n    // ambient\n    #ifdef LIT_ADD_AMBIENT\n\n        // the ambient light arriving at the back of the surface, which the diffuse transmission\n        // lets through, is added to the diffuse light first and moved out of it\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            addAmbient(-litArgs_worldNormal);\n            dDiffuseTransmissionLight = dDiffuseLight;\n            dDiffuseLight = vec3f(0.0);\n        #endif\n\n        addAmbient(litArgs_worldNormal);\n\n        #ifdef LIT_SPECULAR\n            dDiffuseLight = dDiffuseLight * (1.0 - litArgs_specularity);\n\n            #ifdef LIT_DIFFUSE_TRANSMISSION\n                dDiffuseTransmissionLight = dDiffuseTransmissionLight * (1.0 - litArgs_specularity);\n            #endif\n        #endif\n\n        // move ambient color out of diffuse (used by Lightmapper, to multiply ambient color by accumulated AO)\n        #ifdef LIT_SEPARATE_AMBIENT\n            var dAmbientLight: vec3f = dDiffuseLight;\n            dDiffuseLight = vec3(0.0);\n        #endif\n    #endif\n\n    dDiffuseLight = dDiffuseLight * litArgs_ambient;\n\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseTransmissionLight = dDiffuseTransmissionLight * litArgs_ambient;\n    #endif\n\n    // the ambient occlusion darkens the ambient light here, and with occludeDirect, which is 0 or 1,\n    // the direct light as well, once that is added below\n    #ifdef LIT_AO\n        occludeDiffuse(mix(litArgs_ao, 1.0, uniform.material_occludeDirect));\n    #endif\n\n    #ifdef LIT_LIGHTMAP\n        addLightMap(\n            litArgs_lightmap, \n            litArgs_lightmapDir, \n            litArgs_worldNormal, \n            dViewDirW, \n            dReflDirW, \n            litArgs_gloss, \n            litArgs_specularity, \n            dVertexNormalW,\n            dTBN\n        #if defined(LIT_IRIDESCENCE)\n            , iridescenceFresnel,\n            litArgs_iridescence_intensity\n        #endif\n        );\n    #endif\n\n    #ifdef LIT_LIGHTING || LIT_REFLECTIONS\n\n        #ifdef LIT_REFLECTIONS\n\n            #ifdef LIT_CLEARCOAT\n                addReflectionCC(ccReflDirW, litArgs_clearcoat_gloss);\n            \n                #ifdef LIT_SPECULAR_FRESNEL\n                    ccFresnel = getFresnelCC(dot(dViewDirW, litArgs_clearcoat_worldNormal));\n                    ccReflection = ccReflection * ccFresnel;\n                #else\n                    ccFresnel = 0.0;\n                #endif\n            #endif\n\n            #ifdef LIT_SPECULARITY_FACTOR\n                ccReflection = ccReflection * litArgs_specularityFactor;\n            #endif\n\n            #ifdef LIT_SHEEN\n                addReflectionSheen(litArgs_worldNormal, dViewDirW, litArgs_sheen_gloss);\n            #endif\n\n            // Fresnel has to be applied to reflections\n            addReflection(dReflDirW, litArgs_gloss);\n\n            #ifdef LIT_FRESNEL_MODEL\n\n                dReflection = vec4f(\n                    dReflection.rgb * getFresnel(\n                        dot(dViewDirW, litArgs_worldNormal),\n                        litArgs_gloss,\n                        litArgs_specularity\n                    #if defined(LIT_IRIDESCENCE)\n                        , iridescenceFresnel,\n                        litArgs_iridescence_intensity\n                    #endif\n                        ),\n                    dReflection.a\n                );\n\n            #else\n\n                dReflection = vec4f(dReflection.rgb * litArgs_specularity, dReflection.a);\n\n            #endif\n\n        #endif\n\n        #ifdef AREA_LIGHTS\n            // specular has to be accumulated differently if we want area lights to look correct\n            dSpecularLight = dSpecularLight * litArgs_specularity;\n\n            #ifdef LIT_SPECULAR\n                // evaluate material based area lights data, shared by all area lights\n                calcLTCLightValues(litArgs_gloss, litArgs_worldNormal, dViewDirW, litArgs_specularity, litArgs_clearcoat_gloss, litArgs_clearcoat_worldNormal, litArgs_clearcoat_specularity);\n            #endif\n        #endif\n        \n        // LOOP - evaluate all non-clustered lights\n        #ifdef LIGHT_COUNT > 0\n            #include \"lightEvaluationPS, LIGHT_COUNT\"\n        #endif\n\n        // clustered lighting\n        #ifdef LIT_CLUSTERED_LIGHTS\n            addClusteredLights(litArgs_worldNormal, dViewDirW, dReflDirW,\n                #if defined(LIT_CLEARCOAT)\n                        ccReflDirW,\n                #endif\n                        litArgs_gloss, litArgs_specularity, dVertexNormalW, dTBN, \n                #if defined(LIT_IRIDESCENCE)\n                        iridescenceFresnel,\n                #endif\n                        litArgs_clearcoat_worldNormal, litArgs_clearcoat_gloss, litArgs_sheen_gloss, litArgs_iridescence_intensity\n            );\n        #endif\n\n        #ifdef AREA_LIGHTS\n\n            #ifdef LIT_CLEARCOAT\n                // specular has to be accumulated differently if we want area lights to look correct\n                litArgs_clearcoat_specularity = 1.0;\n            #endif\n\n            #ifdef LIT_SPECULAR\n                litArgs_specularity = vec3(1.0);\n            #endif\n\n        #endif\n\n    #endif\n\n    // the diffuse transmission takes its share of the light entering the surface, and the diffuse\n    // reflection the rest\n    #ifdef LIT_DIFFUSE_TRANSMISSION\n        dDiffuseLight = dDiffuseLight * (1.0 - litArgs_diffuseTransmission_intensity);\n        dDiffuseTransmissionLight = dDiffuseTransmissionLight * litArgs_diffuseTransmission_intensity;\n    #endif\n\n    // refraction is not gated on lighting / reflections, so that it also works without them\n    #ifdef LIT_REFRACTION\n        addRefraction(\n            litArgs_worldNormal,\n            dViewDirW,\n            litArgs_thickness,\n            litArgs_gloss,\n            litArgs_specularity,\n            litArgs_albedo,\n            litArgs_transmission,\n            litArgs_ior,\n            litArgs_dispersion\n            #if defined(LIT_IRIDESCENCE)\n                , iridescenceFresnel,\n                litArgs_iridescence_intensity\n            #endif\n        );\n\n        // refraction replaces the diffuse transmission as it replaces the diffuse reflection\n        #ifdef LIT_DIFFUSE_TRANSMISSION\n            dDiffuseTransmissionLight = dDiffuseTransmissionLight * (1.0 - litArgs_transmission);\n        #endif\n    #endif\n\n    // apply ambient occlusion\n    #ifdef LIT_AO\n        occludeDiffuse(mix(1.0, litArgs_ao, uniform.material_occludeDirect));\n\n        #if LIT_OCCLUDE_SPECULAR != NONE\n            occludeSpecular(litArgs_gloss, litArgs_ao, litArgs_worldNormal, dViewDirW);\n        #endif\n    #endif\n\n    #if !defined(LIT_OPACITY_FADES_SPECULAR)\n\n        #if LIT_BLEND_TYPE == NORMAL || LIT_BLEND_TYPE == PREMULTIPLIED\n\n            var specLum: f32 = dot((dSpecularLight + dReflection.rgb * dReflection.a), vec3f( 0.2126, 0.7152, 0.0722 ));\n            #ifdef LIT_CLEARCOAT\n                specLum = specLum + dot(ccSpecularLight * litArgs_clearcoat_specularity + ccReflection * litArgs_clearcoat_specularity, vec3f( 0.2126, 0.7152, 0.0722 ));\n            #endif\n            litArgs_opacity = clamp(litArgs_opacity + gammaCorrectInput(specLum), 0.0, 1.0);\n\n        #endif\n\n        litArgs_opacity = litArgs_opacity * uniform.material_alphaFade;\n\n    #endif\n\n    // end chunks - when baking lightmap\n    #ifdef LIT_LIGHTMAP_BAKING\n        #ifdef LIT_LIGHTMAP_BAKING_COLOR\n            #include \"bakeLmEndPS\"\n        #endif\n        #ifdef LIT_LIGHTMAP_BAKING_DIR\n            #include \"bakeDirLmEndPS\"\n        #endif\n    #else\n        // end chunks - in all other cases\n        #include \"endPS\"\n        #include \"outputAlphaPS\"\n    #endif\n\n    #ifdef LIT_MSDF\n        output.color = applyMsdf(output.color);\n    #endif\n\n    #include \"outputPS\"\n    #include \"debugOutputPS\"\n\n    #ifdef LIT_SHADOW_CATCHER\n        // output when the shadow catcher is enabled - accumulated shadows\n        output.color = vec4f(vec3f(dShadowCatcher), output.color.a);\n    #endif\n\n    #include \"outlineOutputPS\"\n\n    return output;\n}\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardBackend.js CHANGED Viewed

@@ -54,9 +54,7 @@ fn evaluateBackend() -> FragmentOutput {
 		dDiffuseTransmissionLight = dDiffuseTransmissionLight * litArgs_ambient;
 	#endif
 	#ifdef LIT_AO
-		#ifndef LIT_OCCLUDE_DIRECT
-			occludeDiffuse(litArgs_ao);
-		#endif
+		occludeDiffuse(mix(litArgs_ao, 1.0, uniform.material_occludeDirect));
 	#endif
 	#ifdef LIT_LIGHTMAP
 		addLightMap(
@@ -167,9 +165,7 @@ fn evaluateBackend() -> FragmentOutput {
 		#endif
 	#endif
 	#ifdef LIT_AO
-		#ifdef LIT_OCCLUDE_DIRECT
-			occludeDiffuse(litArgs_ao);
-		#endif
+		occludeDiffuse(mix(1.0, litArgs_ao, uniform.material_occludeDirect));
 		#if LIT_OCCLUDE_SPECULAR != NONE
 			occludeSpecular(litArgs_gloss, litArgs_ao, litArgs_worldNormal, dViewDirW);
 		#endif

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardDeclaration.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n\n// globals\nvar<private> sReflection: vec3f;\nvar<private> dVertexNormalW: vec3f;\nvar<private> dTangentW: vec3f;\nvar<private> dBinormalW: vec3f;\nvar<private> dViewDirW: vec3f;\nvar<private> dReflDirW: vec3f;\nvar<private> ccReflDirW: vec3f;\n\n// Per-light temporaries\nvar<private> dLightDirNormW: vec3f;\nvar<private> dAtten: f32;\n\n// Outputs\nvar<private> dTBN: mat3x3f;\nvar<private> dReflection: vec4f;\nvar<private> dDiffuseLight: vec3f;\nvar<private> dSpecularLight: vec3f;\nvar<private> ccFresnel: f32;\nvar<private> ccReflection: vec3f;\nvar<private> ccSpecularLight: vec3f;\nvar<private> ccSpecularityNoFres: f32;\nvar<private> sSpecularLight: vec3f;\n\n#ifdef LIT_DIFFUSE_TRANSMISSION\n    // the light arriving at the back of the surface, which the diffuse transmission lets through\n    var<private> dDiffuseTransmissionLight: vec3f = vec3f(0.0);\n#endif\n\n// FRAGMENT SHADER INPUTS: UNIFORMS\n\n#ifndef LIT_OPACITY_FADES_SPECULAR\n    uniform material_alphaFade: f32;\n#endif\n\n#ifdef LIT_SSAO\n    var ssaoTexture : texture_2d<f32>;\n    var ssaoTextureSampler : sampler;\n    uniform ssaoTextureSizeInv: vec2f;\n#endif\n\n// dynamic refraction (matrix_viewProjection comes from the view uniform buffer)\n#ifdef LIT_SCENE_COLOR\n    var uSceneColorMap : texture_2d<f32>;\n    var uSceneColorMapSampler : sampler;\n#endif\n\n#ifdef LIT_SCREEN_SIZE\n    uniform screen_size: vec4f;\n#endif\n\n// lighting and shadowing declarations\n\n#ifdef LIT_SHADOW_CATCHER\n    // a variable to accumulate shadows for shadow catcher materials\n    var<private> dShadowCatcher: f32 = 1.0;\n#endif\n\n// LOOP - uniform declarations for all non-clustered lights\n#if LIGHT_COUNT > 0\n    #include \"lightDeclarationPS, LIGHT_COUNT\"\n#endif\n\n// lightmap baking\n#ifdef STD_LIGHTMAP_DIR\n    uniform bakeDir: f32;\n#endif\n#ifdef LIT_LIGHTMAP_BAKING_ADD_AMBIENT\n    uniform ambientBakeOcclusionContrast: f32;\n    uniform ambientBakeOcclusionBrightness: f32;\n#endif\n";
+declare const _default: "\n\n// globals\nvar<private> sReflection: vec3f;\nvar<private> dVertexNormalW: vec3f;\nvar<private> dTangentW: vec3f;\nvar<private> dBinormalW: vec3f;\nvar<private> dViewDirW: vec3f;\nvar<private> dReflDirW: vec3f;\nvar<private> ccReflDirW: vec3f;\n\n// Per-light temporaries\nvar<private> dLightDirNormW: vec3f;\nvar<private> dAtten: f32;\n\n// Outputs\nvar<private> dTBN: mat3x3f;\nvar<private> dReflection: vec4f;\nvar<private> dDiffuseLight: vec3f;\nvar<private> dSpecularLight: vec3f;\nvar<private> ccFresnel: f32;\nvar<private> ccReflection: vec3f;\nvar<private> ccSpecularLight: vec3f;\nvar<private> ccSpecularityNoFres: f32;\nvar<private> sSpecularLight: vec3f;\n\n#ifdef LIT_DIFFUSE_TRANSMISSION\n    // the light arriving at the back of the surface, which the diffuse transmission lets through\n    var<private> dDiffuseTransmissionLight: vec3f = vec3f(0.0);\n#endif\n\n// FRAGMENT SHADER INPUTS: UNIFORMS\n\n#ifndef LIT_OPACITY_FADES_SPECULAR\n    uniform material_alphaFade: f32;\n#endif\n\n#ifdef LIT_AO\n    uniform material_occludeDirect: f32;\n#endif\n\n#ifdef LIT_NEEDS_NORMAL\n    uniform material_twoSidedLighting: f32;\n#endif\n\n#ifdef LIT_SSAO\n    var ssaoTexture : texture_2d<f32>;\n    var ssaoTextureSampler : sampler;\n    uniform ssaoTextureSizeInv: vec2f;\n#endif\n\n// dynamic refraction (matrix_viewProjection comes from the view uniform buffer)\n#ifdef LIT_SCENE_COLOR\n    var uSceneColorMap : texture_2d<f32>;\n    var uSceneColorMapSampler : sampler;\n#endif\n\n#ifdef LIT_SCREEN_SIZE\n    uniform screen_size: vec4f;\n#endif\n\n// lighting and shadowing declarations\n\n#ifdef LIT_SHADOW_CATCHER\n    // a variable to accumulate shadows for shadow catcher materials\n    var<private> dShadowCatcher: f32 = 1.0;\n#endif\n\n// LOOP - uniform declarations for all non-clustered lights\n#if LIGHT_COUNT > 0\n    #include \"lightDeclarationPS, LIGHT_COUNT\"\n#endif\n\n// lightmap baking\n#ifdef STD_LIGHTMAP_DIR\n    uniform bakeDir: f32;\n#endif\n#ifdef LIT_LIGHTMAP_BAKING_ADD_AMBIENT\n    uniform ambientBakeOcclusionContrast: f32;\n    uniform ambientBakeOcclusionBrightness: f32;\n#endif\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardDeclaration.js CHANGED Viewed

@@ -23,6 +23,12 @@ var<private> sSpecularLight: vec3f;
 #ifndef LIT_OPACITY_FADES_SPECULAR
 	uniform material_alphaFade: f32;
 #endif
+#ifdef LIT_AO
+	uniform material_occludeDirect: f32;
+#endif
+#ifdef LIT_NEEDS_NORMAL
+	uniform material_twoSidedLighting: f32;
+#endif
 #ifdef LIT_SSAO
 	var ssaoTexture : texture_2d<f32>;
 	var ssaoTextureSampler : sampler;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardMain.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n\n#include \"sceneTexturesPS\"\n\n@fragment\nfn fragmentMain(input: FragmentInput) -> FragmentOutput {\n\n    #ifdef CLIP_PLANES\n        applyClipPlanes(vPositionW);\n    #endif\n\n    #include \"litUserMainStartPS\"\n\n    dReflection = vec4f(0.0);\n\n    #ifdef LIT_CLEARCOAT\n        ccSpecularLight = vec3f(0.0);\n        ccReflection = vec3f(0.0);\n    #endif\n\n    #if LIT_NONE_SLICE_MODE == SLICED\n        #include \"startNineSlicedPS\"\n    #elif LIT_NONE_SLICE_MODE == TILED\n        #include \"startNineSlicedTiledPS\"\n    #endif\n\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef FLAT_SHADING\n            dVertexNormalW = getFlatNormal(vPositionW);\n        #else\n            dVertexNormalW = normalize(vNormalW);\n        #endif\n\n        #ifdef LIT_TANGENTS\n            #if defined(LIT_HEIGHTS) || defined(LIT_USE_NORMALS) || defined(LIT_USE_CLEARCOAT_NORMALS) || defined(LIT_GGX_SPECULAR)\n                dTangentW = vTangentW;\n                dBinormalW = vBinormalW;\n            #endif\n        #endif\n\n        getViewDir();\n\n        #ifdef LIT_TBN\n            getTBN(dTangentW, dBinormalW, dVertexNormalW);\n        #endif\n\n        // after the TBN matrix, which is built from the unflipped normal\n        #ifdef LIT_TWO_SIDED_LIGHTING\n            handleTwoSidedLighting();\n        #endif\n    #endif\n\n    // invoke frontend functions\n    evaluateFrontend();\n\n    #include \"debugProcessFrontendPS\"\n\n    var output: FragmentOutput = evaluateBackend();\n\n    // guarded by the same define the write function tests internally, as vLinearDepth is only\n    // generated when the depth is written\n    #ifdef SCENE_TEXTURE_DEPTH\n        writeSceneTextureDepth(&output, vLinearDepth, 1.0);\n    #endif\n\n    #include \"litUserMainEndPS\"\n\n    return output;\n}\n";
+declare const _default: "\n\n#include \"sceneTexturesPS\"\n\n@fragment\nfn fragmentMain(input: FragmentInput) -> FragmentOutput {\n\n    #ifdef CLIP_PLANES\n        applyClipPlanes(vPositionW);\n    #endif\n\n    #include \"litUserMainStartPS\"\n\n    dReflection = vec4f(0.0);\n\n    #ifdef LIT_CLEARCOAT\n        ccSpecularLight = vec3f(0.0);\n        ccReflection = vec3f(0.0);\n    #endif\n\n    #if LIT_NONE_SLICE_MODE == SLICED\n        #include \"startNineSlicedPS\"\n    #elif LIT_NONE_SLICE_MODE == TILED\n        #include \"startNineSlicedTiledPS\"\n    #endif\n\n    #ifdef LIT_NEEDS_NORMAL\n        #ifdef FLAT_SHADING\n            dVertexNormalW = getFlatNormal(vPositionW);\n        #else\n            dVertexNormalW = normalize(vNormalW);\n        #endif\n\n        #ifdef LIT_TANGENTS\n            #if defined(LIT_HEIGHTS) || defined(LIT_USE_NORMALS) || defined(LIT_USE_CLEARCOAT_NORMALS) || defined(LIT_GGX_SPECULAR)\n                dTangentW = vTangentW;\n                dBinormalW = vBinormalW;\n            #endif\n        #endif\n\n        getViewDir();\n\n        #ifdef LIT_TBN\n            getTBN(dTangentW, dBinormalW, dVertexNormalW);\n        #endif\n\n        // after the TBN matrix, which is built from the unflipped normal. twoSidedLighting is 0 or 1,\n        // the same for every pixel the material renders.\n        if (uniform.material_twoSidedLighting != 0.0) {\n            handleTwoSidedLighting();\n        }\n    #endif\n\n    // invoke frontend functions\n    evaluateFrontend();\n\n    #include \"debugProcessFrontendPS\"\n\n    var output: FragmentOutput = evaluateBackend();\n\n    // guarded by the same define the write function tests internally, as vLinearDepth is only\n    // generated when the depth is written\n    #ifdef SCENE_TEXTURE_DEPTH\n        writeSceneTextureDepth(&output, vLinearDepth, 1.0);\n    #endif\n\n    #include \"litUserMainEndPS\"\n\n    return output;\n}\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardMain.js CHANGED Viewed

@@ -32,9 +32,9 @@ fn fragmentMain(input: FragmentInput) -> FragmentOutput {
 		#ifdef LIT_TBN
 			getTBN(dTangentW, dBinormalW, dVertexNormalW);
 		#endif
-		#ifdef LIT_TWO_SIDED_LIGHTING
+		if (uniform.material_twoSidedLighting != 0.0) {
 			handleTwoSidedLighting();
-		#endif
+		}
 	#endif
 	evaluateFrontend();
 	#include "debugProcessFrontendPS"

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardPreCode.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n\n#include \"basePS\"\n#include \"sphericalPS\"\n#include \"decodePS\"\n#include \"gammaPS\"\n#include \"tonemappingPS\"\n#include \"fogPS\"\n\n// 9-slice support code\n#if LIT_NONE_SLICE_MODE == SLICED\n    #include \"baseNineSlicedPS\"\n#elif LIT_NONE_SLICE_MODE == TILED\n    #include \"baseNineSlicedTiledPS\"\n#endif\n\n// flat shading\n#ifdef FLAT_SHADING\n    #include \"flatNormalPS\"\n#endif\n\n// TBN\n#ifdef LIT_TBN\n    #include \"TBNPS\"\n#endif\n\n// two sided lighting\n#if defined(LIT_NEEDS_NORMAL) && defined(LIT_TWO_SIDED_LIGHTING)\n    #include \"twoSidedLightingPS\"\n#endif\n\n";
+declare const _default: "\n\n#include \"basePS\"\n#include \"sphericalPS\"\n#include \"decodePS\"\n#include \"gammaPS\"\n#include \"tonemappingPS\"\n#include \"fogPS\"\n\n// 9-slice support code\n#if LIT_NONE_SLICE_MODE == SLICED\n    #include \"baseNineSlicedPS\"\n#elif LIT_NONE_SLICE_MODE == TILED\n    #include \"baseNineSlicedTiledPS\"\n#endif\n\n// flat shading\n#ifdef FLAT_SHADING\n    #include \"flatNormalPS\"\n#endif\n\n// TBN\n#ifdef LIT_TBN\n    #include \"TBNPS\"\n#endif\n\n// two sided lighting\n#ifdef LIT_NEEDS_NORMAL\n    #include \"twoSidedLightingPS\"\n#endif\n\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/lit/frag/pass-forward/litForwardPreCode.js CHANGED Viewed

@@ -16,7 +16,7 @@ var litForwardPreCode_default = `
 #ifdef LIT_TBN
 	#include "TBNPS"
 #endif
-#if defined(LIT_NEEDS_NORMAL) && defined(LIT_TWO_SIDED_LIGHTING)
+#ifdef LIT_NEEDS_NORMAL
 	#include "twoSidedLightingPS"
 #endif
 `;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/particle/vert/particleAnimFrameClamp.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const _default: "\n    let animFrame: f32 = min(floor(input.texCoordsAlphaLife.w * uniform.animTexParams.y) + uniform.animTexParams.x, uniform.animTexParams.z);\n";
+declare const _default: "\n    let animFrame: f32 = min(floor(output.texCoordsAlphaLife.w * uniform.animTexParams.y) + uniform.animTexParams.x, uniform.animTexParams.z);\n";
 export default _default;

package/build/playcanvas/src/scene/shader-lib/wgsl/chunks/particle/vert/particleAnimFrameClamp.js CHANGED Viewed

@@ -1,5 +1,5 @@
 var particleAnimFrameClamp_default = `
-	let animFrame: f32 = min(floor(input.texCoordsAlphaLife.w * uniform.animTexParams.y) + uniform.animTexParams.x, uniform.animTexParams.z);
+	let animFrame: f32 = min(floor(output.texCoordsAlphaLife.w * uniform.animTexParams.y) + uniform.animTexParams.x, uniform.animTexParams.z);
 `;
 export {
 	particleAnimFrameClamp_default as default

package/build/playcanvas.d.ts CHANGED Viewed

@@ -14850,14 +14850,6 @@ declare class LitShaderOptions {
      * Apply SSAO during the lighting.
      */
     ssao: boolean;
-    /**
-     * The value of {@link StandardMaterial#twoSidedLighting}.
-     */
-    twoSidedLighting: boolean;
-    /**
-     * The value of {@link StandardMaterial#occludeDirect}.
-     */
-    occludeDirect: boolean;
     /**
      * The value of {@link StandardMaterial#occludeSpecular}.
      */
@@ -57254,11 +57246,11 @@ declare class ParticleEmitter {
  *
  * Relevant Engine API examples:
  *
- * - [Particle Animated Index](https://playcanvas.github.io/#/graphics/particles-anim-index)
- * - [Particle Mesh](https://playcanvas.github.io/#/graphics/particles-mesh)
- * - [Particle Random Sprites](https://playcanvas.github.io/#/graphics/particles-random-sprites)
- * - [Particle Snow](https://playcanvas.github.io/#/graphics/particles-snow)
- * - [Particle Spark](https://playcanvas.github.io/#/graphics/particles-spark)
+ * - [Particle Animated Index](https://playcanvas.github.io/#/particles/anim-index)
+ * - [Particle Mesh](https://playcanvas.github.io/#/particles/mesh)
+ * - [Particle Random Sprites](https://playcanvas.github.io/#/particles/random-sprites)
+ * - [Particle Snow](https://playcanvas.github.io/#/particles/snow)
+ * - [Particle Spark](https://playcanvas.github.io/#/particles/spark)
  * - [Particles in a user interface](https://playcanvas.github.io/#/user-interface/particle-system)
  *
  * @hideconstructor
@@ -75160,6 +75152,8 @@ declare class FlyController extends InputController {
  * view around the focus within {@link yawRange} and {@link pitchRange}, the first two `move`
  * components pan the focus point, and the third scales the distance within {@link zoomRange}.
  * Motion is smoothed with {@link rotateDamping}, {@link moveDamping} and {@link zoomDamping}.
+ * With {@link horizontalPan}, the pan moves the focus point across the ground instead of the
+ * plane of the view.
  *
  * @category Input
  * @alpha
@@ -75199,6 +75193,13 @@ declare class OrbitController extends InputController {
      * The zoom damping. A higher value means more damping. A value of 0 means no damping.
      */
     zoomDamping: number;
+    /**
+     * Whether the pan moves the focus point across the horizontal plane, as when dragging a map,
+     * instead of across the plane of the view. The first two `move` components are then the
+     * distances to move the focus point to the right and forward, level with the ground, so the
+     * height of the focus point does not change. Default is false.
+     */
+    horizontalPan: boolean;
     set pitchRange(range: Vec2);
     get pitchRange(): Vec2;
     set yawRange(range: Vec2);