@galacean/engine-ui 2.0.0-alpha.29 → 2.0.0-alpha.31
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 +2 -25
- 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 +2 -25
- package/dist/main.js.map +1 -1
- package/dist/module.js +3 -26
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
package/dist/browser.js
CHANGED
|
@@ -2363,7 +2363,7 @@
|
|
|
2363
2363
|
* @internal
|
|
2364
2364
|
*/ _proto._onRootCanvasModify = function _onRootCanvasModify(flag) {
|
|
2365
2365
|
if (flag === RootCanvasModifyFlags.ReferenceResolutionPerUnit) {
|
|
2366
|
-
this._setDirtyFlagTrue(
|
|
2366
|
+
this._setDirtyFlagTrue(25);
|
|
2367
2367
|
}
|
|
2368
2368
|
};
|
|
2369
2369
|
_proto._updateBounds = function _updateBounds(worldBounds) {
|
|
@@ -3226,10 +3226,6 @@
|
|
|
3226
3226
|
Transition: Transition
|
|
3227
3227
|
});
|
|
3228
3228
|
|
|
3229
|
-
var uiDefaultFs = "#include <common>\nuniform sampler2D renderer_UITexture;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n vec4 baseColor = texture2DSRGB(renderer_UITexture, v_uv);\n vec4 finalColor = baseColor * v_color;\n #ifdef ENGINE_SHOULD_SRGB_CORRECT\n finalColor = outputSRGBCorrection(finalColor);\n #endif\n gl_FragColor = finalColor;\n}"; // eslint-disable-line
|
|
3230
|
-
|
|
3231
|
-
var uiDefaultVs = "uniform mat4 renderer_MVPMat;\n\nattribute vec3 POSITION;\nattribute vec2 TEXCOORD_0;\nattribute vec4 COLOR_0;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n gl_Position = renderer_MVPMat * vec4(POSITION, 1.0);\n\n v_uv = TEXCOORD_0;\n v_color = COLOR_0;\n}\n"; // eslint-disable-line
|
|
3232
|
-
|
|
3233
3229
|
/**
|
|
3234
3230
|
* @internal
|
|
3235
3231
|
*/ var UIHitResult = function UIHitResult() {
|
|
@@ -3480,17 +3476,6 @@
|
|
|
3480
3476
|
var shader = _getOrCreateUIShader();
|
|
3481
3477
|
// @ts-ignore
|
|
3482
3478
|
var material = new engine.Material(this, shader);
|
|
3483
|
-
var renderState = material.renderState;
|
|
3484
|
-
var target = renderState.blendState.targetBlendState;
|
|
3485
|
-
target.enabled = true;
|
|
3486
|
-
target.sourceColorBlendFactor = engine.BlendFactor.SourceAlpha;
|
|
3487
|
-
target.destinationColorBlendFactor = engine.BlendFactor.OneMinusSourceAlpha;
|
|
3488
|
-
target.sourceAlphaBlendFactor = engine.BlendFactor.One;
|
|
3489
|
-
target.destinationAlphaBlendFactor = engine.BlendFactor.OneMinusSourceAlpha;
|
|
3490
|
-
target.colorBlendOperation = target.alphaBlendOperation = engine.BlendOperation.Add;
|
|
3491
|
-
renderState.depthState.writeEnabled = false;
|
|
3492
|
-
renderState.rasterState.cullMode = engine.CullMode.Off;
|
|
3493
|
-
renderState.renderQueueType = engine.RenderQueueType.Transparent;
|
|
3494
3479
|
material.isGCIgnored = true;
|
|
3495
3480
|
this._uiDefaultMaterial = material;
|
|
3496
3481
|
}
|
|
@@ -3535,15 +3520,7 @@
|
|
|
3535
3520
|
_getOrCreateUIShader();
|
|
3536
3521
|
}
|
|
3537
3522
|
function _getOrCreateUIShader() {
|
|
3538
|
-
|
|
3539
|
-
if (!shader) {
|
|
3540
|
-
shader = engine.Shader.create("ui", [
|
|
3541
|
-
new engine.ShaderPass("Forward", uiDefaultVs, uiDefaultFs, {
|
|
3542
|
-
pipelineStage: engine.PipelineStage.Forward
|
|
3543
|
-
})
|
|
3544
|
-
]);
|
|
3545
|
-
}
|
|
3546
|
-
return shader;
|
|
3523
|
+
return engine.Shader.find("2D/UIDefault");
|
|
3547
3524
|
}
|
|
3548
3525
|
|
|
3549
3526
|
exports.Button = Button;
|