Working through adding trimmed frame support to Bitmap Text

Author: photonstorm

v3/src/gameobjects/bitmaptext/ParseFromAtlas.js

@@ -0,0 +1,22 @@
+var ParseXMLBitmapFont = require('./ParseXMLBitmapFont');
+
+var ParseFromAtlas = function (state, fontName, textureKey, frameKey, xmlKey, xSpacing, ySpacing)
+{
+    var frame = state.sys.textures.getFrame(textureKey, frameKey);
+    var xml = state.sys.cache.xml.get(xmlKey);
+
+    if (frame && xml)
+    {
+        var data = ParseXMLBitmapFont(xml, xSpacing, ySpacing, frame);
+
+        state.sys.cache.bitmapFont.add(fontName, { data: data, texture: textureKey, frame: frameKey });
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+};
+
+module.exports = ParseFromAtlas;

v3/src/gameobjects/bitmaptext/ParseXMLBitmapFont.js

@@ -3,6 +3,16 @@ function getValue (node, attribute)
     return parseInt(node.getAttribute(attribute), 10);
 }
 
+// "azo-fire":
+// {
+//     "frame": {"x":2,"y":2,"w":1020,"h":376},
+//     "rotated": false,
+//     "trimmed": true,
+//     "spriteSourceSize": {"x":1,"y":1,"w":1020,"h":376},
+//     "sourceSize": {"w":1024,"h":512},
+//     "pivot": {"x":0.5,"y":0.5}
+// },
+
 var ParseXMLBitmapFont = function (xml, xSpacing, ySpacing, frame)
 {
     if (xSpacing === undefined) { xSpacing = 0; }
@@ -19,8 +29,13 @@ var ParseXMLBitmapFont = function (xml, xSpacing, ySpacing, frame)
 
     var letters = xml.getElementsByTagName('char');
 
-    var x = (frame) ? frame.x : 0;
-    var y = (frame) ? frame.y : 0;
+    var x = 0;
+    var y = 0;
+
+    if (frame && frame.trim)
+    {
+
+    }
 
     for (var i = 0; i < letters.length; i++)
     {

v3/src/gameobjects/bitmaptext/static/BitmapText.js

@@ -1,9 +1,10 @@
 var Class = require('../../../utils/Class');
-var GameObject = require('../../GameObject');
 var Components = require('../../components');
-var Render = require('./BitmapTextRender');
+var GameObject = require('../../GameObject');
 var GetBitmapTextSize = require('../GetBitmapTextSize');
+var ParseFromAtlas = require('../ParseFromAtlas');
 var ParseRetroFont = require('../ParseRetroFont');
+var Render = require('./BitmapTextRender');
 
 var BitmapText = new Class({
 
@@ -25,21 +26,23 @@ var BitmapText = new Class({
 
     initialize:
 
-    function BitmapText (state, x, y, font, text, size, align)
+    function BitmapText (state, x, y, font, text, size)
     {
         if (text === undefined) { text = ''; }
-        if (align === undefined) { align = 'left'; }
 
         GameObject.call(this, state, 'BitmapText');
 
         this.font = font;
-        this.fontData = this.state.sys.cache.bitmapFont.get(font);
+
+        var entry = this.state.sys.cache.bitmapFont.get(font);
+
+        this.fontData = entry.data;
 
         this.text = (Array.isArray(text)) ? text.join('\n') : text;
 
         this.fontSize = size || this.fontData.size;
 
-        this.setTexture(font);
+        this.setTexture(entry.texture, entry.frame);
         this.setPosition(x, y);
         this.setOrigin(0, 0);
     },
@@ -101,5 +104,6 @@ var BitmapText = new Class({
 });
 
 BitmapText.ParseRetroFont = ParseRetroFont;
+BitmapText.ParseFromAtlas = ParseFromAtlas;
 
 module.exports = BitmapText;

v3/src/gameobjects/bitmaptext/static/BitmapTextCreator.js

@@ -1,15 +1,16 @@
 var BitmapText = require('./BitmapText');
-var GetAdvancedValue = require('../../../utils/object/GetAdvancedValue');
 var BuildGameObject = require('../../BuildGameObject');
+var GetAdvancedValue = require('../../../utils/object/GetAdvancedValue');
+var GetValue = require('../../../utils/object/GetValue');
 
 var BitmapTextCreator = function (state, config)
 {
-    var font = GetAdvancedValue(config, 'font', '');
+    var font = GetValue(config, 'font', '');
     var text = GetAdvancedValue(config, 'text', '');
     var size = GetAdvancedValue(config, 'size', false);
-    var align = GetAdvancedValue(config, 'align', 'left');
+    var align = GetValue(config, 'align', 'left');
 
-    var bitmapText = new BitmapText(state, 0, 0, font, text, size, align);
+    var bitmapText = new BitmapText(state, 0, 0, font, text, size);
 
     BuildGameObject(state, bitmapText, config);
 

v3/src/gameobjects/bitmaptext/static/BitmapTextFactory.js

@@ -1,8 +1,8 @@
 var BitmapText = require('./BitmapText');
 
-var BitmapTextFactory = function (state, x, y, font, text, size, align)
+var BitmapTextFactory = function (state, x, y, font, text, size)
 {
-    return new BitmapText(state, x, y, font, text, size, align);
+    return new BitmapText(state, x, y, font, text, size);
 };
 
 module.exports = BitmapTextFactory;