use font asset as cache

This commit is contained in:
zilongshanren
2017-03-16 10:03:14 +08:00
parent 7aa42f1b41
commit fd2d1a1bc2
3 changed files with 9 additions and 9 deletions
+3 -1
View File
@@ -49,7 +49,9 @@ var BitmapFont = cc.Class({
fontSize: {
default: -1
}
},
//用来缓存 BitmapFont 解析之后的数据
_fntConfig: null
}
});
+1 -1
View File
@@ -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);
+5 -7
View File
@@ -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;