Fixed HANE's degree of jump up curve.

[chise/kage.git] / engine / kage.js

diff --git a/engine/kage.js b/engine/kage.js
index 49343c7..743186e 100755 (executable)
--- a/engine/kage.js
+++ b/engine/kage.js
@@ -1,9 +1,9 @@
-function Kage(){\r
+function Kage(size){\r
   // method\r
   function makeGlyph(polygons, buhin){ // void\r
     var glyphData = this.kBuhin.search(buhin);\r
     if(glyphData != ""){\r
-      this.drawStrokesArray(polygons, this.adjustKirikuchi(this.adjustUroko(this.adjustKakato(this.getEachStrokes(glyphData)))));\r
+      this.drawStrokesArray(polygons, this.adjustKirikuchi(this.adjustUroko(this.adjustKakato(this.adjustTate(this.getEachStrokes(glyphData))))));\r
     }\r
   }\r
   Kage.prototype.makeGlyph = makeGlyph;\r
@@ -63,7 +63,7 @@ function Kage(){
   }\r
   Kage.prototype.getEachStrokesOfBuhin = getEachStrokesOfBuhin;\r
   \r
-       function adjustUroko(strokesArray){ // strokesArray\r
+  function adjustUroko(strokesArray){ // strokesArray\r
     for(var i = 0; i < strokesArray.length; i++){\r
       if(strokesArray[i][0] == 1 && strokesArray[i][2] == 0){ // no operation for TATE\r
         for(var k = 0; k < this.kAdjustUrokoLengthStep; k++){\r
@@ -91,8 +91,27 @@ function Kage(){
     return strokesArray;\r
   }\r
   Kage.prototype.adjustUroko = adjustUroko;\r
-       \r
-       function adjustKirikuchi(strokesArray){ // strokesArray\r
+  \r
+  function adjustTate(strokesArray){ // strokesArray\r
+    for(var i = 0; i < strokesArray.length; i++){\r
+      if((strokesArray[i][0] == 1 || strokesArray[i][0] == 3 || strokesArray[i][0] == 7) && strokesArray[i][3] == strokesArray[i][5]){\r
+        for(var j = 0; j < strokesArray.length; j++){\r
+          if(i != j && (strokesArray[j][0] == 1 || strokesArray[j][0] == 3 || strokesArray[j][0] == 7) && strokesArray[j][3] == strokesArray[j][5] &&\r
+             !(strokesArray[i][4] + 1 > strokesArray[j][6] || strokesArray[i][6] - 1 < strokesArray[j][4]) &&\r
+             Math.abs(strokesArray[i][3] - strokesArray[j][3]) < this.kMinWidthT * 4){\r
+            strokesArray[i][1] += (4 - Math.floor(Math.abs(strokesArray[i][3] - strokesArray[j][3]) / this.kMinWidthT)) * 1000;\r
+            if(strokesArray[i][1] > this.kAdjustTateStep * 1000){\r
+              strokesArray[i][1] = strokesArray[i][1] % 1000 + this.kAdjustTateStep * 1000;\r
+            }\r
+          }\r
+        }\r
+      }\r
+    }\r
+    return strokesArray;\r
+  }\r
+  Kage.prototype.adjustTate = adjustTate;\r
+  \r
+  function adjustKirikuchi(strokesArray){ // strokesArray\r
     for(var i = 0; i < strokesArray.length; i++){\r
       if(strokesArray[i][0] == 2 && strokesArray[i][1] == 32 &&\r
          strokesArray[i][3] > strokesArray[i][5] &&\r
@@ -110,7 +129,7 @@ function Kage(){
     return strokesArray;\r
   }\r
   Kage.prototype.adjustKirikuchi = adjustKirikuchi;\r
-       \r
+  \r
   function adjustKakato(strokesArray){ // strokesArray\r
     for(var i = 0; i < strokesArray.length; i++){\r
       if(strokesArray[i][0] == 1 &&\r
@@ -215,29 +234,53 @@ function Kage(){
   Kage.prototype.kMincho = 0;\r
   Kage.prototype.kGothic = 1;\r
   this.kShotai = this.kMincho;\r
-       \r
+  \r
   this.kRate = 100;\r
-       \r
-  this.kMinWidthY = 2;\r
-  this.kMinWidthT = 6;\r
-  this.kWidth = 5;\r
-  this.kKakato = 3;\r
-  this.kL2RDfatten = 1.1;\r
-  this.kMage = 10;\r
-  this.kUseCurve = 0;\r
-       \r
-  this.kAdjustKakatoL = ([14, 9, 5, 2]); // for KAKATO adjustment 000,100,200,300\r
-  this.kAdjustKakatoR = ([8, 6, 4, 2]); // for KAKATO adjustment 000,100,200,300\r
-  this.kAdjustKakatoRangeX = 20; // check area width\r
-  this.kAdjustKakatoRangeY = ([1, 19, 24, 30]); // 3 steps of checking\r
-  this.kAdjustKakatoStep = 3; // number of steps\r
-       \r
-  this.kAdjustUrokoX = ([24, 20, 16, 12]); // for UROKO adjustment 000,100,200,300\r
-  this.kAdjustUrokoY = ([12, 11, 9, 8]); // for UROKO adjustment 000,100,200,300\r
-  this.kAdjustUrokoLength = ([22, 36, 50]); // length for checking\r
-  this.kAdjustUrokoLengthStep = 3; // number of steps\r
-  this.kAdjustUrokoLine = ([22, 26, 30]); // check for crossing. corresponds to length\r
-       \r
+  \r
+  if(size == 1){\r
+    this.kMinWidthY = 1.2;\r
+    this.kMinWidthT = 3.6;\r
+    this.kWidth = 3;\r
+    this.kKakato = 1.8;\r
+    this.kL2RDfatten = 1.1;\r
+    this.kMage = 6;\r
+    this.kUseCurve = 0;\r
+    \r
+    this.kAdjustKakatoL = ([8, 5, 3, 1]); // for KAKATO adjustment 000,100,200,300\r
+    this.kAdjustKakatoR = ([4, 3, 2, 1]); // for KAKATO adjustment 000,100,200,300\r
+    this.kAdjustKakatoRangeX = 12; // check area width\r
+    this.kAdjustKakatoRangeY = ([1, 11, 14, 18]); // 3 steps of checking\r
+    this.kAdjustKakatoStep = 3; // number of steps\r
+    \r
+    this.kAdjustUrokoX = ([14, 12, 9, 7]); // for UROKO adjustment 000,100,200,300\r
+    this.kAdjustUrokoY = ([7, 6, 5, 4]); // for UROKO adjustment 000,100,200,300\r
+    this.kAdjustUrokoLength = ([13, 21, 30]); // length for checking\r
+    this.kAdjustUrokoLengthStep = 3; // number of steps\r
+    this.kAdjustUrokoLine = ([13, 15, 18]); // check for crossing. corresponds to length\r
+  } else {\r
+    this.kMinWidthY = 2;\r
+    this.kMinWidthT = 6;\r
+    this.kWidth = 5;\r
+    this.kKakato = 3;\r
+    this.kL2RDfatten = 1.1;\r
+    this.kMage = 10;\r
+    this.kUseCurve = 0;\r
+    \r
+    this.kAdjustKakatoL = ([14, 9, 5, 2]); // for KAKATO adjustment 000,100,200,300\r
+    this.kAdjustKakatoR = ([8, 6, 4, 2]); // for KAKATO adjustment 000,100,200,300\r
+    this.kAdjustKakatoRangeX = 20; // check area width\r
+    this.kAdjustKakatoRangeY = ([1, 19, 24, 30]); // 3 steps of checking\r
+    this.kAdjustKakatoStep = 3; // number of steps\r
+    \r
+    this.kAdjustUrokoX = ([24, 20, 16, 12]); // for UROKO adjustment 000,100,200,300\r
+    this.kAdjustUrokoY = ([12, 11, 9, 8]); // for UROKO adjustment 000,100,200,300\r
+    this.kAdjustUrokoLength = ([22, 36, 50]); // length for checking\r
+    this.kAdjustUrokoLengthStep = 3; // number of steps\r
+    this.kAdjustUrokoLine = ([22, 26, 30]); // check for crossing. corresponds to length\r
+    \r
+    this.kAdjustTateStep = 4;\r
+  }\r
+  \r
   this.kBuhin = new Buhin();\r
   \r
   return this;\r