@onerjs/core 8.56.4 → 9.0.1

package/Materials/standardMaterial.pure.js

@@ -113,6 +113,7 @@ export class StandardMaterialDefines extends ImageProcessingDefinesMixin(Standar
         this.REFRACTIONMAP_3D = false;
         this.REFLECTIONOVERALPHA = false;
         this.TWOSIDEDLIGHTING = false;
+        this.SKIP_OUT_OF_RANGE_LIGHTING = false;
         this.SHADOWFLOAT = false;
         this.MORPHTARGETS = false;
         this.MORPHTARGETS_POSITION = false;
@@ -171,7 +172,7 @@ class StandardMaterialBase extends ImageProcessingMixin(PushMaterial) {
  * @see https://doc.babylonjs.com/features/featuresDeepDive/materials/using/materials_introduction
  */
 let StandardMaterial = (() => {
-    var _a, _StandardMaterial_diffuseTexture_accessor_storage, _StandardMaterial_ambientTexture_accessor_storage, _StandardMaterial_opacityTexture_accessor_storage, _StandardMaterial_reflectionTexture_accessor_storage, _StandardMaterial_emissiveTexture_accessor_storage, _StandardMaterial_specularTexture_accessor_storage, _StandardMaterial_bumpTexture_accessor_storage, _StandardMaterial_lightmapTexture_accessor_storage, _StandardMaterial_refractionTexture_accessor_storage, _StandardMaterial_useAlphaFromDiffuseTexture_accessor_storage, _StandardMaterial_useEmissiveAsIllumination_accessor_storage, _StandardMaterial_linkEmissiveWithDiffuse_accessor_storage, _StandardMaterial_useSpecularOverAlpha_accessor_storage, _StandardMaterial_useReflectionOverAlpha_accessor_storage, _StandardMaterial_disableLighting_accessor_storage, _StandardMaterial_useObjectSpaceNormalMap_accessor_storage, _StandardMaterial_useParallax_accessor_storage, _StandardMaterial_useParallaxOcclusion_accessor_storage, _StandardMaterial_roughness_accessor_storage, _StandardMaterial_useLightmapAsShadowmap_accessor_storage, _StandardMaterial_diffuseFresnelParameters_accessor_storage, _StandardMaterial_opacityFresnelParameters_accessor_storage, _StandardMaterial_reflectionFresnelParameters_accessor_storage, _StandardMaterial_refractionFresnelParameters_accessor_storage, _StandardMaterial_emissiveFresnelParameters_accessor_storage, _StandardMaterial_useReflectionFresnelFromSpecular_accessor_storage, _StandardMaterial_useGlossinessFromSpecularMapAlpha_accessor_storage, _StandardMaterial_maxSimultaneousLights_accessor_storage, _StandardMaterial_invertNormalMapX_accessor_storage, _StandardMaterial_invertNormalMapY_accessor_storage, _StandardMaterial_twoSidedLighting_accessor_storage, _StandardMaterial_applyDecalMapAfterDetailMap_accessor_storage;
+    var _a, _StandardMaterial_diffuseTexture_accessor_storage, _StandardMaterial_ambientTexture_accessor_storage, _StandardMaterial_opacityTexture_accessor_storage, _StandardMaterial_reflectionTexture_accessor_storage, _StandardMaterial_emissiveTexture_accessor_storage, _StandardMaterial_specularTexture_accessor_storage, _StandardMaterial_bumpTexture_accessor_storage, _StandardMaterial_lightmapTexture_accessor_storage, _StandardMaterial_refractionTexture_accessor_storage, _StandardMaterial_useAlphaFromDiffuseTexture_accessor_storage, _StandardMaterial_useEmissiveAsIllumination_accessor_storage, _StandardMaterial_linkEmissiveWithDiffuse_accessor_storage, _StandardMaterial_useSpecularOverAlpha_accessor_storage, _StandardMaterial_useReflectionOverAlpha_accessor_storage, _StandardMaterial_disableLighting_accessor_storage, _StandardMaterial_useObjectSpaceNormalMap_accessor_storage, _StandardMaterial_useParallax_accessor_storage, _StandardMaterial_useParallaxOcclusion_accessor_storage, _StandardMaterial_roughness_accessor_storage, _StandardMaterial_useLightmapAsShadowmap_accessor_storage, _StandardMaterial_diffuseFresnelParameters_accessor_storage, _StandardMaterial_opacityFresnelParameters_accessor_storage, _StandardMaterial_reflectionFresnelParameters_accessor_storage, _StandardMaterial_refractionFresnelParameters_accessor_storage, _StandardMaterial_emissiveFresnelParameters_accessor_storage, _StandardMaterial_useReflectionFresnelFromSpecular_accessor_storage, _StandardMaterial_useGlossinessFromSpecularMapAlpha_accessor_storage, _StandardMaterial_maxSimultaneousLights_accessor_storage, _StandardMaterial_skipOutOfRangeLighting_accessor_storage, _StandardMaterial_invertNormalMapX_accessor_storage, _StandardMaterial_invertNormalMapY_accessor_storage, _StandardMaterial_twoSidedLighting_accessor_storage, _StandardMaterial_applyDecalMapAfterDetailMap_accessor_storage;
     let _classSuper = StandardMaterialBase;
     let __diffuseTexture_decorators;
     let __diffuseTexture_initializers = [];
@@ -368,6 +369,12 @@ let StandardMaterial = (() => {
     let _maxSimultaneousLights_decorators;
     let _maxSimultaneousLights_initializers = [];
     let _maxSimultaneousLights_extraInitializers = [];
+    let __skipOutOfRangeLighting_decorators;
+    let __skipOutOfRangeLighting_initializers = [];
+    let __skipOutOfRangeLighting_extraInitializers = [];
+    let _skipOutOfRangeLighting_decorators;
+    let _skipOutOfRangeLighting_initializers = [];
+    let _skipOutOfRangeLighting_extraInitializers = [];
     let __invertNormalMapX_decorators;
     let __invertNormalMapX_initializers = [];
     let __invertNormalMapX_extraInitializers = [];
@@ -555,6 +562,13 @@ let StandardMaterial = (() => {
              */
             get maxSimultaneousLights() { return __classPrivateFieldGet(this, _StandardMaterial_maxSimultaneousLights_accessor_storage, "f"); }
             set maxSimultaneousLights(value) { __classPrivateFieldSet(this, _StandardMaterial_maxSimultaneousLights_accessor_storage, value, "f"); }
+            /**
+             * If set to true, point and spot lights skip their lighting computations for fragments beyond the light range, where they
+             * contribute nothing. Only lights with a finite range are affected. The extra per-fragment test costs time when most fragments
+             * are within range of most lights, so only enable it for sparse lighting measured on the target devices (default: false).
+             */
+            get skipOutOfRangeLighting() { return __classPrivateFieldGet(this, _StandardMaterial_skipOutOfRangeLighting_accessor_storage, "f"); }
+            set skipOutOfRangeLighting(value) { __classPrivateFieldSet(this, _StandardMaterial_skipOutOfRangeLighting_accessor_storage, value, "f"); }
             /**
              * If sets to true, x component of normal map value will invert (x = 1.0 - x).
              */
@@ -698,7 +712,9 @@ let StandardMaterial = (() => {
                 _StandardMaterial_useGlossinessFromSpecularMapAlpha_accessor_storage.set(this, (__runInitializers(this, __useGlossinessFromSpecularMapAlpha_extraInitializers), __runInitializers(this, _useGlossinessFromSpecularMapAlpha_initializers, void 0)));
                 this._maxSimultaneousLights = (__runInitializers(this, _useGlossinessFromSpecularMapAlpha_extraInitializers), __runInitializers(this, __maxSimultaneousLights_initializers, 4));
                 _StandardMaterial_maxSimultaneousLights_accessor_storage.set(this, (__runInitializers(this, __maxSimultaneousLights_extraInitializers), __runInitializers(this, _maxSimultaneousLights_initializers, void 0)));
-                this._invertNormalMapX = (__runInitializers(this, _maxSimultaneousLights_extraInitializers), __runInitializers(this, __invertNormalMapX_initializers, false));
+                this._skipOutOfRangeLighting = (__runInitializers(this, _maxSimultaneousLights_extraInitializers), __runInitializers(this, __skipOutOfRangeLighting_initializers, false));
+                _StandardMaterial_skipOutOfRangeLighting_accessor_storage.set(this, (__runInitializers(this, __skipOutOfRangeLighting_extraInitializers), __runInitializers(this, _skipOutOfRangeLighting_initializers, void 0)));
+                this._invertNormalMapX = (__runInitializers(this, _skipOutOfRangeLighting_extraInitializers), __runInitializers(this, __invertNormalMapX_initializers, false));
                 _StandardMaterial_invertNormalMapX_accessor_storage.set(this, (__runInitializers(this, __invertNormalMapX_extraInitializers), __runInitializers(this, _invertNormalMapX_initializers, void 0)));
                 this._invertNormalMapY = (__runInitializers(this, _invertNormalMapX_extraInitializers), __runInitializers(this, __invertNormalMapY_initializers, false));
                 _StandardMaterial_invertNormalMapY_accessor_storage.set(this, (__runInitializers(this, __invertNormalMapY_extraInitializers), __runInitializers(this, _invertNormalMapY_initializers, void 0)));
@@ -822,6 +838,7 @@ let StandardMaterial = (() => {
                 const engine = scene.getEngine();
                 // Lights
                 defines._needNormals = PrepareDefinesForLights(scene, mesh, defines, true, this._maxSimultaneousLights, this._disableLighting);
+                defines.SKIP_OUT_OF_RANGE_LIGHTING = this._skipOutOfRangeLighting;
                 if (!AreLightsTexturesReady(scene, mesh, this._maxSimultaneousLights, this._disableLighting)) {
                     return false;
                 }
@@ -1416,6 +1433,12 @@ let StandardMaterial = (() => {
                                 ubo.updateColor4("emissiveRightColor", this.emissiveFresnelParameters.rightColor, this.emissiveFresnelParameters.bias);
                             }
                         }
+                        // The alpha test compares against alphaCutOff whatever supplies the alpha: a texture, vertex or
+                        // instance color, opacity fresnel or the material alpha. Binding it only when a texture carried
+                        // alpha left every other case testing against the default of 0, so nothing was ever discarded.
+                        if (defines.ALPHATEST) {
+                            ubo.updateFloat("alphaCutOff", this.alphaCutOff);
+                        }
                         // Textures
                         if (scene.texturesEnabled) {
                             if (this._diffuseTexture && _a.DiffuseTextureEnabled) {
@@ -1430,9 +1453,6 @@ let StandardMaterial = (() => {
                                 ubo.updateFloat2("vOpacityInfos", this._opacityTexture.coordinatesIndex, this._opacityTexture.level);
                                 BindTextureMatrix(this._opacityTexture, ubo, "opacity");
                             }
-                            if (this._hasAlphaChannel()) {
-                                ubo.updateFloat("alphaCutOff", this.alphaCutOff);
-                            }
                             BindIBLParameters(scene, defines, ubo, Color3.White(), this._reflectionTexture, false, false, true, false, false, false, this.roughness);
                             if (!this._reflectionTexture || !_a.ReflectionTextureEnabled) {
                                 ubo.updateFloat2("vReflectionInfos", 0.0, this.roughness);
@@ -1872,6 +1892,7 @@ let StandardMaterial = (() => {
         _StandardMaterial_useReflectionFresnelFromSpecular_accessor_storage = new WeakMap(),
         _StandardMaterial_useGlossinessFromSpecularMapAlpha_accessor_storage = new WeakMap(),
         _StandardMaterial_maxSimultaneousLights_accessor_storage = new WeakMap(),
+        _StandardMaterial_skipOutOfRangeLighting_accessor_storage = new WeakMap(),
         _StandardMaterial_invertNormalMapX_accessor_storage = new WeakMap(),
         _StandardMaterial_invertNormalMapY_accessor_storage = new WeakMap(),
         _StandardMaterial_twoSidedLighting_accessor_storage = new WeakMap(),
@@ -1943,6 +1964,8 @@ let StandardMaterial = (() => {
             _useGlossinessFromSpecularMapAlpha_decorators = [expandToProperty("_markAllSubMeshesAsTexturesDirty")];
             __maxSimultaneousLights_decorators = [serialize("maxSimultaneousLights")];
             _maxSimultaneousLights_decorators = [expandToProperty("_markAllSubMeshesAsLightsDirty")];
+            __skipOutOfRangeLighting_decorators = [serialize("skipOutOfRangeLighting")];
+            _skipOutOfRangeLighting_decorators = [expandToProperty("_markAllSubMeshesAsLightsDirty")];
             __invertNormalMapX_decorators = [serialize("invertNormalMapX")];
             _invertNormalMapX_decorators = [expandToProperty("_markAllSubMeshesAsTexturesDirty")];
             __invertNormalMapY_decorators = [serialize("invertNormalMapY")];
@@ -1979,6 +2002,7 @@ let StandardMaterial = (() => {
             __esDecorate(_a, null, _useReflectionFresnelFromSpecular_decorators, { kind: "accessor", name: "useReflectionFresnelFromSpecular", static: false, private: false, access: { has: obj => "useReflectionFresnelFromSpecular" in obj, get: obj => obj.useReflectionFresnelFromSpecular, set: (obj, value) => { obj.useReflectionFresnelFromSpecular = value; } }, metadata: _metadata }, _useReflectionFresnelFromSpecular_initializers, _useReflectionFresnelFromSpecular_extraInitializers);
             __esDecorate(_a, null, _useGlossinessFromSpecularMapAlpha_decorators, { kind: "accessor", name: "useGlossinessFromSpecularMapAlpha", static: false, private: false, access: { has: obj => "useGlossinessFromSpecularMapAlpha" in obj, get: obj => obj.useGlossinessFromSpecularMapAlpha, set: (obj, value) => { obj.useGlossinessFromSpecularMapAlpha = value; } }, metadata: _metadata }, _useGlossinessFromSpecularMapAlpha_initializers, _useGlossinessFromSpecularMapAlpha_extraInitializers);
             __esDecorate(_a, null, _maxSimultaneousLights_decorators, { kind: "accessor", name: "maxSimultaneousLights", static: false, private: false, access: { has: obj => "maxSimultaneousLights" in obj, get: obj => obj.maxSimultaneousLights, set: (obj, value) => { obj.maxSimultaneousLights = value; } }, metadata: _metadata }, _maxSimultaneousLights_initializers, _maxSimultaneousLights_extraInitializers);
+            __esDecorate(_a, null, _skipOutOfRangeLighting_decorators, { kind: "accessor", name: "skipOutOfRangeLighting", static: false, private: false, access: { has: obj => "skipOutOfRangeLighting" in obj, get: obj => obj.skipOutOfRangeLighting, set: (obj, value) => { obj.skipOutOfRangeLighting = value; } }, metadata: _metadata }, _skipOutOfRangeLighting_initializers, _skipOutOfRangeLighting_extraInitializers);
             __esDecorate(_a, null, _invertNormalMapX_decorators, { kind: "accessor", name: "invertNormalMapX", static: false, private: false, access: { has: obj => "invertNormalMapX" in obj, get: obj => obj.invertNormalMapX, set: (obj, value) => { obj.invertNormalMapX = value; } }, metadata: _metadata }, _invertNormalMapX_initializers, _invertNormalMapX_extraInitializers);
             __esDecorate(_a, null, _invertNormalMapY_decorators, { kind: "accessor", name: "invertNormalMapY", static: false, private: false, access: { has: obj => "invertNormalMapY" in obj, get: obj => obj.invertNormalMapY, set: (obj, value) => { obj.invertNormalMapY = value; } }, metadata: _metadata }, _invertNormalMapY_initializers, _invertNormalMapY_extraInitializers);
             __esDecorate(_a, null, _twoSidedLighting_decorators, { kind: "accessor", name: "twoSidedLighting", static: false, private: false, access: { has: obj => "twoSidedLighting" in obj, get: obj => obj.twoSidedLighting, set: (obj, value) => { obj.twoSidedLighting = value; } }, metadata: _metadata }, _twoSidedLighting_initializers, _twoSidedLighting_extraInitializers);
@@ -2020,6 +2044,7 @@ let StandardMaterial = (() => {
             __esDecorate(null, null, __useReflectionFresnelFromSpecular_decorators, { kind: "field", name: "_useReflectionFresnelFromSpecular", static: false, private: false, access: { has: obj => "_useReflectionFresnelFromSpecular" in obj, get: obj => obj._useReflectionFresnelFromSpecular, set: (obj, value) => { obj._useReflectionFresnelFromSpecular = value; } }, metadata: _metadata }, __useReflectionFresnelFromSpecular_initializers, __useReflectionFresnelFromSpecular_extraInitializers);
             __esDecorate(null, null, __useGlossinessFromSpecularMapAlpha_decorators, { kind: "field", name: "_useGlossinessFromSpecularMapAlpha", static: false, private: false, access: { has: obj => "_useGlossinessFromSpecularMapAlpha" in obj, get: obj => obj._useGlossinessFromSpecularMapAlpha, set: (obj, value) => { obj._useGlossinessFromSpecularMapAlpha = value; } }, metadata: _metadata }, __useGlossinessFromSpecularMapAlpha_initializers, __useGlossinessFromSpecularMapAlpha_extraInitializers);
             __esDecorate(null, null, __maxSimultaneousLights_decorators, { kind: "field", name: "_maxSimultaneousLights", static: false, private: false, access: { has: obj => "_maxSimultaneousLights" in obj, get: obj => obj._maxSimultaneousLights, set: (obj, value) => { obj._maxSimultaneousLights = value; } }, metadata: _metadata }, __maxSimultaneousLights_initializers, __maxSimultaneousLights_extraInitializers);
+            __esDecorate(null, null, __skipOutOfRangeLighting_decorators, { kind: "field", name: "_skipOutOfRangeLighting", static: false, private: false, access: { has: obj => "_skipOutOfRangeLighting" in obj, get: obj => obj._skipOutOfRangeLighting, set: (obj, value) => { obj._skipOutOfRangeLighting = value; } }, metadata: _metadata }, __skipOutOfRangeLighting_initializers, __skipOutOfRangeLighting_extraInitializers);
             __esDecorate(null, null, __invertNormalMapX_decorators, { kind: "field", name: "_invertNormalMapX", static: false, private: false, access: { has: obj => "_invertNormalMapX" in obj, get: obj => obj._invertNormalMapX, set: (obj, value) => { obj._invertNormalMapX = value; } }, metadata: _metadata }, __invertNormalMapX_initializers, __invertNormalMapX_extraInitializers);
             __esDecorate(null, null, __invertNormalMapY_decorators, { kind: "field", name: "_invertNormalMapY", static: false, private: false, access: { has: obj => "_invertNormalMapY" in obj, get: obj => obj._invertNormalMapY, set: (obj, value) => { obj._invertNormalMapY = value; } }, metadata: _metadata }, __invertNormalMapY_initializers, __invertNormalMapY_extraInitializers);
             __esDecorate(null, null, __twoSidedLighting_decorators, { kind: "field", name: "_twoSidedLighting", static: false, private: false, access: { has: obj => "_twoSidedLighting" in obj, get: obj => obj._twoSidedLighting, set: (obj, value) => { obj._twoSidedLighting = value; } }, metadata: _metadata }, __twoSidedLighting_initializers, __twoSidedLighting_extraInitializers);