@onerjs/addons 8.27.3 → 8.27.5

package/atmosphere/atmosphere.d.ts

@@ -72,6 +72,7 @@ export declare class Atmosphere implements IDisposable {
     private _aerialPerspectiveRenderingGroup;
     private _globeAtmosphereRenderingGroup;
     private _isEnabled;
+    private _aerialPerspectiveLutHasBeenRendered;
     private _hasRenderedMultiScatteringLut;
     private _multiScatteringEffectWrapper;
     private _multiScatteringLutRenderTarget;
@@ -93,6 +94,10 @@ export declare class Atmosphere implements IDisposable {
      * @returns True if the atmosphere is supported, false otherwise.
      */
     static IsSupported(engine: AbstractEngine): boolean;
+    /**
+     * The unique ID of this atmosphere instance.
+     */
+    readonly uniqueId: number;
     /**
      * Called after the atmosphere variables have been updated for the specified camera.
      */
@@ -283,7 +288,6 @@ export declare class Atmosphere implements IDisposable {
      * Gets the camera-related variables for this atmosphere. Updated each frame.
      */
     get cameraAtmosphereVariables(): AtmospherePerCameraVariables;
-    readonly uniqueId: number;
     /**
      * Constructs the {@link Atmosphere}.
      * @param name - The name of this instance.
@@ -382,6 +386,7 @@ export declare class Atmosphere implements IDisposable {
      * Draws the aerial perspective LUT using {@link EffectWrapper} and {@link EffectRenderer}.
      */
     private _drawAerialPerspectiveLut;
+    private _clearAerialPerspectiveLut;
     /**
      * Draws the sky view LUT using {@link EffectWrapper} and {@link EffectRenderer}.
      */

package/atmosphere/atmosphere.js

@@ -26,6 +26,8 @@ import "./Shaders/ShadersInclude/atmosphereUboDeclaration.js";
 import "./Shaders/ShadersInclude/atmosphereVertexDeclaration.js";
 import "./Shaders/ShadersInclude/depthFunctions.js";
 const MaterialPlugin = "atmo-pbr";
+const AerialPerspectiveLutLayers = 32;
+let UniqueId = 0;
 /**
  * Renders a physically based atmosphere.
  * Use {@link IsSupported} to check if the atmosphere is supported before creating an instance.
@@ -210,7 +212,7 @@ export class Atmosphere {
         }
         const scene = this.scene;
         const name = "atmo-aerialPerspective";
-        const renderTarget = (this._aerialPerspectiveLutRenderTarget = CreateRenderTargetTexture(name, { width: 16, height: 64, layers: 32 }, scene, {}));
+        const renderTarget = (this._aerialPerspectiveLutRenderTarget = CreateRenderTargetTexture(name, { width: 16, height: 64, layers: AerialPerspectiveLutLayers }, scene, {}));
         this._aerialPerspectiveLutEffectWrapper = CreateAerialPerspectiveEffectWrapper(this._engine, this.uniformBuffer);
         return renderTarget;
     }
@@ -497,6 +499,7 @@ export class Atmosphere {
         this._atmosphereUniformBufferAsArray = [];
         this._effectRenderer = null;
         this._isEnabled = true;
+        this._aerialPerspectiveLutHasBeenRendered = false;
         this._hasRenderedMultiScatteringLut = false;
         this._multiScatteringEffectWrapper = null;
         this._multiScatteringLutRenderTarget = null;
@@ -512,6 +515,10 @@ export class Atmosphere {
         this._onBeforeCameraRenderObserver = null;
         this._onBeforeDrawPhaseObserver = null;
         this._onAfterRenderingGroupObserver = null;
+        /**
+         * The unique ID of this atmosphere instance.
+         */
+        this.uniqueId = UniqueId++;
         /**
          * Called after the atmosphere variables have been updated for the specified camera.
          */
@@ -556,7 +563,6 @@ export class Atmosphere {
         this.getDiffuseSkyIrradianceToRef = (directionToLight, pointRadius, pointGeocentricNormal, lightIrradiance, result) => this._diffuseSkyIrradianceLut?.getDiffuseSkyIrradianceToRef(directionToLight, pointRadius, pointGeocentricNormal, lightIrradiance, result) ??
             ((result.r = 0), (result.g = 0), (result.b = 0), result);
         const engine = (this._engine = scene.getEngine());
-        this.uniqueId = scene.getUniqueId();
         if (engine.isWebGPU) {
             throw new Error("Atmosphere is not supported on WebGPU.");
         }
@@ -988,9 +994,18 @@ export class Atmosphere {
                 if (this._isSkyViewLutEnabled) {
                     this._drawSkyViewLut();
                 }
-                // Only need to render aerial perspective LUT when inside the atmosphere.
-                if (this._isAerialPerspectiveLutEnabled && this._cameraAtmosphereVariables.clampedCameraRadius <= this._physicalProperties.atmosphereRadius) {
-                    this._drawAerialPerspectiveLut();
+                if (this._isAerialPerspectiveLutEnabled) {
+                    // Only need to render aerial perspective LUT when inside the atmosphere.
+                    if (this._cameraAtmosphereVariables.clampedCameraRadius <= this._physicalProperties.atmosphereRadius) {
+                        this._drawAerialPerspectiveLut();
+                    }
+                    else {
+                        // Make sure to clear the LUT to some initial value if this would have otherwise been the first time rendering it.
+                        if (!this._aerialPerspectiveLutHasBeenRendered) {
+                            this._clearAerialPerspectiveLut();
+                        }
+                    }
+                    this._aerialPerspectiveLutHasBeenRendered = true;
                 }
             }
             this.onAfterRenderLutsForCameraObservable.notifyObservers();
@@ -1093,10 +1108,9 @@ export class Atmosphere {
         const multiScatteringLut = this._multiScatteringLutRenderTarget;
         DrawEffect(this._engine, this._effectRenderer, this._aerialPerspectiveLutEffectWrapper, this._aerialPerspectiveLutRenderTarget, (effectRenderer, renderTarget, effect, engine) => {
             this.bindUniformBufferToEffect(effect);
-            const layers = 32;
             effect.setTexture("transmittanceLut", transmittanceLut);
             effect.setTexture("multiScatteringLut", multiScatteringLut);
-            for (let layer = 0; layer < layers; layer++) {
+            for (let layer = 0; layer < AerialPerspectiveLutLayers; layer++) {
                 engine.bindFramebuffer(renderTarget, undefined, undefined, undefined, true, undefined, layer);
                 effectRenderer.bindBuffers(effect);
                 effect.setFloat("layerIdx", layer);
@@ -1104,6 +1118,17 @@ export class Atmosphere {
             }
         });
     }
+    _clearAerialPerspectiveLut() {
+        const renderTarget = this._aerialPerspectiveLutRenderTarget?.renderTarget;
+        if (renderTarget) {
+            const engine = this._engine;
+            const clearColor = { r: 0, g: 0, b: 0, a: 0 };
+            for (let layer = 0; layer < AerialPerspectiveLutLayers; layer++) {
+                engine.bindFramebuffer(renderTarget, undefined, undefined, undefined, true, undefined, layer);
+                engine.clear(clearColor, true, false, false);
+            }
+        }
+    }
     /**
      * Draws the sky view LUT using {@link EffectWrapper} and {@link EffectRenderer}.
      */
@@ -1147,13 +1172,19 @@ const CreateEffectWrapper = (engine, name, fragmentShader, uniformNames, sampler
     });
 };
 const CreateRenderTargetTexture = (name, size, scene, options) => {
+    const caps = scene.getEngine().getCaps();
+    const textureType = caps.textureHalfFloatRender
+        ? Constants.TEXTURETYPE_HALF_FLOAT
+        : caps.textureFloatRender
+            ? Constants.TEXTURETYPE_FLOAT
+            : Constants.TEXTURETYPE_UNSIGNED_BYTE;
     const rtOptions = {
         generateMipMaps: false,
         generateDepthBuffer: false,
         generateStencilBuffer: false,
         gammaSpace: false,
         samplingMode: Constants.TEXTURE_BILINEAR_SAMPLINGMODE,
-        type: Constants.TEXTURETYPE_HALF_FLOAT,
+        type: textureType,
         format: Constants.TEXTUREFORMAT_RGBA,
         ...options,
     };