@babylonjs/gui 5.41.0 → 5.42.1

package/2D/advancedDynamicTexture.d.ts

@@ -34,6 +34,7 @@ export declare class AdvancedDynamicTexture extends DynamicTexture {
     private _canvasPointerOutObserver;
     private _canvasBlurObserver;
     private _controlAddedObserver;
+    private _controlRemovedObserver;
     private _background;
     /** @internal */
     _rootContainer: Container;
@@ -69,6 +70,7 @@ export declare class AdvancedDynamicTexture extends DynamicTexture {
     private _rootElement;
     private _cursorChanged;
     private _defaultMousePointerId;
+    private _rootChildrenHaveChanged;
     /** @internal */
     _capturedPointerIds: Set<number>;
     /** @internal */

package/2D/advancedDynamicTexture.js

@@ -56,6 +56,7 @@ export class AdvancedDynamicTexture extends DynamicTexture {
         this._renderScale = 1;
         this._cursorChanged = false;
         this._defaultMousePointerId = 0;
+        this._rootChildrenHaveChanged = false;
         /** @internal */
         this._capturedPointerIds = new Set();
         /** @internal */
@@ -151,9 +152,15 @@ export class AdvancedDynamicTexture extends DynamicTexture {
         this.applyYInversionOnUpdate = invertY;
         this._rootElement = scene.getEngine().getInputElement();
         this._renderObserver = scene.onBeforeCameraRenderObservable.add((camera) => this._checkUpdate(camera));
+        /** Whenever a control is added or removed to the root, we have to recheck the camera projection as it can have changed  */
         this._controlAddedObserver = this._rootContainer.onControlAddedObservable.add((control) => {
-            if (control && this._scene && this._scene.activeCamera) {
-                this._checkUpdate(this._scene.activeCamera);
+            if (control) {
+                this._rootChildrenHaveChanged = true;
+            }
+        });
+        this._controlRemovedObserver = this._rootContainer.onControlRemovedObservable.add((control) => {
+            if (control) {
+                this._rootChildrenHaveChanged = true;
             }
         });
         this._preKeyboardObserver = scene.onPreKeyboardObservable.add((info) => {
@@ -551,6 +558,9 @@ export class AdvancedDynamicTexture extends DynamicTexture {
         if (this._controlAddedObserver) {
             this._rootContainer.onControlAddedObservable.remove(this._controlAddedObserver);
         }
+        if (this._controlRemovedObserver) {
+            this._rootContainer.onControlRemovedObservable.remove(this._controlRemovedObserver);
+        }
         if (this._layerToDispose) {
             this._layerToDispose.texture = null;
             this._layerToDispose.dispose();
@@ -631,7 +641,7 @@ export class AdvancedDynamicTexture extends DynamicTexture {
         const projectedPosition = Vector3.Project(position, worldMatrix, scene.getTransformMatrix(), globalViewport);
         return new Vector3(projectedPosition.x, projectedPosition.y, projectedPosition.z);
     }
-    _checkUpdate(camera) {
+    _checkUpdate(camera, skipUpdate) {
         if (this._layerToDispose) {
             if ((camera.layerMask & this._layerToDispose.layerMask) === 0) {
                 return;
@@ -671,16 +681,27 @@ export class AdvancedDynamicTexture extends DynamicTexture {
             return;
         }
         this._isDirty = false;
-        this._render();
-        this.update(this.applyYInversionOnUpdate, this.premulAlpha, AdvancedDynamicTexture.AllowGPUOptimizations);
+        this._render(skipUpdate);
+        if (!skipUpdate) {
+            this.update(this.applyYInversionOnUpdate, this.premulAlpha, AdvancedDynamicTexture.AllowGPUOptimizations);
+        }
     }
-    _render() {
+    _render(skipRender) {
+        var _a;
         const textureSize = this.getSize();
         const renderWidth = textureSize.width;
         const renderHeight = textureSize.height;
         const context = this.getContext();
         context.font = "18px Arial";
         context.strokeStyle = "white";
+        /** We have to recheck the camera projection in the case the root control's children have changed  */
+        if (this._rootChildrenHaveChanged) {
+            const camera = (_a = this.getScene()) === null || _a === void 0 ? void 0 : _a.activeCamera;
+            if (camera) {
+                this._rootChildrenHaveChanged = false;
+                this._checkUpdate(camera, true);
+            }
+        }
         // Layout
         this.onBeginLayoutObservable.notifyObservers(this);
         const measure = new Measure(0, 0, renderWidth, renderHeight);
@@ -688,6 +709,9 @@ export class AdvancedDynamicTexture extends DynamicTexture {
         this._rootContainer._layout(measure, context);
         this.onEndLayoutObservable.notifyObservers(this);
         this._isDirty = false; // Restoring the dirty state that could have been set by controls during layout processing
+        if (skipRender) {
+            return;
+        }
         // Clear
         if (this._invalidatedRectangle) {
             this._clearMeasure.copyFrom(this._invalidatedRectangle);