Test_Project_Cocos/cocos-enhance-kit
1
0
Fork 0
mirror of https://github.com/smallmain/cocos-enhance-kit.git synced 2025-04-12 06:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: This should be '>=' instead of '==='

Browse Source
This commit is contained in:
段旭东 2024-12-26 13:56:15 +08:00 committed by SmallMain
parent 070d510578
commit 5277bb6fca
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engine/cocos2d/core/renderer/utils/label/letter-font.js
View File

@ -162,7 +162,7 @@ cc.js.mixin(LetterAtlas.prototype, {
for (let i = 0; i < this.frees.length; i++) {
const freeLetter = this.frees[i];
if (freeLetter._width === width && freeLetter._height === height) {
if (freeLetter._width >= width && freeLetter._height >= height) {
areaFit = freeLetter._width * freeLetter._height - width * height;
if (areaFit < score) {
original = freeLetter;
@ -235,7 +235,7 @@ cc.js.mixin(LetterAtlas.prototype, {
this._texture.drawTextureAt(texture, this._x, this._y);
this._dirty = true;
let letter = new FontLetterDefinition();
letter.u = this._x + bleed / 2;
letter.v = this._y + bleed / 2;
@ -255,7 +255,7 @@ cc.js.mixin(LetterAtlas.prototype, {
this._x += width + space;
this._atlases._fontDefDictionary.addLetterDefinitions(letterTexture._hash, letter);
return letter
},
@ -331,7 +331,7 @@ class LetterAtlases {
* 所有获取过的字符集合
*/
letterCache = null;
/**
* 是否记录所有获取过的字符
*/
@ -479,8 +479,8 @@ class LetterAtlases {
return letter;
}
cacheLetter(info) {
textUtils.applyMeasureCache({ [textUtils.computeHash(info.char, info.fontDesc)]: info.measure });
shareLabelInfo.hash = info.hash;
@ -492,8 +492,8 @@ class LetterAtlases {
shareLabelInfo.isOutlined = info.isOutlined;
this.getLetterDefinitionForChar(info.char, shareLabelInfo);
}
getLetterCache() {
const arr = [];
for (const key in this.letterCache) {
@ -502,8 +502,8 @@ class LetterAtlases {
}
return arr;
}
applyLetterCache(data) {
for (const cache of data) {
this.cacheLetter(cache);
@ -554,7 +554,7 @@ function computeHash (labelInfo) {
if (labelInfo.isOutlined && labelInfo.margin > 0) {
out = out + labelInfo.margin + labelInfo.out.toHEX();
}
return hashData + labelInfo.fontSize + labelInfo.fontFamily + color + out;
}
@ -590,7 +590,7 @@ export default class LetterFontAssembler extends WebglBmfontAssembler {
_shareAtlas = new LetterAtlases();
cc.Label._shareAtlas = _shareAtlas;
}
return _shareAtlas.getTexture();
}