From fd2d1a1bc2c2e40cbd2720929cd31d4d64cc9129 Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Thu, 16 Mar 2017 10:03:14 +0800 Subject: [PATCH] use font asset as cache --- cocos2d/core/assets/CCBitmapFont.js | 4 +++- cocos2d/core/components/CCLabel.js | 2 +- cocos2d/core/label/CCSGLabel.js | 12 +++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cocos2d/core/assets/CCBitmapFont.js b/cocos2d/core/assets/CCBitmapFont.js index 7ef7ca02fb..6007c5ef48 100644 --- a/cocos2d/core/assets/CCBitmapFont.js +++ b/cocos2d/core/assets/CCBitmapFont.js @@ -49,7 +49,9 @@ var BitmapFont = cc.Class({ fontSize: { default: -1 - } + }, + //用来缓存 BitmapFont 解析之后的数据 + _fntConfig: null } }); diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 9616f1508a..5100aa9b1f 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -493,7 +493,7 @@ var Label = cc.Class({ if (CC_JSB) { sgNode = this._sgNode = new _ccsg.Label(this.string, this.font.fntDataStr, this.font.spriteFrame); } else { - sgNode = this._sgNode = new _ccsg.Label(this.string, this.font.fntDataStr, this.font.spriteFrame, this.font._uuid); + sgNode = this._sgNode = new _ccsg.Label(this.string, this.font.fntDataStr, this.font.spriteFrame, this.font); } } else { cc.warnID(4011, this.font.name); diff --git a/cocos2d/core/label/CCSGLabel.js b/cocos2d/core/label/CCSGLabel.js index 2be71ca8d5..fdf73d3fa1 100644 --- a/cocos2d/core/label/CCSGLabel.js +++ b/cocos2d/core/label/CCSGLabel.js @@ -26,8 +26,6 @@ var EventTarget = require("../cocos2d/core/event/event-target"); -cc.BMFontCache = {}; - var FntLoader = { INFO_EXP: /info [^\n]*(\n|$)/gi, COMMON_EXP: /common [^\n]*(\n|$)/gi, @@ -231,10 +229,10 @@ _ccsg.Label = _ccsg.Node.extend({ _isBold: false, _isItalic: false, _isUnderline: false, - _bmfontUUID: "", + _fontAsset: null, //fontHandle it is a system font name, ttf file path or bmfont file path. - ctor: function(string, fontHandle, spriteFrame, bmfontUUID) { + ctor: function(string, fontHandle, spriteFrame, fontAsset) { EventTarget.call(this); fontHandle = fontHandle || ""; @@ -244,7 +242,7 @@ _ccsg.Label = _ccsg.Node.extend({ } this._string = string; - this._bmfontUUID = bmfontUUID; + this._fontAsset = fontAsset; _ccsg.Node.prototype.ctor.call(this); this.setAnchorPoint(cc.p(0.5, 0.5)); _ccsg.Node.prototype.setContentSize.call(this, cc.size(128, 128)); @@ -1304,12 +1302,12 @@ cc.BMFontHelper = { var self = this; this._resetBMFont(); - var fntConfig = cc.BMFontCache[this._bmfontUUID]; + var fntConfig = this._fontAsset._fntConfig; if (fntConfig) { self._config = fntConfig; } else { self._config = FntLoader.parseFnt(fntDataStr); - cc.BMFontCache[this._bmfontUUID] = self._config; + this._fontAsset._fntConfig = self._config; } self._createFontChars(); self._spriteFrame = spriteFrame;