@galacean/engine 1.6.3 → 1.6.5

package/dist/browser.js

@@ -13644,7 +13644,7 @@
                 Logger.error("mipLevel only take effect in WebGL2.0");
             }
             var ignoreClearFlags;
-            if (this._cameraType !== CameraType$1.Normal && !this._renderTarget && !this._isIndependentCanvasEnabled()) {
+            if (this._cameraType !== CameraType$1.Normal && !this._renderTarget) {
                 ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
             }
             this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
@@ -13778,6 +13778,9 @@
                 width = canvas.width;
                 height = canvas.height;
             }
+            this._adjustPixelViewport(width, height);
+        };
+        _proto._adjustPixelViewport = function _adjustPixelViewport(width, height) {
             var viewport = this._viewport;
             this._pixelViewport.set(viewport.x * width, viewport.y * height, viewport.z * width, viewport.w * height);
             !this._customAspectRatio && this._dispatchModify(CameraModifyFlags.AspectRatio);
@@ -15774,7 +15777,8 @@
         _proto.onRender = function onRender(context) {
             var engine = this.engine;
             var camera = context.camera;
-            var viewport = camera.viewport, scene = camera.scene, pixelViewport = camera.pixelViewport;
+            camera.viewport;
+            var scene = camera.scene, pixelViewport = camera.pixelViewport;
             var ambientOcclusion = scene.ambientOcclusion;
             var shaderData = this._material.shaderData;
             var projectionMatrix = context.projectionMatrix;
@@ -15806,15 +15810,15 @@
             var _this = this, saoTarget = _this._saoRenderTarget, material = _this._material;
             // Draw ambient occlusion texture
             var sourceTexture = this._depthRenderTarget.depthTexture;
-            Blitter.blitTexture(engine, sourceTexture, saoTarget, 0, viewport, material, 0);
+            Blitter.blitTexture(engine, sourceTexture, saoTarget, 0, undefined, material, 0);
             // Horizontal blur, saoRenderTarget -> blurRenderTarget
             var saoTexture = saoTarget.getColorTexture();
             var offsetX = this._offsetX.set(1, 1, this._blurStepPixels / saoTexture.width, 0);
-            Blitter.blitTexture(engine, saoTexture, this._blurRenderTarget, 0, viewport, material, 1, offsetX);
+            Blitter.blitTexture(engine, saoTexture, this._blurRenderTarget, 0, undefined, material, 1, offsetX);
             // Vertical blur, blurRenderTarget -> saoRenderTarget
             var horizontalBlur = this._blurRenderTarget.getColorTexture();
             var offsetY = this._offsetY.set(1, 1, 0, this._blurStepPixels / saoTexture.height);
-            Blitter.blitTexture(engine, horizontalBlur, saoTarget, 0, viewport, material, 1, offsetY);
+            Blitter.blitTexture(engine, horizontalBlur, saoTarget, 0, undefined, material, 1, offsetY);
             // Set the SAO texture
             camera.shaderData.setTexture(exports.Camera._cameraAOTextureProperty, saoTexture);
         };
@@ -19281,7 +19285,8 @@
             } else {
                 uberShaderData.disableMacro(TonemappingEffect._enableMacro);
             }
-            Blitter.blitTexture(camera.engine, srcTexture, destTarget, 0, camera.viewport, this._uberMaterial, undefined);
+            var viewport = destTarget === camera.renderTarget ? camera.viewport : undefined;
+            Blitter.blitTexture(camera.engine, srcTexture, destTarget, 0, viewport, this._uberMaterial, undefined);
         };
         /**
        * @inheritdoc
@@ -19319,7 +19324,7 @@
                 uberShaderData.disableMacro(BloomEffect._hqMacro);
             }
             uberShaderData.setTexture(BloomEffect._dirtTextureProp, dirtTexture.value);
-            if (dirtTexture) {
+            if (dirtTexture.value) {
                 uberShaderData.enableMacro(BloomEffect._dirtMacro);
             } else {
                 uberShaderData.disableMacro(BloomEffect._dirtMacro);
@@ -19452,11 +19457,12 @@
             var enableFXAA = camera.antiAliasing === AntiAliasing.FXAA;
             // Should convert to sRGB when FXAA is enabled or camera's render target is not set
             var sourceTexture = this._inputRenderTarget.getColorTexture();
-            var outputRenderTarget = enableFXAA ? this._srgbRenderTarget : renderTarget;
-            Blitter.blitTexture(engine, sourceTexture, outputRenderTarget, 0, viewport, this._sRGBmaterial);
             if (enableFXAA) {
+                Blitter.blitTexture(engine, sourceTexture, this._srgbRenderTarget, 0, undefined, this._sRGBmaterial);
                 var sRGBTexture = this._srgbRenderTarget.getColorTexture();
                 Blitter.blitTexture(engine, sRGBTexture, renderTarget, 0, viewport, this._antiAliasingMaterial);
+            } else {
+                Blitter.blitTexture(engine, sourceTexture, renderTarget, 0, viewport, this._sRGBmaterial);
             }
         };
         _proto.release = function release() {
@@ -44214,7 +44220,7 @@
             var yStart = flipY ? srcHeight - viewport.y * srcHeight - copyHeight : viewport.y * srcHeight;
             var _srcRT__platformRenderTarget__frameBuffer;
             // @ts-ignore
-            var frameBuffer = (_srcRT__platformRenderTarget__frameBuffer = srcRT == null ? void 0 : srcRT._platformRenderTarget._frameBuffer) != null ? _srcRT__platformRenderTarget__frameBuffer : null;
+            var frameBuffer = (_srcRT__platformRenderTarget__frameBuffer = srcRT == null ? void 0 : srcRT._platformRenderTarget._frameBuffer) != null ? _srcRT__platformRenderTarget__frameBuffer : this._mainFrameBuffer;
             // @ts-ignore
             gl.bindFramebuffer(gl.FRAMEBUFFER, frameBuffer);
             // @ts-ignore
@@ -51607,7 +51613,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.6.3";
+    var version = "1.6.5";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);