Added 2-points stretch function.

diff --git a/engine/kage.js b/engine/kage.js
index 18595de..34df397 100755 (executable)
--- a/engine/kage.js
+++ b/engine/kage.js
@@ -43,7 +43,9 @@ function Kage(size){
                                                   Math.floor(columns[5]),\r
                                                   Math.floor(columns[6]),\r
                                                   Math.floor(columns[1]),\r
-                                                  Math.floor(columns[2]))\r
+                                                  Math.floor(columns[2]),\r
+                                                  Math.floor(columns[9]),\r
+                                                  Math.floor(columns[10]))\r
                             );\r
         }\r
       }\r
@@ -52,27 +54,29 @@ function Kage(size){
   }\r
   Kage.prototype.getEachStrokes = getEachStrokes;\r
   \r
-  function getEachStrokesOfBuhin(buhin, x1, y1, x2, y2, a1, a2){\r
+  function getEachStrokesOfBuhin(buhin, x1, y1, x2, y2, sx, sy, sx2, sy2){\r
     var temp = this.getEachStrokes(buhin);\r
     var result = new Array();\r
     var box = this.getBox(buhin);\r
     for(var i = 0; i < temp.length; i++){\r
-\r
-       var sx = a1;\r
-       var sy = a2;\r
        if(sx != 0 || sy != 0){\r
-           temp[i][3] = stretch(sx, temp[i][3], box.minX, box.maxX);\r
-           temp[i][4] = stretch(sy, temp[i][4], box.minY, box.maxY);\r
-           temp[i][5] = stretch(sx, temp[i][5], box.minX, box.maxX);\r
-           temp[i][6] = stretch(sy, temp[i][6], box.minY, box.maxY);\r
+           if(sx > 200){\r
+               sx -= 200; // Ǥ°ÕÅÀ¥â¡¼¥É\r
+           } else {\r
+               sx2 = 0; // Ãæ¿´ÅÀ¥â¡¼¥É\r
+               sy2 = 0;\r
+           }\r
+           temp[i][3] = stretch(sx, sx2, temp[i][3], box.minX, box.maxX);\r
+           temp[i][4] = stretch(sy, sy2, temp[i][4], box.minY, box.maxY);\r
+           temp[i][5] = stretch(sx, sx2, temp[i][5], box.minX, box.maxX);\r
+           temp[i][6] = stretch(sy, sy2,temp[i][6], box.minY, box.maxY);\r
            if(temp[i][0] != 99){\r
-               temp[i][7] = stretch(sx, temp[i][7], box.minX, box.maxX);       \r
-               temp[i][8] = stretch(sy, temp[i][8], box.minY, box.maxY);\r
+               temp[i][7] = stretch(sx, sx2, temp[i][7], box.minX, box.maxX);  \r
+               temp[i][8] = stretch(sy, sy2, temp[i][8], box.minY, box.maxY);\r
+               temp[i][9] = stretch(sx, sx2, temp[i][9], box.minX, box.maxX);\r
+               temp[i][10] = stretch(sy, sy2, temp[i][10], box.minY, box.maxY);\r
            }\r
-           temp[i][9] = stretch(sx, temp[i][9], box.minX, box.maxX);\r
-           temp[i][10] = stretch(sy, temp[i][10], box.minY, box.maxY);\r
        }\r
-\r
       result.push([temp[i][0],\r
                    temp[i][1],\r
                    temp[i][2],\r
@@ -305,7 +309,9 @@ function Kage(size){
                          Math.floor(columns[5]),\r
                          Math.floor(columns[6]),\r
                          Math.floor(columns[1]),\r
-                         Math.floor(columns[2]));\r
+                         Math.floor(columns[2]),\r
+                         Math.floor(columns[9]),\r
+                         Math.floor(columns[10]));\r
         }\r
       }\r
     }\r
@@ -338,6 +344,7 @@ function Kage(size){
          a.maxY = Math.max(a.maxY, strokes[i][8]);\r
          if(strokes[i][0] == 2){ continue; }\r
          if(strokes[i][0] == 3){ continue; }\r
+         if(strokes[i][0] == 4){ continue; }\r
          a.minX = Math.min(a.minX, strokes[i][9]);\r
          a.maxX = Math.max(a.maxX, strokes[i][9]);\r
          a.minY = Math.min(a.minY, strokes[i][10]);\r
@@ -347,42 +354,46 @@ function Kage(size){
   }\r
   Kage.prototype.getBox = getBox;\r
 \r
-  function stretch(dp, sp, min, max){ // interger\r
+  function stretch(dp, sp, p, min, max){ // interger\r
       var p1, p2, p3, p4;\r
-      if(sp < 100){\r
+      if(p < sp + 100){\r
          p1 = min;\r
          p3 = min;\r
-         p2 = 100;\r
-         p4 = 100 + dp;\r
+         p2 = sp + 100;\r
+         p4 = dp + 100;\r
       } else {\r
-         p1 = 100;\r
-         p3 = 100 + dp;\r
+         p1 = sp + 100;\r
+         p3 = dp + 100;\r
          p2 = max;\r
          p4 = max;\r
       }\r
-      return Math.floor(((sp - p1) / (p2 - p1)) * (p4 - p3) + p3);\r
+      return Math.floor(((p - p1) / (p2 - p1)) * (p4 - p3) + p3);\r
   }\r
   Kage.prototype.stretch = stretch;\r
 \r
-  function drawBuhin(polygons, glyph, x1, y1, x2, y2, sx, sy){ // void\r
+  function drawBuhin(polygons, glyph, x1, y1, x2, y2, sx, sy, sx2, sy2){ // void\r
     var strokes = glyph.split("$");\r
     var box = this.getBox(glyph);\r
     for(var i = 0; i < strokes.length; i++){\r
       var columns = strokes[i].split(":");\r
-\r
        if(sx != 0 || sy != 0){\r
-           columns[3] = stretch(sx, columns[3], box.minX, box.maxX);\r
-           columns[4] = stretch(sy, columns[4], box.minY, box.maxY);\r
-           columns[5] = stretch(sx, columns[5], box.minX, box.maxX);\r
-           columns[6] = stretch(sy, columns[6], box.minY, box.maxY);\r
+           if(sx > 200){\r
+               sx -= 200; // Ǥ°ÕÅÀ¥â¡¼¥É\r
+           } else {\r
+               sx2 = 0; // Ãæ¿´ÅÀ¥â¡¼¥É\r
+               sy2 = 0;\r
+           }\r
+           columns[3] = stretch(sx, sx2, columns[3], box.minX, box.maxX);\r
+           columns[4] = stretch(sy, sy2, columns[4], box.minY, box.maxY);\r
+           columns[5] = stretch(sx, sx2, columns[5], box.minX, box.maxX);\r
+           columns[6] = stretch(sy, sy2, columns[6], box.minY, box.maxY);\r
            if(columns[0] != 99){\r
-               columns[7] = stretch(sx, columns[7], box.minX, box.maxX);\r
-               columns[8] = stretch(sy, columns[8], box.minY, box.maxY);\r
+               columns[7] = stretch(sx, sx2, columns[7], box.minX, box.maxX);\r
+               columns[8] = stretch(sy, sy2, columns[8], box.minY, box.maxY);\r
+               columns[9] = stretch(sx, sx2, columns[9], box.minX, box.maxX);\r
+               columns[10] = stretch(sy, sy2, columns[10], box.minY, box.maxY);\r
            }\r
-           columns[9] = stretch(sx, columns[9], box.minX, box.maxX);\r
-           columns[10] = stretch(sy, columns[10], box.minY, box.maxY);\r
        }\r
-\r
       if(Math.floor(columns[0]) != 99){\r
         dfDrawFont(this, polygons,\r
                    Math.floor(columns[0]),\r
@@ -405,7 +416,9 @@ function Kage(size){
                          x1 + Math.floor(columns[5]) * (x2 - x1) / 200,\r
                          y1 + Math.floor(columns[6]) * (y2 - y1) / 200,\r
                         Math.floor(columns[1]),\r
-                        Math.floor(columns[2]));\r
+                        Math.floor(columns[2]),\r
+                        Math.floor(columns[9]),\r
+                        Math.floor(columns[10]));\r
         }\r
       }\r
     }\r