@galacean/engine-core 1.5.15 → 1.5.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +10 -5
- package/dist/main.js.map +1 -1
- package/dist/module.js +10 -5
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/Camera.d.ts +1 -0
- package/types/postProcess/PostProcessUberPass.d.ts +1 -1
package/dist/module.js
CHANGED
|
@@ -8776,7 +8776,7 @@ var Camera = /*#__PURE__*/ function(Component) {
|
|
|
8776
8776
|
Logger.error("mipLevel only take effect in WebGL2.0");
|
|
8777
8777
|
}
|
|
8778
8778
|
var ignoreClearFlags;
|
|
8779
|
-
if (this._cameraType !== CameraType.Normal && !this._renderTarget
|
|
8779
|
+
if (this._cameraType !== CameraType.Normal && !this._renderTarget) {
|
|
8780
8780
|
ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
|
|
8781
8781
|
}
|
|
8782
8782
|
this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
|
|
@@ -8910,6 +8910,9 @@ var Camera = /*#__PURE__*/ function(Component) {
|
|
|
8910
8910
|
width = canvas.width;
|
|
8911
8911
|
height = canvas.height;
|
|
8912
8912
|
}
|
|
8913
|
+
this._adjustPixelViewport(width, height);
|
|
8914
|
+
};
|
|
8915
|
+
_proto._adjustPixelViewport = function _adjustPixelViewport(width, height) {
|
|
8913
8916
|
var viewport = this._viewport;
|
|
8914
8917
|
this._pixelViewport.set(viewport.x * width, viewport.y * height, viewport.z * width, viewport.w * height);
|
|
8915
8918
|
!this._customAspectRatio && this._dispatchModify(CameraModifyFlags.AspectRatio);
|
|
@@ -14180,7 +14183,8 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
|
|
|
14180
14183
|
} else {
|
|
14181
14184
|
uberShaderData.disableMacro(TonemappingEffect._enableMacro);
|
|
14182
14185
|
}
|
|
14183
|
-
|
|
14186
|
+
var viewport = destTarget === camera.renderTarget ? camera.viewport : undefined;
|
|
14187
|
+
Blitter.blitTexture(camera.engine, srcTexture, destTarget, 0, viewport, this._uberMaterial, undefined);
|
|
14184
14188
|
};
|
|
14185
14189
|
/**
|
|
14186
14190
|
* @inheritdoc
|
|
@@ -14218,7 +14222,7 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
|
|
|
14218
14222
|
uberShaderData.disableMacro(BloomEffect._hqMacro);
|
|
14219
14223
|
}
|
|
14220
14224
|
uberShaderData.setTexture(BloomEffect._dirtTextureProp, dirtTexture.value);
|
|
14221
|
-
if (dirtTexture) {
|
|
14225
|
+
if (dirtTexture.value) {
|
|
14222
14226
|
uberShaderData.enableMacro(BloomEffect._dirtMacro);
|
|
14223
14227
|
} else {
|
|
14224
14228
|
uberShaderData.disableMacro(BloomEffect._dirtMacro);
|
|
@@ -14361,11 +14365,12 @@ var FXAA3_11 = "//--------------------------------------------------------------
|
|
|
14361
14365
|
var enableFXAA = camera.antiAliasing === AntiAliasing.FXAA;
|
|
14362
14366
|
// Should convert to sRGB when FXAA is enabled or camera's render target is not set
|
|
14363
14367
|
var sourceTexture = this._inputRenderTarget.getColorTexture();
|
|
14364
|
-
var outputRenderTarget = enableFXAA ? this._srgbRenderTarget : renderTarget;
|
|
14365
|
-
Blitter.blitTexture(engine, sourceTexture, outputRenderTarget, 0, viewport, this._sRGBmaterial);
|
|
14366
14368
|
if (enableFXAA) {
|
|
14369
|
+
Blitter.blitTexture(engine, sourceTexture, this._srgbRenderTarget, 0, undefined, this._sRGBmaterial);
|
|
14367
14370
|
var sRGBTexture = this._srgbRenderTarget.getColorTexture();
|
|
14368
14371
|
Blitter.blitTexture(engine, sRGBTexture, renderTarget, 0, viewport, this._antiAliasingMaterial);
|
|
14372
|
+
} else {
|
|
14373
|
+
Blitter.blitTexture(engine, sourceTexture, renderTarget, 0, viewport, this._sRGBmaterial);
|
|
14369
14374
|
}
|
|
14370
14375
|
};
|
|
14371
14376
|
_proto.release = function release() {
|