@onerjs/core 8.54.4 → 8.54.5

package/Engines/thinNativeEngine.pure.d.ts

@@ -86,6 +86,11 @@ export declare class ThinNativeEngine extends ThinEngine {
      * @internal
      */
     protected _initializeNativeEngine(adaptToDeviceRatio: boolean): void;
+    /**
+     * Brackets a scene's render with a command scope, so the commands it encodes are submitted together.
+     * @param scene the scene whose render should be wrapped
+     */
+    private _wrapSceneRenderWithCommandScope;
     setHardwareScalingLevel(level: number): void;
     dispose(): void;
     /**

package/Engines/thinNativeEngine.pure.js

@@ -324,14 +324,37 @@ export class ThinNativeEngine extends ThinEngine {
         // Shader processor
         this._shaderProcessor = new NativeShaderProcessor();
         this.onNewSceneAddedObservable.add((scene) => {
-            const originalRender = scene.render;
-            scene.render = (...args) => {
-                this._commandBufferEncoder.beginCommandScope();
-                originalRender.apply(scene, args);
-                this._commandBufferEncoder.endCommandScope();
-            };
+            this._wrapSceneRenderWithCommandScope(scene);
         });
     }
+    /**
+     * Brackets a scene's render with a command scope, so the commands it encodes are submitted together.
+     * @param scene the scene whose render should be wrapped
+     */
+    _wrapSceneRenderWithCommandScope(scene) {
+        const originalRender = scene.render;
+        scene.render = (...args) => {
+            this._commandBufferEncoder.beginCommandScope();
+            try {
+                originalRender.apply(scene, args);
+            }
+            catch (renderException) {
+                // The scope must be closed even when the render throws. Otherwise it stays
+                // open forever and every later frame fails with "Command scope already
+                // active.", so one recoverable error permanently breaks the engine instead
+                // of affecting just this frame.
+                try {
+                    this._commandBufferEncoder.endCommandScope();
+                }
+                catch (endException) {
+                    // Never let this replace the root cause; report it separately instead.
+                    Logger.Error(`Failed to end the command scope while unwinding a render error: ${endException}`);
+                }
+                throw renderException;
+            }
+            this._commandBufferEncoder.endCommandScope();
+        };
+    }
     setHardwareScalingLevel(level) {
         super.setHardwareScalingLevel(level);
         this._engine.setHardwareScalingLevel(level);