@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/main.js
CHANGED
|
@@ -4231,12 +4231,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
4231
4231
|
this._hookResource._addReferCount(-1);
|
|
4232
4232
|
this._hookResource = null;
|
|
4233
4233
|
}
|
|
4234
|
-
this.isActive = false;
|
|
4235
|
-
if (this._isRoot) {
|
|
4236
|
-
this._scene.removeRootEntity(this);
|
|
4237
|
-
} else {
|
|
4238
|
-
this._setParent(null);
|
|
4239
|
-
}
|
|
4240
4234
|
var components = this._components;
|
|
4241
4235
|
for(var i = components.length - 1; i >= 0; i--){
|
|
4242
4236
|
components[i].destroy();
|
|
@@ -4246,6 +4240,12 @@ var ComponentCloner = /*#__PURE__*/ function() {
|
|
|
4246
4240
|
while(children.length > 0){
|
|
4247
4241
|
children[0].destroy();
|
|
4248
4242
|
}
|
|
4243
|
+
if (this._isRoot) {
|
|
4244
|
+
this._scene.removeRootEntity(this);
|
|
4245
|
+
} else {
|
|
4246
|
+
this._setParent(null);
|
|
4247
|
+
}
|
|
4248
|
+
this.isActive = false;
|
|
4249
4249
|
};
|
|
4250
4250
|
/**
|
|
4251
4251
|
* @internal
|
|
@@ -6228,6 +6228,12 @@ var ShaderFactory = /*#__PURE__*/ function() {
|
|
|
6228
6228
|
};
|
|
6229
6229
|
return BlendState;
|
|
6230
6230
|
}();
|
|
6231
|
+
__decorate([
|
|
6232
|
+
deepClone
|
|
6233
|
+
], BlendState.prototype, "targetBlendState", void 0);
|
|
6234
|
+
__decorate([
|
|
6235
|
+
deepClone
|
|
6236
|
+
], BlendState.prototype, "blendColor", void 0);
|
|
6231
6237
|
|
|
6232
6238
|
/**
|
|
6233
6239
|
* Depth state.
|
|
@@ -6610,6 +6616,18 @@ var ShaderFactory = /*#__PURE__*/ function() {
|
|
|
6610
6616
|
};
|
|
6611
6617
|
return RenderState;
|
|
6612
6618
|
}();
|
|
6619
|
+
__decorate([
|
|
6620
|
+
deepClone
|
|
6621
|
+
], RenderState.prototype, "blendState", void 0);
|
|
6622
|
+
__decorate([
|
|
6623
|
+
deepClone
|
|
6624
|
+
], RenderState.prototype, "depthState", void 0);
|
|
6625
|
+
__decorate([
|
|
6626
|
+
deepClone
|
|
6627
|
+
], RenderState.prototype, "stencilState", void 0);
|
|
6628
|
+
__decorate([
|
|
6629
|
+
deepClone
|
|
6630
|
+
], RenderState.prototype, "rasterState", void 0);
|
|
6613
6631
|
|
|
6614
6632
|
/**
|
|
6615
6633
|
* Shader for rendering.
|
|
@@ -12327,7 +12345,7 @@ var SpriteMaskBatcher = /*#__PURE__*/ function(Basic2DBatcher1) {
|
|
|
12327
12345
|
program.uploadAll(program.rendererUniformBlock, renderer.shaderData);
|
|
12328
12346
|
program.uploadAll(program.materialUniformBlock, material.shaderData);
|
|
12329
12347
|
material.renderState._apply(engine, false, pass._renderStateDataMap, material.shaderData);
|
|
12330
|
-
engine._hardwareRenderer.drawPrimitive(mesh, subMesh, program);
|
|
12348
|
+
engine._hardwareRenderer.drawPrimitive(mesh._primitive, subMesh, program);
|
|
12331
12349
|
}
|
|
12332
12350
|
};
|
|
12333
12351
|
return SpriteMaskBatcher;
|
|
@@ -16938,7 +16956,7 @@ ShaderPool.init();
|
|
|
16938
16956
|
program.uploadAll(program.materialUniformBlock, materialShaderData);
|
|
16939
16957
|
program.uploadUnGroupTextures();
|
|
16940
16958
|
renderState._apply(engine, false, pass._renderStateDataMap, materialShaderData);
|
|
16941
|
-
rhi.drawPrimitive(mesh, mesh.subMesh, program);
|
|
16959
|
+
rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
|
|
16942
16960
|
cameraShaderData.setMatrix(RenderContext.vpMatrixProperty, originViewProjMatrix);
|
|
16943
16961
|
};
|
|
16944
16962
|
_create_class(Sky, [
|
|
@@ -20321,7 +20339,7 @@ var /**
|
|
|
20321
20339
|
program.uploadAll(program.materialUniformBlock, material.shaderData);
|
|
20322
20340
|
program.uploadUnGroupTextures();
|
|
20323
20341
|
(pass._renderState || material.renderState)._apply(engine, false, pass._renderStateDataMap, material.shaderData);
|
|
20324
|
-
rhi.drawPrimitive(mesh, mesh.subMesh, program);
|
|
20342
|
+
rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
|
|
20325
20343
|
};
|
|
20326
20344
|
_proto._callRender = function _callRender(context) {
|
|
20327
20345
|
var engine = context.camera.engine;
|
|
@@ -26175,7 +26193,6 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
26175
26193
|
var state = playState.state;
|
|
26176
26194
|
var clipDuration = state.clip.length;
|
|
26177
26195
|
if (this.speed * state.speed >= 0) {
|
|
26178
|
-
console.log(999, clipTime, lastClipTime);
|
|
26179
26196
|
if (clipTime < lastClipTime) {
|
|
26180
26197
|
this._checkSubTransition(playState, transitions, layerIndex, lastClipTime, state.clipEndTime * clipDuration);
|
|
26181
26198
|
playState.currentTransitionIndex = 0;
|