@galacean/engine 1.3.0-beta.8 → 1.3.0
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/browser.js +52 -53
- package/dist/browser.js.map +1 -1
- package/dist/browser.min.js +1 -1
- package/dist/browser.min.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +1 -1
- package/dist/module.js +1 -1
- package/dist/module.js.map +1 -1
- package/package.json +5 -5
package/dist/browser.js
CHANGED
|
@@ -10738,7 +10738,7 @@
|
|
|
10738
10738
|
_this._overrideUpdate = _this.update !== prototype.update;
|
|
10739
10739
|
_this._addResourceReferCount(_this.shaderData, 1);
|
|
10740
10740
|
_this._onTransformChanged = _this._onTransformChanged.bind(_assert_this_initialized(_this));
|
|
10741
|
-
_this.
|
|
10741
|
+
_this._setTransform(entity.transform);
|
|
10742
10742
|
shaderData.enableMacro(exports.Renderer._receiveShadowMacro);
|
|
10743
10743
|
shaderData.setVector4(exports.Renderer._rendererLayerProperty, _this._rendererLayer);
|
|
10744
10744
|
return _this;
|
|
@@ -10865,7 +10865,7 @@
|
|
|
10865
10865
|
* @internal
|
|
10866
10866
|
*/ _proto._onDestroy = function _onDestroy() {
|
|
10867
10867
|
Component1.prototype._onDestroy.call(this);
|
|
10868
|
-
this.
|
|
10868
|
+
this._setTransform(null);
|
|
10869
10869
|
this._addResourceReferCount(this.shaderData, -1);
|
|
10870
10870
|
var materials = this._materials;
|
|
10871
10871
|
for(var i = 0, n = materials.length; i < n; i++){
|
|
@@ -10887,7 +10887,7 @@
|
|
|
10887
10887
|
/**
|
|
10888
10888
|
* @internal
|
|
10889
10889
|
*/ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
|
|
10890
|
-
var worldMatrix = this.
|
|
10890
|
+
var worldMatrix = this._transform.worldMatrix;
|
|
10891
10891
|
if (onlyMVP) {
|
|
10892
10892
|
this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
|
|
10893
10893
|
} else {
|
|
@@ -10926,7 +10926,7 @@
|
|
|
10926
10926
|
Matrix.invert(mvMatrix, mvInvMatrix);
|
|
10927
10927
|
Matrix.invert(worldMatrix, normalMatrix);
|
|
10928
10928
|
normalMatrix.transpose();
|
|
10929
|
-
shaderData.setMatrix(exports.Renderer._localMatrixProperty, this.
|
|
10929
|
+
shaderData.setMatrix(exports.Renderer._localMatrixProperty, this._transform.localMatrix);
|
|
10930
10930
|
shaderData.setMatrix(exports.Renderer._worldMatrixProperty, worldMatrix);
|
|
10931
10931
|
shaderData.setMatrix(exports.Renderer._mvMatrixProperty, mvMatrix);
|
|
10932
10932
|
shaderData.setMatrix(exports.Renderer._mvInvMatrixProperty, mvInvMatrix);
|
|
@@ -10945,13 +10945,11 @@
|
|
|
10945
10945
|
};
|
|
10946
10946
|
/**
|
|
10947
10947
|
* @internal
|
|
10948
|
-
*/ _proto.
|
|
10949
|
-
|
|
10950
|
-
|
|
10951
|
-
|
|
10952
|
-
|
|
10953
|
-
*/ _proto._unRegisterEntityTransformListener = function _unRegisterEntityTransformListener() {
|
|
10954
|
-
this.entity.transform._updateFlagManager.removeListener(this._onTransformChanged);
|
|
10948
|
+
*/ _proto._setTransform = function _setTransform(transform) {
|
|
10949
|
+
var _this__transform, _transform;
|
|
10950
|
+
(_this__transform = this._transform) == null ? void 0 : _this__transform._updateFlagManager.removeListener(this._onTransformChanged);
|
|
10951
|
+
(_transform = transform) == null ? void 0 : _transform._updateFlagManager.addListener(this._onTransformChanged);
|
|
10952
|
+
this._transform = transform;
|
|
10955
10953
|
};
|
|
10956
10954
|
/**
|
|
10957
10955
|
* @internal
|
|
@@ -11123,6 +11121,9 @@
|
|
|
11123
11121
|
__decorate$1([
|
|
11124
11122
|
ignoreClone
|
|
11125
11123
|
], exports.Renderer.prototype, "_rendererLayer", void 0);
|
|
11124
|
+
__decorate$1([
|
|
11125
|
+
ignoreClone
|
|
11126
|
+
], exports.Renderer.prototype, "_transform", void 0);
|
|
11126
11127
|
__decorate$1([
|
|
11127
11128
|
deepClone
|
|
11128
11129
|
], exports.Renderer.prototype, "_shaderData", void 0);
|
|
@@ -13303,7 +13304,8 @@
|
|
|
13303
13304
|
* @param mipLevel - Set mip level the data want to write, only take effect in webgl2.0
|
|
13304
13305
|
*/ _proto.render = function render(cubeFace, mipLevel) {
|
|
13305
13306
|
if (mipLevel === void 0) mipLevel = 0;
|
|
13306
|
-
var
|
|
13307
|
+
var engine = this._engine;
|
|
13308
|
+
var context = engine._renderContext;
|
|
13307
13309
|
var virtualCamera = this._virtualCamera;
|
|
13308
13310
|
var transform = this.entity.transform;
|
|
13309
13311
|
Matrix.multiply(this.projectionMatrix, this.viewMatrix, virtualCamera.viewProjectionMatrix);
|
|
@@ -13324,16 +13326,16 @@
|
|
|
13324
13326
|
this._updateShaderData();
|
|
13325
13327
|
// union scene and camera macro.
|
|
13326
13328
|
ShaderMacroCollection.unionCollection(this.scene._globalShaderMacro, this.shaderData._macroCollection, this._globalShaderMacro);
|
|
13327
|
-
if (mipLevel > 0 && !
|
|
13329
|
+
if (mipLevel > 0 && !engine._hardwareRenderer.isWebGL2) {
|
|
13328
13330
|
mipLevel = 0;
|
|
13329
13331
|
Logger.error("mipLevel only take effect in WebGL2.0");
|
|
13330
13332
|
}
|
|
13331
|
-
var
|
|
13332
|
-
if (this._cameraType !== exports.CameraType.Normal) {
|
|
13333
|
-
|
|
13333
|
+
var ignoreClearFlags;
|
|
13334
|
+
if (this._cameraType !== exports.CameraType.Normal && !this._renderTarget && !this.independentCanvasEnabled) {
|
|
13335
|
+
ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
|
|
13334
13336
|
}
|
|
13335
|
-
this._renderPipeline.render(context, cubeFace, mipLevel,
|
|
13336
|
-
|
|
13337
|
+
this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
|
|
13338
|
+
engine._renderCount++;
|
|
13337
13339
|
};
|
|
13338
13340
|
_proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
|
|
13339
13341
|
if (failureStrategy === void 0) failureStrategy = exports.ReplacementFailureStrategy.KeepOriginalShader;
|
|
@@ -23021,9 +23023,7 @@
|
|
|
23021
23023
|
/**
|
|
23022
23024
|
* @internal
|
|
23023
23025
|
*/ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
|
|
23024
|
-
var
|
|
23025
|
-
var _this_skin_rootBone;
|
|
23026
|
-
var worldMatrix = ((_this_skin_rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone) != null ? _this_skin_rootBone : this.entity).transform.worldMatrix;
|
|
23026
|
+
var worldMatrix = this._transform.worldMatrix;
|
|
23027
23027
|
if (onlyMVP) {
|
|
23028
23028
|
this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
|
|
23029
23029
|
} else {
|
|
@@ -23108,7 +23108,7 @@
|
|
|
23108
23108
|
var _this_skin;
|
|
23109
23109
|
var rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone;
|
|
23110
23110
|
if (rootBone) {
|
|
23111
|
-
BoundingBox.transform(this._localBounds,
|
|
23111
|
+
BoundingBox.transform(this._localBounds, this._transform.worldMatrix, worldBounds);
|
|
23112
23112
|
} else {
|
|
23113
23113
|
MeshRenderer1.prototype._updateBounds.call(this, worldBounds);
|
|
23114
23114
|
}
|
|
@@ -23149,6 +23149,7 @@
|
|
|
23149
23149
|
}
|
|
23150
23150
|
break;
|
|
23151
23151
|
case SkinUpdateFlag.RootBoneChanged:
|
|
23152
|
+
this._setTransform(value.transform);
|
|
23152
23153
|
this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
|
|
23153
23154
|
break;
|
|
23154
23155
|
}
|
|
@@ -24228,12 +24229,11 @@
|
|
|
24228
24229
|
var _this__subAssetPromiseCallbacks_assetBaseURL;
|
|
24229
24230
|
var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
|
|
24230
24231
|
if (subPromiseCallback) {
|
|
24231
|
-
// Already resolved
|
|
24232
24232
|
subPromiseCallback.resolve(value);
|
|
24233
24233
|
} else {
|
|
24234
24234
|
var _this__subAssetPromiseCallbacks, _assetBaseURL;
|
|
24235
24235
|
((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
|
|
24236
|
-
|
|
24236
|
+
resolvedValue: value
|
|
24237
24237
|
};
|
|
24238
24238
|
}
|
|
24239
24239
|
};
|
|
@@ -24243,12 +24243,11 @@
|
|
|
24243
24243
|
var _this__subAssetPromiseCallbacks_assetBaseURL;
|
|
24244
24244
|
var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
|
|
24245
24245
|
if (subPromiseCallback) {
|
|
24246
|
-
// Already rejected
|
|
24247
24246
|
subPromiseCallback.reject(value);
|
|
24248
24247
|
} else {
|
|
24249
24248
|
var _this__subAssetPromiseCallbacks, _assetBaseURL;
|
|
24250
24249
|
((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
|
|
24251
|
-
|
|
24250
|
+
rejectedValue: value
|
|
24252
24251
|
};
|
|
24253
24252
|
}
|
|
24254
24253
|
};
|
|
@@ -24429,32 +24428,32 @@
|
|
|
24429
24428
|
var _this__subAssetPromiseCallbacks_assetBaseURL, _subPromiseCallback, _subPromiseCallback1;
|
|
24430
24429
|
var loadingPromises = this._loadingPromises;
|
|
24431
24430
|
var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
|
|
24432
|
-
var resolvedValue = (_subPromiseCallback = subPromiseCallback) == null ? void 0 : _subPromiseCallback.
|
|
24433
|
-
var rejectedValue = (_subPromiseCallback1 = subPromiseCallback) == null ? void 0 : _subPromiseCallback1.
|
|
24434
|
-
|
|
24435
|
-
|
|
24436
|
-
|
|
24437
|
-
|
|
24438
|
-
|
|
24439
|
-
|
|
24440
|
-
|
|
24441
|
-
|
|
24442
|
-
var _this__subAssetPromiseCallbacks, _assetBaseURL;
|
|
24443
|
-
// Pending
|
|
24444
|
-
loadingPromises[assetURL] = promise;
|
|
24445
|
-
((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
|
|
24446
|
-
resolve: resolve,
|
|
24447
|
-
reject: reject
|
|
24448
|
-
};
|
|
24449
|
-
}
|
|
24450
|
-
});
|
|
24451
|
-
if (!resolvedValue && !rejectedValue) {
|
|
24452
|
-
promise.then(function() {
|
|
24453
|
-
delete loadingPromises[assetURL];
|
|
24454
|
-
}, function() {
|
|
24455
|
-
return delete loadingPromises[assetURL];
|
|
24431
|
+
var resolvedValue = (_subPromiseCallback = subPromiseCallback) == null ? void 0 : _subPromiseCallback.resolvedValue;
|
|
24432
|
+
var rejectedValue = (_subPromiseCallback1 = subPromiseCallback) == null ? void 0 : _subPromiseCallback1.rejectedValue;
|
|
24433
|
+
// Already resolved or rejected
|
|
24434
|
+
if (resolvedValue || rejectedValue) {
|
|
24435
|
+
return new AssetPromise(function(resolve, reject) {
|
|
24436
|
+
if (resolvedValue) {
|
|
24437
|
+
resolve(resolvedValue);
|
|
24438
|
+
} else if (rejectedValue) {
|
|
24439
|
+
reject(rejectedValue);
|
|
24440
|
+
}
|
|
24456
24441
|
});
|
|
24457
24442
|
}
|
|
24443
|
+
// Pending
|
|
24444
|
+
var promise = new AssetPromise(function(resolve, reject) {
|
|
24445
|
+
var _this__subAssetPromiseCallbacks, _assetBaseURL;
|
|
24446
|
+
((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
|
|
24447
|
+
resolve: resolve,
|
|
24448
|
+
reject: reject
|
|
24449
|
+
};
|
|
24450
|
+
});
|
|
24451
|
+
loadingPromises[assetURL] = promise;
|
|
24452
|
+
promise.then(function() {
|
|
24453
|
+
delete loadingPromises[assetURL];
|
|
24454
|
+
}, function() {
|
|
24455
|
+
return delete loadingPromises[assetURL];
|
|
24456
|
+
});
|
|
24458
24457
|
return promise;
|
|
24459
24458
|
};
|
|
24460
24459
|
_proto._gc = function _gc(forceDestroy) {
|
|
@@ -27914,7 +27913,7 @@
|
|
|
27914
27913
|
};
|
|
27915
27914
|
/**
|
|
27916
27915
|
* @internal
|
|
27917
|
-
*/ _proto.
|
|
27916
|
+
*/ _proto._getCameraIgnoreClearFlags = function _getCameraIgnoreClearFlags(type) {
|
|
27918
27917
|
return exports.CameraClearFlags.None;
|
|
27919
27918
|
};
|
|
27920
27919
|
return XRManager;
|
|
@@ -33035,7 +33034,7 @@
|
|
|
33035
33034
|
*/ _proto.setParameterValue = function setParameterValue(name1, value) {
|
|
33036
33035
|
var _this__animatorController;
|
|
33037
33036
|
var parameter = (_this__animatorController = this._animatorController) == null ? void 0 : _this__animatorController._parametersMap[name1];
|
|
33038
|
-
if (parameter
|
|
33037
|
+
if (parameter) {
|
|
33039
33038
|
this._parametersValueMap[name1] = value;
|
|
33040
33039
|
}
|
|
33041
33040
|
};
|
|
@@ -48031,7 +48030,7 @@
|
|
|
48031
48030
|
], KHR_materials_anisotropy);
|
|
48032
48031
|
|
|
48033
48032
|
//@ts-ignore
|
|
48034
|
-
var version = "1.3.0
|
|
48033
|
+
var version = "1.3.0";
|
|
48035
48034
|
console.log("Galacean engine version: " + version);
|
|
48036
48035
|
for(var key in CoreObjects){
|
|
48037
48036
|
Loader.registerClass(key, CoreObjects[key]);
|