@galacean/engine-core 1.3.0-beta.9 → 1.3.1

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 CHANGED
@@ -5892,7 +5892,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
5892
5892
  _this._overrideUpdate = _this.update !== prototype.update;
5893
5893
  _this._addResourceReferCount(_this.shaderData, 1);
5894
5894
  _this._onTransformChanged = _this._onTransformChanged.bind(_assert_this_initialized(_this));
5895
- _this._registerEntityTransformListener();
5895
+ _this._setTransform(entity.transform);
5896
5896
  shaderData.enableMacro(exports.Renderer._receiveShadowMacro);
5897
5897
  shaderData.setVector4(exports.Renderer._rendererLayerProperty, _this._rendererLayer);
5898
5898
  return _this;
@@ -6018,7 +6018,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
6018
6018
  * @internal
6019
6019
  */ _proto._onDestroy = function _onDestroy() {
6020
6020
  Component1.prototype._onDestroy.call(this);
6021
- this._unRegisterEntityTransformListener();
6021
+ this._setTransform(null);
6022
6022
  this._addResourceReferCount(this.shaderData, -1);
6023
6023
  var materials = this._materials;
6024
6024
  for(var i = 0, n = materials.length; i < n; i++){
@@ -6040,7 +6040,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
6040
6040
  /**
6041
6041
  * @internal
6042
6042
  */ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
6043
- var worldMatrix = this.entity.transform.worldMatrix;
6043
+ var worldMatrix = this._transform.worldMatrix;
6044
6044
  if (onlyMVP) {
6045
6045
  this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
6046
6046
  } else {
@@ -6079,7 +6079,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
6079
6079
  engineMath.Matrix.invert(mvMatrix, mvInvMatrix);
6080
6080
  engineMath.Matrix.invert(worldMatrix, normalMatrix);
6081
6081
  normalMatrix.transpose();
6082
- shaderData.setMatrix(exports.Renderer._localMatrixProperty, this.entity.transform.localMatrix);
6082
+ shaderData.setMatrix(exports.Renderer._localMatrixProperty, this._transform.localMatrix);
6083
6083
  shaderData.setMatrix(exports.Renderer._worldMatrixProperty, worldMatrix);
6084
6084
  shaderData.setMatrix(exports.Renderer._mvMatrixProperty, mvMatrix);
6085
6085
  shaderData.setMatrix(exports.Renderer._mvInvMatrixProperty, mvInvMatrix);
@@ -6098,13 +6098,11 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
6098
6098
  };
6099
6099
  /**
6100
6100
  * @internal
6101
- */ _proto._registerEntityTransformListener = function _registerEntityTransformListener() {
6102
- this.entity.transform._updateFlagManager.addListener(this._onTransformChanged);
6103
- };
6104
- /**
6105
- * @internal
6106
- */ _proto._unRegisterEntityTransformListener = function _unRegisterEntityTransformListener() {
6107
- this.entity.transform._updateFlagManager.removeListener(this._onTransformChanged);
6101
+ */ _proto._setTransform = function _setTransform(transform) {
6102
+ var _this__transform, _transform;
6103
+ (_this__transform = this._transform) == null ? void 0 : _this__transform._updateFlagManager.removeListener(this._onTransformChanged);
6104
+ (_transform = transform) == null ? void 0 : _transform._updateFlagManager.addListener(this._onTransformChanged);
6105
+ this._transform = transform;
6108
6106
  };
6109
6107
  /**
6110
6108
  * @internal
@@ -6276,6 +6274,9 @@ __decorate([
6276
6274
  __decorate([
6277
6275
  ignoreClone
6278
6276
  ], exports.Renderer.prototype, "_rendererLayer", void 0);
6277
+ __decorate([
6278
+ ignoreClone
6279
+ ], exports.Renderer.prototype, "_transform", void 0);
6279
6280
  __decorate([
6280
6281
  deepClone
6281
6282
  ], exports.Renderer.prototype, "_shaderData", void 0);
@@ -8483,7 +8484,8 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
8483
8484
  * @param mipLevel - Set mip level the data want to write, only take effect in webgl2.0
8484
8485
  */ _proto.render = function render(cubeFace, mipLevel) {
8485
8486
  if (mipLevel === void 0) mipLevel = 0;
8486
- var context = this.engine._renderContext;
8487
+ var engine = this._engine;
8488
+ var context = engine._renderContext;
8487
8489
  var virtualCamera = this._virtualCamera;
8488
8490
  var transform = this.entity.transform;
8489
8491
  engineMath.Matrix.multiply(this.projectionMatrix, this.viewMatrix, virtualCamera.viewProjectionMatrix);
@@ -8504,16 +8506,16 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
8504
8506
  this._updateShaderData();
8505
8507
  // union scene and camera macro.
8506
8508
  ShaderMacroCollection.unionCollection(this.scene._globalShaderMacro, this.shaderData._macroCollection, this._globalShaderMacro);
8507
- if (mipLevel > 0 && !this.engine._hardwareRenderer.isWebGL2) {
8509
+ if (mipLevel > 0 && !engine._hardwareRenderer.isWebGL2) {
8508
8510
  mipLevel = 0;
8509
8511
  Logger.error("mipLevel only take effect in WebGL2.0");
8510
8512
  }
8511
- var clearMask;
8512
- if (this._cameraType !== exports.CameraType.Normal) {
8513
- clearMask = this.engine.xrManager._getCameraClearFlagsMask(this._cameraType);
8513
+ var ignoreClearFlags;
8514
+ if (this._cameraType !== exports.CameraType.Normal && !this._renderTarget && !this.independentCanvasEnabled) {
8515
+ ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
8514
8516
  }
8515
- this._renderPipeline.render(context, cubeFace, mipLevel, clearMask);
8516
- this._engine._renderCount++;
8517
+ this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
8518
+ engine._renderCount++;
8517
8519
  };
8518
8520
  _proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
8519
8521
  if (failureStrategy === void 0) failureStrategy = exports.ReplacementFailureStrategy.KeepOriginalShader;
@@ -18275,9 +18277,7 @@ var SkinUpdateFlag;
18275
18277
  /**
18276
18278
  * @internal
18277
18279
  */ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
18278
- var _this_skin;
18279
- var _this_skin_rootBone;
18280
- var worldMatrix = ((_this_skin_rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone) != null ? _this_skin_rootBone : this.entity).transform.worldMatrix;
18280
+ var worldMatrix = this._transform.worldMatrix;
18281
18281
  if (onlyMVP) {
18282
18282
  this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
18283
18283
  } else {
@@ -18362,7 +18362,7 @@ var SkinUpdateFlag;
18362
18362
  var _this_skin;
18363
18363
  var rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone;
18364
18364
  if (rootBone) {
18365
- engineMath.BoundingBox.transform(this._localBounds, rootBone.transform.worldMatrix, worldBounds);
18365
+ engineMath.BoundingBox.transform(this._localBounds, this._transform.worldMatrix, worldBounds);
18366
18366
  } else {
18367
18367
  MeshRenderer1.prototype._updateBounds.call(this, worldBounds);
18368
18368
  }
@@ -18403,6 +18403,7 @@ var SkinUpdateFlag;
18403
18403
  }
18404
18404
  break;
18405
18405
  case SkinUpdateFlag.RootBoneChanged:
18406
+ this._setTransform(value.transform);
18406
18407
  this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
18407
18408
  break;
18408
18409
  }
@@ -23252,7 +23253,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
23252
23253
  };
23253
23254
  /**
23254
23255
  * @internal
23255
- */ _proto._getCameraClearFlagsMask = function _getCameraClearFlagsMask(type) {
23256
+ */ _proto._getCameraIgnoreClearFlags = function _getCameraIgnoreClearFlags(type) {
23256
23257
  return exports.CameraClearFlags.None;
23257
23258
  };
23258
23259
  return XRManager;