@galacean/engine-ui 2.0.0-alpha.30 → 2.0.0-alpha.31

package/dist/module.js

@@ -1,4 +1,4 @@
-import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, TransformModifyFlags, Transform, deepClone, Vector2, Rect, MathUtil, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, Script, CameraModifyFlags, Logger, Signal, SpriteDrawMode, RenderQueueFlags, SpriteModifyFlags, SpriteTileMode, TiledSpriteAssembler, SlicedSpriteAssembler, SimpleSpriteAssembler, BoundingBox, ShaderData, ShaderDataGroup, TextUtils, Engine, TextVerticalAlignment, TextHorizontalAlignment, OverflowMode, CharRenderInfo, FontStyle, ReferResource, registerPointerEventEmitter, PointerEventEmitter, CameraClearFlags, Material, BlendFactor, BlendOperation, CullMode, RenderQueueType, Entity, Loader, Shader, ShaderPass, PipelineStage } from '@galacean/engine';
+import { EntityModifyFlags, ignoreClone, assignmentClone, DisorderedArray, Component, TransformModifyFlags, Transform, deepClone, Vector2, Rect, MathUtil, Vector3, Matrix, Plane, ShaderProperty, dependentComponents, DependentMode, BatchUtils, ShaderMacroCollection, Renderer, Vector4, Color, RendererUpdateFlags, Script, CameraModifyFlags, Logger, Signal, SpriteDrawMode, RenderQueueFlags, SpriteModifyFlags, SpriteTileMode, TiledSpriteAssembler, SlicedSpriteAssembler, SimpleSpriteAssembler, BoundingBox, ShaderData, ShaderDataGroup, TextUtils, Engine, TextVerticalAlignment, TextHorizontalAlignment, OverflowMode, CharRenderInfo, FontStyle, ReferResource, registerPointerEventEmitter, PointerEventEmitter, CameraClearFlags, Material, Entity, Loader, Shader } from '@galacean/engine';
 
 function _defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
@@ -2359,7 +2359,7 @@ __decorate([
    * @internal
    */ _proto._onRootCanvasModify = function _onRootCanvasModify(flag) {
         if (flag === RootCanvasModifyFlags.ReferenceResolutionPerUnit) {
-            this._setDirtyFlagTrue(8);
+            this._setDirtyFlagTrue(25);
         }
     };
     _proto._updateBounds = function _updateBounds(worldBounds) {
@@ -3222,10 +3222,6 @@ var GUIComponent = /*#__PURE__*/Object.freeze({
     Transition: Transition
 });
 
-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
-
-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
-
 /**
  * @internal
  */ var UIHitResult = function UIHitResult() {
@@ -3476,17 +3472,6 @@ var EngineExtension = /*#__PURE__*/ function() {
             var shader = _getOrCreateUIShader();
             // @ts-ignore
             var material = new Material(this, shader);
-            var renderState = material.renderState;
-            var target = renderState.blendState.targetBlendState;
-            target.enabled = true;
-            target.sourceColorBlendFactor = BlendFactor.SourceAlpha;
-            target.destinationColorBlendFactor = BlendFactor.OneMinusSourceAlpha;
-            target.sourceAlphaBlendFactor = BlendFactor.One;
-            target.destinationAlphaBlendFactor = BlendFactor.OneMinusSourceAlpha;
-            target.colorBlendOperation = target.alphaBlendOperation = BlendOperation.Add;
-            renderState.depthState.writeEnabled = false;
-            renderState.rasterState.cullMode = CullMode.Off;
-            renderState.renderQueueType = RenderQueueType.Transparent;
             material.isGCIgnored = true;
             this._uiDefaultMaterial = material;
         }
@@ -3531,15 +3516,7 @@ ApplyMixins(Entity, [
     _getOrCreateUIShader();
 }
 function _getOrCreateUIShader() {
-    var shader = Shader.find("ui");
-    if (!shader) {
-        shader = Shader.create("ui", [
-            new ShaderPass("Forward", uiDefaultVs, uiDefaultFs, {
-                pipelineStage: PipelineStage.Forward
-            })
-        ]);
-    }
-    return shader;
+    return Shader.find("2D/UIDefault");
 }
 
 export { Button, CanvasRenderMode, ColorTransition, EngineExtension, EntityExtension, HorizontalAlignmentMode, Image, ResolutionAdaptationMode, ScaleTransition, SpriteTransition, Text, Transition, UICanvas, UIGroup, UIPointerEventEmitter, UIRenderer, UITransform, VerticalAlignmentMode, registerGUI };