@galacean/engine-core 1.5.14 → 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 +21 -10
- package/dist/main.js.map +1 -1
- package/dist/module.js +21 -10
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/Camera.d.ts +1 -0
- package/types/Entity.d.ts +1 -0
- package/types/postProcess/PostProcessUberPass.d.ts +1 -1
package/dist/main.js
CHANGED
|
@@ -8780,7 +8780,7 @@ exports.Camera = /*#__PURE__*/ function(Component) {
|
|
|
8780
8780
|
Logger.error("mipLevel only take effect in WebGL2.0");
|
|
8781
8781
|
}
|
|
8782
8782
|
var ignoreClearFlags;
|
|
8783
|
-
if (this._cameraType !== CameraType.Normal && !this._renderTarget
|
|
8783
|
+
if (this._cameraType !== CameraType.Normal && !this._renderTarget) {
|
|
8784
8784
|
ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
|
|
8785
8785
|
}
|
|
8786
8786
|
this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
|
|
@@ -8914,6 +8914,9 @@ exports.Camera = /*#__PURE__*/ function(Component) {
|
|
|
8914
8914
|
width = canvas.width;
|
|
8915
8915
|
height = canvas.height;
|
|
8916
8916
|
}
|
|
8917
|
+
this._adjustPixelViewport(width, height);
|
|
8918
|
+
};
|
|
8919
|
+
_proto._adjustPixelViewport = function _adjustPixelViewport(width, height) {
|
|
8917
8920
|
var viewport = this._viewport;
|
|
8918
8921
|
this._pixelViewport.set(viewport.x * width, viewport.y * height, viewport.z * width, viewport.w * height);
|
|
8919
8922
|
!this._customAspectRatio && this._dispatchModify(CameraModifyFlags.AspectRatio);
|
|
@@ -14184,7 +14187,8 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
|
|
|
14184
14187
|
} else {
|
|
14185
14188
|
uberShaderData.disableMacro(TonemappingEffect._enableMacro);
|
|
14186
14189
|
}
|
|
14187
|
-
|
|
14190
|
+
var viewport = destTarget === camera.renderTarget ? camera.viewport : undefined;
|
|
14191
|
+
Blitter.blitTexture(camera.engine, srcTexture, destTarget, 0, viewport, this._uberMaterial, undefined);
|
|
14188
14192
|
};
|
|
14189
14193
|
/**
|
|
14190
14194
|
* @inheritdoc
|
|
@@ -14222,7 +14226,7 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
|
|
|
14222
14226
|
uberShaderData.disableMacro(BloomEffect._hqMacro);
|
|
14223
14227
|
}
|
|
14224
14228
|
uberShaderData.setTexture(BloomEffect._dirtTextureProp, dirtTexture.value);
|
|
14225
|
-
if (dirtTexture) {
|
|
14229
|
+
if (dirtTexture.value) {
|
|
14226
14230
|
uberShaderData.enableMacro(BloomEffect._dirtMacro);
|
|
14227
14231
|
} else {
|
|
14228
14232
|
uberShaderData.disableMacro(BloomEffect._dirtMacro);
|
|
@@ -14365,11 +14369,12 @@ var FXAA3_11 = "//--------------------------------------------------------------
|
|
|
14365
14369
|
var enableFXAA = camera.antiAliasing === AntiAliasing.FXAA;
|
|
14366
14370
|
// Should convert to sRGB when FXAA is enabled or camera's render target is not set
|
|
14367
14371
|
var sourceTexture = this._inputRenderTarget.getColorTexture();
|
|
14368
|
-
var outputRenderTarget = enableFXAA ? this._srgbRenderTarget : renderTarget;
|
|
14369
|
-
Blitter.blitTexture(engine, sourceTexture, outputRenderTarget, 0, viewport, this._sRGBmaterial);
|
|
14370
14372
|
if (enableFXAA) {
|
|
14373
|
+
Blitter.blitTexture(engine, sourceTexture, this._srgbRenderTarget, 0, undefined, this._sRGBmaterial);
|
|
14371
14374
|
var sRGBTexture = this._srgbRenderTarget.getColorTexture();
|
|
14372
14375
|
Blitter.blitTexture(engine, sRGBTexture, renderTarget, 0, viewport, this._antiAliasingMaterial);
|
|
14376
|
+
} else {
|
|
14377
|
+
Blitter.blitTexture(engine, sourceTexture, renderTarget, 0, viewport, this._sRGBmaterial);
|
|
14373
14378
|
}
|
|
14374
14379
|
};
|
|
14375
14380
|
_proto.release = function release() {
|
|
@@ -21697,11 +21702,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
21697
21702
|
], args));
|
|
21698
21703
|
this._components.push(component);
|
|
21699
21704
|
// @todo: temporary solution
|
|
21700
|
-
if (_instanceof(component, Transform))
|
|
21701
|
-
var transform = this._transform;
|
|
21702
|
-
this._transform = component;
|
|
21703
|
-
transform == null ? void 0 : transform.destroy();
|
|
21704
|
-
}
|
|
21705
|
+
if (_instanceof(component, Transform)) this._setTransform(component);
|
|
21705
21706
|
component._setActive(true, ActiveChangeFlag.All);
|
|
21706
21707
|
return component;
|
|
21707
21708
|
};
|
|
@@ -22130,6 +22131,16 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
22130
22131
|
}
|
|
22131
22132
|
}
|
|
22132
22133
|
};
|
|
22134
|
+
_proto._setTransform = function _setTransform(value) {
|
|
22135
|
+
var _this__transform;
|
|
22136
|
+
(_this__transform = this._transform) == null ? void 0 : _this__transform.destroy();
|
|
22137
|
+
this._transform = value;
|
|
22138
|
+
var children = this._children;
|
|
22139
|
+
for(var i = 0, n = children.length; i < n; i++){
|
|
22140
|
+
var _children_i_transform;
|
|
22141
|
+
(_children_i_transform = children[i].transform) == null ? void 0 : _children_i_transform._parentChange();
|
|
22142
|
+
}
|
|
22143
|
+
};
|
|
22133
22144
|
/**
|
|
22134
22145
|
* @deprecated
|
|
22135
22146
|
*/ _proto.getInvModelMatrix = function getInvModelMatrix() {
|