Tided up the renderer, optimized ParseXML a load, removed dead files.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '7d8aef10-ffa6-11e6-8da0-df16c1ad112f'
+build: '8a9ef8e0-ffb0-11e6-922a-fdf541bc229e'
 };
 module.exports = CHECKSUM;

v3/src/gameobjects/bitmaptext/BitmapText.js

@@ -46,18 +46,41 @@ var BitmapText = new Class({
         return this;
     },
 
+    setFontSize: function (size)
+    {
+        this.fontSize = size;
+
+        return this;
+    },
+
     setText: function (text)
     {
         this.text = text;
 
         return this;
     },
 
+    // {
+    //     local: {
+    //         x,
+    //         y,
+    //         width,
+    //         height
+    //     },
+    //     global: {
+    //         x,
+    //         y,
+    //         width,
+    //         height
+    //     }
+    // }
+
     getTextBounds: function ()
     {
-        var size = GetBitmapTextSize(this);
+        //  local = the BitmapText based on fontSize and 0x0 coords
+        //  global = the BitmapText, taking into account scale and world position
 
-        return { x: this.x + size.x, y: this.y + size.y, width: size.width, height: size.height };
+        return GetBitmapTextSize(this);
     }
 
 });

v3/src/gameobjects/bitmaptext/BitmapTextCanvasRenderer.js

@@ -133,13 +133,6 @@ var BitmapTextCanvasRenderer = function (renderer, src, interpolationPercentage,
         // ctx.fillStyle = 'rgba(0,255,0,0.2)';
         // ctx.fillRect(0, 0, glyphW, glyphH);
 
-        // if (!window.bob)
-        // {
-        //     window.bob = true;
-        //     console.log('xywh', x, y, glyphW, glyphH);
-        //     console.log('scaled', x * scale, y * scale, glyphW * scale, glyphH * scale);
-        // }
-
         ctx.drawImage(image, glyphX, glyphY, glyphW, glyphH, 0, 0, glyphW, glyphH);
 
         ctx.restore();

v3/src/gameobjects/bitmaptext/GetBitmapTextSize.js

@@ -4,16 +4,6 @@ var GetBitmapTextSize = function (src)
     var text = src.text;
     var textLength = text.length;
 
-    if (textLength === 0)
-    {
-        return {
-            x: 0,
-            y: 0,
-            width: 0,
-            height: 0
-        };
-    }
-
     var bx = Number.MAX_VALUE;
     var by = Number.MAX_VALUE;
     var bw = 0;
@@ -38,8 +28,6 @@ var GetBitmapTextSize = function (src)
     var lastGlyph = null;
     var lastCharCode = 0;
 
-    var scale = (src.fontSize / src.fontData.size);
-
     for (var index = 0; index < textLength; ++index)
     {
         charCode = text.charCodeAt(index);
@@ -101,19 +89,23 @@ var GetBitmapTextSize = function (src)
         lastCharCode = charCode;
     }
 
+    var scale = (src.fontSize / src.fontData.size);
     var sx = scale * src.scaleX;
     var sy = scale * src.scaleY;
 
-    bx *= sx;
-    by *= sy;
-    bw *= sx;
-    bh *= sy;
-
     return {
-        x: bx,
-        y: by,
-        width: bw,
-        height: bh
+        local: {
+            x: bx * scale,
+            y: by * scale,
+            width: bw * scale,
+            height: bh * scale
+        },
+        global: {
+            x: src.x + (bx * sx),
+            y: src.y + (by * sy),
+            width: bw * sx,
+            height: bh * sy
+        }
     };
 };
 

v3/src/gameobjects/bitmaptext/ParseXMLBitmapFont.js

@@ -1,3 +1,8 @@
+function getValue (node, attribute)
+{
+    return parseInt(node.getAttribute(attribute), 10);
+}
+
 var ParseXMLBitmapFont = function (xml, xSpacing, ySpacing, frame)
 {
     if (xSpacing === undefined) { xSpacing = 0; }
@@ -8,8 +13,8 @@ var ParseXMLBitmapFont = function (xml, xSpacing, ySpacing, frame)
     var common = xml.getElementsByTagName('common')[0];
 
     data.font = info.getAttribute('face');
-    data.size = parseInt(info.getAttribute('size'), 10);
-    data.lineHeight = parseInt(common.getAttribute('lineHeight'), 10) + ySpacing;
+    data.size = getValue(info, 'size');
+    data.lineHeight = getValue(common, 'lineHeight') + ySpacing;
     data.chars = {};
 
     var letters = xml.getElementsByTagName('char');
@@ -19,17 +24,23 @@ var ParseXMLBitmapFont = function (xml, xSpacing, ySpacing, frame)
 
     for (var i = 0; i < letters.length; i++)
     {
-        var charCode = parseInt(letters[i].getAttribute('id'), 10);
+        var node = letters[i];
+
+        var charCode = getValue(node, 'id');
+        var gw = getValue(node, 'width');
+        var gh = getValue(node, 'height');
 
         data.chars[charCode] =
         {
-            x: x + parseInt(letters[i].getAttribute('x'), 10),
-            y: y + parseInt(letters[i].getAttribute('y'), 10),
-            width: parseInt(letters[i].getAttribute('width'), 10),
-            height: parseInt(letters[i].getAttribute('height'), 10),
-            xOffset: parseInt(letters[i].getAttribute('xoffset'), 10),
-            yOffset: parseInt(letters[i].getAttribute('yoffset'), 10),
-            xAdvance: parseInt(letters[i].getAttribute('xadvance'), 10) + xSpacing,
+            x: x + getValue(node, 'x'),
+            y: y + getValue(node, 'y'),
+            width: gw,
+            height: gh,
+            centerX: Math.floor(gw / 2),
+            centerY: Math.floor(gh / 2),
+            xOffset: getValue(node, 'xoffset'),
+            yOffset: getValue(node, 'yoffset'),
+            xAdvance: getValue(node, 'xadvance') + xSpacing,
             kerning: {}
         };
     }
@@ -38,9 +49,11 @@ var ParseXMLBitmapFont = function (xml, xSpacing, ySpacing, frame)
 
     for (i = 0; i < kernings.length; i++)
     {
-        var first = parseInt(kernings[i].getAttribute('first'), 10);
-        var second = parseInt(kernings[i].getAttribute('second'), 10);
-        var amount = parseInt(kernings[i].getAttribute('amount'), 10);
+        var kern = kernings[i];
+
+        var first = getValue(kern, 'first');
+        var second = getValue(kern, 'second');
+        var amount = getValue(kern, 'amount');
 
         data.chars[second].kerning[first] = amount;
     }