- ctx が bitmap の時しか用意してなかったので fillstyle 処理の頭に移動1

[flapp/flapp.git] / src / shape.js

diff --git a/src/shape.js b/src/shape.js
index f5bf43f..5c41754 100644 (file)
--- a/src/shape.js
+++ b/src/shape.js
@@ -34,6 +34,7 @@ FlappShape.prototype = {
        var lineStyles = shape.lineStyles;
        var fillEdges = shape.edges.fillEdges;
        var lineEdges = shape.edges.lineEdges;
+       rca.push("var ctx = canvas.ctx;");
        for (var fillStyle in fillEdges) {
            // style
            var style = fillStyles[fillStyle - 1];
@@ -50,7 +51,7 @@ FlappShape.prototype = {
            var maxY = edgeInfoList.maxY;
            switch (style.type) {
            case 00:
-               styleCode = '"'+style.color.toCSS()+'"';
+               styleCode = '"'+FlappSWFRGBA.toCSS(style.color)+'"';
                break;
             case 0x40:
             case 0x41:
@@ -61,7 +62,6 @@ FlappShape.prototype = {
                } else {
                    var bitmap = dict.get(style.bitmapId);
                    var image = bitmap.image;
-                   rca.push("var ctx = canvas.ctx;");
                    rca.push("var bitmap = dict.get("+style.bitmapId+");");
                    rca.push("var image = bitmap.image;");
                    rca.push("var canvas_im = document.createElement('canvas');");
@@ -117,7 +117,7 @@ FlappShape.prototype = {
                    edgesUsed[currIndex] = 1; // used
                    for (var i2 = 2, l2 = edges.length ; i2 < l2; ) {
                        if (types[i2 / 2 - 1] === 'C') {
-                           rca.push("ctx.ctx.quadraticCurveTo("+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+","+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+");");
+                           rca.push("ctx.quadraticCurveTo("+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+","+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+");");
                        } else {
                            rca.push("ctx.lineTo("+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+");");
                        }