From d86feb9eae8847ca6110d737ba04fee4eee209f4 Mon Sep 17 00:00:00 2001 From: ChiaNing Date: Sun, 25 Apr 2021 21:08:33 +0800 Subject: [PATCH] name change (#8554) --- cocos/2d/assembler/label/bmfont.ts | 8 ++++---- cocos/2d/assembler/sprite/bar-filled.ts | 8 ++++---- cocos/2d/assembler/sprite/radial-filled.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cocos/2d/assembler/label/bmfont.ts b/cocos/2d/assembler/label/bmfont.ts index ac227356cc..cbacca768c 100644 --- a/cocos/2d/assembler/label/bmfont.ts +++ b/cocos/2d/assembler/label/bmfont.ts @@ -37,7 +37,7 @@ import { IAssembler } from '../../renderer/base'; import { fillMeshVertices3D } from '../utils'; import { bmfontUtils } from './bmfontUtils'; -const COLOR = new Color(255, 255, 255, 255); +const tempColor = new Color(255, 255, 255, 255); /** * bmfont 组装器 @@ -51,9 +51,9 @@ export const bmfont: IAssembler = { fillBuffers (comp: Label, renderer: Batcher2D) { const node = comp.node; comp._setCacheAlpha(node._uiProps.opacity); - COLOR.set(comp.color); - COLOR.a = node._uiProps.opacity * 255; - fillMeshVertices3D(node, renderer, comp.renderData!, COLOR); + tempColor.set(comp.color); + tempColor.a = node._uiProps.opacity * 255; + fillMeshVertices3D(node, renderer, comp.renderData!, tempColor); }, appendQuad (comp: Label, spriteFrame: SpriteFrame, rect: Rect, rotated: boolean, x: number, y: number, scale: number) { diff --git a/cocos/2d/assembler/sprite/bar-filled.ts b/cocos/2d/assembler/sprite/bar-filled.ts index 22786a7b5b..199b6e00c4 100644 --- a/cocos/2d/assembler/sprite/bar-filled.ts +++ b/cocos/2d/assembler/sprite/bar-filled.ts @@ -39,7 +39,7 @@ import { dynamicAtlasManager } from '../../utils/dynamic-atlas/atlas-manager'; const FillType = Sprite.FillType; const matrix = new Mat4(); -const COLOR = new Color(255, 255, 255, 255); +const tempColor = new Color(255, 255, 255, 255); /** * barFilled 组装器 @@ -260,9 +260,9 @@ export const barFilled: IAssembler = { } const node = sprite.node; - COLOR.set(sprite.color); - COLOR.a = node._uiProps.opacity * 255; - fillVerticesWithoutCalc3D(node, renderer, sprite.renderData!, COLOR); + tempColor.set(sprite.color); + tempColor.a = node._uiProps.opacity * 255; + fillVerticesWithoutCalc3D(node, renderer, sprite.renderData!, tempColor); }, updateColor (sprite: Sprite) { diff --git a/cocos/2d/assembler/sprite/radial-filled.ts b/cocos/2d/assembler/sprite/radial-filled.ts index c6576d5e2a..79f338fdb9 100644 --- a/cocos/2d/assembler/sprite/radial-filled.ts +++ b/cocos/2d/assembler/sprite/radial-filled.ts @@ -39,7 +39,7 @@ import { dynamicAtlasManager } from '../../utils/dynamic-atlas/atlas-manager'; const PI_2 = Math.PI * 2; const EPSILON = 1e-6; -const COLOR = new Color(255, 255, 255, 255); +const tempColor = new Color(255, 255, 255, 255); const _vertPos: Vec2[] = [new Vec2(), new Vec2(), new Vec2(), new Vec2()]; const _vertices: number[] = new Array(4); @@ -366,9 +366,9 @@ export const radialFilled: IAssembler = { fillBuffers (comp: Sprite, renderer: Batcher2D) { const node = comp.node; const renderData: RenderData = comp.renderData!; - COLOR.set(comp.color); - COLOR.a = node._uiProps.opacity * 255; - fillVertices3D(node, renderer, renderData, COLOR); + tempColor.set(comp.color); + tempColor.a = node._uiProps.opacity * 255; + fillVertices3D(node, renderer, renderData, tempColor); }, updateColor (sprite: Sprite) {