@galacean/engine-core 1.1.0-beta.0 → 1.1.0-beta.2
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 +27 -10
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +27 -10
- package/dist/module.js +27 -10
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
package/dist/miniprogram.js
CHANGED
|
@@ -4232,12 +4232,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
4232
4232
|
this._hookResource._addReferCount(-1);
|
|
4233
4233
|
this._hookResource = null;
|
|
4234
4234
|
}
|
|
4235
|
-
this.isActive = false;
|
|
4236
|
-
if (this._isRoot) {
|
|
4237
|
-
this._scene.removeRootEntity(this);
|
|
4238
|
-
} else {
|
|
4239
|
-
this._setParent(null);
|
|
4240
|
-
}
|
|
4241
4235
|
var components = this._components;
|
|
4242
4236
|
for(var i = components.length - 1; i >= 0; i--){
|
|
4243
4237
|
components[i].destroy();
|
|
@@ -4247,6 +4241,12 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
4247
4241
|
while(children.length > 0){
|
|
4248
4242
|
children[0].destroy();
|
|
4249
4243
|
}
|
|
4244
|
+
if (this._isRoot) {
|
|
4245
|
+
this._scene.removeRootEntity(this);
|
|
4246
|
+
} else {
|
|
4247
|
+
this._setParent(null);
|
|
4248
|
+
}
|
|
4249
|
+
this.isActive = false;
|
|
4250
4250
|
};
|
|
4251
4251
|
/**
|
|
4252
4252
|
* @internal
|
|
@@ -6229,6 +6229,12 @@ var ShaderFactory = /*#__PURE__*/ function() {
|
|
|
6229
6229
|
};
|
|
6230
6230
|
return BlendState;
|
|
6231
6231
|
}();
|
|
6232
|
+
__decorate([
|
|
6233
|
+
deepClone
|
|
6234
|
+
], BlendState.prototype, "targetBlendState", void 0);
|
|
6235
|
+
__decorate([
|
|
6236
|
+
deepClone
|
|
6237
|
+
], BlendState.prototype, "blendColor", void 0);
|
|
6232
6238
|
|
|
6233
6239
|
/**
|
|
6234
6240
|
* Depth state.
|
|
@@ -6611,6 +6617,18 @@ var ShaderFactory = /*#__PURE__*/ function() {
|
|
|
6611
6617
|
};
|
|
6612
6618
|
return RenderState;
|
|
6613
6619
|
}();
|
|
6620
|
+
__decorate([
|
|
6621
|
+
deepClone
|
|
6622
|
+
], RenderState.prototype, "blendState", void 0);
|
|
6623
|
+
__decorate([
|
|
6624
|
+
deepClone
|
|
6625
|
+
], RenderState.prototype, "depthState", void 0);
|
|
6626
|
+
__decorate([
|
|
6627
|
+
deepClone
|
|
6628
|
+
], RenderState.prototype, "stencilState", void 0);
|
|
6629
|
+
__decorate([
|
|
6630
|
+
deepClone
|
|
6631
|
+
], RenderState.prototype, "rasterState", void 0);
|
|
6614
6632
|
|
|
6615
6633
|
/**
|
|
6616
6634
|
* Shader for rendering.
|
|
@@ -12328,7 +12346,7 @@ var SpriteMaskBatcher = /*#__PURE__*/ function(Basic2DBatcher1) {
|
|
|
12328
12346
|
program.uploadAll(program.rendererUniformBlock, renderer.shaderData);
|
|
12329
12347
|
program.uploadAll(program.materialUniformBlock, material.shaderData);
|
|
12330
12348
|
material.renderState._apply(engine, false, pass._renderStateDataMap, material.shaderData);
|
|
12331
|
-
engine._hardwareRenderer.drawPrimitive(mesh, subMesh, program);
|
|
12349
|
+
engine._hardwareRenderer.drawPrimitive(mesh._primitive, subMesh, program);
|
|
12332
12350
|
}
|
|
12333
12351
|
};
|
|
12334
12352
|
return SpriteMaskBatcher;
|
|
@@ -16939,7 +16957,7 @@ ShaderPool.init();
|
|
|
16939
16957
|
program.uploadAll(program.materialUniformBlock, materialShaderData);
|
|
16940
16958
|
program.uploadUnGroupTextures();
|
|
16941
16959
|
renderState._apply(engine, false, pass._renderStateDataMap, materialShaderData);
|
|
16942
|
-
rhi.drawPrimitive(mesh, mesh.subMesh, program);
|
|
16960
|
+
rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
|
|
16943
16961
|
cameraShaderData.setMatrix(RenderContext.vpMatrixProperty, originViewProjMatrix);
|
|
16944
16962
|
};
|
|
16945
16963
|
_create_class(Sky, [
|
|
@@ -20322,7 +20340,7 @@ var /**
|
|
|
20322
20340
|
program.uploadAll(program.materialUniformBlock, material.shaderData);
|
|
20323
20341
|
program.uploadUnGroupTextures();
|
|
20324
20342
|
(pass._renderState || material.renderState)._apply(engine, false, pass._renderStateDataMap, material.shaderData);
|
|
20325
|
-
rhi.drawPrimitive(mesh, mesh.subMesh, program);
|
|
20343
|
+
rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
|
|
20326
20344
|
};
|
|
20327
20345
|
_proto._callRender = function _callRender(context) {
|
|
20328
20346
|
var engine = context.camera.engine;
|
|
@@ -26176,7 +26194,6 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
26176
26194
|
var state = playState.state;
|
|
26177
26195
|
var clipDuration = state.clip.length;
|
|
26178
26196
|
if (this.speed * state.speed >= 0) {
|
|
26179
|
-
console.log(999, clipTime, lastClipTime);
|
|
26180
26197
|
if (clipTime < lastClipTime) {
|
|
26181
26198
|
this._checkSubTransition(playState, transitions, layerIndex, lastClipTime, state.clipEndTime * clipDuration);
|
|
26182
26199
|
playState.currentTransitionIndex = 0;
|
package/dist/module.js
CHANGED
|
@@ -4227,12 +4227,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
4227
4227
|
this._hookResource._addReferCount(-1);
|
|
4228
4228
|
this._hookResource = null;
|
|
4229
4229
|
}
|
|
4230
|
-
this.isActive = false;
|
|
4231
|
-
if (this._isRoot) {
|
|
4232
|
-
this._scene.removeRootEntity(this);
|
|
4233
|
-
} else {
|
|
4234
|
-
this._setParent(null);
|
|
4235
|
-
}
|
|
4236
4230
|
var components = this._components;
|
|
4237
4231
|
for(var i = components.length - 1; i >= 0; i--){
|
|
4238
4232
|
components[i].destroy();
|
|
@@ -4242,6 +4236,12 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
4242
4236
|
while(children.length > 0){
|
|
4243
4237
|
children[0].destroy();
|
|
4244
4238
|
}
|
|
4239
|
+
if (this._isRoot) {
|
|
4240
|
+
this._scene.removeRootEntity(this);
|
|
4241
|
+
} else {
|
|
4242
|
+
this._setParent(null);
|
|
4243
|
+
}
|
|
4244
|
+
this.isActive = false;
|
|
4245
4245
|
};
|
|
4246
4246
|
/**
|
|
4247
4247
|
* @internal
|
|
@@ -6224,6 +6224,12 @@ var ShaderFactory = /*#__PURE__*/ function() {
|
|
|
6224
6224
|
};
|
|
6225
6225
|
return BlendState;
|
|
6226
6226
|
}();
|
|
6227
|
+
__decorate([
|
|
6228
|
+
deepClone
|
|
6229
|
+
], BlendState.prototype, "targetBlendState", void 0);
|
|
6230
|
+
__decorate([
|
|
6231
|
+
deepClone
|
|
6232
|
+
], BlendState.prototype, "blendColor", void 0);
|
|
6227
6233
|
|
|
6228
6234
|
/**
|
|
6229
6235
|
* Depth state.
|
|
@@ -6606,6 +6612,18 @@ var ShaderFactory = /*#__PURE__*/ function() {
|
|
|
6606
6612
|
};
|
|
6607
6613
|
return RenderState;
|
|
6608
6614
|
}();
|
|
6615
|
+
__decorate([
|
|
6616
|
+
deepClone
|
|
6617
|
+
], RenderState.prototype, "blendState", void 0);
|
|
6618
|
+
__decorate([
|
|
6619
|
+
deepClone
|
|
6620
|
+
], RenderState.prototype, "depthState", void 0);
|
|
6621
|
+
__decorate([
|
|
6622
|
+
deepClone
|
|
6623
|
+
], RenderState.prototype, "stencilState", void 0);
|
|
6624
|
+
__decorate([
|
|
6625
|
+
deepClone
|
|
6626
|
+
], RenderState.prototype, "rasterState", void 0);
|
|
6609
6627
|
|
|
6610
6628
|
/**
|
|
6611
6629
|
* Shader for rendering.
|
|
@@ -12323,7 +12341,7 @@ var SpriteMaskBatcher = /*#__PURE__*/ function(Basic2DBatcher1) {
|
|
|
12323
12341
|
program.uploadAll(program.rendererUniformBlock, renderer.shaderData);
|
|
12324
12342
|
program.uploadAll(program.materialUniformBlock, material.shaderData);
|
|
12325
12343
|
material.renderState._apply(engine, false, pass._renderStateDataMap, material.shaderData);
|
|
12326
|
-
engine._hardwareRenderer.drawPrimitive(mesh, subMesh, program);
|
|
12344
|
+
engine._hardwareRenderer.drawPrimitive(mesh._primitive, subMesh, program);
|
|
12327
12345
|
}
|
|
12328
12346
|
};
|
|
12329
12347
|
return SpriteMaskBatcher;
|
|
@@ -16934,7 +16952,7 @@ ShaderPool.init();
|
|
|
16934
16952
|
program.uploadAll(program.materialUniformBlock, materialShaderData);
|
|
16935
16953
|
program.uploadUnGroupTextures();
|
|
16936
16954
|
renderState._apply(engine, false, pass._renderStateDataMap, materialShaderData);
|
|
16937
|
-
rhi.drawPrimitive(mesh, mesh.subMesh, program);
|
|
16955
|
+
rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
|
|
16938
16956
|
cameraShaderData.setMatrix(RenderContext.vpMatrixProperty, originViewProjMatrix);
|
|
16939
16957
|
};
|
|
16940
16958
|
_create_class(Sky, [
|
|
@@ -20317,7 +20335,7 @@ var /**
|
|
|
20317
20335
|
program.uploadAll(program.materialUniformBlock, material.shaderData);
|
|
20318
20336
|
program.uploadUnGroupTextures();
|
|
20319
20337
|
(pass._renderState || material.renderState)._apply(engine, false, pass._renderStateDataMap, material.shaderData);
|
|
20320
|
-
rhi.drawPrimitive(mesh, mesh.subMesh, program);
|
|
20338
|
+
rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
|
|
20321
20339
|
};
|
|
20322
20340
|
_proto._callRender = function _callRender(context) {
|
|
20323
20341
|
var engine = context.camera.engine;
|
|
@@ -26171,7 +26189,6 @@ var AnimatorLayerBlendingMode;
|
|
|
26171
26189
|
var state = playState.state;
|
|
26172
26190
|
var clipDuration = state.clip.length;
|
|
26173
26191
|
if (this.speed * state.speed >= 0) {
|
|
26174
|
-
console.log(999, clipTime, lastClipTime);
|
|
26175
26192
|
if (clipTime < lastClipTime) {
|
|
26176
26193
|
this._checkSubTransition(playState, transitions, layerIndex, lastClipTime, state.clipEndTime * clipDuration);
|
|
26177
26194
|
playState.currentTransitionIndex = 0;
|