@galacean/engine-core 1.6.3 → 1.6.5

package/dist/main.js

@@ -8721,7 +8721,7 @@ exports.Camera = /*#__PURE__*/ function(Component) {
             Logger.error("mipLevel only take effect in WebGL2.0");
         }
         var ignoreClearFlags;
-        if (this._cameraType !== CameraType.Normal && !this._renderTarget && !this._isIndependentCanvasEnabled()) {
+        if (this._cameraType !== CameraType.Normal && !this._renderTarget) {
             ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
         }
         this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
@@ -8855,6 +8855,9 @@ exports.Camera = /*#__PURE__*/ function(Component) {
             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);
@@ -10868,7 +10871,7 @@ var scalableAmbientOcclusionFS = "// Ambient Occlusion, largely inspired from:\n
     _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;
@@ -10900,15 +10903,15 @@ var scalableAmbientOcclusionFS = "// Ambient Occlusion, largely inspired from:\n
         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);
     };
@@ -14422,7 +14425,8 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
         } 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
@@ -14460,7 +14464,7 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
             uberShaderData.disableMacro(BloomEffect._hqMacro);
         }
         uberShaderData.setTexture(BloomEffect._dirtTextureProp, dirtTexture.value);
-        if (dirtTexture) {
+        if (dirtTexture.value) {
             uberShaderData.enableMacro(BloomEffect._dirtMacro);
         } else {
             uberShaderData.disableMacro(BloomEffect._dirtMacro);
@@ -14597,11 +14601,12 @@ var FXAA3_11 = "//--------------------------------------------------------------
         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() {