From eaa0da71cc652fd1378c601db21dc34ed5e44329 Mon Sep 17 00:00:00 2001 From: cary <39078800+caryliu1999@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:08:24 +0800 Subject: [PATCH] Synchronize some changes of 2d engine. (#7608) --- cocos/core/components/ui-base/ui-renderable.ts | 2 +- cocos/ui/assembler/graphics/webgl/graphics-assembler.ts | 2 ++ cocos/ui/assembler/label/ttfUtils.ts | 2 -- cocos/ui/components/ui-opacity.ts | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cocos/core/components/ui-base/ui-renderable.ts b/cocos/core/components/ui-base/ui-renderable.ts index 4e254262d4..8f9de587b0 100644 --- a/cocos/core/components/ui-base/ui-renderable.ts +++ b/cocos/core/components/ui-base/ui-renderable.ts @@ -432,7 +432,7 @@ export class UIRenderable extends RenderableComponent { protected _canRender () { // this.getMaterial(0) !== null still can render is hack for builtin Material - return this.enabled && (this._delegateSrc ? this._delegateSrc.activeInHierarchy : this.enabledInHierarchy); + return this.enabled && (this._delegateSrc ? this._delegateSrc.activeInHierarchy : this.enabledInHierarchy) && this._color.a > 0; } protected _postCanRender () {} diff --git a/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts b/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts index 03294284a1..4233a16192 100644 --- a/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts +++ b/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts @@ -276,6 +276,8 @@ export const graphicsAssembler: IAssembler = { end = pointsLength - 1; } + p1 = p1 || p0; + if (!loop) { // Add cap const dPos = new Point(p1.x, p1.y); diff --git a/cocos/ui/assembler/label/ttfUtils.ts b/cocos/ui/assembler/label/ttfUtils.ts index dcc00236d9..78d6100af5 100644 --- a/cocos/ui/assembler/label/ttfUtils.ts +++ b/cocos/ui/assembler/label/ttfUtils.ts @@ -176,8 +176,6 @@ export const ttfUtils = { _isOutlined = true; _margin = _outlineWidth = outline.width; _outlineColor.set(outline.color); - // TODO: temporary solution, cascade opacity for outline color - _outlineColor.a = _outlineColor.a * comp.color.a / 255.0; } else { _isOutlined = false; diff --git a/cocos/ui/components/ui-opacity.ts b/cocos/ui/components/ui-opacity.ts index 63eda88b5a..295980e451 100644 --- a/cocos/ui/components/ui-opacity.ts +++ b/cocos/ui/components/ui-opacity.ts @@ -5,6 +5,7 @@ import { Component } from '../../core/components/component'; import { ccclass, help, executeInEditMode, executionOrder, menu, editable, serializable } from 'cc.decorator'; +import { clampf } from '../../core/utils/misc'; /** * @en @@ -37,7 +38,7 @@ export class UIOpacity extends Component { if (this._opacity === value) { return; } - + value = clampf(value, 0, 255); this._opacity = value; this.node._uiProps.opacity = value / 255; }